@ives_xxz/framework 1.6.5 → 2.0.0

package/manager/FWLayerManager.ts

@@ -1,12 +1,9 @@
-import { FWManager } from "./FWManager";
-import { FWSystemDefine } from "../define/FWSystemDefine";
-import FWLayer from "../layer/FWLayer";
-import FWLog from "../log/FWLog";
-import { FWQueue } from "../utils/FWQueue";
-import { FrameworkBase } from "../FrameworkBase";
-import { PerformanceMonitor } from "../expand/FWDecorator";
+import { FWManager } from './FWManager';
+import { FWQueue } from '../utils/FWQueue';
+import { FrameworkBase } from '../FrameworkBase';
+import { PerformanceMonitor } from '../expand/FWDecorator';
 
-const ADD_EXTERNAL_REFERENCE: string = "addExternalReference";
+const ADD_EXTERNAL_REFERENCE: string = 'addExternalReference';
 
 export class FWLayerManager extends FWManager implements FW.LayerManager {
   private resourceManager: FWLayerResourceManager;
@@ -30,16 +27,16 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
       this.resourceManager,
       this.createManager,
       this.stackManager,
-      this.queueManager
+      this.queueManager,
     );
   }
 
   /**
    * 异步打开Layer
    */
-  @PerformanceMonitor("openAsync")
+  @PerformanceMonitor('openAsync')
   async openAsync<Ctr extends FW.LayerController = FW.LayerController>(
-    data: FW.LayerOpenArgs
+    data: FW.LayerOpenArgs,
   ): Promise<Ctr> {
     return this.openManager.openLayerAsync(data) as Promise<Ctr>;
   }
@@ -47,28 +44,22 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
   /**
    * 同步打开
    */
