From 48887b1aee3cee66de848a3ac620b52ecf4c0160 Mon Sep 17 00:00:00 2001
From: ALEXTANG <574809918@qq.com>
Date: Fri, 27 Oct 2023 13:18:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=86=E6=9E=B6=E6=94=AF=E6=8C=81Shudown?=
 =?UTF-8?q?=E4=B8=8D=E5=85=B3=E9=97=AD=E6=B8=B8=E6=88=8F=E9=87=8D=E5=90=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

框架支持Shudown不关闭游戏重启
---
 .../Main/Launcher/Scripts/UI/UILoadUpdate.cs  |  6 +--
 .../Modules/DebugerModule/DebuggerModule.cs   |  2 +-
 .../TEngine/Runtime/Modules/GameModule.cs     | 39 ++++++++++++++++++-
 .../Modules/ModuleCore/ModuleSystem.cs        |  3 +-
 .../Runtime/Modules/UIModule/UIModule.cs      |  4 ++
 5 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/UnityProject/Assets/GameScripts/Main/Launcher/Scripts/UI/UILoadUpdate.cs b/UnityProject/Assets/GameScripts/Main/Launcher/Scripts/UI/UILoadUpdate.cs
index 74087ab6..6f2285bc 100644
--- a/UnityProject/Assets/GameScripts/Main/Launcher/Scripts/UI/UILoadUpdate.cs
+++ b/UnityProject/Assets/GameScripts/Main/Launcher/Scripts/UI/UILoadUpdate.cs
@@ -23,6 +23,7 @@ namespace GameMain
             m_btnClear = FindChildComponent<Button>("TopNode/m_btnClear");
             m_textAppid = FindChildComponent<Text>("TopNode/m_textAppid");
             m_textResid = FindChildComponent<Text>("TopNode/m_textResid");
+            m_scrollbarProgress = FindChildComponent<Scrollbar>("m_scrollbarProgress");
             m_btnClear.onClick.AddListener(OnClickClearBtn);
         }
         #endregion
@@ -30,7 +31,6 @@ namespace GameMain
         public override void OnCreate()
         {
             base.OnCreate();
-            m_scrollbarProgress = FindChildComponent<Scrollbar>("m_scrollbarProgress");
             LoadUpdateLogic.Instance.DownloadCompleteAction += DownLoad_Complete_Action;
             LoadUpdateLogic.Instance.DownProgressAction += DownLoad_Progress_Action;
             LoadUpdateLogic.Instance.UnpackedCompleteAction += Unpacked_Complete_Action;
@@ -118,12 +118,12 @@ namespace GameMain
             m_scrollbarProgress.size = progress;
         }
 
-        protected override void Close()
+        public override void OnDestroy()
         {
+            base.OnDestroy();
             OnStop(null);
             LoadUpdateLogic.Instance.DownloadCompleteAction -= DownLoad_Complete_Action;
             LoadUpdateLogic.Instance.DownProgressAction -= DownLoad_Progress_Action;
-            base.Close();
         }
     }
 }
\ No newline at end of file
diff --git a/UnityProject/Assets/TEngine/Runtime/Modules/DebugerModule/DebuggerModule.cs b/UnityProject/Assets/TEngine/Runtime/Modules/DebugerModule/DebuggerModule.cs
index b9a727f6..dad1a66c 100644
--- a/UnityProject/Assets/TEngine/Runtime/Modules/DebugerModule/DebuggerModule.cs
+++ b/UnityProject/Assets/TEngine/Runtime/Modules/DebugerModule/DebuggerModule.cs
@@ -395,7 +395,7 @@ namespace TEngine
                 DrawDebuggerWindowGroup(subDebuggerWindowGroup);
             }
 
-            debuggerWindowGroup.SelectedWindow.OnDraw();
+            debuggerWindowGroup?.SelectedWindow?.OnDraw();
         }
 
         private void DrawDebuggerWindowIcon(int windowId)
