@ives_xxz/framework 1.5.8 → 1.5.10

package/manager/FWLayerManager.ts

@@ -9,6 +9,8 @@ import FWLogic from "../logic/FWLogic";
 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";
 
@@ -258,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
    */
@@ -279,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);
 
@@ -303,12 +306,6 @@ class FWLayerDataManager {
     const layerData = new FWLayerData();
     const layerType = ctr.layerType;
 
-    ctr.config = FW.Entry.getComponent(FWAssetConfig);
-    ctr.logic = FW.Entry.getComponent(FWLogic);
-    ctr.data = FW.Entry.getComponent(FWData);
-    ctr.sender = FW.Entry.getComponent(FWSocketSender);
-    ctr.handle = FW.Entry.getComponent(FWSocketHandle);
-
     layerData.layerRenderOrder = ctr.renderOrder;
     layerData.layerAssetProperty = ctr.layerAssetProperty;
     layerData.layerType = layerType;
@@ -561,20 +558,6 @@ class FWLayerOpenManager {
     return true;
   }
 
-  /**
-   * 获取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
    */
@@ -843,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/manager/FWPromiseManager.ts

@@ -29,6 +29,7 @@ export default class FWPromiseManager
     const retryInterval = options.retryInterval || 0;
     let retryCount = 0;
     let timerSchedule: FW.TimerSchedule;
+
     const createPromise = (): Promise<T> => {
       return new Promise<T>((resolve, reject) => {
         if (options.timeout && options.timeout > 0) {

package/package.json

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