Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -213,6 +213,8 @@ public class EventSystemManager : Singleton<EventSystemManager>
         int count = 0;
         foreach (var eventList in AccountFileInfo.Instance.playerData.eventList)
         {
+            if (eventList == null || eventList.eventID == 0)
+                continue;
             EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
             if (eventConfig.EventTriggerType != 5)
             {

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceInfoPanel.cs

@@ -52,7 +52,7 @@ namespace Fort23.Mono
             Text_Level.text = $"神识等级:{AccountFileInfo.Instance.playerData.divineSenseLevel}级";
             Text_Exp.text = $"{AccountFileInfo.Instance.playerData.divineSenseexp}/{divineSenseConfig.exp}";
             Slider_Exp.maxValue = divineSenseConfig.exp;
-            Slider_Exp.value = divineSenseConfig.exp;
+            Slider_Exp.value =AccountFileInfo.Instance.playerData.divineSenseexp;
 
             int count = AccountFileInfo.Instance.playerData.divineSensePoint / PlayerManager.Instance.gameConstantConfig.DetectEventCount;
             int maxCount = heroPowerUpConfig.ShenshiMax / PlayerManager.Instance.gameConstantConfig.DetectEventCount;