diff --git a/Assets/TEngine/Editor/Inspector/MemoryPoolComponentInspector.cs b/Assets/TEngine/Editor/Inspector/MemoryPoolModuleInspector.cs similarity index 97% rename from Assets/TEngine/Editor/Inspector/MemoryPoolComponentInspector.cs rename to Assets/TEngine/Editor/Inspector/MemoryPoolModuleInspector.cs index 8ea84170..012209b3 100644 --- a/Assets/TEngine/Editor/Inspector/MemoryPoolComponentInspector.cs +++ b/Assets/TEngine/Editor/Inspector/MemoryPoolModuleInspector.cs @@ -7,8 +7,8 @@ using UnityEngine; namespace TEngine.Editor.Inspector { - [CustomEditor(typeof(MemoryPoolComponent))] - internal sealed class MemoryPoolComponentInspector : GameFrameworkInspector + [CustomEditor(typeof(MemoryPoolModule))] + internal sealed class MemoryPoolModuleInspector : GameFrameworkInspector { private readonly Dictionary> m_MemoryPoolInfos = new Dictionary>(StringComparer.Ordinal); private readonly HashSet m_OpenedItems = new HashSet(); @@ -23,7 +23,7 @@ namespace TEngine.Editor.Inspector serializedObject.Update(); - MemoryPoolComponent t = (MemoryPoolComponent)target; + MemoryPoolModule t = (MemoryPoolModule)target; if (EditorApplication.isPlaying && IsPrefabInHierarchy(t.gameObject)) { diff --git a/Assets/TEngine/Editor/Inspector/MemoryPoolComponentInspector.cs.meta b/Assets/TEngine/Editor/Inspector/MemoryPoolModuleInspector.cs.meta similarity index 100% rename from Assets/TEngine/Editor/Inspector/MemoryPoolComponentInspector.cs.meta rename to Assets/TEngine/Editor/Inspector/MemoryPoolModuleInspector.cs.meta diff --git a/Assets/TEngine/Editor/Inspector/ObjectPoolComponentInspector.cs b/Assets/TEngine/Editor/Inspector/ObjectPoolModuleInspector.cs similarity index 97% rename from Assets/TEngine/Editor/Inspector/ObjectPoolComponentInspector.cs rename to Assets/TEngine/Editor/Inspector/ObjectPoolModuleInspector.cs index daf4fb96..e0bea518 100644 --- a/Assets/TEngine/Editor/Inspector/ObjectPoolComponentInspector.cs +++ b/Assets/TEngine/Editor/Inspector/ObjectPoolModuleInspector.cs @@ -7,8 +7,8 @@ using UnityEngine; namespace TEngine.Editor.Inspector { - [CustomEditor(typeof(ObjectPoolComponent))] - internal sealed class ObjectPoolComponentInspector : GameFrameworkInspector + [CustomEditor(typeof(ObjectPoolModule))] + internal sealed class ObjectPoolModuleInspector : GameFrameworkInspector { private readonly HashSet m_OpenedItems = new HashSet(); @@ -22,7 +22,7 @@ namespace TEngine.Editor.Inspector return; } - ObjectPoolComponent t = (ObjectPoolComponent)target; + ObjectPoolModule t = (ObjectPoolModule)target; if (IsPrefabInHierarchy(t.gameObject)) { diff --git a/Assets/TEngine/Editor/Inspector/ObjectPoolComponentInspector.cs.meta b/Assets/TEngine/Editor/Inspector/ObjectPoolModuleInspector.cs.meta similarity index 100% rename from Assets/TEngine/Editor/Inspector/ObjectPoolComponentInspector.cs.meta rename to Assets/TEngine/Editor/Inspector/ObjectPoolModuleInspector.cs.meta diff --git a/Assets/TEngine/Editor/Inspector/SettingComponentInspector.cs b/Assets/TEngine/Editor/Inspector/SettingModuleInspector.cs similarity index 91% rename from Assets/TEngine/Editor/Inspector/SettingComponentInspector.cs rename to Assets/TEngine/Editor/Inspector/SettingModuleInspector.cs index 8f973913..5e215bc1 100644 --- a/Assets/TEngine/Editor/Inspector/SettingComponentInspector.cs +++ b/Assets/TEngine/Editor/Inspector/SettingModuleInspector.cs @@ -3,8 +3,8 @@ using UnityEngine; namespace TEngine.Editor.Inspector { - [CustomEditor(typeof(SettingComponent))] - internal sealed class SettingComponentInspector : GameFrameworkInspector + [CustomEditor(typeof(SettingModule))] + internal sealed class SettingModuleInspector : GameFrameworkInspector { private HelperInfo m_SettingHelperInfo = new HelperInfo("Setting"); @@ -12,7 +12,7 @@ namespace TEngine.Editor.Inspector { base.OnInspectorGUI(); - SettingComponent t = (SettingComponent)target; + SettingModule t = (SettingModule)target; EditorGUI.BeginDisabledGroup(EditorApplication.isPlayingOrWillChangePlaymode); { diff --git a/Assets/TEngine/Editor/Inspector/SettingComponentInspector.cs.meta b/Assets/TEngine/Editor/Inspector/SettingModuleInspector.cs.meta similarity index 100% rename from Assets/TEngine/Editor/Inspector/SettingComponentInspector.cs.meta rename to Assets/TEngine/Editor/Inspector/SettingModuleInspector.cs.meta diff --git a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.EnvironmentInformationWindow.cs b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.EnvironmentInformationWindow.cs index 8ae8cad0..163cf2c6 100644 --- a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.EnvironmentInformationWindow.cs +++ b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.EnvironmentInformationWindow.cs @@ -5,25 +5,25 @@ using UnityEngine.Rendering; namespace TEngine { - public sealed partial class DebuggerModule : GameFrameworkComponent + public sealed partial class DebuggerModule : GameFrameworkModuleBase { private sealed class EnvironmentInformationWindow : ScrollableDebuggerWindowBase { private RootModule _mRootModule = null; - private ResourceComponent m_ResourceComponent = null; + private ResourceModuleBase _mResourceModuleBase = null; public override void Initialize(params object[] args) { - _mRootModule = GameEntry.GetComponent(); + _mRootModule = GameEntry.GetModule(); if (_mRootModule == null) { Log.Fatal("Base component is invalid."); return; } - m_ResourceComponent = GameEntry.GetComponent(); - if (m_ResourceComponent == null) + _mResourceModuleBase = GameEntry.GetModule(); + if (_mResourceModuleBase == null) { Log.Fatal("Resource component is invalid."); return; @@ -44,7 +44,7 @@ namespace TEngine #endif DrawItem("Game Framework Version", Version.GameFrameworkVersion); DrawItem("Game Version", Utility.Text.Format("{0} ({1})", Version.GameVersion, Version.InternalGameVersion)); - DrawItem("Resource Version", (string.IsNullOrEmpty(m_ResourceComponent.ApplicableGameVersion) ? "Unknown" : Utility.Text.Format("{0} ({1})", m_ResourceComponent.ApplicableGameVersion, m_ResourceComponent.InternalResourceVersion))); + DrawItem("Resource Version", (string.IsNullOrEmpty(_mResourceModuleBase.ApplicableGameVersion) ? "Unknown" : Utility.Text.Format("{0} ({1})", _mResourceModuleBase.ApplicableGameVersion, _mResourceModuleBase.InternalResourceVersion))); DrawItem("Application Version", Application.version); DrawItem("Unity Version", Application.unityVersion); DrawItem("Platform", Application.platform.ToString()); diff --git a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.GraphicsInformationWindow.cs b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.GraphicsInformationWindow.cs index 85f018f3..5fd051c4 100644 --- a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.GraphicsInformationWindow.cs +++ b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.GraphicsInformationWindow.cs @@ -2,7 +2,7 @@ namespace TEngine { - public sealed partial class DebuggerModule : GameFrameworkComponent + public sealed partial class DebuggerModule : GameFrameworkModuleBase { private sealed class GraphicsInformationWindow : ScrollableDebuggerWindowBase { diff --git a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.InputAccelerationInformationWindow.cs b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.InputAccelerationInformationWindow.cs index 07efbf3f..9a3651c7 100644 --- a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.InputAccelerationInformationWindow.cs +++ b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.InputAccelerationInformationWindow.cs @@ -2,7 +2,7 @@ namespace TEngine { - public sealed partial class DebuggerModule : GameFrameworkComponent + public sealed partial class DebuggerModule : GameFrameworkModuleBase { private sealed class InputAccelerationInformationWindow : ScrollableDebuggerWindowBase { diff --git a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.InputCompassInformationWindow.cs b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.InputCompassInformationWindow.cs index 039d76ef..4aaa0f5a 100644 --- a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.InputCompassInformationWindow.cs +++ b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.InputCompassInformationWindow.cs @@ -2,7 +2,7 @@ namespace TEngine { - public sealed partial class DebuggerModule : GameFrameworkComponent + public sealed partial class DebuggerModule : GameFrameworkModuleBase { private sealed class InputCompassInformationWindow : ScrollableDebuggerWindowBase { diff --git a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.InputGyroscopeInformationWindow.cs b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.InputGyroscopeInformationWindow.cs index 30a33d3d..bec248d7 100644 --- a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.InputGyroscopeInformationWindow.cs +++ b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.InputGyroscopeInformationWindow.cs @@ -2,7 +2,7 @@ namespace TEngine { - public sealed partial class DebuggerModule : GameFrameworkComponent + public sealed partial class DebuggerModule : GameFrameworkModuleBase { private sealed class InputGyroscopeInformationWindow : ScrollableDebuggerWindowBase { diff --git a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.InputLocationInformationWindow.cs b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.InputLocationInformationWindow.cs index 8d759539..cdcc5223 100644 --- a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.InputLocationInformationWindow.cs +++ b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.InputLocationInformationWindow.cs @@ -2,7 +2,7 @@ namespace TEngine { - public sealed partial class DebuggerModule : GameFrameworkComponent + public sealed partial class DebuggerModule : GameFrameworkModuleBase { private sealed class InputLocationInformationWindow : ScrollableDebuggerWindowBase { diff --git a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.InputSummaryInformationWindow.cs b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.InputSummaryInformationWindow.cs index 3db8954d..337002bc 100644 --- a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.InputSummaryInformationWindow.cs +++ b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.InputSummaryInformationWindow.cs @@ -2,7 +2,7 @@ namespace TEngine { - public sealed partial class DebuggerModule : GameFrameworkComponent + public sealed partial class DebuggerModule : GameFrameworkModuleBase { private sealed class InputSummaryInformationWindow : ScrollableDebuggerWindowBase { diff --git a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.InputTouchInformationWindow.cs b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.InputTouchInformationWindow.cs index 8e470821..571dcdf9 100644 --- a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.InputTouchInformationWindow.cs +++ b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.InputTouchInformationWindow.cs @@ -2,7 +2,7 @@ namespace TEngine { - public sealed partial class DebuggerModule : GameFrameworkComponent + public sealed partial class DebuggerModule : GameFrameworkModuleBase { private sealed class InputTouchInformationWindow : ScrollableDebuggerWindowBase { diff --git a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.LogNode.cs b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.LogNode.cs index a546b14b..4ed7b518 100644 --- a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.LogNode.cs +++ b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.LogNode.cs @@ -3,7 +3,7 @@ using UnityEngine; namespace TEngine { - public sealed partial class DebuggerModule : GameFrameworkComponent + public sealed partial class DebuggerModule : GameFrameworkModuleBase { /// /// 日志记录结点。 diff --git a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.MemoryPoolInformationWindow.cs b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.MemoryPoolInformationWindow.cs index 84a3498a..b49f62bf 100644 --- a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.MemoryPoolInformationWindow.cs +++ b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.MemoryPoolInformationWindow.cs @@ -4,7 +4,7 @@ using UnityEngine; namespace TEngine { - public sealed partial class DebuggerModule : GameFrameworkComponent + public sealed partial class DebuggerModule : GameFrameworkModuleBase { private sealed class MemoryPoolPoolInformationWindow : ScrollableDebuggerWindowBase { diff --git a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.NetworkInformationWindow.cs b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.NetworkInformationWindow.cs index 0ed03d62..f3946adc 100644 --- a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.NetworkInformationWindow.cs +++ b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.NetworkInformationWindow.cs @@ -2,7 +2,7 @@ // // namespace TEngine // { -// public sealed partial class DebuggerModule : GameFrameworkComponent +// public sealed partial class DebuggerModule : GameFrameworkModuleBase // { // private sealed class NetworkInformationWindow : ScrollableDebuggerWindowBase // { diff --git a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.ObjectPoolInformationWindow.cs b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.ObjectPoolInformationWindow.cs index 8151d956..8233cd4e 100644 --- a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.ObjectPoolInformationWindow.cs +++ b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.ObjectPoolInformationWindow.cs @@ -2,16 +2,16 @@ namespace TEngine { - public sealed partial class DebuggerModule : GameFrameworkComponent + public sealed partial class DebuggerModule : GameFrameworkModuleBase { private sealed class ObjectPoolInformationWindow : ScrollableDebuggerWindowBase { - private ObjectPoolComponent m_ObjectPoolComponent = null; + private ObjectPoolModule _mObjectPoolModule = null; public override void Initialize(params object[] args) { - m_ObjectPoolComponent = GameEntry.GetComponent(); - if (m_ObjectPoolComponent == null) + _mObjectPoolModule = GameEntry.GetModule(); + if (_mObjectPoolModule == null) { Log.Fatal("Object pool component is invalid."); return; @@ -23,10 +23,10 @@ namespace TEngine GUILayout.Label("Object Pool Information"); GUILayout.BeginVertical("box"); { - DrawItem("Object Pool Count", m_ObjectPoolComponent.Count.ToString()); + DrawItem("Object Pool Count", _mObjectPoolModule.Count.ToString()); } GUILayout.EndVertical(); - ObjectPoolBase[] objectPools = m_ObjectPoolComponent.GetAllObjectPools(true); + ObjectPoolBase[] objectPools = _mObjectPoolModule.GetAllObjectPools(true); for (int i = 0; i < objectPools.Length; i++) { DrawObjectPool(objectPools[i]); diff --git a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.OperationsWindow.cs b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.OperationsWindow.cs index 872f9e28..8a0eb064 100644 --- a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.OperationsWindow.cs +++ b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.OperationsWindow.cs @@ -2,7 +2,7 @@ namespace TEngine { - public sealed partial class DebuggerModule : GameFrameworkComponent + public sealed partial class DebuggerModule : GameFrameworkModuleBase { private sealed class OperationsWindow : ScrollableDebuggerWindowBase { @@ -11,21 +11,21 @@ namespace TEngine GUILayout.Label("Operations"); GUILayout.BeginVertical("box"); { - ObjectPoolComponent objectPoolComponent = GameEntry.GetComponent(); - if (objectPoolComponent != null) + ObjectPoolModule objectPoolModule = GameEntry.GetModule(); + if (objectPoolModule != null) { if (GUILayout.Button("Object Pool Release", GUILayout.Height(30f))) { - objectPoolComponent.Release(); + objectPoolModule.Release(); } if (GUILayout.Button("Object Pool Release All Unused", GUILayout.Height(30f))) { - objectPoolComponent.ReleaseAllUnused(); + objectPoolModule.ReleaseAllUnused(); } } - ResourceComponent resourceCompoent = GameEntry.GetComponent(); + ResourceModuleBase resourceCompoent = GameEntry.GetModule(); if (resourceCompoent != null) { if (GUILayout.Button("Unload Unused Assets", GUILayout.Height(30f))) diff --git a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.PathInformationWindow.cs b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.PathInformationWindow.cs index dfada737..dfe7c3e8 100644 --- a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.PathInformationWindow.cs +++ b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.PathInformationWindow.cs @@ -3,7 +3,7 @@ using UnityEngine; namespace TEngine { - public sealed partial class DebuggerModule : GameFrameworkComponent + public sealed partial class DebuggerModule : GameFrameworkModuleBase { private sealed class PathInformationWindow : ScrollableDebuggerWindowBase { diff --git a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.ProfilerInformationWindow.cs b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.ProfilerInformationWindow.cs index 4def8f27..020e928e 100644 --- a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.ProfilerInformationWindow.cs +++ b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.ProfilerInformationWindow.cs @@ -5,7 +5,7 @@ using UnityEngine.Profiling; namespace TEngine { - public sealed partial class DebuggerModule : GameFrameworkComponent + public sealed partial class DebuggerModule : GameFrameworkModuleBase { private sealed class ProfilerInformationWindow : ScrollableDebuggerWindowBase { diff --git a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.QualityInformationWindow.cs b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.QualityInformationWindow.cs index 9f18e7b6..2f59dd24 100644 --- a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.QualityInformationWindow.cs +++ b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.QualityInformationWindow.cs @@ -2,7 +2,7 @@ namespace TEngine { - public sealed partial class DebuggerModule : GameFrameworkComponent + public sealed partial class DebuggerModule : GameFrameworkModuleBase { private sealed class QualityInformationWindow : ScrollableDebuggerWindowBase { diff --git a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.RuntimeMemoryInformationWindow.Sample.cs b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.RuntimeMemoryInformationWindow.Sample.cs index 1c116325..bee26b3a 100644 --- a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.RuntimeMemoryInformationWindow.Sample.cs +++ b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.RuntimeMemoryInformationWindow.Sample.cs @@ -1,6 +1,6 @@ namespace TEngine { - public sealed partial class DebuggerModule : GameFrameworkComponent + public sealed partial class DebuggerModule : GameFrameworkModuleBase { private sealed partial class RuntimeMemoryInformationWindow : ScrollableDebuggerWindowBase where T : UnityEngine.Object { diff --git a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.RuntimeMemoryInformationWindow.cs b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.RuntimeMemoryInformationWindow.cs index 01625f2f..bc74a3e7 100644 --- a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.RuntimeMemoryInformationWindow.cs +++ b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.RuntimeMemoryInformationWindow.cs @@ -7,7 +7,7 @@ using UnityEngine.Profiling; namespace TEngine { - public sealed partial class DebuggerModule : GameFrameworkComponent + public sealed partial class DebuggerModule : GameFrameworkModuleBase { private sealed partial class RuntimeMemoryInformationWindow : ScrollableDebuggerWindowBase where T : UnityEngine.Object { diff --git a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.RuntimeMemorySummaryWindow.Record.cs b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.RuntimeMemorySummaryWindow.Record.cs index b8e01491..052e4a2a 100644 --- a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.RuntimeMemorySummaryWindow.Record.cs +++ b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.RuntimeMemorySummaryWindow.Record.cs @@ -1,6 +1,6 @@ namespace TEngine { - public sealed partial class DebuggerModule : GameFrameworkComponent + public sealed partial class DebuggerModule : GameFrameworkModuleBase { private sealed partial class RuntimeMemorySummaryWindow : ScrollableDebuggerWindowBase { diff --git a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.RuntimeMemorySummaryWindow.cs b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.RuntimeMemorySummaryWindow.cs index d7a0c39a..5bee7b5f 100644 --- a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.RuntimeMemorySummaryWindow.cs +++ b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.RuntimeMemorySummaryWindow.cs @@ -7,7 +7,7 @@ using UnityEngine.Profiling; namespace TEngine { - public sealed partial class DebuggerModule : GameFrameworkComponent + public sealed partial class DebuggerModule : GameFrameworkModuleBase { private sealed partial class RuntimeMemorySummaryWindow : ScrollableDebuggerWindowBase { diff --git a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.SceneInformationWindow.cs b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.SceneInformationWindow.cs index d572930b..4caf3f9e 100644 --- a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.SceneInformationWindow.cs +++ b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.SceneInformationWindow.cs @@ -3,7 +3,7 @@ using UnityEngine.SceneManagement; namespace TEngine { - public sealed partial class DebuggerModule : GameFrameworkComponent + public sealed partial class DebuggerModule : GameFrameworkModuleBase { private sealed class SceneInformationWindow : ScrollableDebuggerWindowBase { diff --git a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.ScreenInformationWindow.cs b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.ScreenInformationWindow.cs index 90240103..389aa781 100644 --- a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.ScreenInformationWindow.cs +++ b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.ScreenInformationWindow.cs @@ -2,7 +2,7 @@ namespace TEngine { - public sealed partial class DebuggerModule : GameFrameworkComponent + public sealed partial class DebuggerModule : GameFrameworkModuleBase { private sealed class ScreenInformationWindow : ScrollableDebuggerWindowBase { diff --git a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.ScrollableDebuggerWindowBase.cs b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.ScrollableDebuggerWindowBase.cs index a51a583b..6fd3f5d6 100644 --- a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.ScrollableDebuggerWindowBase.cs +++ b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.ScrollableDebuggerWindowBase.cs @@ -2,7 +2,7 @@ namespace TEngine { - public sealed partial class DebuggerModule : GameFrameworkComponent + public sealed partial class DebuggerModule : GameFrameworkModuleBase { private abstract class ScrollableDebuggerWindowBase : IDebuggerWindow { diff --git a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.SettingsWindow.cs b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.SettingsWindow.cs index 2b3ede83..0f2e0ea1 100644 --- a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.SettingsWindow.cs +++ b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.SettingsWindow.cs @@ -2,12 +2,12 @@ namespace TEngine { - public sealed partial class DebuggerModule : GameFrameworkComponent + public sealed partial class DebuggerModule : GameFrameworkModuleBase { private sealed class SettingsWindow : ScrollableDebuggerWindowBase { private DebuggerModule _mDebuggerModule = null; - private SettingComponent m_SettingComponent = null; + private SettingModule _mSettingModule = null; private float m_LastIconX = 0f; private float m_LastIconY = 0f; private float m_LastWindowX = 0f; @@ -18,27 +18,27 @@ namespace TEngine public override void Initialize(params object[] args) { - _mDebuggerModule = GameEntry.GetComponent(); + _mDebuggerModule = GameEntry.GetModule(); if (_mDebuggerModule == null) { Log.Fatal("Debugger component is invalid."); return; } - m_SettingComponent = GameEntry.GetComponent(); - if (m_SettingComponent == null) + _mSettingModule = GameEntry.GetModule(); + if (_mSettingModule == null) { Log.Fatal("Setting component is invalid."); return; } - m_LastIconX = m_SettingComponent.GetFloat("Debugger.Icon.X", DefaultIconRect.x); - m_LastIconY = m_SettingComponent.GetFloat("Debugger.Icon.Y", DefaultIconRect.y); - m_LastWindowX = m_SettingComponent.GetFloat("Debugger.Window.X", DefaultWindowRect.x); - m_LastWindowY = m_SettingComponent.GetFloat("Debugger.Window.Y", DefaultWindowRect.y); - m_LastWindowWidth = m_SettingComponent.GetFloat("Debugger.Window.Width", DefaultWindowRect.width); - m_LastWindowHeight = m_SettingComponent.GetFloat("Debugger.Window.Height", DefaultWindowRect.height); - _mDebuggerModule.WindowScale = m_LastWindowScale = m_SettingComponent.GetFloat("Debugger.Window.Scale", DefaultWindowScale); + m_LastIconX = _mSettingModule.GetFloat("Debugger.Icon.X", DefaultIconRect.x); + m_LastIconY = _mSettingModule.GetFloat("Debugger.Icon.Y", DefaultIconRect.y); + m_LastWindowX = _mSettingModule.GetFloat("Debugger.Window.X", DefaultWindowRect.x); + m_LastWindowY = _mSettingModule.GetFloat("Debugger.Window.Y", DefaultWindowRect.y); + m_LastWindowWidth = _mSettingModule.GetFloat("Debugger.Window.Width", DefaultWindowRect.width); + m_LastWindowHeight = _mSettingModule.GetFloat("Debugger.Window.Height", DefaultWindowRect.height); + _mDebuggerModule.WindowScale = m_LastWindowScale = _mSettingModule.GetFloat("Debugger.Window.Scale", DefaultWindowScale); _mDebuggerModule.IconRect = new Rect(m_LastIconX, m_LastIconY, DefaultIconRect.width, DefaultIconRect.height); _mDebuggerModule.WindowRect = new Rect(m_LastWindowX, m_LastWindowY, m_LastWindowWidth, m_LastWindowHeight); } @@ -48,43 +48,43 @@ namespace TEngine if (m_LastIconX != _mDebuggerModule.IconRect.x) { m_LastIconX = _mDebuggerModule.IconRect.x; - m_SettingComponent.SetFloat("Debugger.Icon.X", _mDebuggerModule.IconRect.x); + _mSettingModule.SetFloat("Debugger.Icon.X", _mDebuggerModule.IconRect.x); } if (m_LastIconY != _mDebuggerModule.IconRect.y) { m_LastIconY = _mDebuggerModule.IconRect.y; - m_SettingComponent.SetFloat("Debugger.Icon.Y", _mDebuggerModule.IconRect.y); + _mSettingModule.SetFloat("Debugger.Icon.Y", _mDebuggerModule.IconRect.y); } if (m_LastWindowX != _mDebuggerModule.WindowRect.x) { m_LastWindowX = _mDebuggerModule.WindowRect.x; - m_SettingComponent.SetFloat("Debugger.Window.X", _mDebuggerModule.WindowRect.x); + _mSettingModule.SetFloat("Debugger.Window.X", _mDebuggerModule.WindowRect.x); } if (m_LastWindowY != _mDebuggerModule.WindowRect.y) { m_LastWindowY = _mDebuggerModule.WindowRect.y; - m_SettingComponent.SetFloat("Debugger.Window.Y", _mDebuggerModule.WindowRect.y); + _mSettingModule.SetFloat("Debugger.Window.Y", _mDebuggerModule.WindowRect.y); } if (m_LastWindowWidth != _mDebuggerModule.WindowRect.width) { m_LastWindowWidth = _mDebuggerModule.WindowRect.width; - m_SettingComponent.SetFloat("Debugger.Window.Width", _mDebuggerModule.WindowRect.width); + _mSettingModule.SetFloat("Debugger.Window.Width", _mDebuggerModule.WindowRect.width); } if (m_LastWindowHeight != _mDebuggerModule.WindowRect.height) { m_LastWindowHeight = _mDebuggerModule.WindowRect.height; - m_SettingComponent.SetFloat("Debugger.Window.Height", _mDebuggerModule.WindowRect.height); + _mSettingModule.SetFloat("Debugger.Window.Height", _mDebuggerModule.WindowRect.height); } if (m_LastWindowScale != _mDebuggerModule.WindowScale) { m_LastWindowScale = _mDebuggerModule.WindowScale; - m_SettingComponent.SetFloat("Debugger.Window.Scale", _mDebuggerModule.WindowScale); + _mSettingModule.SetFloat("Debugger.Window.Scale", _mDebuggerModule.WindowScale); } } diff --git a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.SystemInformationWindow.cs b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.SystemInformationWindow.cs index e2edee90..365ef436 100644 --- a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.SystemInformationWindow.cs +++ b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.SystemInformationWindow.cs @@ -2,7 +2,7 @@ namespace TEngine { - public sealed partial class DebuggerModule : GameFrameworkComponent + public sealed partial class DebuggerModule : GameFrameworkModuleBase { private sealed class SystemInformationWindow : ScrollableDebuggerWindowBase { diff --git a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.TimeInformationWindow.cs b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.TimeInformationWindow.cs index 86ded78b..4ab4c058 100644 --- a/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.TimeInformationWindow.cs +++ b/Assets/TEngine/Runtime/GameFramework/Debugger/Component/DebuggerModule.TimeInformationWindow.cs @@ -2,7 +2,7 @@ namespace TEngine { - public sealed partial class DebuggerModule : GameFrameworkComponent + public sealed partial class DebuggerModule : GameFrameworkModuleBase { private sealed class TimeInformationWindow : ScrollableDebuggerWindowBase { diff --git a/Assets/TEngine/Runtime/GameFramework/Debugger/DebuggerComponent.ConsoleWindow.cs b/Assets/TEngine/Runtime/GameFramework/Debugger/DebuggerComponent.ConsoleWindow.cs index 87e43ded..d9dde440 100644 --- a/Assets/TEngine/Runtime/GameFramework/Debugger/DebuggerComponent.ConsoleWindow.cs +++ b/Assets/TEngine/Runtime/GameFramework/Debugger/DebuggerComponent.ConsoleWindow.cs @@ -4,14 +4,14 @@ using UnityEngine; namespace TEngine { - public sealed partial class DebuggerModule : GameFrameworkComponent + public sealed partial class DebuggerModule : GameFrameworkModuleBase { [Serializable] private sealed class ConsoleWindow : IDebuggerWindow { private readonly Queue m_LogNodes = new Queue(); - private SettingComponent m_SettingComponent = null; + private SettingModule _mSettingModule = null; private Vector2 m_LogScrollPosition = Vector2.zero; private Vector2 m_StackScrollPosition = Vector2.zero; private int m_InfoCount = 0; @@ -209,19 +209,19 @@ namespace TEngine public void Initialize(params object[] args) { - m_SettingComponent = GameEntry.GetComponent(); - if (m_SettingComponent == null) + _mSettingModule = GameEntry.GetModule(); + if (_mSettingModule == null) { Log.Fatal("Setting component is invalid."); return; } Application.logMessageReceived += OnLogMessageReceived; - m_LockScroll = m_LastLockScroll = m_SettingComponent.GetBool("Debugger.Console.LockScroll", true); - m_InfoFilter = m_LastInfoFilter = m_SettingComponent.GetBool("Debugger.Console.InfoFilter", true); - m_WarningFilter = m_LastWarningFilter = m_SettingComponent.GetBool("Debugger.Console.WarningFilter", true); - m_ErrorFilter = m_LastErrorFilter = m_SettingComponent.GetBool("Debugger.Console.ErrorFilter", true); - m_FatalFilter = m_LastFatalFilter = m_SettingComponent.GetBool("Debugger.Console.FatalFilter", true); + m_LockScroll = m_LastLockScroll = _mSettingModule.GetBool("Debugger.Console.LockScroll", true); + m_InfoFilter = m_LastInfoFilter = _mSettingModule.GetBool("Debugger.Console.InfoFilter", true); + m_WarningFilter = m_LastWarningFilter = _mSettingModule.GetBool("Debugger.Console.WarningFilter", true); + m_ErrorFilter = m_LastErrorFilter = _mSettingModule.GetBool("Debugger.Console.ErrorFilter", true); + m_FatalFilter = m_LastFatalFilter = _mSettingModule.GetBool("Debugger.Console.FatalFilter", true); } public void Shutdown() @@ -243,31 +243,31 @@ namespace TEngine if (m_LastLockScroll != m_LockScroll) { m_LastLockScroll = m_LockScroll; - m_SettingComponent.SetBool("Debugger.Console.LockScroll", m_LockScroll); + _mSettingModule.SetBool("Debugger.Console.LockScroll", m_LockScroll); } if (m_LastInfoFilter != m_InfoFilter) { m_LastInfoFilter = m_InfoFilter; - m_SettingComponent.SetBool("Debugger.Console.InfoFilter", m_InfoFilter); + _mSettingModule.SetBool("Debugger.Console.InfoFilter", m_InfoFilter); } if (m_LastWarningFilter != m_WarningFilter) { m_LastWarningFilter = m_WarningFilter; - m_SettingComponent.SetBool("Debugger.Console.WarningFilter", m_WarningFilter); + _mSettingModule.SetBool("Debugger.Console.WarningFilter", m_WarningFilter); } if (m_LastErrorFilter != m_ErrorFilter) { m_LastErrorFilter = m_ErrorFilter; - m_SettingComponent.SetBool("Debugger.Console.ErrorFilter", m_ErrorFilter); + _mSettingModule.SetBool("Debugger.Console.ErrorFilter", m_ErrorFilter); } if (m_LastFatalFilter != m_FatalFilter) { m_LastFatalFilter = m_FatalFilter; - m_SettingComponent.SetBool("Debugger.Console.FatalFilter", m_FatalFilter); + _mSettingModule.SetBool("Debugger.Console.FatalFilter", m_FatalFilter); } } diff --git a/Assets/TEngine/Runtime/GameFramework/Debugger/DebuggerComponent.FpsCounter.cs b/Assets/TEngine/Runtime/GameFramework/Debugger/DebuggerComponent.FpsCounter.cs index c50e6063..fe51ae35 100644 --- a/Assets/TEngine/Runtime/GameFramework/Debugger/DebuggerComponent.FpsCounter.cs +++ b/Assets/TEngine/Runtime/GameFramework/Debugger/DebuggerComponent.FpsCounter.cs @@ -1,6 +1,6 @@ namespace TEngine { - public sealed partial class DebuggerModule : GameFrameworkComponent + public sealed partial class DebuggerModule : GameFrameworkModuleBase { private sealed class FpsCounter { diff --git a/Assets/TEngine/Runtime/GameFramework/Debugger/DebuggerModule.cs b/Assets/TEngine/Runtime/GameFramework/Debugger/DebuggerModule.cs index 634d4038..ca7326e6 100644 --- a/Assets/TEngine/Runtime/GameFramework/Debugger/DebuggerModule.cs +++ b/Assets/TEngine/Runtime/GameFramework/Debugger/DebuggerModule.cs @@ -8,7 +8,7 @@ namespace TEngine /// 调试器组件。 /// [DisallowMultipleComponent] - public sealed partial class DebuggerModule : GameFrameworkComponent + public sealed partial class DebuggerModule : GameFrameworkModuleBase { /// /// 默认调试器漂浮框大小。 @@ -154,7 +154,7 @@ namespace TEngine } } - private SettingComponent m_SettingComponent = null; + private SettingModule _mSettingModule = null; /// /// 游戏框架组件初始化。 @@ -172,33 +172,33 @@ namespace TEngine m_FpsCounter = new FpsCounter(0.5f); - m_SettingComponent = GameEntry.GetComponent(); - if (m_SettingComponent == null) + _mSettingModule = GameEntry.GetModule(); + if (_mSettingModule == null) { Log.Fatal("Setting component is invalid."); return; } - var lastIconX = m_SettingComponent.GetFloat("Debugger.Icon.X", DefaultIconRect.x); - var lastIconY = m_SettingComponent.GetFloat("Debugger.Icon.Y", DefaultIconRect.y); - var lastWindowX = m_SettingComponent.GetFloat("Debugger.Window.X", DefaultWindowRect.x); - var lastWindowY = m_SettingComponent.GetFloat("Debugger.Window.Y", DefaultWindowRect.y); - var lastWindowWidth = m_SettingComponent.GetFloat("Debugger.Window.Width", DefaultWindowRect.width); - var lastWindowHeight = m_SettingComponent.GetFloat("Debugger.Window.Height", DefaultWindowRect.height); - m_WindowScale = m_SettingComponent.GetFloat("Debugger.Window.Scale", DefaultWindowScale); + var lastIconX = _mSettingModule.GetFloat("Debugger.Icon.X", DefaultIconRect.x); + var lastIconY = _mSettingModule.GetFloat("Debugger.Icon.Y", DefaultIconRect.y); + var lastWindowX = _mSettingModule.GetFloat("Debugger.Window.X", DefaultWindowRect.x); + var lastWindowY = _mSettingModule.GetFloat("Debugger.Window.Y", DefaultWindowRect.y); + var lastWindowWidth = _mSettingModule.GetFloat("Debugger.Window.Width", DefaultWindowRect.width); + var lastWindowHeight = _mSettingModule.GetFloat("Debugger.Window.Height", DefaultWindowRect.height); + m_WindowScale = _mSettingModule.GetFloat("Debugger.Window.Scale", DefaultWindowScale); m_WindowRect = new Rect(lastIconX, lastIconY, DefaultIconRect.width, DefaultIconRect.height); m_WindowRect = new Rect(lastWindowX, lastWindowY, lastWindowWidth, lastWindowHeight); } private void OnDestroy() { - if (m_SettingComponent == null) + if (_mSettingModule == null) { Log.Fatal("Setting component is invalid."); return; } - m_SettingComponent.Save(); + _mSettingModule.Save(); } private void Start() diff --git a/Assets/TEngine/Runtime/GameFramework/Fsm/FsmModule.cs b/Assets/TEngine/Runtime/GameFramework/Fsm/FsmModule.cs index 7b7d5e3e..97f23993 100644 --- a/Assets/TEngine/Runtime/GameFramework/Fsm/FsmModule.cs +++ b/Assets/TEngine/Runtime/GameFramework/Fsm/FsmModule.cs @@ -8,7 +8,7 @@ namespace TEngine /// 有限状态机模块。 /// [DisallowMultipleComponent] - public sealed class FsmModule : GameFrameworkComponent + public sealed class FsmModule : GameFrameworkModuleBase { private IFsmManager m_FsmManager = null; diff --git a/Assets/TEngine/Runtime/GameFramework/GameEntry.cs b/Assets/TEngine/Runtime/GameFramework/GameEntry.cs index ff2ce334..229920f2 100644 --- a/Assets/TEngine/Runtime/GameFramework/GameEntry.cs +++ b/Assets/TEngine/Runtime/GameFramework/GameEntry.cs @@ -10,7 +10,7 @@ namespace TEngine /// public static class GameEntry { - private static readonly GameFrameworkLinkedList s_GameFrameworkComponents = new GameFrameworkLinkedList(); + private static readonly GameFrameworkLinkedList s_GameFrameworkModules = new GameFrameworkLinkedList(); /// /// 游戏框架所在的场景编号。 @@ -18,23 +18,23 @@ namespace TEngine internal const int GameFrameworkSceneId = 0; /// - /// 获取游戏框架组件。 + /// 获取游戏框架模块。 /// /// 要获取的游戏框架组件类型。 /// 要获取的游戏框架组件。 - public static T GetComponent() where T : GameFrameworkComponent + public static T GetModule() where T : GameFrameworkModuleBase { - return (T)GetComponent(typeof(T)); + return (T)GetModule(typeof(T)); } /// - /// 获取游戏框架组件。 + /// 获取游戏框架模块。 /// /// 要获取的游戏框架组件类型。 /// 要获取的游戏框架组件。 - public static GameFrameworkComponent GetComponent(Type type) + public static GameFrameworkModuleBase GetModule(Type type) { - LinkedListNode current = s_GameFrameworkComponents.First; + LinkedListNode current = s_GameFrameworkModules.First; while (current != null) { if (current.Value.GetType() == type) @@ -49,13 +49,13 @@ namespace TEngine } /// - /// 获取游戏框架组件。 + /// 获取游戏框架模块。 /// /// 要获取的游戏框架组件类型名称。 /// 要获取的游戏框架组件。 - public static GameFrameworkComponent GetComponent(string typeName) + public static GameFrameworkModuleBase GetModule(string typeName) { - LinkedListNode current = s_GameFrameworkComponents.First; + LinkedListNode current = s_GameFrameworkModules.First; while (current != null) { Type type = current.Value.GetType(); @@ -78,14 +78,14 @@ namespace TEngine { Log.Info("Shutdown Game Framework ({0})...", shutdownType); Utility.Unity.Release(); - RootModule rootModule = GetComponent(); + RootModule rootModule = GetModule(); if (rootModule != null) { rootModule.Shutdown(); rootModule = null; } - s_GameFrameworkComponents.Clear(); + s_GameFrameworkModules.Clear(); if (shutdownType == ShutdownType.None) { @@ -108,20 +108,20 @@ namespace TEngine } /// - /// 注册游戏框架组件。 + /// 注册游戏框架模块。 /// - /// 要注册的游戏框架组件。 - internal static void RegisterComponent(GameFrameworkComponent gameFrameworkComponent) + /// 要注册的游戏框架模块。 + internal static void RegisterModule(GameFrameworkModuleBase gameFrameworkModule) { - if (gameFrameworkComponent == null) + if (gameFrameworkModule == null) { Log.Error("Game Framework component is invalid."); return; } - Type type = gameFrameworkComponent.GetType(); + Type type = gameFrameworkModule.GetType(); - LinkedListNode current = s_GameFrameworkComponents.First; + LinkedListNode current = s_GameFrameworkModules.First; while (current != null) { if (current.Value.GetType() == type) @@ -133,7 +133,7 @@ namespace TEngine current = current.Next; } - s_GameFrameworkComponents.AddLast(gameFrameworkComponent); + s_GameFrameworkModules.AddLast(gameFrameworkModule); } } } diff --git a/Assets/TEngine/Runtime/GameFramework/GameFrameworkComponent.cs b/Assets/TEngine/Runtime/GameFramework/GameFrameworkModuleBase.cs similarity index 71% rename from Assets/TEngine/Runtime/GameFramework/GameFrameworkComponent.cs rename to Assets/TEngine/Runtime/GameFramework/GameFrameworkModuleBase.cs index 2c61e3dd..118bc82f 100644 --- a/Assets/TEngine/Runtime/GameFramework/GameFrameworkComponent.cs +++ b/Assets/TEngine/Runtime/GameFramework/GameFrameworkModuleBase.cs @@ -5,14 +5,14 @@ namespace TEngine /// /// 游戏框架组件抽象类。 /// - public abstract class GameFrameworkComponent : MonoBehaviour + public abstract class GameFrameworkModuleBase : MonoBehaviour { /// /// 游戏框架组件初始化。 /// protected virtual void Awake() { - GameEntry.RegisterComponent(this); + GameEntry.RegisterModule(this); } } } diff --git a/Assets/TEngine/Runtime/GameFramework/GameFrameworkComponent.cs.meta b/Assets/TEngine/Runtime/GameFramework/GameFrameworkModuleBase.cs.meta similarity index 100% rename from Assets/TEngine/Runtime/GameFramework/GameFrameworkComponent.cs.meta rename to Assets/TEngine/Runtime/GameFramework/GameFrameworkModuleBase.cs.meta diff --git a/Assets/TEngine/Runtime/GameFramework/MemoryPool/MemoryPoolComponent.cs b/Assets/TEngine/Runtime/GameFramework/MemoryPool/MemoryPoolModule.cs similarity index 96% rename from Assets/TEngine/Runtime/GameFramework/MemoryPool/MemoryPoolComponent.cs rename to Assets/TEngine/Runtime/GameFramework/MemoryPool/MemoryPoolModule.cs index 370f5b3f..311a9b0b 100644 --- a/Assets/TEngine/Runtime/GameFramework/MemoryPool/MemoryPoolComponent.cs +++ b/Assets/TEngine/Runtime/GameFramework/MemoryPool/MemoryPoolModule.cs @@ -32,7 +32,7 @@ namespace TEngine /// 基础组件。 /// [DisallowMultipleComponent] - public sealed class MemoryPoolComponent : GameFrameworkComponent + public sealed class MemoryPoolModule : GameFrameworkModuleBase { [SerializeField] private MemoryStrictCheckType m_EnableStrictCheck = MemoryStrictCheckType.AlwaysEnable; diff --git a/Assets/TEngine/Runtime/GameFramework/MemoryPool/MemoryPoolComponent.cs.meta b/Assets/TEngine/Runtime/GameFramework/MemoryPool/MemoryPoolModule.cs.meta similarity index 100% rename from Assets/TEngine/Runtime/GameFramework/MemoryPool/MemoryPoolComponent.cs.meta rename to Assets/TEngine/Runtime/GameFramework/MemoryPool/MemoryPoolModule.cs.meta diff --git a/Assets/TEngine/Runtime/GameFramework/ObjectPool/ObjectPoolComponent.cs b/Assets/TEngine/Runtime/GameFramework/ObjectPool/ObjectPoolModule.cs similarity index 99% rename from Assets/TEngine/Runtime/GameFramework/ObjectPool/ObjectPoolComponent.cs rename to Assets/TEngine/Runtime/GameFramework/ObjectPool/ObjectPoolModule.cs index 36d1d01e..c433bdb8 100644 --- a/Assets/TEngine/Runtime/GameFramework/ObjectPool/ObjectPoolComponent.cs +++ b/Assets/TEngine/Runtime/GameFramework/ObjectPool/ObjectPoolModule.cs @@ -8,7 +8,7 @@ namespace TEngine /// 对象池组件。 /// [DisallowMultipleComponent] - public sealed class ObjectPoolComponent : GameFrameworkComponent + public sealed class ObjectPoolModule : GameFrameworkModuleBase { private IObjectPoolManager m_ObjectPoolManager = null; diff --git a/Assets/TEngine/Runtime/GameFramework/ObjectPool/ObjectPoolComponent.cs.meta b/Assets/TEngine/Runtime/GameFramework/ObjectPool/ObjectPoolModule.cs.meta similarity index 100% rename from Assets/TEngine/Runtime/GameFramework/ObjectPool/ObjectPoolComponent.cs.meta rename to Assets/TEngine/Runtime/GameFramework/ObjectPool/ObjectPoolModule.cs.meta diff --git a/Assets/TEngine/Runtime/GameFramework/Resource/ResourceComponent.cs b/Assets/TEngine/Runtime/GameFramework/Resource/ResourceModuleBase.cs similarity index 93% rename from Assets/TEngine/Runtime/GameFramework/Resource/ResourceComponent.cs rename to Assets/TEngine/Runtime/GameFramework/Resource/ResourceModuleBase.cs index cfd71d95..540e0ef0 100644 --- a/Assets/TEngine/Runtime/GameFramework/Resource/ResourceComponent.cs +++ b/Assets/TEngine/Runtime/GameFramework/Resource/ResourceModuleBase.cs @@ -4,7 +4,7 @@ using UnityEngine; namespace TEngine { [DisallowMultipleComponent] - public class ResourceComponent: GameFrameworkComponent + public class ResourceModuleBase: GameFrameworkModuleBase { private IResourceManager m_ResourceManager; diff --git a/Assets/TEngine/Runtime/GameFramework/Resource/ResourceComponent.cs.meta b/Assets/TEngine/Runtime/GameFramework/Resource/ResourceModuleBase.cs.meta similarity index 100% rename from Assets/TEngine/Runtime/GameFramework/Resource/ResourceComponent.cs.meta rename to Assets/TEngine/Runtime/GameFramework/Resource/ResourceModuleBase.cs.meta diff --git a/Assets/TEngine/Runtime/GameFramework/RootModule.cs b/Assets/TEngine/Runtime/GameFramework/RootModule.cs index db9dec09..372f921d 100644 --- a/Assets/TEngine/Runtime/GameFramework/RootModule.cs +++ b/Assets/TEngine/Runtime/GameFramework/RootModule.cs @@ -8,7 +8,7 @@ namespace TEngine /// 基础模块。 /// [DisallowMultipleComponent] - public sealed class RootModule : GameFrameworkComponent + public sealed class RootModule : GameFrameworkModuleBase { private const int DefaultDpi = 96; // default windows dpi @@ -318,16 +318,16 @@ namespace TEngine { Log.Warning("Low memory reported..."); - ObjectPoolComponent objectPoolComponent = GameEntry.GetComponent(); - if (objectPoolComponent != null) + ObjectPoolModule objectPoolModule = GameEntry.GetModule(); + if (objectPoolModule != null) { - objectPoolComponent.ReleaseAllUnused(); + objectPoolModule.ReleaseAllUnused(); } - ResourceComponent resourceComponent = GameEntry.GetComponent(); - if (resourceComponent != null) + ResourceModuleBase resourceModuleBase = GameEntry.GetModule(); + if (resourceModuleBase != null) { - resourceComponent.ForceUnloadUnusedAssets(true); + resourceModuleBase.ForceUnloadUnusedAssets(true); } } } diff --git a/Assets/TEngine/Runtime/GameFramework/Setting/SettingComponent.cs b/Assets/TEngine/Runtime/GameFramework/Setting/SettingModule.cs similarity index 99% rename from Assets/TEngine/Runtime/GameFramework/Setting/SettingComponent.cs rename to Assets/TEngine/Runtime/GameFramework/Setting/SettingModule.cs index 60c084e8..d055a567 100644 --- a/Assets/TEngine/Runtime/GameFramework/Setting/SettingComponent.cs +++ b/Assets/TEngine/Runtime/GameFramework/Setting/SettingModule.cs @@ -8,7 +8,7 @@ namespace TEngine /// 游戏配置组件。 /// [DisallowMultipleComponent] - public sealed class SettingComponent : GameFrameworkComponent + public sealed class SettingModule : GameFrameworkModuleBase { private ISettingManager m_SettingManager = null; diff --git a/Assets/TEngine/Runtime/GameFramework/Setting/SettingComponent.cs.meta b/Assets/TEngine/Runtime/GameFramework/Setting/SettingModule.cs.meta similarity index 100% rename from Assets/TEngine/Runtime/GameFramework/Setting/SettingComponent.cs.meta rename to Assets/TEngine/Runtime/GameFramework/Setting/SettingModule.cs.meta diff --git a/Assets/TEngine/Runtime/GameFramework/UI/DefaultUIWindowHelper.cs b/Assets/TEngine/Runtime/GameFramework/UI/DefaultUIWindowHelper.cs index 3ad3063c..05d20567 100644 --- a/Assets/TEngine/Runtime/GameFramework/UI/DefaultUIWindowHelper.cs +++ b/Assets/TEngine/Runtime/GameFramework/UI/DefaultUIWindowHelper.cs @@ -7,7 +7,7 @@ namespace TEngine /// public class DefaultUIWindowHelper : UIWindowHelperBase { - private ResourceComponent m_ResourceComponent = null; + private ResourceModuleBase _mResourceModuleBase = null; private Vector2 m_Half = new Vector2(0.5f,0.5f); @@ -16,8 +16,8 @@ namespace TEngine private void Start() { m_UILayer = LayerMask.NameToLayer("UI"); - m_ResourceComponent = GameEntry.GetComponent(); - if (m_ResourceComponent == null) + _mResourceModuleBase = GameEntry.GetModule(); + if (_mResourceModuleBase == null) { Log.Fatal("Resource component is invalid."); return; diff --git a/Assets/TEngine/Runtime/GameFramework/UI/UIGroup/UIComponent.UIGroup.cs b/Assets/TEngine/Runtime/GameFramework/UI/UIGroup/UIComponent.UIGroup.cs index 74f723fd..6bf41f10 100644 --- a/Assets/TEngine/Runtime/GameFramework/UI/UIGroup/UIComponent.UIGroup.cs +++ b/Assets/TEngine/Runtime/GameFramework/UI/UIGroup/UIComponent.UIGroup.cs @@ -3,7 +3,7 @@ using UnityEngine; namespace TEngine { - public sealed partial class UIModule : GameFrameworkComponent + public sealed partial class UIModule : GameFrameworkModuleBase { [Serializable] private sealed class UIGroup diff --git a/Assets/TEngine/Runtime/GameFramework/UI/UIModule.cs b/Assets/TEngine/Runtime/GameFramework/UI/UIModule.cs index 0424ff88..547798ae 100644 --- a/Assets/TEngine/Runtime/GameFramework/UI/UIModule.cs +++ b/Assets/TEngine/Runtime/GameFramework/UI/UIModule.cs @@ -19,7 +19,7 @@ namespace TEngine /// UI模块。 /// [DisallowMultipleComponent] - public sealed partial class UIModule : GameFrameworkComponent + public sealed partial class UIModule : GameFrameworkModuleBase { private const int DefaultPriority = 0; @@ -63,7 +63,7 @@ namespace TEngine private void Start() { - RootModule rootModule = GameEntry.GetComponent(); + RootModule rootModule = GameEntry.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 6b2e4a36..4b4fdc67 100644 --- a/Assets/TEngine/Runtime/GameModule.cs +++ b/Assets/TEngine/Runtime/GameModule.cs @@ -8,7 +8,7 @@ using UnityEngine; /// public class GameModule:MonoBehaviour { - #region BaseComponents + #region BaseModules /// /// 获取游戏基础模块。 /// @@ -27,17 +27,17 @@ public class GameModule:MonoBehaviour /// /// 获取对象池模块。 /// - public static ObjectPoolComponent ObjectPool { get; private set; } + public static ObjectPoolModule ObjectPool { get; private set; } /// /// 获取资源模块。 /// - public static ResourceComponent Resource { get; private set; } + public static ResourceModuleBase Resource { get; private set; } /// /// 获取配置模块。 /// - public static SettingComponent Setting { get; private set; } + public static SettingModule Setting { get; private set; } /// /// 获取UI模块。 @@ -49,46 +49,46 @@ public class GameModule:MonoBehaviour /// /// 初始化系统框架模块 /// - public static void InitFrameWorkComponents() + public static void InitFrameWorkModules() { Base = Get(); Debugger = Get(); Fsm = Get(); - ObjectPool = Get(); - Resource = Get(); - Setting = Get(); + ObjectPool = Get(); + Resource = Get(); + Setting = Get(); UI = Get(); } - public static void InitCustomComponents() + public static void InitCustomModules() { } - private static readonly Dictionary s_Components = new Dictionary(); + private static readonly Dictionary Modules = new Dictionary(); - public static T Get()where T : GameFrameworkComponent + public static T Get()where T : GameFrameworkModuleBase { Type type = typeof(T); - if (s_Components.ContainsKey(type)) + if (Modules.ContainsKey(type)) { - return s_Components[type] as T; + return Modules[type] as T; } - T component = TEngine.GameEntry.GetComponent(); + T module = TEngine.GameEntry.GetModule(); - Log.Assert(condition:component != null,$"{typeof(T)} is null"); + Log.Assert(condition:module != null,$"{typeof(T)} is null"); - s_Components.Add(type,component); + Modules.Add(type,module); - return component; + return module; } public void Start() { Log.Info("GameModule Active"); - InitFrameWorkComponents(); - InitCustomComponents(); + InitFrameWorkModules(); + InitCustomModules(); } } \ No newline at end of file