Merge pull request #75 from SunXuebing/main

调整编辑器模式下模块销毁顺序，解决编辑器退出运行后资源管理器销毁了还被调用问题
ALEXTANGXIAO · May 20, 2024 · b00679a · b00679a
2 parents db6e715 + cd9a10c
commit b00679a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/UnityProject/Assets/TEngine/Runtime/Modules/GameModule.cs b/UnityProject/Assets/TEngine/Runtime/Modules/GameModule.cs
@@ -194,6 +194,7 @@ void HandlePlayModeStateChanged(PlayModeStateChange state)
         {
             if (state == PlayModeStateChange.ExitingPlayMode)
             {
+				ModuleImpSystem.Shutdown();
                 ModuleSystem.Shutdown(ShutdownType.Quit);
             }
         }

diff --git a/UnityProject/Assets/TEngine/Runtime/Modules/RootModule.cs b/UnityProject/Assets/TEngine/Runtime/Modules/RootModule.cs
@@ -154,7 +154,9 @@ private void OnApplicationQuit()
 
         private void OnDestroy()
         {
+#if !UNITY_EDITOR
             ModuleImpSystem.Shutdown();
+#endif
         }
 
         /// <summary>