@ives_xxz/framework 1.2.9 → 1.2.11

package/manager/FWLayerManager.ts

@@ -20,7 +20,7 @@ export class FWLayerData<T extends FWLayerController = FWLayerController>
   layerParent?: cc.Node;
   layerPosition?: cc.Vec3;
   controllerName: string;
-  controller: FWLayerController;
+  controller: FW.LayerController;
   loaded: boolean;
   externalReference?: Set<(ref: FW.LayerController | null) => void>;
 }
@@ -35,7 +35,6 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
    */
   private layerMap: Map<string, FWLayerData>;
 
-  private layerProxyMap: Map<string, FW.LayerController>;
   /**
    * 当前所有打开Layer注册表
    */
@@ -48,7 +47,6 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
   public initialize(): void {
     this.layerQueue = new FWQueue<FWLayerData>();
     this.layerMap = new Map<string, FWLayerData>();
-    this.layerProxyMap = new Map<string, FW.LayerController>();
     this.layerRegistry = new Set<new () => FW.LayerController>();
     this.layerStack = [];
   }
@@ -124,41 +122,46 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
       return undefined;
     }
 
-    const ctr = new data.type();
-
-    /** 如果不是重复打开的Layer,不是需要添加进队列末尾的,并且已经存在于注册表中的 不进行重复打开 */
-    if (this.layerRegistry.has(data.type) && !ctr.isRepeatOpen) {
-      const targetController = this.findLayerProxy<Ctr>(ctr);
-      if (targetController) {
-        return targetController;
+    for (const [key, value] of this.layerMap) {
+      if (value.layerConstructor == data.type) {
+        return value.controller as Ctr;
       }
     }
 
-    this.layerRegistry.add(data.type);
+    const ctr = new data.type();
+    const ctrName = cc.js.getClassName(ctr);
+    const layerData = this.createLayerData(ctr);
 
-    if (ctr.layerType == FWSystemDefine.FWLayerType.POPUP_QUEUE && !this.layerQueue.isEmpty()) {
-      this.layerQueue.add(ctr.layerData);
-      this.layerRegistry.delete(data.type);
-      const targetController = this.findLayerProxy<Ctr>(ctr);
-      if (targetController) {
-        return targetController;
-      }
+    layerData.layerConstructor = data.type;
+    layerData.controller = ctr;
+    layerData.controllerName = ctrName;
+
+    this.layerMap.set(ctrName, layerData);
+
+    if (this.layerRegistry.has(data.type)) {
+      return this.layerMap.get(ctrName).controller as Ctr;
     }
 
-    if (ctr.layerType != FWSystemDefine.FWLayerType.REPEAT && !ctr.isRepeatOpen) {
-      for (const [key, value] of this.layerMap) {
-        if (value.layerAssetProperty.path == ctr.layerAssetProperty.path) {
-          return this.findLayerProxy<Ctr>(ctr);
+    this.layerRegistry.add(data.type);
+
+    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;
         }
       }
     }
 
     ctr.initialize();
 
-    const layerData = this.createLayerData(ctr);
-
     const res = await this.openLayerAsync(layerData);
-
     const layer = await this.createLayer(
       res.asset,
       res.asset.name,
@@ -168,21 +171,17 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
     );
 
     const layerName = cc.js.getClassName(layer);
-    const ctrName = cc.js.getClassName(ctr);
 
     ctr.layerData = layerData;
     ctr.layerData.loaded = true;
     ctr.layer = layer;
     ctr.layerData.layerName = layerName;
-    ctr.layerData.controllerName = ctrName;
     ctr.layerData.uuid = res.uuid;
     ctr.uuid = res.uuid;
     ctr.onInit?.(data.args);
 
     this.lifecycleProcessing(ctr);
 
-    this.layerMap.set(res.uuid, layerData);
-
     if (ctr.layerType !== FWSystemDefine.FWLayerType.PERMANENT) {
       this.layerStack.push(layerData);
     }
@@ -199,7 +198,7 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
         return target[prop];
       },
     });
-    this.layerProxyMap.set(ctr.uuid, proxy);
+
     return proxy;
   }
 
@@ -214,74 +213,72 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
       return undefined;
     }
 
