lzx hace 2 días
padre
commit
47358a3548

+ 7 - 0
Assets/Res/Config/ChanllegeResource.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: BiwetyurVngilPeVuD9BZjnjQP5s46Nw77hJuys7ARTXWlKLmTs0npxuEUxm
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 11 - 0
Assets/Scripts/GameData/ExcelConfig/ChanllegeResource.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: CnIY4yP+BSmUdS99YUIVmemuXxs4eh/bbiZkWCHhox25F0W/U0Zdl9ij4jED
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 7 - 2
Assets/Scripts/GameLogic/Combat/CombatType/LevelBattleCombatType.cs

@@ -79,11 +79,16 @@ namespace GameLogic.Combat.CombatType
                 int group = levelbattleConfig.Group[i];
                 GroupConfig groupConfig = ConfigComponent.Instance.Get<GroupConfig>(group);
                 int[] monster = groupConfig.GroupMonster;
-                int level = groupConfig.GroupMonsterLevel;
-                if (level < 0)
+                int[] levels = groupConfig.GroupMonsterLevel;
+                int level = 0;
+                if (levels == null)
                 {
                     level = PlayerManager.Instance.myHero.level.Value;
                 }
+                else
+                {
+                    level = levels[0];
+                }
 
                 for (int j = 0; j < monster.Length; j++)
                 {

+ 8 - 6
Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -90,10 +90,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
         int maxCount = heroPowerUpConfig.ShenshiMax / PlayerManager.Instance.gameConstantConfig.DetectEventCount;
         count = count + AccountFileInfo.Instance.playerData.eventList.Count > maxCount ? maxCount - AccountFileInfo.Instance.playerData.eventList.Count : count;
 
-        int xiaoHao = count * PlayerManager.Instance.gameConstantConfig.DetectEventCount;
-
-        AccountFileInfo.Instance.playerData.divineSenseexp += xiaoHao;
-        AccountFileInfo.Instance.playerData.divineSensePoint -= xiaoHao;
+     
         EventManager.Instance.Dispatch(CustomEventType.DivineSensePointChange, null);
         // 神识升级逻辑
         UpDivinesense();
@@ -102,6 +99,11 @@ public class EventSystemManager : Singleton<EventSystemManager>
         if (eventConfigs == null || eventConfigs.Count == 0)
             return default;
 
+        //扣除神识值 增加神识经验
+        int xiaoHao =  eventConfigs.Count * PlayerManager.Instance.gameConstantConfig.DetectEventCount;
+        AccountFileInfo.Instance.playerData.divineSenseexp += xiaoHao;
+        AccountFileInfo.Instance.playerData.divineSensePoint -= xiaoHao;
+        
         AccountFileInfo.Instance.playerData.eventList.AddRange(eventConfigs);
         AccountFileInfo.Instance.SavePlayerData();
         return eventConfigs;
@@ -198,11 +200,11 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
 
             // 获取通用事件
-            List<EventConfig> globalEvents = eventConfigs.Where(e => e.EventTriggerType == 1 && CanTriggerEvent(e.ID) && e.EventQuality == quality && !BagIsEvent(e.ID)).ToList();
+            List<EventConfig> globalEvents = eventConfigs.Where(e => e.EventTriggerType == 1 && CanTriggerEvent(e.ID) && e.EventQuality == quality && !BagIsEvent(e.ID) && eventLists.FirstOrDefault(el => el.eventID == e.ID) == null).ToList();
 
 
             //场景特定事件
-            List<EventConfig> candidateEvents = eventConfigs.Where(e => bigMap.SpecialTaskID.Contains(e.ID) && CanTriggerEvent(e.ID) && e.EventQuality == quality && !BagIsEvent(e.ID)).ToList();
+            List<EventConfig> candidateEvents = eventConfigs.Where(e => bigMap.SpecialTaskID.Contains(e.ID) && CanTriggerEvent(e.ID) && e.EventQuality == quality && !BagIsEvent(e.ID) && eventLists.FirstOrDefault(el => el.eventID == e.ID) == null).ToList();
 
             if (candidateEvents.Count == 0 && globalEvents.Count == 0)
             {

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 193 - 756
UserSettings/Layouts/default-2022.dwlt


Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio