|
@@ -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)
|
|
|
{
|