@ives_xxz/framework 1.4.9 → 1.4.11

package/FW.d.ts

@@ -664,7 +664,7 @@ declare namespace FW {
      * 移除所有子Layer
      * @param layer
      */
-    removeAllChildren(layer: Layer);
+    removeAllChildren(node: cc.Node);
 
     getLayerMap(): Map<new () => LayerController, LayerData>;
   };

package/controller/FWLayerController.ts

@@ -33,18 +33,16 @@ export abstract class FWLayerController implements FW.LayerController {
   onEnable?();
   onDisable?();
   onDestroy?();
-  onClose?();
+  async onClose?();
   initialize() {}
 
-  destroy() {
+  async destroy() {
     FW.Entry.timeMgr?.unSchedule(this);
     FW.Entry.evtMgr?.targetOff(this);
     cc.Tween.stopAllByTarget(this.layer?.node);
     this.layer?.node?.stopAllActions();
     this.layer?.unscheduleAllCallbacks();
     this.layer?.node?.destroy();
-    this.onClose?.();
-    this.onDestroy?.();
   }
 
   /**

package/manager/FWLayerManager.ts

@@ -47,9 +47,9 @@ class FWLayerDataManager {
   /**
    * 从类型创建Layer数据
    */
-  createLayerDataFromType<Ctr extends FW.LayerController = FW.LayerController>(
+  createLayerData<Ctr extends FW.LayerController = FW.LayerController>(
     type: new () => Ctr,
-  ): FWLayerData | undefined {
+  ): FW.LayerData {
     const ctr = new type();
     const ctrName = cc.js.getClassName(ctr);
     const layerData = this.createBaseLayerData(ctr);
@@ -58,10 +58,15 @@ class FWLayerDataManager {
     layerData.controller = ctr;
     layerData.controllerName = ctrName;
 
-    this.layerMap.set(type, layerData);
     return layerData;
   }
 
+  addLayerData(ctr: new () => FW.LayerController, layerData: FW.LayerData) {
+    if (!this.layerMap.has(ctr)) {
+      this.layerMap.set(ctr, layerData);
+    }
+  }
+
   /**
    * 创建基础Layer数据
    */
@@ -248,7 +253,8 @@ class FWLayerOpenManager {
       return this.wrapResult(existingLayer, isAsync) as Ctr;
     }
 
-    const layerData = this.dataManager.createLayerDataFromType(data.type);
+    const layerData = this.dataManager.createLayerData(data.type);
+
     if (!layerData) {
       return this.getUndefinedResult(isAsync);
     }
@@ -262,6 +268,8 @@ class FWLayerOpenManager {
       return this.getUndefinedResult(isAsync);
     }
 
+    this.dataManager.addLayerData(data.type, layerData);
+
     if (isAsync) {
       return this.loadAndCreateLayerAsync(layerData, data);
     } else {
@@ -459,7 +467,7 @@ class FWLayerQueueManager {
   ): boolean {
     if (layerData.controller.layerType === FWSystemDefine.FWLayerType.POPUP_QUEUE) {
       const hasNonPermanentLayers = Array.from(layerMap.values()).some(
-        (value) => value.layerType !== FWSystemDefine.FWLayerType.PERMANENT,
+        (value) => value.layerType === FWSystemDefine.FWLayerType.POPUP_QUEUE,
       );
 
       if (hasNonPermanentLayers) {
@@ -673,9 +681,9 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
    * @param layer
    * @returns
    */
-  async removeAllChildren(layer: FW.Layer) {
-    if (cc.isValid(!layer?.node)) return;
-    const layers = layer.node.getComponentsInChildren(FWLayer);
+  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();
@@ -694,9 +702,8 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
     let layerData = ctr.layerData;
 
     if (cc.isValid(ctr.layer?.node)) {
-      ctr.layer.node.destroy?.();
+      await ctr.onClose?.();
       ctr.destroy?.();
-      ctr.onClose?.();
       if (ctr.autoRelease) {
         FW.Entry.resMgr.releaseAsset(ctr.layerData.layerAssetProperty);
       }

package/package.json

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