@ives_xxz/framework 1.5.9 → 1.5.10

package/manager/FWLayerManager.ts

@@ -10,6 +10,7 @@ import FWData from "../data/FWData";
 import FWSocketSender from "../service/socket/FWSocketSender";
 import FWSocketHandle from "../service/socket/FWSocketHandle";
 import Framework from "../Framework";
+import { FrameworkBase } from "../FrameworkBase";
 
 const ADD_EXTERNAL_REFERENCE: string = "addExternalReference";
 
@@ -259,7 +260,8 @@ 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();
   /**
    * 获取已存在的Layer
    */
@@ -280,7 +282,7 @@ class FWLayerDataManager {
   createLayerData<Ctr extends FW.LayerController = FW.LayerController>(
     type: new () => Ctr
   ): FW.LayerData {
-    const ctr = new type();
+    const ctr = this.layerControllerFactory.createController(type);
     const ctrName = cc.js.getClassName(ctr);
     const layerData = this.generationData(ctr);
 
@@ -297,39 +299,12 @@ class FWLayerDataManager {
     }
   }
 
-  private findBundleNameByClassName(name: string): string | undefined {
-    const registeredComponents = Framework.getRegisteredComponents();
-
-    const bundleNames = Array.from(registeredComponents.keys());
-
-    for (const bundleName of bundleNames) {
-      if (this.doesClassNameContainBundleName(name, bundleName)) {
-        return bundleName;
-      }
-    }
-    return undefined;
-  }
-
-  private doesClassNameContainBundleName(
-    className: string,
-    bundleName: string
-  ): boolean {
-    const bundleNameLower = bundleName.toLowerCase();
-    const classNameLower = className.toLowerCase();
-    return classNameLower.includes(bundleNameLower);
-  }
-
   /**
    * 生成数据
    */
   private generationData(ctr: FW.LayerController): FWLayerData {
     const layerData = new FWLayerData();
     const layerType = ctr.layerType;
-    const constructorName = ctr.constructor.name;
-    const bundleName = this.findBundleNameByClassName(constructorName);
-    const configTag = FWSystemDefine.FWBindTag.CONFIG;
-
-    ctr.config = FW.Entry.getComponent(`${bundleName}${configTag}`);
 
     layerData.layerRenderOrder = ctr.renderOrder;
     layerData.layerAssetProperty = ctr.layerAssetProperty;
@@ -851,3 +826,20 @@ class FWLayerLifecycleManager {
     };
   }
 }
+
+class FWLayerControllerFactory {
+  /**
+   * 创建并初始化 LayerController
+   */
+  createController<Ctr extends FW.LayerController = FW.LayerController>(
+    type: new () => Ctr
+  ): Ctr {
+    const ctr = new type();
+
+    if (ctr instanceof FrameworkBase) {
+      ctr.initializeDependencies?.();
+    }
+
+    return ctr;
+  }
+}

package/package.json

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