UI工具翻新

1. 增加UI工具
2. 增加设置页面
3. GameLoop更新
4. 导入ActionKit工具

Assets/Scripts/Dialog System/BaseYarnCommand.cs

@@ -15,19 +15,13 @@ namespace AibisDream
         {
             EnumEventSystem.Global.Send(EventEnum.NextYarn);
             StorageSystem.Instance.ClearLocal();
-            DialogController.Instance.StartCoroutine(GameLoopManager.Instance.NextSceneSo());
-        }
-
-        [YarnCommand("BackToMenu")]
-        public static void BackToMenu()
-        {
-            StartMenu.Instance.BackToMenu();
+            DialogController.Instance.StartCoroutine(GameManager.Instance.NextSceneSo());
         }
 
         [YarnCommand("OpenEndMenu")]
         public static void OpenEndMenu()
         {
-            EndMenu.Instance.OpenEndMenu();
+            UIManager.Instance.ShowPanel<EndPanel>();
         }
 
         [Obsolete]
@@ -66,37 +60,57 @@ namespace AibisDream
         [YarnCommand("fade_in")]
         public static IEnumerator FadeIn(float duration = 1)
         {
-            return MainUIController.Instance.FadeInSync(duration);
+            var panel = UIManager.Instance.GetPanel<PlayToolPanel>();
+            return panel.FadeInAsync(duration);
         }
 
         [YarnCommand("fade_out")]
         public static IEnumerator FadeOut(float duration = 1)
         {
-            return MainUIController.Instance.FadeOutSync(duration);
+            var panel = UIManager.Instance.GetPanel<PlayToolPanel>();
+            return panel.FadeOutAsync(duration);
         }
 
         [YarnCommand("show_obj")]
         public static IEnumerator ShowObj(string picName)
         {
-            return MainUIController.Instance.ShowObj(picName);
+            var panel = UIManager.Instance.GetPanel<PlayToolPanel>();
+            return panel.ShowObj(picName);
         }
 
         [YarnCommand("hide_obj")]
         public static IEnumerator HideObj()
         {
-            return MainUIController.Instance.HideObj();
+            var panel = UIManager.Instance.GetPanel<PlayToolPanel>();
+            return panel.HideObj();
         }
 
         [YarnCommand("show_full_screen")]
         public static IEnumerator ShowFullScreen(string picName)
         {
-            return MainUIController.Instance.ShowFullScreen(picName);
+            var panel = UIManager.Instance.GetPanel<PlayToolPanel>();
+            return panel.ShowFullScreen(picName);
         }
 
         [YarnCommand("hide_full_screen")]
         public static IEnumerator HideFullScreen()
         {
-            return MainUIController.Instance.HideFullScreen();
+            var panel = UIManager.Instance.GetPanel<PlayToolPanel>();
+            return panel.HideFullScreen();
+        }
+        
+        [YarnCommand("open_progress_window")]
+        public static IEnumerator OpenProgressWindow(string title, string description, float duration)
+        {
+            var panel = UIManager.Instance.GetPanel<PlayToolPanel>();
+            return panel.OpenProgressWindow(title, description, duration);
+        }
+
+        [YarnCommand("flash_red")]
+        public static IEnumerator FlashRed(float duration = 0.2f)
+        {
+            var panel = UIManager.Instance.GetPanel<PlayToolPanel>();
+            return panel.FlashRed(duration);
         }
 
         [YarnCommand("switch_dialog_viewer")]

Assets/Scripts/Dialog System/DialogController.cs

@@ -58,21 +58,7 @@ namespace AibisDream
                 OnDialogueComplete?.Invoke();
                 IsTalking = false;
             });
-            
-            RegisterEvent();
-        }
 
-        private void RegisterEvent()
-        {
-            EnumEventSystem.Global.Register(EventEnum.SceneUnload, ResetDialog);
-        }
-
-        private void ResetDialog()
-        {
-            _dialogueRunner.Stop();
-            StorageSystem.Instance.Clear();
-            DialogCanvasManager.Instance.HideDialog();
-            DialogCanvasManager.Instance.SwitchDialogView(DialogViewType.OldBox);
         }
 
         /// <summary>
@@ -84,9 +70,13 @@ namespace AibisDream
             _dialogueRunner.SetProject(yarnProject);
             _dialogueRunner.StartDialogue("Start");
         }
+
         public void StopDialog()
         {
             _dialogueRunner.Stop();
+            StorageSystem.Instance.Clear();
+            DialogCanvasManager.Instance.HideDialog();
+            DialogCanvasManager.Instance.SwitchDialogView(DialogViewType.OldBox);
         }
 
         public void LoadDialog(YarnProject yarnProject)
@@ -117,7 +107,7 @@ namespace AibisDream
                 return false;
             }
         }
-        
+
         /// <summary>
         /// 跳到下一句
         /// </summary>