@ives_xxz/framework 1.4.8 → 1.4.10

package/FW.d.ts

@@ -660,6 +660,11 @@ declare namespace FW {
      * @param name
      */
     closeFromLayerName(name: string | string[]);
+    /**
+     * 移除所有子Layer
+     * @param layer
+     */
+    removeAllChildren(node: cc.Node);
 
     getLayerMap(): Map<new () => LayerController, LayerData>;
   };
@@ -968,6 +973,8 @@ declare namespace FW {
 
   type Layer = {
     readonly entry: FW.Entry;
+    node: cc.Node;
+    ctr: LayerController;
     onLoad(): void;
     start(): void;
     onEnable(): void;
@@ -1219,33 +1226,6 @@ declare namespace FW {
      * @returns
      */
     createSkeleton(skeleton: sp.Skeleton): FW.Skeleton;
-    /**
-     * 获取一个skeleton动画
-     * @param animationName
-     * @returns
-     */
-    getSkeleton(animationName: string): FW.Skeleton;
-
-    /**
-     * 暂停一个skeleton动画
-     * @param animationName
-     * @returns
-     */
-    pauseSkeleton(animationName: string): void;
-
-    /**
-     * 恢复一个skeleton动画
-     * @param animationName
-     * @returns
-     */
-    resumeSkeleton(animationName: string): void;
-
-    /**
-     * 移除一个skeleton动画
-     * @param animationName
-     * @returns
-     */
-    removeSkeleton(animationName: string): void;
 
     /**
      * 暂停所有动画
@@ -1255,19 +1235,6 @@ declare namespace FW {
      * 恢复所有动画
      * */
     resumeAll(): void;
-    /**
-     * 创建动画机
-     * @param animationMachineName
-     * @returns
-     */
-    createAnimationMachine(animationMachineName: string): void;
-
-    /**
-     * 移除动画机
-     * @param animationMachineName
-     * @returns
-     */
-    removeAnimationMachine(animationMachineName: string): void;
   };
 
   type Tween = {

package/Framework.ts

@@ -1,7 +1,6 @@
 import 'reflect-metadata';
 import { Container, interfaces } from 'inversify';
 import { FWSystemDefine } from './define/FWSystemDefine';
-import FWLog from './log/FWLog';
 
 class Framework {
   private container: Container;
@@ -140,15 +139,12 @@ class Framework {
    */
   register(data: FW.RegisterFramework) {
     const classes = [data.logic, data.data, data.config, data.sender, data.handle];
-    FWLog.debug('framework注册->', classes);
     classes.forEach((cls, index) => {
       if (cls && !this.container.isBound(cls)) {
-        FWLog.debug('framework容器绑定成功->', cls);
         this.container.bind(cls).toSelf().inSingletonScope();
         this.container.bind(this.getKey(data.bundleName, index)).toService(cls);
       }
     });
-    FWLog.debug('framework注册完成->', this.container);
   }
   /**
    * 注销数据
@@ -157,21 +153,17 @@ class Framework {
    */
   unRegister(data: FW.RegisterFramework) {
     const classes = [data.logic, data.data, data.config, data.sender, data.handle];
-    FWLog.debug('framework注销->', classes);
     classes.forEach((cls, index) => {
       const key = this.getKey(data.bundleName, index);
       if (cls && this.container.isBound(cls)) {
         this.container.get(key)['onDestroy']?.();
         this.container.unbind(cls);
-        FWLog.debug('framework容器解开绑定->', cls);
       }
       if (this.container.isBound(key)) {
         this.container.get(key)['onDestroy']?.();
         this.container.unbind(this.getKey(data.bundleName, index));
-        FWLog.debug('framework容器解开绑定->', this.getKey(data.bundleName, index));
       }
     });
-    FWLog.debug('framework注销完成->', this.container);
   }
 
   private getKey(bundleName: string, tag: FWSystemDefine.FWBindTag) {

package/animation/FWSkeleton.ts

@@ -28,7 +28,6 @@ export class FWSkeleton extends FWAnimation implements FW.Skeleton {
     return new Promise((resolve) => {
       this.animation.setCompleteListener(() => {
         this.animation.setCompleteListener(null);
-        FW.Entry.animationMgr.removeSkeleton(this.animationName);
         args?.cb?.();
         resolve();
       });

package/define/FWSystemDefine.ts

@@ -137,4 +137,11 @@ export namespace FWSystemDefine {
     REJECTED = 'rejected',
     CANCELLED = 'cancelled',
   }
+
+  export enum FWLayerState {
+    CLOSED = 'closed',
+    OPENING = 'opening',
+    OPENED = 'opened',
+    CLOSING = 'closing',
+  }
 }

package/layer/FWLayer.ts

@@ -3,6 +3,7 @@ const { ccclass, property } = cc._decorator;
 @ccclass
 export default class FWLayer extends cc.Component implements FW.Layer {
   public readonly entry: FW.Entry = FW.Entry;
+  public ctr: FW.LayerController;
   public onLoad(): void {}
   public start(): void {}
   public onEnable(): void {}

package/manager/FWAnimationManager.ts

@@ -44,47 +44,6 @@ export default class FWAnimationManager extends FWManager {
     return s;
   }
 
-  /**
-   * 获取一个skeleton动画
-   * @param animationName
-   * @returns
-   */
-  getSkeleton(animationName: string) {
-    if (!this.animationMachineMap.has(FWSystemDefine.FWAnimationMachineType.SKELETON)) return;
-    return this.animationMachineMap
-      .get(FWSystemDefine.FWAnimationMachineType.SKELETON)
-      .getAnimation(animationName) as FWSkeleton;
-  }
-
-  /**
-   * 暂停一个skeleton动画
-   * @param animationName
-   * @returns
-   */
-  pauseSkeleton(animationName: string) {
-    if (!this.animationMachineMap.has(FWSystemDefine.FWAnimationMachineType.SKELETON)) return;
-    this.animationMachineMap.get(animationName).pause();
-  }
-
-  /**
-   * 恢复一个skeleton动画
-   * @param animationName
-   * @returns
-   */
-  resumeSkeleton(animationName: string) {
-    if (!this.animationMachineMap.has(FWSystemDefine.FWAnimationMachineType.SKELETON)) return;
-    this.animationMachineMap.get(animationName).resume();
-  }
-  /**
-   * 移除一个skeleton动画
-   * @param animationName
-   * @returns
-   */
-  removeSkeleton(animationName: string) {
-    if (!this.animationMachineMap.has(FWSystemDefine.FWAnimationMachineType.SKELETON)) return;
-    this.animationMachineMap.delete(animationName);
-  }
-
   /**
    * 暂停所有动画
    */
@@ -102,7 +61,7 @@ export default class FWAnimationManager extends FWManager {
    * @param animationMachineName
    * @returns
    */
-  createAnimationMachine(animationMachineName: string) {
+  private createAnimationMachine(animationMachineName: string) {
     if (this.animationMachineMap.has(animationMachineName)) {
       FWLog.warn(`已创建动画机:${animationMachineName},请勿重复注册!`);
       return;
@@ -117,12 +76,16 @@ export default class FWAnimationManager extends FWManager {
    * @param animationMachineName
    * @returns
    */
-  removeAnimationMachine(animationMachineName: string) {
+  private removeAnimationMachine(animationMachineName: string) {
     if (!this.animationMachineMap.has(animationMachineName)) {
       return;
     }
     this.animationMachineMap.delete(animationMachineName);
   }
 
-  onDestroy(): void {}
+  onDestroy(): void {
+    this.animationMachineMap.forEach((v, k) => {
+      this.removeAnimationMachine(k);
+    });
+  }
 }

package/manager/FWLayerManager.ts

@@ -18,7 +18,7 @@ export class FWLayerData<T extends FW.LayerController = FW.LayerController>
   layerRenderOrder: FWSystemDefine.FWLayerRenderOrder;
   layerType: FWSystemDefine.FWLayerType;
   layerParent?: cc.Node;
-  layerPosition?: cc.Vec3;
+  layerPosition?: FW.Vec3;
   controllerName: string;
   controller: FW.LayerController;
   loaded: boolean;
@@ -26,282 +26,578 @@ export class FWLayerData<T extends FW.LayerController = FW.LayerController>
   externalReference?: Set<(ref: FW.LayerController | null) => void>;
 }
 
-export class FWLayerManager extends FWManager implements FW.LayerManager {
+class FWLayerDataManager {
+  private layerMap: Map<new () => FW.LayerController, FWLayerData> = new Map();
+  private layerRegistry: Set<new () => FW.LayerController> = new Set();
+
   /**
-   * 当前待打开的layer队列
+   * 获取已存在的Layer
    */
-  private layerQueue: FWQueue<FW.LayerData>;
+  getExistingLayer<Ctr extends FW.LayerController = FW.LayerController>(
+    type: new () => Ctr,
+  ): Ctr | undefined {
+    for (const [key, value] of this.layerMap) {
+      if (value.controllerConstructor === type) {
+        return value.controllerProxy as Ctr;
+      }
+    }
+    return undefined;
+  }
+
   /**
-   * 当前已经打开的layer缓存容器
+   * 从类型创建Layer数据
    */
-  private layerMap: Map<new () => FW.LayerController, FW.LayerData>;
+  createLayerData<Ctr extends FW.LayerController = FW.LayerController>(
+    type: new () => Ctr,
+  ): FW.LayerData {
+    const ctr = new type();
+    const ctrName = cc.js.getClassName(ctr);
+    const layerData = this.createBaseLayerData(ctr);
+
+    layerData.controllerConstructor = type;
+    layerData.controller = ctr;
+    layerData.controllerName = ctrName;
+
+    return layerData;
+  }
+
+  addLayerData(ctr: new () => FW.LayerController, layerData: FW.LayerData) {
+    if (!this.layerMap.has(ctr)) {
+      this.layerMap.set(ctr, layerData);
+    }
+  }
 
   /**
-   * 当前所有打开Layer注册表
+   * 创建基础Layer数据
    */
-  private layerRegistry: Set<new () => FW.LayerController>;
+  private createBaseLayerData(ctr: FW.LayerController): FWLayerData {
+    const layerData = new FWLayerData();
+    const layerType = ctr.layerType;
+
+    layerData.layerRenderOrder = ctr.renderOrder;
+    layerData.layerAssetProperty = ctr.layerAssetProperty;
+    layerData.layerType = layerType;
+    layerData.controller = ctr;
+    layerData.loaded = false;
+    layerData.externalReference = new Set();
+
+    return layerData;
+  }
+
   /**
-   * layer栈队列
+   * 检查注册状态并添加
    */
-  private layerStack: FWLayerData[];
+  checkRegistryAndAdd(type: new () => FW.LayerController): boolean {
+    if (this.layerRegistry.has(type)) {
+      return true;
+    }
+    this.layerRegistry.add(type);
+    return false;
+  }
 
-  public initialize(): void {
-    this.layerQueue = new FWQueue<FW.LayerData>();
-    this.layerMap = new Map<new () => FW.LayerController, FW.LayerData>();
-    this.layerRegistry = new Set<new () => FW.LayerController>();
-    this.layerStack = [];
+  /**
+   * 获取已存在的代理
+   */
+  getExistingProxy<Ctr extends FW.LayerController = FW.LayerController>(
+    type: new () => Ctr,
+  ): Ctr | undefined {
+    return this.layerMap.get(type)?.controllerProxy as Ctr;
   }
 
   /**
-   * 异步打开layer
-   * @param layerData
-   * @returns
+   * 设置Layer数据
    */
-  protected async openLayerAsync(layerData: FWLayerData) {
-    try {
-      const res = await FW.Entry.resMgr.loadAssetData<cc.Prefab>(layerData.layerAssetProperty);
+  setupLayerData(
+    layerData: FWLayerData,
+    res: { asset: cc.Prefab; uuid: string },
+    layer: FWLayer,
+    layerName: string,
+  ): void {
+    layerData.loaded = true;
+    layerData.layer = layer;
+    layerData.layerName = layerName;
+    layerData.uuid = res.uuid;
 
-      /** 保存资源数据 */
-      res.user = layerData.layerName;
-      res.autoRelease = layerData.controller.autoRelease;
-      res.dependentBundle = layerData.controller.layerAssetProperty.bundle;
+    layerData.controller.layerData = layerData;
+    layerData.controller.layer = layer;
+    layerData.controller.uuid = res.uuid;
 
-      return res;
-    } catch (e) {
-      FWLog.error(`openLayerAsync failed : `, e);
-    }
+    layer.ctr = layerData.controller;
   }
+
   /**
-   * 同步打开layer
-   * @param layerData
-   * @returns
+   * 创建控制器代理
    */
-  protected openLayerSync(layerData: FWLayerData) {
-    layerData.layerAssetProperty.bundle =
-      layerData.layerAssetProperty.bundle || FW.Entry.bundleName;
-    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;
+  createControllerProxy(layerData: FWLayerData): FW.LayerController {
+    return new Proxy(layerData.controller, {
+      get: (target, prop) => {
+        if (prop === ADD_EXTERNAL_REFERENCE) {
+          return (cb: (ref: FW.LayerController | null) => void) => {
+            layerData.externalReference.add(cb);
+          };
+        }
+        return target[prop];
+      },
+    });
+  }
 
-    layerData.uuid = res.uuid;
+  /**
+   * 清理失败的Layer
+   */
+  cleanupFailedLayer(layerData: FWLayerData): void {
+    this.layerMap.delete(layerData.controllerConstructor);
+    this.layerRegistry.delete(layerData.controllerConstructor);
+  }
+
+  /**
+   * 通知外部引用更新
+   */
+  notifyExternalRefUpdates(layerData: FWLayerData): void {
+    layerData.externalReference.forEach((cb) => {
+      try {
+        cb?.(null);
+      } catch (e) {
+        FWLog.error('External ref update callback error:', e);
+      }
+    });
+    layerData.externalReference.clear();
+  }
 
-    return res;
+  getLayerMap(): Map<new () => FW.LayerController, FWLayerData> {
+    return this.layerMap;
   }
 
+  removeFromRegistry(type: new () => FW.LayerController): void {
+    this.layerRegistry.delete(type);
+  }
+
+  removeFromMap(type: new () => FW.LayerController): void {
+    this.layerMap.delete(type);
+  }
+
+  clear(): void {
+    this.layerMap.clear();
+    this.layerRegistry.clear();
+  }
+}
+
+class FWLayerCreateManager {
+  private lifecycleManager: FWLayerLifecycleManager = new FWLayerLifecycleManager();
+
   /**
-   * 创建layer数据
-   * @param ctr
-   * @returns
+   * 创建Layer节点
    */
-  protected createLayerData(ctr: FW.LayerController) {
-    const layerData = new FWLayerData();
-    const layerType = ctr.layerType;
+  createLayer(
+    prefab: cc.Prefab,
+    layerComponent: string,
+    renderOrder: number,
+    parent: cc.Node,
+    position: FW.Vec3,
+  ): FWLayer {
+    parent = parent || FW.Entry.scene?.node;
+    position = position || cc.Vec3.ZERO;
 
-    /** 记录layer数据 */
-    layerData.layerRenderOrder = ctr.renderOrder;
-    layerData.layerAssetProperty = ctr.layerAssetProperty;
-    layerData.layerType = layerType;
-    layerData.controller = ctr;
-    layerData.loaded = false;
-    layerData.externalReference = new Set();
+    if (!parent.activeInHierarchy || !cc.isValid(parent)) {
+      FWLog.error(`createLayer failed , parent : ${parent}`);
+      return;
+    }
 
-    return layerData;
+    const node = cc.instantiate(prefab);
+    const p = cc.v3(position.x, position.y);
+    node.setParent(parent);
+    node.setPosition(p);
+    node.zIndex = renderOrder;
+
+    !node.getComponent(layerComponent) && node.addComponent(layerComponent);
+    return node.getComponent(FWLayer);
   }
 
   /**
-   * 异步打开layer
-   * @param data
-   * @returns
+   * 设置Layer生命周期
    */
-  async openAsync<Ctr extends FW.LayerController = FW.LayerController>(
+  setupLayerLifecycle(layer: FWLayer, ctr: FW.LayerController): void {
+    this.lifecycleManager.setupLifecycleHooks(layer, ctr);
+  }
+
+  /**
+   * 初始化控制器
+   */
+  initializeController(ctr: FW.LayerController, data: any): void {
+    ctr.initialize();
+    ctr.onInit?.(data);
+  }
+}
+
+class FWLayerOpenManager {
+  constructor(
+    private dataManager: FWLayerDataManager,
+    private resourceManager: FWLayerResourceManager,
+    private createManager: FWLayerCreateManager,
+    private stackManager: FWLayerStackManager,
+    private queueManager: FWLayerQueueManager,
+  ) {}
+
+  /**
+   * 统一的Layer打开方法
+   */
+  async openLayer<Ctr extends FW.LayerController = FW.LayerController>(
     data: FW.LayerOpenArgs,
+    isAsync: boolean,
   ): Promise<Ctr> {
-    if (!data) {
-      FWLog.error(`打开Layer失败:${data},请检查参数!`);
-      return undefined;
+    if (!this.validateOpenData(data)) {
+      return this.getUndefinedResult(isAsync);
     }
 
-    for (const [key, value] of this.layerMap) {
-      if (value.controllerConstructor == data.type) {
-        return value.controllerProxy as Ctr;
-      }
+    const existingLayer = this.dataManager.getExistingLayer(data.type);
+    if (existingLayer) {
+      return this.wrapResult(existingLayer, isAsync) as Ctr;
     }
 
-    const ctr = new data.type();
-    const ctrName = cc.js.getClassName(ctr);
-    const layerData = this.createLayerData(ctr);
+    const layerData = this.dataManager.createLayerData(data.type);
 
-    layerData.controllerConstructor = data.type;
-    layerData.controller = ctr;
-    layerData.controllerName = ctrName;
+    if (!layerData) {
+      return this.getUndefinedResult(isAsync);
+    }
 
-    this.layerMap.set(data.type, layerData);
+    if (this.dataManager.checkRegistryAndAdd(data.type)) {
+      const proxy = this.dataManager.getExistingProxy(data.type);
+      return this.wrapResult(proxy, isAsync) as Ctr;
+    }
 
-    if (this.layerRegistry.has(data.type)) {
-      return this.layerMap.get(data.type).controllerProxy as Ctr;
+    if (this.queueManager.handlePopupQueue(layerData, this.dataManager.getLayerMap())) {
+      return this.getUndefinedResult(isAsync);
     }
 
-    this.layerRegistry.add(data.type);
+    this.dataManager.addLayerData(data.type, layerData);
 
-    if (ctr.layerType == FWSystemDefine.FWLayerType.POPUP_QUEUE) {
-      if (this.layerRegistry.size == 0) {
-        let unclose = true;
-        for (const [key, value] of this.layerMap) {
-          if (value.layerType != FWSystemDefine.FWLayerType.PERMANENT) {
-            unclose = false;
-          }
-        }
-        if (!unclose) {
-          this.layerQueue.add(ctr.layerData);
-          return;
-        }
-      }
+    if (isAsync) {
+      return this.loadAndCreateLayerAsync(layerData, data);
+    } else {
+      return this.loadAndCreateLayerSync(layerData, data) as Ctr;
     }
+  }
 
-    ctr.initialize();
+  /**
+   * 验证打开数据
+   */
+  private validateOpenData(data: FW.LayerOpenArgs): boolean {
+    if (!data) {
+      FWLog.error(`打开Layer失败:${data},请检查参数!`);
+      return false;
+    }
+    return true;
+  }
 
-    const res = await this.openLayerAsync(layerData);
-    const layer = await this.createLayer(
+  /**
+   * 获取undefined结果
+   */
+  private getUndefinedResult<Ctr>(isAsync: boolean): Promise<Ctr> | Ctr {
+    return isAsync ? Promise.resolve(undefined) : undefined;
+  }
+
+  /**
+   * 包装结果
+   */
+  private wrapResult<Ctr>(result: Ctr, isAsync: boolean): Promise<Ctr> | Ctr {
+    return isAsync ? Promise.resolve(result) : result;
+  }
+
+  /**
+   * 异步加载资源并创建Layer
+   */
+  private async loadAndCreateLayerAsync<Ctr extends FW.LayerController = FW.LayerController>(
+    layerData: FWLayerData,
+    data: FW.LayerOpenArgs,
+  ): Promise<Ctr> {
+    try {
+      const res = await this.resourceManager.loadLayerAsync(layerData);
+      return this.createLayerAndSetup(layerData, res, data) as Ctr;
+    } catch (e) {
+      FWLog.error(`loadAndCreateLayerAsync failed:`, e);
+      this.dataManager.cleanupFailedLayer(layerData);
+      throw e;
+    }
+  }
+
+  /**
+   * 同步加载资源并创建Layer
+   */
+  private loadAndCreateLayerSync<Ctr extends FW.LayerController = FW.LayerController>(
+    layerData: FWLayerData,
+    data: FW.LayerOpenArgs,
+  ): Ctr {
+    try {
+      const res = this.resourceManager.loadLayerSync(layerData);
+      return this.createLayerAndSetup(layerData, res, data);
+    } catch (e) {
+      FWLog.error(`loadAndCreateLayerSync failed:`, e);
+      this.dataManager.cleanupFailedLayer(layerData);
+      return undefined;
+    }
+  }
+
+  /**
+   * 创建Layer并进行设置
+   */
+  private createLayerAndSetup<Ctr extends FW.LayerController = FW.LayerController>(
+    layerData: FWLayerData,
+    res: { asset: cc.Prefab; uuid: string },
+    data: FW.LayerOpenArgs,
+  ): Ctr {
+    const layer = this.createManager.createLayer(
       res.asset,
       res.asset.name,
-      ctr.renderOrder,
+      layerData.controller.renderOrder,
       data.parent,
       data.position,
     );
-
     const layerName = cc.js.getClassName(layer);
 
-    ctr.layerData = layerData;
-    ctr.layerData.loaded = true;
-    ctr.layer = layer;
-    ctr.layerData.layerName = layerName;
-    ctr.layerData.uuid = res.uuid;
-    ctr.uuid = res.uuid;
-    ctr.onInit?.(data.args);
+    this.dataManager.setupLayerData(layerData, res, layer, layerName);
 
-    this.lifecycleProcessing(ctr);
+    this.createManager.initializeController(layerData.controller, data.args);
 
-    if (ctr.layerType !== FWSystemDefine.FWLayerType.PERMANENT) {
-      this.layerStack.push(layerData);
+    this.createManager.setupLayerLifecycle(layer, layerData.controller);
+
+    if (layerData.controller.layerType !== FWSystemDefine.FWLayerType.PERMANENT) {
+      this.stackManager.push(layerData);
     }
 
-    this.layerRegistry.delete(data.type);
+    this.dataManager.removeFromRegistry(layerData.controllerConstructor);
+
+    const proxy = this.dataManager.createControllerProxy(layerData);
+    layerData.controllerProxy = proxy;
 
-    const proxy = new Proxy(ctr, {
-      get: (target, prop) => {
-        if (prop === ADD_EXTERNAL_REFERENCE) {
-          return (cb: (ref: FW.LayerController | null) => void) => {
-            layerData.externalReference.add(cb);
-          };
-        }
-        return target[prop];
-      },
-    });
-    ctr.layerData.controllerProxy = proxy;
     return proxy as Ctr;
   }
+}
 
-  /**
-   * 同步打开
-   * @param data
-   * @returns
-   */
-  openSync<Ctr extends FW.LayerController = FW.LayerController>(data: FW.LayerOpenArgs): Ctr {
-    if (!data) {
-      FWLog.error(`open layer failed:${data},please check param!`);
-      return undefined;
+class FWLayerResourceManager {
+  async loadLayerAsync(layerData: FWLayerData): Promise<{ asset: cc.Prefab; uuid: string }> {
+    try {
+      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);
+      throw e;
     }
+  }
 
-    for (const [key, value] of this.layerMap) {
-      if (value.controllerConstructor == data.type) {
-        return value.controllerProxy as Ctr;
-      }
-    }
+  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);
+    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 };
+  }
+}
 
-    const ctr = new data.type();
-    const ctrName = cc.js.getClassName(ctr);
-    const layerData = this.createLayerData(ctr);
+class FWLayerStackManager {
+  private layerStack: FWLayerData[] = [];
 
-    layerData.controllerConstructor = data.type;
-    layerData.controller = ctr;
-    layerData.controllerName = ctrName;
+  push(layerData: FWLayerData): void {
+    if (layerData.controller.layerType !== FWSystemDefine.FWLayerType.PERMANENT) {
+      this.layerStack.push(layerData);
+    }
+  }
 
-    this.layerMap.set(data.type, layerData);
+  pop(): FWLayerData | undefined {
+    return this.layerStack.pop();
+  }
 
-    if (this.layerRegistry.has(data.type)) {
-      return this.layerMap.get(data.type).controllerProxy as Ctr;
+  remove(layerData: FWLayerData): void {
+    const index = this.layerStack.findIndex((v) => v.controller === layerData.controller);
+    if (index > -1) {
+      this.layerStack.splice(index, 1);
     }
+  }
 
-    this.layerRegistry.add(data.type);
+  getStack(): FWLayerData[] {
+    return [...this.layerStack];
+  }
 
-    if (ctr.layerType == FWSystemDefine.FWLayerType.POPUP_QUEUE) {
-      if (this.layerRegistry.size == 0) {
-        let unclose = true;
-        for (const [key, value] of this.layerMap) {
-          if (value.layerType != FWSystemDefine.FWLayerType.PERMANENT) {
-            unclose = false;
-          }
-        }
-        if (!unclose) {
-          this.layerQueue.add(ctr.layerData);
-          return;
-        }
+  clear(): void {
+    this.layerStack = [];
+  }
+}
+
+class FWLayerStateManager {
+  private layerStates = new Map<new () => FW.LayerController, FWSystemDefine.FWLayerState>();
+
+  setState(ctrType: new () => FW.LayerController, state: FWSystemDefine.FWLayerState): void {
+    this.layerStates.set(ctrType, state);
+  }
+
+  getState(ctrType: new () => FW.LayerController): FWSystemDefine.FWLayerState {
+    return this.layerStates.get(ctrType) || FWSystemDefine.FWLayerState.CLOSED;
+  }
+
+  isOpening(ctrType: new () => FW.LayerController): boolean {
+    return this.getState(ctrType) === FWSystemDefine.FWLayerState.OPENING;
+  }
+
+  isOpened(ctrType: new () => FW.LayerController): boolean {
+    return this.getState(ctrType) === FWSystemDefine.FWLayerState.OPENED;
+  }
+
+  isClosing(ctrType: new () => FW.LayerController): boolean {
+    return this.getState(ctrType) === FWSystemDefine.FWLayerState.CLOSING;
+  }
+
+  removeState(ctrType: new () => FW.LayerController): void {
+    this.layerStates.delete(ctrType);
+  }
+
+  clear(): void {
+    this.layerStates.clear();
+  }
+}
+
+class FWLayerQueueManager {
+  private layerQueue: FWQueue<FWLayerData> = new FWQueue<FWLayerData>();
+
+  handlePopupQueue(
+    layerData: FWLayerData,
+    layerMap: Map<new () => FW.LayerController, FWLayerData>,
+  ): boolean {
+    if (layerData.controller.layerType === FWSystemDefine.FWLayerType.POPUP_QUEUE) {
+      const hasNonPermanentLayers = Array.from(layerMap.values()).some(
+        (value) => value.layerType === FWSystemDefine.FWLayerType.POPUP_QUEUE,
+      );
+
+      if (hasNonPermanentLayers) {
+        this.add(layerData);
+        return true;
       }
     }
+    return false;
+  }
 
-    ctr.initialize();
+  getNextLayer(): FWLayerData | undefined {
+    return this.shift();
+  }
 
-    const res = this.openLayerSync(layerData);
-    const layer = this.createLayer(
-      res.asset,
-      res.asset.name,
-      layerData.layerRenderOrder,
-      layerData.layerParent,
-      layerData.layerPosition,
-    );
-    const layerName = cc.js.getClassName(layer);
+  add(layerData: FWLayerData): void {
+    this.layerQueue.add(layerData);
+  }
 
-    ctr.layerData = layerData;
-    ctr.layerData.loaded = true;
-    ctr.layer = layer;
-    ctr.layerData.layerName = layerName;
-    ctr.layerData.uuid = res.uuid;
-    ctr.uuid = res.uuid;
-    ctr.onInit?.(data.args);
+  shift(): FWLayerData | undefined {
+    return this.layerQueue.shift();
+  }
 
-    this.lifecycleProcessing(ctr);
+  isEmpty(): boolean {
+    return this.layerQueue.isEmpty();
+  }
 
-    if (ctr.layerType !== FWSystemDefine.FWLayerType.PERMANENT) {
-      this.layerStack.push(layerData);
-    }
+  clear(): void {
+    this.layerQueue.clear();
+  }
 
-    this.layerRegistry.delete(data.type);
+  getQueue(): FWLayerData[] {
+    return this.layerQueue.getQueue();
+  }
+}
 
-    const proxy = new Proxy(ctr, {
-      get: (target, prop) => {
-        if (prop === 'addExternalReference') {
-          return (cb: (ref: FW.LayerController | null) => void) => {
-            layerData.externalReference.add(cb);
-          };
-        }
-        return target[prop];
-      },
-    });
-    ctr.layerData.controllerProxy = proxy;
-    return proxy as Ctr;
+class FWLayerLifecycleManager {
+  setupLifecycleHooks(layer: FWLayer, ctr: FW.LayerController): void {
+    const originalOnLoad = layer['onLoad'];
+    layer['onLoad'] = function () {
+      originalOnLoad?.call(this);
+      ctr.onLoad?.();
+    };
+
+    const originalStart = layer['start'];
+    layer['start'] = function () {
+      originalStart?.call(this);
+      ctr.onStart?.();
+    };
+
+    const originalOnEnable = layer['onEnable'];
+    layer['onEnable'] = function () {
+      originalOnEnable?.call(this);
+      ctr.onEnable?.();
+    };
+
+    const originalOnDisable = layer['onDisable'];
+    layer['onDisable'] = function () {
+      originalOnDisable?.call(this);
+      ctr.onDisable?.();
+    };
+
+    const originalOnDestroy = layer['onDestroy'];
+    layer['onDestroy'] = function () {
+      originalOnDestroy?.call(this);
+      ctr.onDestroy?.();
+    };
+
+    const originalUpdate = layer['update'];
+    layer['update'] = function (dt: number) {
+      originalUpdate?.call(this, dt);
+      ctr.onUpdate?.(dt);
+    };
+
+    const originalLateUpdate = layer['lateUpdate'];
+    layer['lateUpdate'] = function () {
+      originalLateUpdate?.call(this);
+      ctr.onLateUpdate?.();
+    };
+  }
+}
+
+export class FWLayerManager extends FWManager implements FW.LayerManager {
+  private resourceManager: FWLayerResourceManager;
+  private dataManager: FWLayerDataManager;
+  private createManager: FWLayerCreateManager;
+  private stackManager: FWLayerStackManager;
+  private stateManager: FWLayerStateManager;
+  private queueManager: FWLayerQueueManager;
+  private openManager: FWLayerOpenManager;
+
+  public initialize(): void {
+    this.resourceManager = new FWLayerResourceManager();
+    this.dataManager = new FWLayerDataManager();
+    this.createManager = new FWLayerCreateManager();
+    this.stackManager = new FWLayerStackManager();
+    this.stateManager = new FWLayerStateManager();
+    this.queueManager = new FWLayerQueueManager();
+
+    this.openManager = new FWLayerOpenManager(
+      this.dataManager,
+      this.resourceManager,
+      this.createManager,
+      this.stackManager,
+      this.queueManager,
+    );
+  }
+
+  /**
+   * 异步打开Layer
+   */
+  async openAsync<Ctr extends FW.LayerController = FW.LayerController>(
+    data: FW.LayerOpenArgs,
+  ): Promise<Ctr> {
+    return this.openManager.openLayer(data, true) as Promise<Ctr>;
+  }
+
+  /**
+   * 同步打开
+   */
+  openSync<Ctr extends FW.LayerController = FW.LayerController>(data: FW.LayerOpenArgs): Ctr {
+    return this.openManager.openLayer(data, false) as unknown as Ctr;
   }
 
   /**
    * 显示layer并恢复所有节点事件
-   * @param ctr
-   * @returns
    */
   displayLayer<Ctr extends FW.LayerController = FW.LayerController>(ctr: Ctr): Ctr {
     const layerData = ctr.layerData;
 
-    if (!this.layerMap.has(ctr.layerData.controllerConstructor)) {
+    if (!this.dataManager.getLayerMap().has(ctr.layerData.controllerConstructor)) {
       FWLog.warn(`display layer failed,layer name : ${layerData.layerName}`);
       return;
     }
@@ -313,17 +609,17 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
     node.resumeSystemEvents(true);
 
     FW.Entry.evtMgr.targetResume(ctr);
-    FW.Entry.timeMgr.pauseSchedule(ctr);
+    FW.Entry.timeMgr.resumeSchedule(ctr);
+
+    return ctr;
   }
 
   /**
    * 隐藏layer并隐藏所有节点事件
-   * @param ctr
-   * @returns
    */
   hideLayer<Ctr extends FW.LayerController = FW.LayerController>(ctr: Ctr): Ctr {
     const layerData = ctr.layerData;
-    if (!this.layerMap.has(ctr.layerData.controllerConstructor)) {
+    if (!this.dataManager.getLayerMap().has(ctr.layerData.controllerConstructor)) {
       FWLog.warn(`hide layer failed,layer name : ${layerData.layerName}`);
       return;
     }
@@ -335,15 +631,16 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
     node.opacity = 0;
     node.pauseSystemEvents(true);
     FW.Entry.evtMgr.targetPause(ctr);
-    FW.Entry.timeMgr.resumeSchedule(ctr);
+    FW.Entry.timeMgr.pauseSchedule(ctr);
+
+    return ctr;
   }
 
   /**
    * 通过layer名字关闭
-   * @param name
    */
   closeFromLayerName(name: string | string[]): void {
-    this.layerMap.forEach((v) => {
+    this.dataManager.getLayerMap().forEach((v) => {
       if (Array.isArray(name)) {
         name.forEach((n) => {
           if (n === v.layerName) {
@@ -357,15 +654,16 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
       }
     });
   }
+
   /**
    * 从栈关闭
    */
   closeFromStack(count?: number) {
     count = count ? count : 1;
     for (let i = 0; i < count; i++) {
-      let layerData = this.layerStack.pop();
+      let layerData = this.stackManager.pop();
       let ctr = layerData.controller;
-      if (!this.layerMap.has(layerData.controllerConstructor)) {
+      if (!this.dataManager.getLayerMap().has(layerData.controllerConstructor)) {
         return;
       }
       if (cc.isValid(ctr.layer?.node)) {
@@ -373,15 +671,28 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
         if (ctr.autoRelease) {
           FW.Entry.resMgr.releaseAsset(ctr.layerData.layerAssetProperty);
         }
-        this.notifyExternalRefUpdates(ctr.layerData);
+        this.dataManager.notifyExternalRefUpdates(ctr.layerData);
       }
-      this.layerMap.delete(layerData.controllerConstructor);
+      this.dataManager.removeFromMap(layerData.controllerConstructor);
     }
   }
+  /**
+   * 移除指定Layer所有子Layer
+   * @param layer
+   * @returns
+   */
+  async removeAllChildren(node: cc.Node) {
+    if (!cc.isValid(node)) return;
+    const layers = node.getComponentsInChildren(FWLayer);
+    layers.forEach((v) => {
+      if (cc.isValid(v?.node)) {
+        v?.ctr?.close();
+      }
+    });
+  }
 
   /**
    * 关闭layer
-   * @param ctr
    */
   async close<Ctr extends FW.LayerController = FW.LayerController>(
     ctr: Ctr,
@@ -397,20 +708,22 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
       if (ctr.autoRelease) {
         FW.Entry.resMgr.releaseAsset(ctr.layerData.layerAssetProperty);
       }
-      this.notifyExternalRefUpdates(ctr.layerData);
+      this.dataManager.notifyExternalRefUpdates(ctr.layerData);
     }
 
-    this.layerMap.delete(layerData.controllerConstructor);
-    this.layerRegistry.delete(ctr.layerData.controllerConstructor);
+    this.dataManager.removeFromMap(layerData.controllerConstructor);
+    this.dataManager.removeFromRegistry(ctr.layerData.controllerConstructor);
 
-    const index = this.layerStack.findIndex((v) => {
+    const index = this.stackManager.getStack().findIndex((v) => {
       v.controller == ctr;
     });
-    this.layerStack.slice(index, 1);
+    if (index > -1) {
+      this.stackManager.getStack().splice(index, 1);
+    }
 
     /** 如果队列中还有等待打开的layer */
-    if (!this.layerQueue.isEmpty()) {
-      const nextLayerData = this.layerQueue.shift();
+    if (!this.queueManager.isEmpty()) {
+      const nextLayerData = this.queueManager.getNextLayer();
       /** 先尝试同步打开 */
       const nextLayer = this.openSync({
         parent: nextLayerData.layerParent,
@@ -432,102 +745,19 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
     }
   }
 
-  private notifyExternalRefUpdates(layerData: FW.LayerData) {
-    layerData.externalReference.forEach((cb) => {
-      try {
-        cb?.(null);
-      } catch (e) {
-        FWLog.error('External ref update callback error:', e);
-      }
-    });
-    layerData.externalReference.clear();
-  }
-  /** 创建layer */
-  private createLayer(
-    prefab: cc.Prefab,
-    layerComponent: string,
-    renderOrder: number,
-    parent: cc.Node,
-    position: FW.Vec3,
-  ) {
-    parent = parent || FW.Entry.scene?.node;
-
-    position = position || cc.Vec3.ZERO;
-
-    if (!parent.activeInHierarchy || !cc.isValid(parent)) {
-      FWLog.error(`createLayer failed , parent : ${parent}`);
-      return;
-    }
-    const node = cc.instantiate(prefab);
-    const p = cc.v3(position.x, position.y);
-    node.setParent(parent);
-    node.setPosition(p);
-    node.zIndex = renderOrder;
-    !node.getComponent(layerComponent) && node.addComponent(layerComponent);
-    return node.getComponent(FWLayer);
-  }
-
-  private lifecycleProcessing(ctr: FW.LayerController) {
-    const layer = ctr.layer;
-
-    const onLoad = layer['onLoad'];
-    layer['onLoad'] = () => {
-      onLoad?.call(layer);
-      ctr.onLoad?.();
-    };
-
-    const onStart = layer['start'];
-    layer['start'] = () => {
-      onStart?.call(layer);
-      ctr.onStart?.();
-    };
-
-    const onEnable = layer['onEnable'];
-    layer['onEnable'] = () => {
-      onEnable?.call(layer);
-      ctr.onEnable?.();
-    };
-
-    const onDisable = layer['onDisable'];
-    layer['onDisable'] = () => {
-      onDisable?.call(layer);
-      ctr.onDisable?.();
-    };
-
-    const onDestroy = layer['onDestroy'];
-    layer['onDestroy'] = () => {
-      onDestroy?.call(layer);
-      ctr.onDestroy?.();
-    };
-
-    const onUpdate = layer['update'];
-    layer['update'] = (dt?: number) => {
-      onUpdate?.call(layer);
-      ctr.onUpdate?.(dt);
-    };
-
-    const onLateUpdate = layer['lateUpdate'];
-    layer['lateUpdate'] = () => {
-      onLateUpdate?.call(layer);
-      ctr.onLateUpdate?.();
-    };
-  }
-
-  getLayerMap(): Map<new () => FW.LayerController, FW.LayerData> {
-    return this.layerMap;
+  getLayerMap(): Map<new () => FW.LayerController, FWLayerData> {
+    return this.dataManager.getLayerMap();
   }
 
   public clear() {
-    this.layerQueue = new FWQueue();
-    this.layerStack = [];
-    this.layerRegistry = new Set<new () => FW.LayerController>();
-    this.layerMap.forEach((v) => this.close(v.controller));
-    this.layerMap.clear();
+    this.queueManager.clear();
+    this.stackManager.clear();
+    this.stateManager.clear();
+    this.dataManager.clear();
+    this.dataManager.getLayerMap().forEach((v) => this.close(v.controller));
   }
 
   public onDestroy(): void {
-    this.layerMap.clear();
-    this.layerMap = null;
-    this.layerQueue = null;
+    this.clear();
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ives_xxz/framework",
-  "version": "1.4.8",
+  "version": "1.4.10",
   "description": "cocoscreator 2.x mvc framework",
   "main": "index.js",
   "keywords": ["123456"],

package/utils/FWQueue.ts

@@ -44,4 +44,12 @@ export class FWQueue<T> {
   public size() {
     return this.queue.length;
   }
+
+  public clear() {
+    this.queue = [];
+  }
+
+  public getQueue() {
+    return this.queue;
+  }
 }