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

Assets/Scripts/GameUI/EventManager/DialogueManager.cs

@@ -274,6 +274,13 @@ public class DialogueManager : Singleton<DialogueManager>
             }
         }
 
+        //如果当前链条没有在事件链条里，不走结束逻辑
+        if (!eventConfig.EventLinksId.Contains(currentDialogueID))
+        {
+            onCancel?.Invoke();
+            return;
+        }
+
 
         switch (dialogueConfig.ResultType)
         {