From 15e75643ef4e80499ea9876226ac3d5beaf06129 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B5=B7?= <1464576565@qq.com> Date: Thu, 20 Mar 2025 20:47:26 +0800 Subject: [PATCH] modify --- Asset/Entry.prefab | 280 ++++++++++---------------- Runtime/AlicizaX.Entry.Runtime.asmdef | 1 - Runtime/GameApp.Audio.cs | 8 +- Runtime/GameApp.Event.cs | 6 +- Runtime/GameApp.EventKit.cs | 24 --- Runtime/GameApp.EventKit.cs.meta | 3 - Runtime/GameApp.Fsm.cs | 8 +- Runtime/GameApp.Localization.cs | 6 +- Runtime/GameApp.Network.cs | 6 +- Runtime/GameApp.ObjectPool.cs | 11 +- Runtime/GameApp.Procedure.cs | 8 +- Runtime/GameApp.Resource.cs | 6 +- Runtime/GameApp.Scene.cs | 8 +- Runtime/GameApp.Setting.cs | 23 --- Runtime/GameApp.Setting.cs.meta | 3 - Runtime/GameApp.Timer.cs | 8 +- Runtime/GameApp.UI.cs | 6 +- Runtime/GameApp.cs | 8 +- 18 files changed, 156 insertions(+), 267 deletions(-) delete mode 100644 Runtime/GameApp.EventKit.cs delete mode 100644 Runtime/GameApp.EventKit.cs.meta delete mode 100644 Runtime/GameApp.Setting.cs delete mode 100644 Runtime/GameApp.Setting.cs.meta diff --git a/Asset/Entry.prefab b/Asset/Entry.prefab index 9dd4040..42acf60 100644 --- a/Asset/Entry.prefab +++ b/Asset/Entry.prefab @@ -44,7 +44,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 028204b1d2277bd4782816ee91aeed81, type: 3} m_Name: m_EditorClassIdentifier: - componentType: AlicizaX.UI.Runtime.UIManager uiRoot: {fileID: 4612363183729467837, guid: 9368ff38b2090b2468f8358242026e4b, type: 3} --- !u!1 &1516812642607394282 GameObject: @@ -90,7 +89,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f05eaceeebe870a4595e51f998ed518b, type: 3} m_Name: m_EditorClassIdentifier: - componentType: AlicizaX.Debugger.Runtime.DebuggerManager m_Skin: {fileID: 11400000, guid: dce698819fdb70b42b393d9b0b6d420e, type: 2} m_ActiveWindow: 3 m_ShowFullWindow: 0 @@ -113,51 +111,6 @@ MonoBehaviour: m_FatalColor: serializedVersion: 2 rgba: 4281545650 ---- !u!1 &1713037984681270060 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1854293209487326123} - - component: {fileID: 4927968100452151227} - m_Layer: 0 - m_Name: Timer - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1854293209487326123 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1713037984681270060} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 425597497363353001} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &4927968100452151227 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1713037984681270060} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6bbfa5f028024a70812e412b33c0a86a, type: 3} - m_Name: - m_EditorClassIdentifier: - componentType: AlicizaX.Timer.Runtime.GameTimerManager --- !u!1 &2077363682113217780 GameObject: m_ObjectHideFlags: 0 @@ -202,54 +155,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1e28a727443c86c40aeb42ff20e0a343, type: 3} m_Name: m_EditorClassIdentifier: - componentType: AlicizaX.ObjectPool.ObjectPoolManager ---- !u!1 &2863938145508470796 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2467323922827256759} - - component: {fileID: 6672875393309450783} - m_Layer: 0 - m_Name: Setting - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2467323922827256759 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2863938145508470796} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 425597497363353001} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &6672875393309450783 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2863938145508470796} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dd5fa5f9376d4c2abee7a298edbfbd19, type: 3} - m_Name: - m_EditorClassIdentifier: - componentType: AlicizaX.Setting.Runtime.SettingManager - m_SettingHelperTypeName: AlicizaX.Setting.Runtime.DefaultSettingHelper - m_CustomSettingHelper: {fileID: 0} --- !u!1 &2946186047994278043 GameObject: m_ObjectHideFlags: 0 @@ -294,7 +199,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a69e41ab65d84e83a0468f1a2cc3926f, type: 3} m_Name: m_EditorClassIdentifier: - componentType: AlicizaX.Fsm.Runtime.FsmManager --- !u!1 &3110504541604719603 GameObject: m_ObjectHideFlags: 0 @@ -339,7 +243,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4d13b628448e4c71a78c4e51756cf98c, type: 3} m_Name: m_EditorClassIdentifier: - componentType: AlicizaX.Procedure.Runtime.ProcedureManager m_AvailableProcedureTypeNames: - Unity.Startup.Procedure.ProcedureClearCache - Unity.Startup.Procedure.ProcedureCreateDownloader @@ -363,9 +266,9 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1933965801183527639} - - component: {fileID: 1956686654474545424} + - component: {fileID: 235061582240253856} m_Layer: 0 - m_Name: Reference Pool + m_Name: Memory Pool m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -386,7 +289,7 @@ Transform: m_Children: [] m_Father: {fileID: 425597497363353001} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1956686654474545424 +--- !u!114 &235061582240253856 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -395,56 +298,10 @@ MonoBehaviour: m_GameObject: {fileID: 3646865557585103128} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8ae4d40d7e878bc498492dc9c410d071, type: 3} + m_Script: {fileID: 11500000, guid: 61474d279eb27214d9178822796f3b88, type: 3} m_Name: m_EditorClassIdentifier: - componentType: m_EnableStrictCheck: 0 ---- !u!1 &4838532054802213812 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8504326711444028785} - - component: {fileID: 9038455970653831619} - m_Layer: 0 - m_Name: Scene - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8504326711444028785 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4838532054802213812} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 425597497363353001} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &9038455970653831619 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4838532054802213812} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a8303f9994334265af3691a4b90f89d7, type: 3} - m_Name: - m_EditorClassIdentifier: - componentType: AlicizaX.Scene.Runtime.GameSceneManager --- !u!1 &5472542677182214335 GameObject: m_ObjectHideFlags: 0 @@ -478,19 +335,18 @@ Transform: - {fileID: 1933965801183527639} - {fileID: 1316740771005759728} - {fileID: 1221616422164529523} - - {fileID: 2467323922827256759} - - {fileID: 1854293209487326123} - {fileID: 1172762408459505014} - {fileID: 5170167877536483258} - {fileID: 424925309774805088} - {fileID: 1226030177838128577} - - {fileID: 8504326711444028785} - {fileID: 7231588671532407876} - {fileID: 1640076400431107710} - {fileID: 8452422965548084857} - {fileID: 9160912643551877041} - {fileID: 9144434048949093429} - {fileID: 5784339135251739962} + - {fileID: 5595937395452803435} + - {fileID: 4571892773427096871} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &7461712675371014626 @@ -505,11 +361,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 252fa1bb9e36411fb4582d0656b987bf, type: 3} m_Name: m_EditorClassIdentifier: - componentType: - m_FrameRate: 120 - m_GameSpeed: 1 - m_RunInBackground: 1 - m_NeverSleep: 1 + frameRate: 120 + gameSpeed: 1 + runInBackground: 1 + neverSleep: 1 --- !u!1 &5578643087445009071 GameObject: m_ObjectHideFlags: 0 @@ -554,7 +409,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f4381f5c6b23d724fa34cc4a3c9a4416, type: 3} m_Name: m_EditorClassIdentifier: - componentType: AlicizaX.Network.Runtime.NetworkManager + m_HeartInterval: 2000 --- !u!1 &6519989611955579811 GameObject: m_ObjectHideFlags: 0 @@ -599,14 +454,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 91e581bb79676824f8c04687f21ed727, type: 3} m_Name: m_EditorClassIdentifier: - componentType: AlicizaX.Resource.Runtime.ResourceManager - m_Milliseconds: 30 - m_defaultPackageName: DefaultPackage - m_AssetAutoReleaseInterval: 60 - m_AssetCapacity: 64 - m_AssetExpireTime: 60 - m_AssetPriority: 0 - m_DecryptionServices: AlicizaX.Resource.Runtime.FileOffsetDecryption + minUnloadUnusedAssetsInterval: 60 + maxUnloadUnusedAssetsInterval: 300 + useSystemUnloadUnusedAssets: 1 + _decryptionServices: + packageName: DefaultPackage + milliseconds: 30 + downloadingMaxNum: 10 + failedTryAgain: 3 + assetAutoReleaseInterval: 60 + assetCapacity: 64 + assetExpireTime: 60 + assetPriority: 0 --- !u!1 &6601518982324708866 GameObject: m_ObjectHideFlags: 0 @@ -651,7 +510,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7d0b3cff83fd3874394b1b456bb54dab, type: 3} m_Name: m_EditorClassIdentifier: - componentType: AlicizaX.Audio.Runtime.AudioManager m_AudioMixer: {fileID: 24100000, guid: 1af7a1b121ae17541a1967d430cef006, type: 2} m_InstanceRoot: {fileID: 1640076400431107710} m_AudioGroupConfigs: @@ -731,7 +589,50 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 577f4666bd05453d9b779ce3050b9ec2, type: 3} m_Name: m_EditorClassIdentifier: - componentType: AlicizaX.Localization.Runtime.LocalizationManager +--- !u!1 &7866404898801560120 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5595937395452803435} + - component: {fileID: 1512056486223068049} + m_Layer: 0 + m_Name: Scene + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5595937395452803435 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7866404898801560120} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 425597497363353001} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1512056486223068049 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7866404898801560120} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a21ca977c2264066ab0da2058aaecb24, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &8241741088829230542 GameObject: m_ObjectHideFlags: 0 @@ -776,7 +677,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e3adf1e69b12944448c9fe6ae10983cb, type: 3} m_Name: m_EditorClassIdentifier: - componentType: m_CheckCanReleaseInterval: 30 m_AutoReleaseInterval: 60 --- !u!1 &8527903851783246430 @@ -823,7 +723,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 48602115335c4223a70dc35cd6b29bbd, type: 3} m_Name: m_EditorClassIdentifier: - componentType: AlicizaX.Event.Runtime.EventManager --- !u!1 &8951643211898284125 GameObject: m_ObjectHideFlags: 0 @@ -868,4 +767,47 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7eec9f691e06464cbfc45f619c7fee9d, type: 3} m_Name: m_EditorClassIdentifier: - componentType: +--- !u!1 &8974750909375893034 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4571892773427096871} + - component: {fileID: 4511179801535963207} + m_Layer: 0 + m_Name: Timer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4571892773427096871 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8974750909375893034} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 425597497363353001} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4511179801535963207 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8974750909375893034} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 40c9991bf8984e2d89a8536bc8557abd, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Runtime/AlicizaX.Entry.Runtime.asmdef b/Runtime/AlicizaX.Entry.Runtime.asmdef index a09ce44..a48ea7f 100644 --- a/Runtime/AlicizaX.Entry.Runtime.asmdef +++ b/Runtime/AlicizaX.Entry.Runtime.asmdef @@ -7,7 +7,6 @@ "GUID:f318a940a77af754eb1172da9dc1b400", "GUID:be2f20a77f3232f44b9711ef43234aac", "GUID:56115dc8e38144842823f4ee0dcad88b", - "GUID:8b8e344bafed3e54eb291c1d5d2319b8", "GUID:4041d17782e62754ba8777fe2dfb6b27", "GUID:36daef23b46453a428399f7b34700c1a", "GUID:000cc1eaf688c5246be5328cb0cf16c8", diff --git a/Runtime/GameApp.Audio.cs b/Runtime/GameApp.Audio.cs index 3069e50..9975fbc 100644 --- a/Runtime/GameApp.Audio.cs +++ b/Runtime/GameApp.Audio.cs @@ -6,18 +6,18 @@ public static partial class GameApp /// /// 获取声音组件。 /// - public static AudioComponent Audio + public static IAudioModule Audio { get { if (_audio == null) { - _audio = GameEntry.GetComponent(); + _audio = ModuleSystem.GetModule(); } return _audio; } } - private static AudioComponent _audio; -} \ No newline at end of file + private static IAudioModule _audio; +} diff --git a/Runtime/GameApp.Event.cs b/Runtime/GameApp.Event.cs index 358495d..772a37b 100644 --- a/Runtime/GameApp.Event.cs +++ b/Runtime/GameApp.Event.cs @@ -7,18 +7,18 @@ public static partial class GameApp /// /// 获取事件组件。 /// - public static EventComponent Event + public static IEventModule Event { get { if (_event == null) { - _event = GameEntry.GetComponent(); + _event = ModuleSystem.GetModule(); } return _event; } } - private static EventComponent _event; + private static IEventModule _event; } diff --git a/Runtime/GameApp.EventKit.cs b/Runtime/GameApp.EventKit.cs deleted file mode 100644 index c9fcad3..0000000 --- a/Runtime/GameApp.EventKit.cs +++ /dev/null @@ -1,24 +0,0 @@ - -using AlicizaX.EventKit.Runtime; -using AlicizaX.Runtime; - -public static partial class GameApp -{ - /// - /// 获取事件组件。 - /// - public static EventKitComponent EventKit - { - get - { - if (_eventkit == null) - { - _eventkit = GameEntry.GetComponent(); - } - - return _eventkit; - } - } - - private static EventKitComponent _eventkit; -} diff --git a/Runtime/GameApp.EventKit.cs.meta b/Runtime/GameApp.EventKit.cs.meta deleted file mode 100644 index c7c7149..0000000 --- a/Runtime/GameApp.EventKit.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 3a16e2e6312148399ed258fd422a57a2 -timeCreated: 1737440954 \ No newline at end of file diff --git a/Runtime/GameApp.Fsm.cs b/Runtime/GameApp.Fsm.cs index 642c7c5..5faa4fe 100644 --- a/Runtime/GameApp.Fsm.cs +++ b/Runtime/GameApp.Fsm.cs @@ -6,18 +6,18 @@ public static partial class GameApp /// /// 获取有限状态机组件。 /// - public static FsmComponent Fsm + public static IFsmModule Fsm { get { if (_fsm == null) { - _fsm = GameEntry.GetComponent(); + _fsm = ModuleSystem.GetModule(); } return _fsm; } } - private static FsmComponent _fsm; -} \ No newline at end of file + private static IFsmModule _fsm; +} diff --git a/Runtime/GameApp.Localization.cs b/Runtime/GameApp.Localization.cs index 4d9e56a..a0c5dc0 100644 --- a/Runtime/GameApp.Localization.cs +++ b/Runtime/GameApp.Localization.cs @@ -6,18 +6,18 @@ public static partial class GameApp /// /// 获取本地化组件。 /// - public static LocalizationComponent Localization + public static ILocalizationModule Localization { get { if (_localization == null) { - _localization = GameEntry.GetComponent(); + _localization = ModuleSystem.GetModule(); } return _localization; } } - private static LocalizationComponent _localization; + private static ILocalizationModule _localization; } diff --git a/Runtime/GameApp.Network.cs b/Runtime/GameApp.Network.cs index 5e9165e..8593d96 100644 --- a/Runtime/GameApp.Network.cs +++ b/Runtime/GameApp.Network.cs @@ -7,18 +7,18 @@ public static partial class GameApp /// /// 获取网络组件。 /// - public static NetworkComponent Network + public static INetworkModule Network { get { if (_network == null) { - _network = GameEntry.GetComponent(); + _network = ModuleSystem.GetModule(); } return _network; } } - private static NetworkComponent _network; + private static INetworkModule _network; } diff --git a/Runtime/GameApp.ObjectPool.cs b/Runtime/GameApp.ObjectPool.cs index 3a97cc4..a2a90c9 100644 --- a/Runtime/GameApp.ObjectPool.cs +++ b/Runtime/GameApp.ObjectPool.cs @@ -1,22 +1,23 @@ -using AlicizaX.Runtime; +using AlicizaX.ObjectPool; +using AlicizaX.Runtime; public static partial class GameApp { /// /// 获取对象池组件。 /// - public static ObjectPoolComponent ObjectPool + public static IObjectPoolModule ObjectPool { get { if (_objectPool == null) { - _objectPool = GameEntry.GetComponent(); + _objectPool = ModuleSystem.GetModule(); } return _objectPool; } } - private static ObjectPoolComponent _objectPool; -} \ No newline at end of file + private static IObjectPoolModule _objectPool; +} diff --git a/Runtime/GameApp.Procedure.cs b/Runtime/GameApp.Procedure.cs index 18ef913..542b46a 100644 --- a/Runtime/GameApp.Procedure.cs +++ b/Runtime/GameApp.Procedure.cs @@ -6,18 +6,18 @@ public static partial class GameApp /// /// 获取流程组件。 /// - public static ProcedureComponent Procedure + public static IProcedureModule Procedure { get { if (_procedure == null) { - _procedure = GameEntry.GetComponent(); + _procedure = ModuleSystem.GetModule(); } return _procedure; } } - private static ProcedureComponent _procedure; -} \ No newline at end of file + private static IProcedureModule _procedure; +} diff --git a/Runtime/GameApp.Resource.cs b/Runtime/GameApp.Resource.cs index 257a747..1fd1ad8 100644 --- a/Runtime/GameApp.Resource.cs +++ b/Runtime/GameApp.Resource.cs @@ -7,18 +7,18 @@ public static partial class GameApp /// /// 获取Asset组件。 /// - public static ResourceComponent Resource + public static IResourceModule Resource { get { if (_resource == null) { - _resource = GameEntry.GetComponent(); + _resource = ModuleSystem.GetModule(); } return _resource; } } - private static ResourceComponent _resource; + private static IResourceModule _resource; } diff --git a/Runtime/GameApp.Scene.cs b/Runtime/GameApp.Scene.cs index 63cb3b4..aefeabe 100644 --- a/Runtime/GameApp.Scene.cs +++ b/Runtime/GameApp.Scene.cs @@ -6,19 +6,19 @@ public static partial class GameApp /// /// 获取场景组件。 /// - public static SceneComponent Scene + public static ISceneModule Scene { get { if (_scene == null) { - _scene = GameEntry.GetComponent(); + _scene = ModuleSystem.GetModule(); } return _scene; } } - private static SceneComponent _scene; + private static ISceneModule _scene; -} \ No newline at end of file +} diff --git a/Runtime/GameApp.Setting.cs b/Runtime/GameApp.Setting.cs deleted file mode 100644 index d261ee5..0000000 --- a/Runtime/GameApp.Setting.cs +++ /dev/null @@ -1,23 +0,0 @@ -using AlicizaX.Runtime; -using AlicizaX.Setting.Runtime; - -public static partial class GameApp -{ - /// - /// 获取配置组件。 - /// - public static SettingComponent Setting - { - get - { - if (_setting == null) - { - _setting = GameEntry.GetComponent(); - } - - return _setting; - } - } - - private static SettingComponent _setting; -} \ No newline at end of file diff --git a/Runtime/GameApp.Setting.cs.meta b/Runtime/GameApp.Setting.cs.meta deleted file mode 100644 index ba1c2ca..0000000 --- a/Runtime/GameApp.Setting.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 2e09dad1c1c146ca89b4db1d5d5f4066 -timeCreated: 1737440423 \ No newline at end of file diff --git a/Runtime/GameApp.Timer.cs b/Runtime/GameApp.Timer.cs index cac09cb..6f8661e 100644 --- a/Runtime/GameApp.Timer.cs +++ b/Runtime/GameApp.Timer.cs @@ -6,18 +6,18 @@ public static partial class GameApp /// /// 获取定时器组件。 /// - public static TimerComponent Timer + public static ITimerModule Timer { get { if (_timer == null) { - _timer = GameEntry.GetComponent(); + _timer = ModuleSystem.GetModule(); } return _timer; } } - private static TimerComponent _timer; -} \ No newline at end of file + private static ITimerModule _timer; +} diff --git a/Runtime/GameApp.UI.cs b/Runtime/GameApp.UI.cs index 30ccbae..d51bf1c 100644 --- a/Runtime/GameApp.UI.cs +++ b/Runtime/GameApp.UI.cs @@ -6,18 +6,18 @@ public static partial class GameApp /// /// 获取UI组件。 /// - public static UIComponent UI + public static IUIModule UI { get { if (_ui == null) { - _ui = GameEntry.GetComponent(); + _ui = ModuleSystem.GetModule(); } return _ui; } } - private static UIComponent _ui; + private static IUIModule _ui; } diff --git a/Runtime/GameApp.cs b/Runtime/GameApp.cs index 598ed82..518d1fd 100644 --- a/Runtime/GameApp.cs +++ b/Runtime/GameApp.cs @@ -5,18 +5,18 @@ public static partial class GameApp /// /// 获取游戏基础组件。 /// - public static BaseComponent Base + public static RootModule Base { get { if (_base == null) { - _base = GameEntry.GetComponent(); + _base = RootModule.Instance; } return _base; } } - private static BaseComponent _base; -} \ No newline at end of file + private static RootModule _base; +}