diff --git a/UnityProject/Assets/TEngine/Runtime/Modules/GameModule.cs b/UnityProject/Assets/TEngine/Runtime/Modules/GameModule.cs
index 2c8bdf90..fcba4595 100644
--- a/UnityProject/Assets/TEngine/Runtime/Modules/GameModule.cs
+++ b/UnityProject/Assets/TEngine/Runtime/Modules/GameModule.cs
@@ -11,18 +11,29 @@ namespace TEngine
     {
         private static readonly Dictionary<Type, Module> _moduleMaps = new Dictionary<Type, Module>(ModuleImpSystem.DesignModuleCount);
 
+        private static GameObject _gameModuleRoot;
+        
         #region 框架模块
         /// <summary>
         /// 获取游戏基础模块。
         /// </summary>
-        public static RootModule Base => _base ??= Get<RootModule>();
+        public static RootModule Base
+        {
+            get => _base ??= Get<RootModule>();
+            private set => _base = value;
+        }
 
         private static RootModule _base;
 
         /// <summary>
         /// 获取调试模块。
         /// </summary>
-        public static DebuggerModule Debugger => _debugger ??= Get<DebuggerModule>();
+        public static DebuggerModule Debugger
+        {
+            get => _debugger ??= Get<DebuggerModule>();
+            private set => _debugger = value;
+        }
+
 
         private static DebuggerModule _debugger;
 
@@ -117,7 +128,31 @@ namespace TEngine
         {
             Log.Info("GameModule Active");
             gameObject.name = $"[{nameof(GameModule)}]";
+            _gameModuleRoot = gameObject;
             DontDestroyOnLoad(gameObject);
         }
+
+        public static void Shutdown(ShutdownType shutdownType)
+        {
+            Log.Info("GameModule Shutdown");
+            if (_gameModuleRoot != null)
+            {
+                Destroy(_gameModuleRoot);
+                _gameModuleRoot = null;
+            }
+            _moduleMaps.Clear();
+            
+            _base = null;
+            _debugger = null;
+            _fsm = null;
+            _procedure = null;
+            _objectPool = null;
+            _resource = null;
+            _audio = null;
+            _setting = null;
+            _ui = null;
+            _localization = null;
+            _scene = null;
+        }
     }
 }
\ No newline at end of file
diff --git a/UnityProject/Assets/TEngine/Runtime/Modules/ModuleCore/ModuleSystem.cs b/UnityProject/Assets/TEngine/Runtime/Modules/ModuleCore/ModuleSystem.cs
index fd259890..f75596fe 100644
--- a/UnityProject/Assets/TEngine/Runtime/Modules/ModuleCore/ModuleSystem.cs
+++ b/UnityProject/Assets/TEngine/Runtime/Modules/ModuleCore/ModuleSystem.cs
@@ -84,9 +84,10 @@ namespace TEngine
                 rootModule.Shutdown();
                 rootModule = null;
             }
-
             _modules.Clear();
 
+            GameModule.Shutdown(shutdownType);
+            
             if (shutdownType == ShutdownType.None)
             {
                 return;
diff --git a/UnityProject/Assets/TEngine/Runtime/Modules/UIModule/UIModule.cs b/UnityProject/Assets/TEngine/Runtime/Modules/UIModule/UIModule.cs
index 5f9c0fcd..ce7882bb 100644
--- a/UnityProject/Assets/TEngine/Runtime/Modules/UIModule/UIModule.cs
+++ b/UnityProject/Assets/TEngine/Runtime/Modules/UIModule/UIModule.cs
@@ -101,6 +101,10 @@ namespace TEngine
                 _errorLogger = null;
             }
             CloseAll();
+            if (m_InstanceRoot != null && m_InstanceRoot.parent != null)
+            {
+                Destroy(m_InstanceRoot.parent.gameObject);
+            }
         }
 
         #region 设置安全区域