diff --git a/Assets/Scenes/main.unity b/Assets/Scenes/main.unity index a273df22..55d90a79 100644 --- a/Assets/Scenes/main.unity +++ b/Assets/Scenes/main.unity @@ -381,7 +381,7 @@ GameObject: - component: {fileID: 2061060682} - component: {fileID: 2061060683} m_Layer: 0 - m_Name: GameMain + m_Name: Root m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/TEngine/Editor/Inspector/BaseComponentInspector.cs b/Assets/TEngine/Editor/Inspector/RootComponentInspector.cs similarity index 98% rename from Assets/TEngine/Editor/Inspector/BaseComponentInspector.cs rename to Assets/TEngine/Editor/Inspector/RootComponentInspector.cs index 875a283c..b9ea34e1 100644 --- a/Assets/TEngine/Editor/Inspector/BaseComponentInspector.cs +++ b/Assets/TEngine/Editor/Inspector/RootComponentInspector.cs @@ -6,8 +6,8 @@ using UnityEngine; namespace TEngine.Editor { - [CustomEditor(typeof(BaseComponent))] - internal sealed class BaseComponentInspector : GameFrameworkInspector + [CustomEditor(typeof(RootComponent))] + internal sealed class RootComponentInspector : 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(); - BaseComponent t = (BaseComponent)target; + RootComponent t = (RootComponent)target; EditorGUI.BeginDisabledGroup(EditorApplication.isPlayingOrWillChangePlaymode); { diff --git a/Assets/TEngine/Editor/Inspector/BaseComponentInspector.cs.meta b/Assets/TEngine/Editor/Inspector/RootComponentInspector.cs.meta similarity index 100% rename from Assets/TEngine/Editor/Inspector/BaseComponentInspector.cs.meta rename to Assets/TEngine/Editor/Inspector/RootComponentInspector.cs.meta diff --git a/Assets/TEngine/Runtime/GameFramework/GameEntry.cs b/Assets/TEngine/Runtime/GameFramework/GameEntry.cs index 378bc550..7bf51c24 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(); - BaseComponent baseComponent = GetComponent(); - if (baseComponent != null) + RootComponent rootComponent = GetComponent(); + if (rootComponent != null) { - baseComponent.Shutdown(); - baseComponent = null; + rootComponent.Shutdown(); + rootComponent = null; } s_GameFrameworkComponents.Clear(); diff --git a/Assets/TEngine/Runtime/GameFramework/MemoryPool/MemoryPoolComponent.cs b/Assets/TEngine/Runtime/GameFramework/MemoryPool/MemoryPoolComponent.cs index 28939cc3..370f5b3f 100644 --- a/Assets/TEngine/Runtime/GameFramework/MemoryPool/MemoryPoolComponent.cs +++ b/Assets/TEngine/Runtime/GameFramework/MemoryPool/MemoryPoolComponent.cs @@ -32,8 +32,7 @@ namespace TEngine /// 基础组件。 /// [DisallowMultipleComponent] - [AddComponentMenu("TEngine/MemoryPool")] - public sealed class MemoryPoolComponent : MonoBehaviour + public sealed class MemoryPoolComponent : GameFrameworkComponent { [SerializeField] private MemoryStrictCheckType m_EnableStrictCheck = MemoryStrictCheckType.AlwaysEnable; diff --git a/Assets/TEngine/Runtime/BaseComponent.cs b/Assets/TEngine/Runtime/RootComponent.cs similarity index 99% rename from Assets/TEngine/Runtime/BaseComponent.cs rename to Assets/TEngine/Runtime/RootComponent.cs index d340f23e..f2e75ba0 100644 --- a/Assets/TEngine/Runtime/BaseComponent.cs +++ b/Assets/TEngine/Runtime/RootComponent.cs @@ -8,7 +8,7 @@ namespace TEngine /// 基础组件。 /// [DisallowMultipleComponent] - public sealed class BaseComponent : GameFrameworkComponent + public sealed class RootComponent : GameFrameworkComponent { private const int DefaultDpi = 96; // default windows dpi @@ -33,7 +33,7 @@ namespace TEngine private string m_JsonHelperTypeName = "TEngine.DefaultJsonHelper"; [SerializeField] - private int m_FrameRate = 30; + private int m_FrameRate = 120; [SerializeField] private float m_GameSpeed = 1f; diff --git a/Assets/TEngine/Runtime/BaseComponent.cs.meta b/Assets/TEngine/Runtime/RootComponent.cs.meta similarity index 100% rename from Assets/TEngine/Runtime/BaseComponent.cs.meta rename to Assets/TEngine/Runtime/RootComponent.cs.meta