Browse Source

修改任务条件检测

lzx 1 week ago
parent
commit
24949f43e9

+ 1 - 4
Assets/Res/Config/EventLinkConfig.json

@@ -23530,10 +23530,7 @@
       "EventID": 9156,
       "EventID": 9156,
       "step": 10,
       "step": 10,
       "optionType": 0,
       "optionType": 0,
-      "ResultType": 1,
-      "ResultOptions": [
-        915611
-      ]
+      "ResultType": 0
     },
     },
     {
     {
       "ID": 915611,
       "ID": 915611,

+ 4 - 4
Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -777,7 +777,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
 
         CurrentEventList = evt;
         CurrentEventList = evt;
         CombatDrive.Instance.CombatController.ChangeState(CombatController.idle);
         CombatDrive.Instance.CombatController.ChangeState(CombatController.idle);
-        await DialogueManager.Instance.StartDialogue(CurrentEventList, dialogueID, eventConfig.ID, async() =>
+        await DialogueManager.Instance.StartDialogue(CurrentEventList, dialogueID, eventConfig.ID, async () =>
         {
         {
             EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(CurrentEventList.eventID);
             EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(CurrentEventList.eventID);
             if (eventConfig.EventTriggerType != 4)
             if (eventConfig.EventTriggerType != 4)
@@ -796,7 +796,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
                     await UIManager.Instance.HideUIUIPanel<DivineSenceEventPreviewPanel>();
                     await UIManager.Instance.HideUIUIPanel<DivineSenceEventPreviewPanel>();
                     UIManager.Instance.HideUIUIPanel<DivineSenceInfoPanel>();
                     UIManager.Instance.HideUIUIPanel<DivineSenceInfoPanel>();
                 }
                 }
-     
+
                 EventManager.Instance.Dispatch(CustomEventType.CompleteUpdate, null);
                 EventManager.Instance.Dispatch(CustomEventType.CompleteUpdate, null);
             }
             }
 
 
@@ -852,6 +852,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
         EventConditionConfig eventConditionConfig =
         EventConditionConfig eventConditionConfig =
             ConfigComponent.Instance.Get<EventConditionConfig>(eventCondition.eventCondition);
             ConfigComponent.Instance.Get<EventConditionConfig>(eventCondition.eventCondition);
 
 
+
         if (eventCondition != null)
         if (eventCondition != null)
         {
         {
             return eventCondition.fishCount >= eventConditionConfig.finishCount;
             return eventCondition.fishCount >= eventConditionConfig.finishCount;
@@ -930,7 +931,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
             ConfigComponent.Instance.Get<EventConditionConfig>(conditionData.eventCondition);
             ConfigComponent.Instance.Get<EventConditionConfig>(conditionData.eventCondition);
 
 
 
 
-        if (IsEvenkLinkComplete(conditionData))
+        if (IsEvenkLinkComplete(conditionData) && eventConditionConfig.ConditionType != 1)
             return;
             return;
 
 
         switch (type)
         switch (type)
@@ -1285,7 +1286,6 @@ public class EventSystemManager : Singleton<EventSystemManager>
         EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
         EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
         if (eventConfig.EventTriggerType == 4)
         if (eventConfig.EventTriggerType == 4)
         {
         {
-          
             await UIManager.Instance.HideUIUIPanel<DivineSenceEventPreviewPanel>();
             await UIManager.Instance.HideUIUIPanel<DivineSenceEventPreviewPanel>();
             await UIManager.Instance.HideUIUIPanel<DivineSenceInfoPanel>();
             await UIManager.Instance.HideUIUIPanel<DivineSenceInfoPanel>();
         }
         }

BIN
Excel2Json/Excel/EventConfig.xlsx