diff --git a/Assets/TEngine/Runtime/GameFramework/Audio/AudioCategory.cs b/Assets/TEngine/Runtime/GameFramework/Audio/AudioCategory.cs index d8d1e1cf..c84b9f7f 100644 --- a/Assets/TEngine/Runtime/GameFramework/Audio/AudioCategory.cs +++ b/Assets/TEngine/Runtime/GameFramework/Audio/AudioCategory.cs @@ -86,7 +86,7 @@ namespace TEngine } AudioAgents = new List(16); InstanceRoot = new GameObject(Utility.Text.Format("Audio Category - {0}", _audioMixerGroup.name)).transform; - InstanceRoot.SetParent(GameEntry.GetModule().InstanceRoot); + InstanceRoot.SetParent(GameModuleSystem.GetModule().InstanceRoot); for (int index = 0; index < _maxChannel; index++) { AudioAgent audioAgent = new AudioAgent(); diff --git a/Assets/TEngine/Runtime/GameFramework/Audio/AudioModule.cs b/Assets/TEngine/Runtime/GameFramework/Audio/AudioModule.cs index 640c6489..4e8503dc 100644 --- a/Assets/TEngine/Runtime/GameFramework/Audio/AudioModule.cs +++ b/Assets/TEngine/Runtime/GameFramework/Audio/AudioModule.cs @@ -331,7 +331,7 @@ namespace TEngine /// private void Initialize() { - RootModule rootModule = GameEntry.GetModule(); + RootModule rootModule = GameModuleSystem.GetModule(); if (rootModule == null) { Log.Fatal("Base component is invalid."); diff --git a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.EnvironmentInformationWindow.cs b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.EnvironmentInformationWindow.cs index 966bebec..444f3c3e 100644 --- a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.EnvironmentInformationWindow.cs +++ b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.EnvironmentInformationWindow.cs @@ -15,14 +15,14 @@ namespace TEngine public override void Initialize(params object[] args) { - _mRootModule = GameEntry.GetModule(); + _mRootModule = GameModuleSystem.GetModule(); if (_mRootModule == null) { Log.Fatal("Base component is invalid."); return; } - _mResourceModule = GameEntry.GetModule(); + _mResourceModule = GameModuleSystem.GetModule(); if (_mResourceModule == null) { Log.Fatal("Resource component is invalid."); diff --git a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.ObjectPoolInformationWindow.cs b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.ObjectPoolInformationWindow.cs index 8233cd4e..5df7f07d 100644 --- a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.ObjectPoolInformationWindow.cs +++ b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.ObjectPoolInformationWindow.cs @@ -10,7 +10,7 @@ namespace TEngine public override void Initialize(params object[] args) { - _mObjectPoolModule = GameEntry.GetModule(); + _mObjectPoolModule = GameModuleSystem.GetModule(); if (_mObjectPoolModule == null) { Log.Fatal("Object pool component is invalid."); diff --git a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.OperationsWindow.cs b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.OperationsWindow.cs index cab0b61c..391ba87a 100644 --- a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.OperationsWindow.cs +++ b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.OperationsWindow.cs @@ -11,7 +11,7 @@ namespace TEngine GUILayout.Label("Operations"); GUILayout.BeginVertical("box"); { - ObjectPoolModule objectPoolModule = GameEntry.GetModule(); + ObjectPoolModule objectPoolModule = GameModuleSystem.GetModule(); if (objectPoolModule != null) { if (GUILayout.Button("Object Pool Release", GUILayout.Height(30f))) @@ -25,7 +25,7 @@ namespace TEngine } } - ResourceModule resourceCompoent = GameEntry.GetModule(); + ResourceModule resourceCompoent = GameModuleSystem.GetModule(); if (resourceCompoent != null) { if (GUILayout.Button("Unload Unused Assets", GUILayout.Height(30f))) @@ -41,15 +41,15 @@ namespace TEngine if (GUILayout.Button("Shutdown Game Framework (None)", GUILayout.Height(30f))) { - GameEntry.Shutdown(ShutdownType.None); + GameModuleSystem.Shutdown(ShutdownType.None); } if (GUILayout.Button("Shutdown Game Framework (Restart)", GUILayout.Height(30f))) { - GameEntry.Shutdown(ShutdownType.Restart); + GameModuleSystem.Shutdown(ShutdownType.Restart); } if (GUILayout.Button("Shutdown Game Framework (Quit)", GUILayout.Height(30f))) { - GameEntry.Shutdown(ShutdownType.Quit); + GameModuleSystem.Shutdown(ShutdownType.Quit); } } GUILayout.EndVertical(); diff --git a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.SettingsWindow.cs b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.SettingsWindow.cs index 0f2e0ea1..7c386771 100644 --- a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.SettingsWindow.cs +++ b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.SettingsWindow.cs @@ -18,14 +18,14 @@ namespace TEngine public override void Initialize(params object[] args) { - _mDebuggerModule = GameEntry.GetModule(); + _mDebuggerModule = GameModuleSystem.GetModule(); if (_mDebuggerModule == null) { Log.Fatal("Debugger component is invalid."); return; } - _mSettingModule = GameEntry.GetModule(); + _mSettingModule = GameModuleSystem.GetModule(); if (_mSettingModule == null) { Log.Fatal("Setting component is invalid."); diff --git a/Assets/TEngine/Runtime/GameFramework/Debugger/DebuggerComponent.ConsoleWindow.cs b/Assets/TEngine/Runtime/GameFramework/Debugger/DebuggerComponent.ConsoleWindow.cs index d9dde440..8cef96e5 100644 --- a/Assets/TEngine/Runtime/GameFramework/Debugger/DebuggerComponent.ConsoleWindow.cs +++ b/Assets/TEngine/Runtime/GameFramework/Debugger/DebuggerComponent.ConsoleWindow.cs @@ -209,7 +209,7 @@ namespace TEngine public void Initialize(params object[] args) { - _mSettingModule = GameEntry.GetModule(); + _mSettingModule = GameModuleSystem.GetModule(); if (_mSettingModule == null) { Log.Fatal("Setting component is invalid."); diff --git a/Assets/TEngine/Runtime/GameFramework/Debugger/DebuggerModule.cs b/Assets/TEngine/Runtime/GameFramework/Debugger/DebuggerModule.cs index dc6169b6..c9fb5da9 100644 --- a/Assets/TEngine/Runtime/GameFramework/Debugger/DebuggerModule.cs +++ b/Assets/TEngine/Runtime/GameFramework/Debugger/DebuggerModule.cs @@ -172,7 +172,7 @@ namespace TEngine m_FpsCounter = new FpsCounter(0.5f); - _mSettingModule = GameEntry.GetModule(); + _mSettingModule = GameModuleSystem.GetModule(); if (_mSettingModule == null) { Log.Fatal("Setting component is invalid."); diff --git a/Assets/TEngine/Runtime/GameFramework/GameFrameworkModuleBase.cs b/Assets/TEngine/Runtime/GameFramework/GameFrameworkModuleBase.cs index 0ab46f73..7aee5cdc 100644 --- a/Assets/TEngine/Runtime/GameFramework/GameFrameworkModuleBase.cs +++ b/Assets/TEngine/Runtime/GameFramework/GameFrameworkModuleBase.cs @@ -12,7 +12,7 @@ namespace TEngine /// protected virtual void Awake() { - GameEntry.RegisterModule(this); + GameModuleSystem.RegisterModule(this); } } } diff --git a/Assets/TEngine/Runtime/GameFramework/GameEntry.cs b/Assets/TEngine/Runtime/GameFramework/GameModuleSystem.cs similarity index 98% rename from Assets/TEngine/Runtime/GameFramework/GameEntry.cs rename to Assets/TEngine/Runtime/GameFramework/GameModuleSystem.cs index 86c803c7..1ebb3507 100644 --- a/Assets/TEngine/Runtime/GameFramework/GameEntry.cs +++ b/Assets/TEngine/Runtime/GameFramework/GameModuleSystem.cs @@ -6,9 +6,9 @@ using UnityEngine.SceneManagement; namespace TEngine { /// - /// 游戏入口。 + /// 游戏框架模块管理系统。 /// - public static class GameEntry + public static class GameModuleSystem { private static readonly GameFrameworkLinkedList s_GameFrameworkModules = new GameFrameworkLinkedList(); diff --git a/Assets/TEngine/Runtime/GameFramework/GameEntry.cs.meta b/Assets/TEngine/Runtime/GameFramework/GameModuleSystem.cs.meta similarity index 100% rename from Assets/TEngine/Runtime/GameFramework/GameEntry.cs.meta rename to Assets/TEngine/Runtime/GameFramework/GameModuleSystem.cs.meta diff --git a/Assets/TEngine/Runtime/GameFramework/Localization/DefaultLocalizationHelper.cs b/Assets/TEngine/Runtime/GameFramework/Localization/DefaultLocalizationHelper.cs index 730c47ee..da494d63 100644 --- a/Assets/TEngine/Runtime/GameFramework/Localization/DefaultLocalizationHelper.cs +++ b/Assets/TEngine/Runtime/GameFramework/Localization/DefaultLocalizationHelper.cs @@ -187,7 +187,7 @@ namespace TEngine private void Start() { - m_ResourceModule = GameEntry.GetModule(); + m_ResourceModule = GameModuleSystem.GetModule(); if (m_ResourceModule == null) { Log.Fatal("Resource component is invalid."); diff --git a/Assets/TEngine/Runtime/GameFramework/Localization/LocalizationModule.cs b/Assets/TEngine/Runtime/GameFramework/Localization/LocalizationModule.cs index ed226e4b..ae20aaa4 100644 --- a/Assets/TEngine/Runtime/GameFramework/Localization/LocalizationModule.cs +++ b/Assets/TEngine/Runtime/GameFramework/Localization/LocalizationModule.cs @@ -72,14 +72,14 @@ namespace TEngine private void Start() { - RootModule rootModule = GameEntry.GetModule(); + RootModule rootModule = GameModuleSystem.GetModule(); if (rootModule == null) { Log.Fatal("Base component is invalid."); return; } - ResourceModule resourceModule = GameEntry.GetModule(); + ResourceModule resourceModule = GameModuleSystem.GetModule(); if (resourceModule == null) { Log.Fatal("Base component is invalid."); diff --git a/Assets/TEngine/Runtime/GameFramework/Resource/ResourceModule.cs b/Assets/TEngine/Runtime/GameFramework/Resource/ResourceModule.cs index 36f3eb80..09511f87 100644 --- a/Assets/TEngine/Runtime/GameFramework/Resource/ResourceModule.cs +++ b/Assets/TEngine/Runtime/GameFramework/Resource/ResourceModule.cs @@ -166,7 +166,7 @@ namespace TEngine private void Start() { - RootModule baseComponent = GameEntry.GetModule(); + RootModule baseComponent = GameModuleSystem.GetModule(); if (baseComponent == null) { Log.Fatal("Base component is invalid."); diff --git a/Assets/TEngine/Runtime/GameFramework/RootModule.cs b/Assets/TEngine/Runtime/GameFramework/RootModule.cs index 33869966..eb75ab8d 100644 --- a/Assets/TEngine/Runtime/GameFramework/RootModule.cs +++ b/Assets/TEngine/Runtime/GameFramework/RootModule.cs @@ -321,13 +321,13 @@ namespace TEngine { Log.Warning("Low memory reported..."); - ObjectPoolModule objectPoolModule = GameEntry.GetModule(); + ObjectPoolModule objectPoolModule = GameModuleSystem.GetModule(); if (objectPoolModule != null) { objectPoolModule.ReleaseAllUnused(); } - ResourceModule ResourceModule = GameEntry.GetModule(); + ResourceModule ResourceModule = GameModuleSystem.GetModule(); if (ResourceModule != null) { ResourceModule.ForceUnloadUnusedAssets(true); diff --git a/Assets/TEngine/Runtime/GameFramework/UI/UIModule.cs b/Assets/TEngine/Runtime/GameFramework/UI/UIModule.cs index 4057c2d2..3b28044e 100644 --- a/Assets/TEngine/Runtime/GameFramework/UI/UIModule.cs +++ b/Assets/TEngine/Runtime/GameFramework/UI/UIModule.cs @@ -43,7 +43,7 @@ namespace TEngine private void Start() { - RootModule rootModule = GameEntry.GetModule(); + RootModule rootModule = GameModuleSystem.GetModule(); if (rootModule == null) { Log.Fatal("Base component is invalid."); diff --git a/Assets/TEngine/Runtime/GameModule.cs b/Assets/TEngine/Runtime/GameModule.cs index fc36b5b9..6131e5ee 100644 --- a/Assets/TEngine/Runtime/GameModule.cs +++ b/Assets/TEngine/Runtime/GameModule.cs @@ -100,7 +100,7 @@ public class GameModule:MonoBehaviour return Modules[type] as T; } - T module = TEngine.GameEntry.GetModule(); + T module = TEngine.GameModuleSystem.GetModule(); Log.Assert(condition:module != null,$"{typeof(T)} is null");