-    const ctr = new data.type();
-
-    /** 如果不是重复打开的Layer,不是需要添加进队列末尾的,并且已经存在于注册表中的 不进行重复打开 */
-    if (this.layerRegistry.has(data.type) && !ctr.isRepeatOpen) {
-      const targetController = this.findLayerProxy<Ctr>(ctr);
-      if (targetController) {
-        return targetController;
+    for (const [key, value] of this.layerMap) {
+      if (value.layerConstructor == data.type) {
+        return value.controller as Ctr;
       }
     }
 
-    this.layerRegistry.add(data.type);
+    const ctr = new data.type();
+    const ctrName = cc.js.getClassName(ctr);
+    const layerData = this.createLayerData(ctr);
 
-    if (ctr.layerType == FWSystemDefine.FWLayerType.POPUP_QUEUE && !this.layerQueue.isEmpty()) {
-      this.layerQueue.add(ctr.layerData);
-      this.layerRegistry.delete(data.type);
-      const targetController = this.findLayerProxy<Ctr>(ctr);
-      if (targetController) {
-        return targetController;
-      }
+    layerData.layerConstructor = data.type;
+    layerData.controller = ctr;
+    layerData.controllerName = ctrName;
+
+    this.layerMap.set(ctrName, layerData);
+
+    if (this.layerRegistry.has(data.type)) {
+      return this.layerMap.get(ctrName).controller as Ctr;
     }
 
-    if (ctr.layerType != FWSystemDefine.FWLayerType.REPEAT && !ctr.isRepeatOpen) {
-      for (const [key, value] of this.layerMap) {
-        if (value.layerAssetProperty.path == ctr.layerAssetProperty.path) {
-          return this.findLayerProxy<Ctr>(ctr);
+    this.layerRegistry.add(data.type);
+
+    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;
         }
       }
     }
 
     ctr.initialize();
 
-    const layerData = this.createLayerData(ctr);
+    this.layerQueue.add(layerData);
+    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);
 
-    if (
-      layerData.layerType == FWSystemDefine.FWLayerType.POPUP_QUEUE &&
-      !this.layerQueue.isEmpty()
-    ) {
-      this.layerQueue.add(layerData);
-    } else {
-      const res = this.openLayerSync(layerData);
-      const layer = this.createLayer(
-        res.asset,
-        res.asset.name,
-        layerData.layerRenderOrder,
-        layerData.layerParent,
-        layerData.layerPosition,
-      );
-      this.layerMap.set(res.uuid, layerData);
-      const layerName = cc.js.getClassName(layer);
-      const ctrName = cc.js.getClassName(ctr);
-
-      ctr.layerData = layerData;
-      ctr.layerData.loaded = true;
-      ctr.layer = layer;
-      ctr.layerData.layerName = layerName;
-      ctr.layerData.controllerName = ctrName;
-      ctr.layerData.uuid = res.uuid;
-      ctr.uuid = res.uuid;
-      ctr.onInit?.(data.args);
-
-      this.lifecycleProcessing(ctr);
-    }
+    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.lifecycleProcessing(ctr);
 
     if (ctr.layerType !== FWSystemDefine.FWLayerType.PERMANENT) {
       this.layerStack.push(layerData);
     }
 
     this.layerRegistry.delete(data.type);
+
     const proxy = new Proxy(ctr, {
       get: (target, prop) => {
         if (prop === 'addExternalReference') {
@@ -292,7 +289,6 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
         return target[prop];
       },
     });
-    this.layerProxyMap.set(ctr.uuid, proxy);
     return proxy;
   }
 
@@ -303,7 +299,7 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
    */
   displayLayer<Ctr extends FWLayerController = FWLayerController>(ctr: Ctr): Ctr {
     const layerData = ctr.layerData;
-    if (!this.layerMap.has(layerData.uuid)) {
+    if (!this.layerMap.has(layerData.controllerName)) {
       FWLog.warn(`display layer failed,layer name : ${layerData.layerName}`);
       return;
     }
@@ -325,7 +321,7 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
    */
   hideLayer<Ctr extends FWLayerController = FWLayerController>(ctr: Ctr): Ctr {
     const layerData = ctr.layerData;
-    if (!this.layerMap.has(layerData.uuid)) {
+    if (!this.layerMap.has(layerData.controllerName)) {
       FWLog.warn(`hide layer failed,layer name : ${layerData.layerName}`);
       return;
     }
@@ -367,18 +363,17 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
     for (let i = 0; i < count; i++) {
       let layerData = this.layerStack.pop();
       let ctr = layerData.controller;
-      if (!this.layerMap.has(layerData.uuid)) {
+      if (!this.layerMap.has(layerData.controllerName)) {
         return;
       }
       if (cc.isValid(ctr.layer?.node)) {
-        ctr.destroy?.();
+        ctr.layer.destroy?.();
         if (ctr.autoRelease) {
           FW.Entry.resMgr.releaseAsset(ctr.layerData.layerAssetProperty);
         }
         this.notifyExternalRefUpdates(ctr.layerData);
       }
-      this.layerMap.delete(layerData.uuid);
-      this.layerProxyMap.delete(layerData.uuid);
+      this.layerMap.delete(layerData.controllerName);
     }
   }
 
@@ -386,28 +381,24 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
    * 关闭layer
    * @param ctr
    */
-  async close<Ctr extends FWLayerController = FWLayerController>(
+  async close<Ctr extends FW.LayerController = FW.LayerController>(
     ctr: Ctr,
-  ): Promise<FWLayerController> {
+  ): Promise<FW.LayerController> {
     if (!ctr) return;
 
     let layerData = ctr.layerData;
 
-    if (!this.layerMap.has(layerData.uuid)) {
-      return;
-    }
-
     if (cc.isValid(ctr.layer?.node)) {
-      ctr.destroy?.();
+      ctr.layer.node.destroy?.();
+      ctr.onClose();
       if (ctr.autoRelease) {
         FW.Entry.resMgr.releaseAsset(ctr.layerData.layerAssetProperty);
       }
       this.notifyExternalRefUpdates(ctr.layerData);
     }
 
-    this.layerMap.delete(layerData.uuid);
-    this.layerProxyMap.delete(layerData.uuid);
-    this.layerStack.pop();
+    this.layerMap.delete(layerData.controllerName);
+    this.layerRegistry.delete(ctr.layerData.layerConstructor);
 
     const index = this.layerStack.findIndex((v) => {
       v.controller == ctr;
@@ -523,6 +514,9 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
   }
 
   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();
   }
@@ -532,12 +526,4 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
     this.layerMap = null;
     this.layerQueue = null;
   }
-
-  private findLayerProxy<Ctr extends FW.LayerController>(ctr: FW.LayerController): Ctr {
-    for (const [key, value] of this.layerMap) {
-      if (value.layerAssetProperty.path == ctr.layerAssetProperty.path) {
-        return this.layerProxyMap.get(value.uuid) as Ctr;
-      }
-    }
-  }
 }

package/package.json

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