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

# Conflicts:
#	UserSettings/Layouts/default-2022.dwlt   resolved by master version

Assets/Scripts/GameLogic/EventManager/DialogueManager.cs

@@ -118,6 +118,10 @@ public class DialogueManager : Singleton<DialogueManager>
         {
             PlayDialogue(dialogueConfig.ResultOptions);
         }
+        else
+        {
+            EndDialogue();
+        }
     }
 
 

Assets/Scripts/GameLogic/EventManager/EventSystemManager.cs

@@ -1,14 +1,7 @@
-using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using Core.Event.Event;
 using Excel2Json;
-using Fort23.Core;
 using Fort23.UTool;
-using GameLogic.Bag;
-using GameLogic.Player;
-using UnityEngine;
 using Utility;
 using Random = UnityEngine.Random;
 
@@ -157,12 +150,12 @@ public class EventSystemManager : Singleton<EventSystemManager>
     }
 
     /// <summary>
-    /// 完成任务
+    /// 完成事件
     /// </summary>
     /// <param name="eventID">事件ID</param>
     public void CompleteEvent(int eventID)
     {
-        LogTool.Log($"完成任务{eventID}");
+        LogTool.Log($"完成事件{eventID}");
         AccountFileInfo.EventData eventData = AccountFileInfo.Instance.playerData.events.FirstOrDefault((e) => e.eventID == eventID);
         if (eventData == null)
         {

Assets/Scripts/GameUI/UI/MainPanel/MainPanel.cs

@@ -2,6 +2,7 @@ using System.Collections.Generic;
 using Excel2Json;
 using Fort23.Core;
 using GameLogic.Combat.CombatTool;
+using UnityEngine;
 
 namespace Fort23.Mono
 {
@@ -45,6 +46,16 @@ namespace Fort23.Mono
             }
         }
 
+        [CustomMethod(CustomMethodType.Update)]
+        public void Update()
+        {
+            if (Input.GetKeyDown(KeyCode.Y))
+            {
+                EventSystemManager.Instance.DetectRandomEvents();
+            }
+                
+        }
+
         public async static CTask OpenPanel()
         {
             await UIManager.Instance.LoadAndOpenPanel<MainPanel>(null);