修改bug

Assets/Scripts/GameUI/EventManager/DialogueManager.cs

@@ -53,15 +53,7 @@ public class DialogueManager : Singleton<DialogueManager>
         currentDialogueID = dialogueID;
         // 找到当前对话组
         var dialogueConfig = ConfigComponent.Instance.Get<EventLinkConfig>(dialogueID);
-        if (CurrentEventList != null)
-        {
-            var eventLinkDatas = CurrentEventList.eventLinks.FirstOrDefault(el => el.eventLinkId == dialogueID);
-            if (eventLinkDatas != null && !EventSystemManager.Instance.CeekEventGroupComplete(eventLinkDatas.eventConditions))
-            {
-                onCancel?.Invoke();
-                return;
-            }
-        }
+      
 
 
         // foreach (var eventConditionData in eventLinkDatas.eventConditions)
@@ -86,7 +78,16 @@ public class DialogueManager : Singleton<DialogueManager>
                     EventSystemManager.Instance.CurrentEventList.selectEventLinkIds.Add(currentDialogueID);
             }
         }
-
+        
+        if (CurrentEventList != null)
+        {
+            var eventLinkDatas = CurrentEventList.eventLinks.FirstOrDefault(el => el.eventLinkId == dialogueID);
+            if (eventLinkDatas != null && !EventSystemManager.Instance.CeekEventGroupComplete(eventLinkDatas.eventConditions))
+            {
+                onCancel?.Invoke();
+                return;
+            }
+        }
 
         if (dialogueConfig.ID == 0)
         {

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -663,9 +663,9 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
             //使用神识
             case 8:
-                if (eventConditionConfig.ConditionType == 5)
+                if (eventConditionConfig.ConditionType == 8)
                 {
-                    conditionData.fishCount += value[1];
+                    conditionData.fishCount += value[0];
 
                     if (IsEvenkLinkComplete(conditionData))
                     {

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

@@ -23,30 +23,26 @@ namespace Fort23.Mono
 
         public override void AddEvent()
         {
-            EventManager.Instance.AddEventListener(CustomEventType.UpdateZuiZhongEvent,UpdateZuiZhongEvent);
+            EventManager.Instance.AddEventListener(CustomEventType.UpdateZuiZhongEvent, UpdateZuiZhongEvent);
         }
 
-     
 
         public override void DelEvent()
         {
-            EventManager.Instance.RemoveEventListener(CustomEventType.UpdateZuiZhongEvent,UpdateZuiZhongEvent);
+            EventManager.Instance.RemoveEventListener(CustomEventType.UpdateZuiZhongEvent, UpdateZuiZhongEvent);
         }
 
         public override void AddButtonEvent()
         {
             base.AddButtonEvent();
             Btn_RemoveEvent.onClick.AddListener(() => { EventSystemManager.Instance.RemoveEvent(eventList); });
-            Btn_Go.onClick.AddListener(() =>
-            {
-                goCallBack?.Invoke(this);
-            });
-            
+            Btn_Go.onClick.AddListener(() => { goCallBack?.Invoke(this); });
+
             Btn_ZuiZhong.onClick.AddListener(() =>
             {
                 AccountFileInfo.Instance.playerData.CurrentZuiZhongEventList = eventList;
-                
-                EventManager.Instance.Dispatch(CustomEventType.UpdateZuiZhongEvent,null);
+
+                EventManager.Instance.Dispatch(CustomEventType.UpdateZuiZhongEvent, null);
             });
         }
 
@@ -61,10 +57,11 @@ namespace Fort23.Mono
         {
             // if(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventList.guid == eventList.guid)
             Btn_ZuiZhong.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventList.guid != eventList.guid);
-            
+
             ZuiZhongRoot.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventList.guid == eventList.guid);
         }
-        public async void CustomInit(AccountFileInfo.EventList eventList,Action<ItemWidgetBasic> goCallBack)
+
+        public async void CustomInit(AccountFileInfo.EventList eventList, Action<ItemWidgetBasic> goCallBack)
         {
             this.eventList = eventList;
             this.goCallBack = goCallBack;
@@ -80,7 +77,14 @@ namespace Fort23.Mono
 
             if (eventLinkData == null || eventLinkData.eventConditions == null || eventLinkData.eventConditions.Count == 0)
             {
-                Text_Eventcondition.text = LanguageManager.Instance.Text(evenkConfig.EventConditionMessage);
+                if (evenkConfig.EventConditionMessage != 0)
+                {
+                    Text_Eventcondition.text = LanguageManager.Instance.Text(evenkConfig.EventConditionMessage);
+                }
+                else
+                {
+                    Text_Eventcondition.text = "";
+                }
             }
             else
             {
@@ -92,9 +96,9 @@ namespace Fort23.Mono
 
                 Text_Eventcondition.text = desc;
             }
-            
+
             Btn_ZuiZhong.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventList.guid != eventList.guid);
-            
+
             ZuiZhongRoot.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventList.guid == eventList.guid);
             Icon_Marsk.gameObject.SetActive(eventList.isCompleted);