diff --git a/GFramework.Core/architecture/Architecture.cs b/GFramework.Core/architecture/Architecture.cs index c4c59c7..d9e79ad 100644 --- a/GFramework.Core/architecture/Architecture.cs +++ b/GFramework.Core/architecture/Architecture.cs @@ -106,10 +106,10 @@ public abstract class Architecture : IArchitecture where T : Architecture, // == Finalize == // 冻结IOC容器,不允许 anymore arch._mContainer.Freeze(); - arch.EnterPhase(ArchitecturePhase.Ready); - // 发送架构初始化完成事件 - arch.SendEvent(new ArchitectureEvents.ArchitectureInitializedEvent()); arch._mInited = true; + arch.EnterPhase(ArchitecturePhase.Ready); + // 发送架构生命周期就绪事件 + arch.SendEvent(new ArchitectureEvents.ArchitectureLifecycleReadyEvent()); return arch; }, LazyThreadSafetyMode.ExecutionAndPublication); diff --git a/GFramework.Core/events/ArchitectureEvents.cs b/GFramework.Core/events/ArchitectureEvents.cs index 251e2a2..7526d38 100644 --- a/GFramework.Core/events/ArchitectureEvents.cs +++ b/GFramework.Core/events/ArchitectureEvents.cs @@ -7,5 +7,5 @@ public static class ArchitectureEvents /// 架构初始化完成事件 /// 在所有 Model / System Init 执行完毕后派发 /// - public readonly struct ArchitectureInitializedEvent; + public readonly struct ArchitectureLifecycleReadyEvent; } \ No newline at end of file diff --git a/GFramework.Godot/system/AbstractResourceFactorySystem.cs b/GFramework.Godot/system/AbstractResourceFactorySystem.cs index 53a80f4..afbeab4 100644 --- a/GFramework.Godot/system/AbstractResourceFactorySystem.cs +++ b/GFramework.Godot/system/AbstractResourceFactorySystem.cs @@ -1,4 +1,5 @@ -using GFramework.Core.events; +using GFramework.Core.architecture; +using GFramework.Core.events; using GFramework.Core.extensions; using GFramework.Core.system; using GFramework.Game.assets; @@ -10,7 +11,7 @@ namespace GFramework.Godot.system; /// 资源工厂系统抽象基类,用于统一管理各类资源的创建与预加载逻辑。 /// 提供注册场景和资源的方法,并通过依赖的资源加载系统和资产目录系统完成实际资源的获取与构造。 /// -public abstract class AbstractResourceFactorySystem : AbstractSystem, IResourceFactorySystem +public abstract class AbstractResourceFactorySystem : AbstractSystem, IResourceFactorySystem, IArchitectureLifecycle { private ResourceFactory.Registry? _registry; private IResourceLoadSystem? _resourceLoadSystem; @@ -26,14 +27,22 @@ public abstract class AbstractResourceFactorySystem : AbstractSystem, IResourceF _registry = new ResourceFactory.Registry(); _resourceLoadSystem = this.GetSystem(); _assetCatalogSystem = this.GetSystem(); - // 监听架构初始化事件 - this.RegisterEvent(_ => + } + + /// + /// 架构阶段回调,在架构就绪时注册和预加载资源 + /// + /// 当前架构阶段 + /// 架构实例 + public void OnPhase(ArchitecturePhase phase, IArchitecture arch) + { + if (phase == ArchitecturePhase.Ready) { // 注册资源 RegisterResources(); // 预加载所有资源 - _registry.PreloadAll(); - }); + _registry!.PreloadAll(); + } } ///