-  openSync<Ctr extends FW.LayerController = FW.LayerController>(
-    data: FW.LayerOpenArgs
-  ): Ctr {
+  openSync<Ctr extends FW.LayerController = FW.LayerController>(data: FW.LayerOpenArgs): Ctr {
     return this.openManager.openLayerSync(data) as Ctr;
   }
 
   /**
    * 显示layer并恢复所有节点事件
    */
-  displayLayer<Ctr extends FW.LayerController = FW.LayerController>(
-    ctr: Ctr
-  ): Ctr {
+  displayLayer<Ctr extends FW.LayerController = FW.LayerController>(ctr: Ctr): Ctr {
     const layerData = ctr.layerData;
 
-    if (
-      !this.dataManager.getLayerMap().has(ctr.layerData.controllerConstructor)
-    ) {
-      FWLog.warn(`display layer failed,layer name : ${layerData.layerName}`);
+    if (!this.dataManager.getLayerMap().has(ctr.layerData.controllerConstructor)) {
+      FW.Log.warn(`display layer failed,layer name : ${layerData.layerName}`);
       return;
     }
     /** 非常驻layer不允许操作透明度显示 */
-    if (ctr.layerType != FWSystemDefine.FWLayerType.PERMANENT) return;
+    if (ctr.layerType != FW.SystemDefine.FWLayerType.PERMANENT) return;
 
     const node = ctr.layer.node;
     node.opacity = 255;
@@ -83,19 +74,15 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
   /**
    * 隐藏layer并隐藏所有节点事件
    */
-  hideLayer<Ctr extends FW.LayerController = FW.LayerController>(
-    ctr: Ctr
-  ): Ctr {
+  hideLayer<Ctr extends FW.LayerController = FW.LayerController>(ctr: Ctr): Ctr {
     const layerData = ctr.layerData;
-    if (
-      !this.dataManager.getLayerMap().has(ctr.layerData.controllerConstructor)
-    ) {
-      FWLog.warn(`hide layer failed,layer name : ${layerData.layerName}`);
+    if (!this.dataManager.getLayerMap().has(ctr.layerData.controllerConstructor)) {
+      FW.Log.warn(`hide layer failed,layer name : ${layerData.layerName}`);
       return;
     }
 
     /** 非常驻layer不允许操作透明度 */
-    if (ctr.layerType != FWSystemDefine.FWLayerType.PERMANENT) return;
+    if (ctr.layerType != FW.SystemDefine.FWLayerType.PERMANENT) return;
 
     const node = ctr.layer.node;
     node.opacity = 0;
@@ -133,9 +120,7 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
     for (let i = 0; i < count; i++) {
       let layerData = this.stackManager.pop();
       let ctr = layerData.controller;
-      if (
-        !this.dataManager.getLayerMap().has(layerData.controllerConstructor)
-      ) {
+      if (!this.dataManager.getLayerMap().has(layerData.controllerConstructor)) {
         return;
       }
       if (cc.isValid(ctr.layer?.node)) {
@@ -155,7 +140,7 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
    */
   async removeAllChildren(node: cc.Node) {
     if (!cc.isValid(node)) return;
-    const layers = node.getComponentsInChildren(FWLayer);
+    const layers = node.getComponentsInChildren(FW.Layer);
     layers.forEach((v) => {
       if (cc.isValid(v?.node)) {
         v?.ctr?.close();
@@ -167,7 +152,7 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
    * 关闭layer
    */
   async close<Ctr extends FW.LayerController = FW.LayerController>(
-    ctr: Ctr
+    ctr: Ctr,
   ): Promise<FW.LayerController> {
     if (!ctr) return;
 
@@ -241,8 +226,8 @@ export class FWLayerData<T extends FW.LayerController = FW.LayerController>
   layer: FW.Layer;
   layerName: string;
   layerAssetProperty: FW.AssetProperty;
-  layerRenderOrder: FWSystemDefine.FWLayerRenderOrder;
-  layerType: FWSystemDefine.FWLayerType;
+  layerRenderOrder: FW.SystemDefine.FWLayerRenderOrder;
+  layerType: FW.SystemDefine.FWLayerType;
   layerParent?: cc.Node;
   layerPosition?: FW.Vec3;
   controllerName: string;
@@ -255,13 +240,12 @@ export class FWLayerData<T extends FW.LayerController = FW.LayerController>
 class FWLayerDataManager {
   private layerMap: Map<new () => FW.LayerController, FWLayerData> = new Map();
   private layerRegistry: Set<new () => FW.LayerController> = new Set();
-  private layerControllerFactory: FWLayerControllerFactory =
-    new FWLayerControllerFactory();
+  private layerControllerFactory: FWLayerControllerFactory = new FWLayerControllerFactory();
   /**
    * 获取已存在的Layer
    */
   getExistingLayer<Ctr extends FW.LayerController = FW.LayerController>(
-    type: new () => Ctr
+    type: new () => Ctr,
   ): Ctr | undefined {
     for (const [key, value] of this.layerMap) {
       if (value.controllerConstructor === type) {
@@ -275,7 +259,7 @@ class FWLayerDataManager {
    * 从类型创建Layer数据
    */
   createLayerData<Ctr extends FW.LayerController = FW.LayerController>(
-    type: new () => Ctr
+    type: new () => Ctr,
   ): FW.LayerData {
     const ctr = this.layerControllerFactory.createController(type);
     const ctrName = cc.js.getClassName(ctr);
@@ -326,7 +310,7 @@ class FWLayerDataManager {
    * 获取已存在的代理
    */
   getExistingProxy<Ctr extends FW.LayerController = FW.LayerController>(
-    type: new () => Ctr
+    type: new () => Ctr,
   ): Ctr | undefined {
     return this.layerMap.get(type)?.controllerProxy as Ctr;
   }
@@ -337,8 +321,8 @@ class FWLayerDataManager {
   setupLayerData(
     layerData: FWLayerData,
     res: { asset: cc.Prefab; uuid: string },
-    layer: FWLayer,
-    layerName: string
+    layer: FW.Layer,
+    layerName: string,
   ): void {
     layerData.loaded = true;
     layerData.layer = layer;
@@ -384,7 +368,7 @@ class FWLayerDataManager {
       try {
         cb?.(null);
       } catch (e) {
-        FWLog.error("External ref update callback error:", e);
+        FW.Log.error('External ref update callback error:', e);
       }
     });
     layerData.externalReference.clear();
@@ -409,8 +393,7 @@ class FWLayerDataManager {
 }
 
 class FWLayerCreateManager {
-  private lifecycleManager: FWLayerLifecycleManager =
-    new FWLayerLifecycleManager();
+  private lifecycleManager: FWLayerLifecycleManager = new FWLayerLifecycleManager();
 
   /**
    * 创建Layer节点
@@ -420,13 +403,13 @@ class FWLayerCreateManager {
     layerComponent: string,
     renderOrder: number,
     parent: cc.Node,
-    position: FW.Vec3
-  ): FWLayer {
+    position: FW.Vec3,
+  ): FW.Layer {
     parent = parent || FW.Entry.scene?.node;
     position = position || cc.Vec3.ZERO;
 
     if (!parent.activeInHierarchy || !cc.isValid(parent)) {
-      FWLog.error(`createLayer failed , parent : ${parent}`);
+      FW.Log.error(`createLayer failed , parent : ${parent}`);
       return;
     }
 
@@ -437,13 +420,13 @@ class FWLayerCreateManager {
     node.zIndex = renderOrder;
 
     !node.getComponent(layerComponent) && node.addComponent(layerComponent);
-    return node.getComponent(FWLayer);
+    return node.getComponent(FW.Layer);
   }
 
   /**
    * 设置Layer生命周期
    */
-  setupLayerLifecycle(layer: FWLayer, ctr: FW.LayerController): void {
+  setupLayerLifecycle(layer: FW.Layer, ctr: FW.LayerController): void {
     this.lifecycleManager.setupLifecycleHooks(layer, ctr);
   }
 
@@ -462,14 +445,14 @@ class FWLayerOpenManager {
     private resourceManager: FWLayerResourceManager,
     private createManager: FWLayerCreateManager,
     private stackManager: FWLayerStackManager,
-    private queueManager: FWLayerQueueManager
+    private queueManager: FWLayerQueueManager,
   ) {}
 
   /**
    * 统一的Layer打开方法
    */
   async openLayerAsync<Ctr extends FW.LayerController = FW.LayerController>(
-    data: FW.LayerOpenArgs
+    data: FW.LayerOpenArgs,
   ): Promise<Ctr> {
     if (!this.validateOpenData(data)) {
       return undefined;
@@ -491,12 +474,7 @@ class FWLayerOpenManager {
       return proxy as Ctr;
     }
 
-    if (
-      this.queueManager.handlePopupQueue(
-        layerData,
-        this.dataManager.getLayerMap()
-      )
-    ) {
+    if (this.queueManager.handlePopupQueue(layerData, this.dataManager.getLayerMap())) {
       return undefined;
     }
 
@@ -505,9 +483,7 @@ class FWLayerOpenManager {
     return this.asyncGenerationLayer(layerData, data);
   }
 
-  openLayerSync<Ctr extends FW.LayerController = FW.LayerController>(
-    data: FW.LayerOpenArgs
-  ): Ctr {
+  openLayerSync<Ctr extends FW.LayerController = FW.LayerController>(data: FW.LayerOpenArgs): Ctr {
     if (!this.validateOpenData(data)) {
       return undefined;
     }
@@ -528,12 +504,7 @@ class FWLayerOpenManager {
       return proxy as Ctr;
     }
 
-    if (
-      this.queueManager.handlePopupQueue(
-        layerData,
-        this.dataManager.getLayerMap()
-      )
-    ) {
+    if (this.queueManager.handlePopupQueue(layerData, this.dataManager.getLayerMap())) {
       return undefined;
     }
 
@@ -547,7 +518,7 @@ class FWLayerOpenManager {
    */
   private validateOpenData(data: FW.LayerOpenArgs): boolean {
     if (!data) {
-      FWLog.error(`打开Layer失败:${data},请检查参数!`);
+      FW.Log.error(`打开Layer失败:${data},请检查参数!`);
       return false;
     }
     return true;
@@ -556,16 +527,17 @@ class FWLayerOpenManager {
   /**
    * 异步生成Layer
    */
-  private async asyncGenerationLayer<
-    Ctr extends FW.LayerController = FW.LayerController
-  >(layerData: FWLayerData, data: FW.LayerOpenArgs): Promise<Ctr> {
+  private async asyncGenerationLayer<Ctr extends FW.LayerController = FW.LayerController>(
+    layerData: FWLayerData,
+    data: FW.LayerOpenArgs,
+  ): Promise<Ctr> {
     try {
       const res = await this.resourceManager.loadLayerAsync(layerData);
       const ctr = this.createLayer(layerData, res, data) as Ctr;
       this.dataManager.removeFromRegistry(layerData.controllerConstructor);
       return ctr;
     } catch (e) {
-      FWLog.error(`asyncGenerationLayer failed:`, e);
+      FW.Log.error(`asyncGenerationLayer failed:`, e);
       this.dataManager.clearFailedLayer(layerData);
       throw e;
     }
@@ -574,16 +546,17 @@ class FWLayerOpenManager {
   /**
    * 同步创建Layer
    */
-  private syncGenerationLayer<
-    Ctr extends FW.LayerController = FW.LayerController
-  >(layerData: FWLayerData, data: FW.LayerOpenArgs): Ctr {
+  private syncGenerationLayer<Ctr extends FW.LayerController = FW.LayerController>(
+    layerData: FWLayerData,
+    data: FW.LayerOpenArgs,
+  ): Ctr {
     try {
       const res = this.resourceManager.loadLayerSync(layerData);
       const ctr = this.createLayer(layerData, res, data) as Ctr;
       this.dataManager.removeFromRegistry(layerData.controllerConstructor);
       return ctr;
     } catch (e) {
-      FWLog.error(`syncGenerationLayer failed:`, e);
+      FW.Log.error(`syncGenerationLayer failed:`, e);
       this.dataManager.clearFailedLayer(layerData);
       return undefined;
     }
@@ -595,14 +568,14 @@ class FWLayerOpenManager {
   private createLayer<Ctr extends FW.LayerController = FW.LayerController>(
     layerData: FWLayerData,
     res: { asset: cc.Prefab; uuid: string },
-    data: FW.LayerOpenArgs
+    data: FW.LayerOpenArgs,
   ): Ctr {
     const layer = this.createManager.createLayer(
       res.asset,
       res.asset.name,
       layerData.controller.renderOrder,
       data.parent,
-      data.position
+      data.position,
     );
     const layerName = cc.js.getClassName(layer);
 
@@ -612,35 +585,28 @@ class FWLayerOpenManager {
 
     this.createManager.setupLayerLifecycle(layer, layerData.controller);
 
-    if (
-      layerData.controller.layerType !== FWSystemDefine.FWLayerType.PERMANENT
-    ) {
+    if (layerData.controller.layerType !== FW.SystemDefine.FWLayerType.PERMANENT) {
       this.stackManager.push(layerData);
     }
 
     this.dataManager.removeFromRegistry(layerData.controllerConstructor);
 
-    layerData.controllerProxy =
-      this.dataManager.createControllerProxy(layerData);
+    layerData.controllerProxy = this.dataManager.createControllerProxy(layerData);
 
     return layerData.controllerProxy as Ctr;
   }
 }
 
 class FWLayerResourceManager {
-  async loadLayerAsync(
-    layerData: FWLayerData
-  ): Promise<{ asset: cc.Prefab; uuid: string }> {
+  async loadLayerAsync(layerData: FWLayerData): Promise<{ asset: cc.Prefab; uuid: string }> {
     try {
-      const res = await FW.Entry.resMgr.loadAssetData<cc.Prefab>(
-        layerData.layerAssetProperty
-      );
+      const res = await FW.Entry.resMgr.loadAssetData<cc.Prefab>(layerData.layerAssetProperty);
       res.user = layerData.layerName;
       res.autoRelease = layerData.controller.autoRelease;
       res.dependentBundle = layerData.controller.layerAssetProperty.bundle;
       return { asset: res.asset as cc.Prefab, uuid: res.uuid };
     } catch (e) {
-      FWLog.error(`loadLayerAsync failed:`, e);
+      FW.Log.error(`loadLayerAsync failed:`, e);
       throw e;
     }
   }
@@ -648,9 +614,7 @@ class FWLayerResourceManager {
   loadLayerSync(layerData: FWLayerData): { asset: cc.Prefab; uuid: string } {
     layerData.layerAssetProperty.bundle =
       layerData.layerAssetProperty.bundle || FW.Entry.bundleName;
-    const res = FW.Entry.resMgr.getAssetData<cc.Prefab>(
-      layerData.layerAssetProperty
-    );
+    const res = FW.Entry.resMgr.getAssetData<cc.Prefab>(layerData.layerAssetProperty);
     res.user = layerData.layerName;
     res.autoRelease = layerData.controller.autoRelease;
     res.dependentBundle = layerData.controller.layerAssetProperty.bundle;
@@ -662,9 +626,7 @@ class FWLayerStackManager {
   private layerStack: FWLayerData[] = [];
 
   push(layerData: FWLayerData): void {
-    if (
-      layerData.controller.layerType !== FWSystemDefine.FWLayerType.PERMANENT
-    ) {
+    if (layerData.controller.layerType !== FW.SystemDefine.FWLayerType.PERMANENT) {
       this.layerStack.push(layerData);
     }
   }
@@ -674,9 +636,7 @@ class FWLayerStackManager {
   }
 
   remove(layerData: FWLayerData): void {
-    const index = this.layerStack.findIndex(
-      (v) => v.controller === layerData.controller
-    );
+    const index = this.layerStack.findIndex((v) => v.controller === layerData.controller);
     if (index > -1) {
       this.layerStack.splice(index, 1);
     }
@@ -692,32 +652,26 @@ class FWLayerStackManager {
 }
 
 class FWLayerStateManager {
-  private layerStates = new Map<
-    new () => FW.LayerController,
-    FWSystemDefine.FWLayerState
-  >();
-
-  setState(
-    ctrType: new () => FW.LayerController,
-    state: FWSystemDefine.FWLayerState
-  ): void {
+  private layerStates = new Map<new () => FW.LayerController, FW.SystemDefine.FWLayerState>();
+
+  setState(ctrType: new () => FW.LayerController, state: FW.SystemDefine.FWLayerState): void {
     this.layerStates.set(ctrType, state);
   }
 
-  getState(ctrType: new () => FW.LayerController): FWSystemDefine.FWLayerState {
-    return this.layerStates.get(ctrType) || FWSystemDefine.FWLayerState.CLOSED;
+  getState(ctrType: new () => FW.LayerController): FW.SystemDefine.FWLayerState {
+    return this.layerStates.get(ctrType) || FW.SystemDefine.FWLayerState.CLOSED;
   }
 
   isOpening(ctrType: new () => FW.LayerController): boolean {
-    return this.getState(ctrType) === FWSystemDefine.FWLayerState.OPENING;
+    return this.getState(ctrType) === FW.SystemDefine.FWLayerState.OPENING;
   }
 
   isOpened(ctrType: new () => FW.LayerController): boolean {
-    return this.getState(ctrType) === FWSystemDefine.FWLayerState.OPENED;
+    return this.getState(ctrType) === FW.SystemDefine.FWLayerState.OPENED;
   }
 
   isClosing(ctrType: new () => FW.LayerController): boolean {
-    return this.getState(ctrType) === FWSystemDefine.FWLayerState.CLOSING;
+    return this.getState(ctrType) === FW.SystemDefine.FWLayerState.CLOSING;
   }
 
   removeState(ctrType: new () => FW.LayerController): void {
@@ -734,13 +688,11 @@ class FWLayerQueueManager {
 
   handlePopupQueue(
     layerData: FWLayerData,
-    layerMap: Map<new () => FW.LayerController, FWLayerData>
+    layerMap: Map<new () => FW.LayerController, FWLayerData>,
   ): boolean {
-    if (
-      layerData.controller.layerType === FWSystemDefine.FWLayerType.POPUP_QUEUE
-    ) {
+    if (layerData.controller.layerType === FW.SystemDefine.FWLayerType.POPUP_QUEUE) {
       const hasNonPermanentLayers = Array.from(layerMap.values()).some(
-        (value) => value.layerType === FWSystemDefine.FWLayerType.POPUP_QUEUE
+        (value) => value.layerType === FW.SystemDefine.FWLayerType.POPUP_QUEUE,
       );
 
       if (hasNonPermanentLayers) {
@@ -777,45 +729,45 @@ class FWLayerQueueManager {
 }
 
 class FWLayerLifecycleManager {
-  setupLifecycleHooks(layer: FWLayer, ctr: FW.LayerController): void {
-    const originalOnLoad = layer["onLoad"];
-    layer["onLoad"] = function () {
+  setupLifecycleHooks(layer: FW.Layer, ctr: FW.LayerController): void {
+    const originalOnLoad = layer['onLoad'];
+    layer['onLoad'] = function () {
       originalOnLoad?.call(this);
       ctr.onLoad?.();
     };
 
-    const originalStart = layer["start"];
-    layer["start"] = function () {
+    const originalStart = layer['start'];
+    layer['start'] = function () {
       originalStart?.call(this);
       ctr.onStart?.();
     };
 
-    const originalOnEnable = layer["onEnable"];
-    layer["onEnable"] = function () {
+    const originalOnEnable = layer['onEnable'];
+    layer['onEnable'] = function () {
       originalOnEnable?.call(this);
       ctr.onEnable?.();
     };
 
-    const originalOnDisable = layer["onDisable"];
-    layer["onDisable"] = function () {
+    const originalOnDisable = layer['onDisable'];
+    layer['onDisable'] = function () {
       originalOnDisable?.call(this);
       ctr.onDisable?.();
     };
 
-    const originalOnDestroy = layer["onDestroy"];
-    layer["onDestroy"] = function () {
+    const originalOnDestroy = layer['onDestroy'];
+    layer['onDestroy'] = function () {
       originalOnDestroy?.call(this);
       ctr.onDestroy?.();
     };
 
-    const originalUpdate = layer["update"];
-    layer["update"] = function (dt: number) {
+    const originalUpdate = layer['update'];
+    layer['update'] = function (dt: number) {
       originalUpdate?.call(this, dt);
       ctr.onUpdate?.(dt);
     };
 
-    const originalLateUpdate = layer["lateUpdate"];
-    layer["lateUpdate"] = function () {
+    const originalLateUpdate = layer['lateUpdate'];
+    layer['lateUpdate'] = function () {
       originalLateUpdate?.call(this);
       ctr.onLateUpdate?.();
     };
@@ -826,9 +778,7 @@ class FWLayerControllerFactory {
   /**
    * 创建并初始化 LayerController
    */
-  createController<Ctr extends FW.LayerController = FW.LayerController>(
-    type: new () => Ctr
-  ): Ctr {
+  createController<Ctr extends FW.LayerController = FW.LayerController>(type: new () => Ctr): Ctr {
     const ctr = new type();
 
     if (ctr instanceof FrameworkBase) {

package/manager/FWManager.ts

@@ -1,6 +1,4 @@
-import { FrameworkBase } from '../FrameworkBase';
-
-export abstract class FWManager extends FrameworkBase implements FW.Manager {
+export abstract class FWManager extends FW.FrameworkBase implements FW.Manager {
   public abstract initialize(): void;
   public abstract onDestroy(): void;
 

package/manager/FWObjectManager.ts

@@ -1,8 +1,6 @@
-import { FWSystemDefine } from '../define/FWSystemDefine';
 import FWObject from '../utils/FWObject';
 import { FWObjectPool } from '../utils/FWObjectPool';
 import { FWManager } from './FWManager';
-import FWLog from '../log/FWLog';
 
 export default class FWObjectManager extends FWManager implements FW.ObjectManager {
   public initialize(): void {
@@ -15,7 +13,7 @@ export default class FWObjectManager extends FWManager implements FW.ObjectManag
       try {
         pool.onDestroy();
       } catch (error) {
-        FWLog.error(`销毁对象池失败: ${tag}`, error);
+        FW.Log.error(`销毁对象池失败: ${tag}`, error);
       }
     });
     this.poolMap.clear();
@@ -56,7 +54,7 @@ export default class FWObjectManager extends FWManager implements FW.ObjectManag
   ): Promise<FWObjectPool>;
   async createObjectPool<T extends FWObject = FWObject>(): Promise<FWObjectPool> {
     if (arguments.length < 2 || arguments.length > 3) {
-      FWLog.error('createObjectPool 参数数量错误,需要2-3个参数');
+      FW.Log.error('createObjectPool 参数数量错误,需要2-3个参数');
       throw new Error('Invalid arguments count');
     }
 
@@ -65,7 +63,7 @@ export default class FWObjectManager extends FWManager implements FW.ObjectManag
     let objectAssetProperty: FW.AssetProperty = null;
     let objectParent: cc.Node;
     let objectTag: string;
-    let objectType: FWSystemDefine.FWObjectType;
+    let objectType: FW.SystemDefine.FWObjectType;
 
     try {
       const resources = arguments[0];
@@ -91,13 +89,13 @@ export default class FWObjectManager extends FWManager implements FW.ObjectManag
       const arg = arguments[2];
       if (typeof arg === 'string') {
         objectTag = arg;
-        objectType = FWSystemDefine.FWObjectType.OPACITY;
+        objectType = FW.SystemDefine.FWObjectType.OPACITY;
       } else if (typeof arg === 'number') {
         objectTag = `pool_${this.poolIdCounter++}`;
         objectType = arg;
       } else {
         objectTag = `pool_${this.poolIdCounter++}`;
-        objectType = FWSystemDefine.FWObjectType.OPACITY;
+        objectType = FW.SystemDefine.FWObjectType.OPACITY;
       }
 
       if (this.poolMap.has(objectTag)) {
@@ -109,7 +107,7 @@ export default class FWObjectManager extends FWManager implements FW.ObjectManag
 
       return pool;
     } catch (error) {
-      FWLog.error('创建对象池失败:', error);
+      FW.Log.error('创建对象池失败:', error);
 
       if (objectNode && objectNode.isValid) {
         objectNode.destroy();
@@ -121,7 +119,7 @@ export default class FWObjectManager extends FWManager implements FW.ObjectManag
 
   getObjectPool(tag: string): FWObjectPool | undefined {
     if (!this.poolMap.has(tag)) {
-      FWLog.warn(`对象池不存在: ${tag}`);
+      FW.Log.warn(`对象池不存在: ${tag}`);
       return undefined;
     }
     return this.poolMap.get(tag);

package/manager/FWPerformanceManager.ts

@@ -1,4 +1,3 @@
-import FWLog from '../log/FWLog';
 import { FWManager } from './FWManager';
 
 /**
@@ -55,7 +54,7 @@ export class FWPerformanceManager extends FWManager implements FW.PerformanceMan
     this.updateModuleStats(module, duration);
 
     if (duration > this.performanceOptions.warningThreshold!) {
-      FWLog.warn(`Performance warning: ${module}.${operation} took ${duration}ms`);
+      FW.Log.warn(`Performance warning: ${module}.${operation} took ${duration}ms`);
     }
   }
 
@@ -154,7 +153,7 @@ export class FWPerformanceManager extends FWManager implements FW.PerformanceMan
 
     const removedCount = initialLength - this.metrics.length;
     if (removedCount > 0) {
-      FWLog.debug(`Cleaned up ${removedCount} old performance records`);
+      FW.Log.debug(`Cleaned up ${removedCount} old performance records`);
     }
 
     return removedCount;