@ives_xxz/framework 1.4.11 → 1.4.13

package/manager/FWLayerManager.ts

@@ -85,9 +85,9 @@ class FWLayerDataManager {
   }
 
   /**
-   * 检查注册状态并添加
+   * 状态表注册
    */
-  checkRegistryAndAdd(type: new () => FW.LayerController): boolean {
+  addRegistry(type: new () => FW.LayerController): boolean {
     if (this.layerRegistry.has(type)) {
       return true;
     }
@@ -144,7 +144,7 @@ class FWLayerDataManager {
   /**
    * 清理失败的Layer
    */
-  cleanupFailedLayer(layerData: FWLayerData): void {
+  clearFailedLayer(layerData: FWLayerData): void {
     this.layerMap.delete(layerData.controllerConstructor);
     this.layerRegistry.delete(layerData.controllerConstructor);
   }
@@ -259,7 +259,7 @@ class FWLayerOpenManager {
       return this.getUndefinedResult(isAsync);
     }
 
-    if (this.dataManager.checkRegistryAndAdd(data.type)) {
+    if (this.dataManager.addRegistry(data.type)) {
       const proxy = this.dataManager.getExistingProxy(data.type);
       return this.wrapResult(proxy, isAsync) as Ctr;
     }
@@ -271,9 +271,9 @@ class FWLayerOpenManager {
     this.dataManager.addLayerData(data.type, layerData);
 
     if (isAsync) {
-      return this.loadAndCreateLayerAsync(layerData, data);
+      return this.asyncGenerationLayer(layerData, data);
     } else {
-      return this.loadAndCreateLayerSync(layerData, data) as Ctr;
+      return this.syncGenerationLayer(layerData, data) as Ctr;
     }
   }
 
@@ -303,43 +303,47 @@ class FWLayerOpenManager {
   }
 
   /**
-   * 异步加载资源并创建Layer
+   * 异步生成Layer
    */
-  private async loadAndCreateLayerAsync<Ctr extends FW.LayerController = FW.LayerController>(
+  private async asyncGenerationLayer<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;
+      const ctr = this.createLayer(layerData, res, data) as Ctr;
+      this.dataManager.removeFromRegistry(layerData.controllerConstructor);
+      return ctr;
     } catch (e) {
-      FWLog.error(`loadAndCreateLayerAsync failed:`, e);
-      this.dataManager.cleanupFailedLayer(layerData);
+      FWLog.error(`asyncGenerationLayer failed:`, e);
+      this.dataManager.clearFailedLayer(layerData);
       throw e;
     }
   }
 
   /**
-   * 同步加载资源并创建Layer
+   * 同步创建Layer
    */
-  private loadAndCreateLayerSync<Ctr extends FW.LayerController = FW.LayerController>(
+  private syncGenerationLayer<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);
+      const ctr = this.createLayer(layerData, res, data) as Ctr;
+      this.dataManager.removeFromRegistry(layerData.controllerConstructor);
+      return ctr;
     } catch (e) {
-      FWLog.error(`loadAndCreateLayerSync failed:`, e);
-      this.dataManager.cleanupFailedLayer(layerData);
+      FWLog.error(`syncGenerationLayer failed:`, e);
+      this.dataManager.clearFailedLayer(layerData);
       return undefined;
     }
   }
 
   /**
-   * 创建Layer并进行设置
+   * 创建Layer
    */
-  private createLayerAndSetup<Ctr extends FW.LayerController = FW.LayerController>(
+  private createLayer<Ctr extends FW.LayerController = FW.LayerController>(
     layerData: FWLayerData,
     res: { asset: cc.Prefab; uuid: string },
     data: FW.LayerOpenArgs,
@@ -365,10 +369,9 @@ class FWLayerOpenManager {
 
     this.dataManager.removeFromRegistry(layerData.controllerConstructor);
 
-    const proxy = this.dataManager.createControllerProxy(layerData);
-    layerData.controllerProxy = proxy;
+    layerData.controllerProxy = this.dataManager.createControllerProxy(layerData);
 
-    return proxy as Ctr;
+    return layerData.controllerProxy as Ctr;
   }
 }
 

package/package-lock.json.meta

@@ -0,0 +1,6 @@
+{
+  "ver": "1.0.2",
+  "uuid": "b688a102-2eb7-4e44-b92b-c77ee5edb7de",
+  "importer": "json",
+  "subMetas": {}
+}

package/package.json

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