diff --git a/Assets/TEngine/Editor/Inspector/RootComponentInspector.cs b/Assets/TEngine/Editor/Inspector/RootModuleInspector.cs similarity index 98% rename from Assets/TEngine/Editor/Inspector/RootComponentInspector.cs rename to Assets/TEngine/Editor/Inspector/RootModuleInspector.cs index b9ea34e1..21cf158d 100644 --- a/Assets/TEngine/Editor/Inspector/RootComponentInspector.cs +++ b/Assets/TEngine/Editor/Inspector/RootModuleInspector.cs @@ -6,8 +6,8 @@ using UnityEngine; namespace TEngine.Editor { - [CustomEditor(typeof(RootComponent))] - internal sealed class RootComponentInspector : GameFrameworkInspector + [CustomEditor(typeof(RootModule))] + internal sealed class RootModuleInspector : GameFrameworkInspector { private const string NoneOptionName = ""; private static readonly float[] GameSpeed = new float[] { 0f, 0.01f, 0.1f, 0.25f, 0.5f, 1f, 1.5f, 2f, 4f, 8f }; @@ -41,7 +41,7 @@ namespace TEngine.Editor serializedObject.Update(); - RootComponent t = (RootComponent)target; + RootModule t = (RootModule)target; EditorGUI.BeginDisabledGroup(EditorApplication.isPlayingOrWillChangePlaymode); { diff --git a/Assets/TEngine/Editor/Inspector/RootComponentInspector.cs.meta b/Assets/TEngine/Editor/Inspector/RootModuleInspector.cs.meta similarity index 100% rename from Assets/TEngine/Editor/Inspector/RootComponentInspector.cs.meta rename to Assets/TEngine/Editor/Inspector/RootModuleInspector.cs.meta diff --git a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerComponent.EnvironmentInformationWindow.cs b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerComponent.EnvironmentInformationWindow.cs index 852fe2d2..19ff23c8 100644 --- a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerComponent.EnvironmentInformationWindow.cs +++ b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerComponent.EnvironmentInformationWindow.cs @@ -9,14 +9,14 @@ namespace TEngine { private sealed class EnvironmentInformationWindow : ScrollableDebuggerWindowBase { - private RootComponent m_RootComponent = null; + private RootModule _mRootModule = null; private ResourceComponent m_ResourceComponent = null; public override void Initialize(params object[] args) { - m_RootComponent = GameEntry.GetComponent(); - if (m_RootComponent == null) + _mRootModule = GameEntry.GetComponent(); + if (_mRootModule == null) { Log.Fatal("Base component is invalid."); return; diff --git a/Assets/TEngine/Runtime/GameFramework/GameEntry.cs b/Assets/TEngine/Runtime/GameFramework/GameEntry.cs index 7bf51c24..ff2ce334 100644 --- a/Assets/TEngine/Runtime/GameFramework/GameEntry.cs +++ b/Assets/TEngine/Runtime/GameFramework/GameEntry.cs @@ -78,11 +78,11 @@ namespace TEngine { Log.Info("Shutdown Game Framework ({0})...", shutdownType); Utility.Unity.Release(); - RootComponent rootComponent = GetComponent(); - if (rootComponent != null) + RootModule rootModule = GetComponent(); + if (rootModule != null) { - rootComponent.Shutdown(); - rootComponent = null; + rootModule.Shutdown(); + rootModule = null; } s_GameFrameworkComponents.Clear(); diff --git a/Assets/TEngine/Runtime/GameFramework/RootComponent.cs b/Assets/TEngine/Runtime/GameFramework/RootModule.cs similarity index 99% rename from Assets/TEngine/Runtime/GameFramework/RootComponent.cs rename to Assets/TEngine/Runtime/GameFramework/RootModule.cs index fea4b56c..b0714e77 100644 --- a/Assets/TEngine/Runtime/GameFramework/RootComponent.cs +++ b/Assets/TEngine/Runtime/GameFramework/RootModule.cs @@ -8,7 +8,7 @@ namespace TEngine /// 基础组件。 /// [DisallowMultipleComponent] - public sealed class RootComponent : GameFrameworkComponent + public sealed class RootModule : GameFrameworkComponent { private const int DefaultDpi = 96; // default windows dpi diff --git a/Assets/TEngine/Runtime/GameFramework/RootComponent.cs.meta b/Assets/TEngine/Runtime/GameFramework/RootModule.cs.meta similarity index 100% rename from Assets/TEngine/Runtime/GameFramework/RootComponent.cs.meta rename to Assets/TEngine/Runtime/GameFramework/RootModule.cs.meta diff --git a/Assets/TEngine/Runtime/GameFramework/UI/UIModule.cs b/Assets/TEngine/Runtime/GameFramework/UI/UIModule.cs index a229f56e..0424ff88 100644 --- a/Assets/TEngine/Runtime/GameFramework/UI/UIModule.cs +++ b/Assets/TEngine/Runtime/GameFramework/UI/UIModule.cs @@ -63,8 +63,8 @@ namespace TEngine private void Start() { - RootComponent rootComponent = GameEntry.GetComponent(); - if (rootComponent == null) + RootModule rootModule = GameEntry.GetComponent(); + if (rootModule == null) { Log.Fatal("Base component is invalid."); return; diff --git a/Assets/TEngine/Runtime/GameModule.cs b/Assets/TEngine/Runtime/GameModule.cs index 51c5e40c..b90c3a62 100644 --- a/Assets/TEngine/Runtime/GameModule.cs +++ b/Assets/TEngine/Runtime/GameModule.cs @@ -12,7 +12,7 @@ public class GameModule:MonoBehaviour /// /// 获取游戏基础模块。 /// - public static RootComponent Base { get; private set; } + public static RootModule Base { get; private set; } /// /// 获取调试模块。 @@ -51,7 +51,7 @@ public class GameModule:MonoBehaviour /// public static void InitFrameWorkComponents() { - Base = Get(); + Base = Get(); Debugger = Get(); Fsm = Get(); ObjectPool = Get();