@ives_xxz/framework 1.2.12 → 1.2.14

package/FW.d.ts

@@ -493,11 +493,11 @@ declare namespace FW {
   /**
    * 层级打开参数
    */
-  type LayerOpenArgs<T> = {
+  type LayerOpenArgs = {
     /**
      * 控制器类型
      */
-    type: new () => T;
+    type: new () => LayerController;
     /**
      * 父节点
      */
@@ -505,17 +505,22 @@ declare namespace FW {
     /**
      * 坐标
      */
-    position?: cc.Vec3;
+    position?: Vec3;
     /**
      * 传递参数
      */
     args?: any;
   };
 
+  type Vec3 = {
+    x: number;
+    y: number;
+  };
+
   /**
    * 层级数据
    */
-  type LayerData<T> = {
+  type LayerData = {
     /**
      * 外部引用
      */
@@ -523,7 +528,7 @@ declare namespace FW {
     /**
      * 构造类
      */
-    layerConstructor: new () => T;
+    controllerConstructor: new () => FW.LayerController;
     /**
      * 唯一id
      */
@@ -555,7 +560,7 @@ declare namespace FW {
     /**
      * layer控制器
      */
-    controller: FWLayerController;
+    controller: LayerController;
     /**
      * 是否加载完成
      */
@@ -568,6 +573,10 @@ declare namespace FW {
      * 坐标
      */
     layerPosition?: Vec3;
+    /**
+     * 代理
+     */
+    controllerProxy: LayerController;
   };
 
   /**
@@ -935,7 +944,7 @@ declare namespace FW {
   type LayerController = {
     readonly entry: FW.Entry;
 
-    layerData: FWLayerData;
+    layerData: LayerData;
     /** uuid */
     uuid: string;
     /** 渲染顺序 */
@@ -950,7 +959,7 @@ declare namespace FW {
     autoRelease: boolean;
     /** 是否允许重复打开 */
     isRepeatOpen: boolean;
-
+    initialize?();
     /** 生命周期函数 */
     onInit?(...args: any);
     onLoad?();

package/manager/FWLayerManager.ts

@@ -7,10 +7,10 @@ import { FWQueue } from '../utils/FWQueue';
 
 const ADD_EXTERNAL_REFERENCE: string = 'addExternalReference';
 
-export class FWLayerData<T extends FWLayerController = FWLayerController>
-  implements FW.LayerData<T>
+export class FWLayerData<T extends FW.LayerController = FW.LayerController>
+  implements FW.LayerData
 {
-  layerConstructor: new () => T;
+  controllerConstructor: new () => T;
   uuid: string;
   layer: FW.Layer;
   layerName: string;
@@ -22,6 +22,7 @@ export class FWLayerData<T extends FWLayerController = FWLayerController>
   controllerName: string;
   controller: FW.LayerController;
   loaded: boolean;
+  controllerProxy: FW.LayerController;
   externalReference?: Set<(ref: FW.LayerController | null) => void>;
 }
 
@@ -29,11 +30,11 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
   /**
    * 当前待打开的layer队列
    */
-  private layerQueue: FWQueue<FWLayerData>;
+  private layerQueue: FWQueue<FW.LayerData>;
   /**
    * 当前已经打开的layer缓存容器
    */
-  private layerMap: Map<string, FWLayerData>;
+  private layerMap: Map<string, FW.LayerData>;
 
   /**
    * 当前所有打开Layer注册表
@@ -45,8 +46,8 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
   private layerStack: FWLayerData[];
 
   public initialize(): void {
-    this.layerQueue = new FWQueue<FWLayerData>();
-    this.layerMap = new Map<string, FWLayerData>();
+    this.layerQueue = new FWQueue<FW.LayerData>();
+    this.layerMap = new Map<string, FW.LayerData>();
     this.layerRegistry = new Set<new () => FW.LayerController>();
     this.layerStack = [];
   }
@@ -94,7 +95,7 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
    * @param ctr
    * @returns
    */
-  protected createLayerData(ctr: FWLayerController) {
+  protected createLayerData(ctr: FW.LayerController) {
     const layerData = new FWLayerData();
     const layerType = ctr.layerType;
 
@@ -114,8 +115,8 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
    * @param data
    * @returns
    */
-  async openAsync<Ctr extends FWLayerController = FWLayerController>(
-    data: FW.LayerOpenArgs<Ctr>,
+  async openAsync<Ctr extends FW.LayerController = FW.LayerController>(
+    data: FW.LayerOpenArgs,
   ): Promise<Ctr> {
     if (!data) {
       FWLog.error(`打开Layer失败:${data},请检查参数!`);
@@ -123,8 +124,8 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
     }
 
     for (const [key, value] of this.layerMap) {
-      if (value.layerConstructor == data.type) {
-        return value.controller as Ctr;
+      if (value.controllerConstructor == data.type) {
+        return value.controllerProxy as Ctr;
       }
     }
 
@@ -132,14 +133,14 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
     const ctrName = cc.js.getClassName(ctr);
     const layerData = this.createLayerData(ctr);
 
-    layerData.layerConstructor = data.type;
+    layerData.controllerConstructor = 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;
+      return this.layerMap.get(ctrName).controllerProxy as Ctr;
     }
 
     this.layerRegistry.add(data.type);
@@ -198,8 +199,8 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
         return target[prop];
       },
     });
-
-    return proxy;
+    ctr.layerData.controllerProxy = proxy;
+    return proxy as Ctr;
   }
 
   /**
@@ -207,15 +208,15 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
    * @param data
    * @returns
    */
-  openSync<Ctr extends FWLayerController = FWLayerController>(data: FW.LayerOpenArgs<Ctr>): Ctr {
+  openSync<Ctr extends FW.LayerController = FW.LayerController>(data: FW.LayerOpenArgs): Ctr {
     if (!data) {
       FWLog.error(`open layer failed:${data},please check param!`);
       return undefined;
     }
 
     for (const [key, value] of this.layerMap) {
-      if (value.layerConstructor == data.type) {
-        return value.controller as Ctr;
+      if (value.controllerConstructor == data.type) {
+        return value.controllerProxy as Ctr;
       }
     }
 
@@ -223,14 +224,14 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
     const ctrName = cc.js.getClassName(ctr);
     const layerData = this.createLayerData(ctr);
 
-    layerData.layerConstructor = data.type;
+    layerData.controllerConstructor = 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;
+      return this.layerMap.get(ctrName).controllerProxy as Ctr;
     }
 
     this.layerRegistry.add(data.type);
@@ -252,7 +253,6 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
 
     ctr.initialize();
 
-    this.layerQueue.add(layerData);
     const res = this.openLayerSync(layerData);
     const layer = this.createLayer(
       res.asset,
@@ -289,7 +289,8 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
         return target[prop];
       },
     });
-    return proxy;
+    ctr.layerData.controllerProxy = proxy;
+    return proxy as Ctr;
   }
 
   /**
@@ -297,7 +298,7 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
    * @param ctr
    * @returns
    */
-  displayLayer<Ctr extends FWLayerController = FWLayerController>(ctr: Ctr): Ctr {
+  displayLayer<Ctr extends FW.LayerController = FW.LayerController>(ctr: Ctr): Ctr {
     const layerData = ctr.layerData;
     if (!this.layerMap.has(layerData.controllerName)) {
       FWLog.warn(`display layer failed,layer name : ${layerData.layerName}`);
@@ -319,7 +320,7 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
    * @param ctr
    * @returns
    */
-  hideLayer<Ctr extends FWLayerController = FWLayerController>(ctr: Ctr): Ctr {
+  hideLayer<Ctr extends FW.LayerController = FW.LayerController>(ctr: Ctr): Ctr {
     const layerData = ctr.layerData;
     if (!this.layerMap.has(layerData.controllerName)) {
       FWLog.warn(`hide layer failed,layer name : ${layerData.layerName}`);
@@ -398,7 +399,7 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
     }
 
     this.layerMap.delete(layerData.controllerName);
-    this.layerRegistry.delete(ctr.layerData.layerConstructor);
+    this.layerRegistry.delete(ctr.layerData.controllerConstructor);
 
     const index = this.layerStack.findIndex((v) => {
       v.controller == ctr;
@@ -412,14 +413,14 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
       const nextLayer = this.openSync({
         parent: nextLayerData.layerParent,
         position: nextLayerData.layerPosition,
-        type: nextLayerData.layerConstructor,
+        type: nextLayerData.controllerConstructor,
       });
       /** 如果同步打开失败,再次尝试异步打开(可能由于资源所在bundle并未提前加载) */
       if (!nextLayer) {
         return this.openAsync({
           parent: nextLayerData.layerParent,
           position: nextLayerData.layerPosition,
-          type: nextLayerData.layerConstructor,
+          type: nextLayerData.controllerConstructor,
         });
       } else {
         return nextLayer;
@@ -429,7 +430,7 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
     }
   }
 
-  private notifyExternalRefUpdates(layerData: FWLayerData) {
+  private notifyExternalRefUpdates(layerData: FW.LayerData) {
     layerData.externalReference.forEach((cb) => {
       try {
         cb?.(null);
@@ -445,7 +446,7 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
     layerComponent: string,
     renderOrder: number,
     parent: cc.Node,
-    position: cc.Vec3,
+    position: FW.Vec3,
   ) {
     parent = parent || FW.Entry.scene?.node;
 
@@ -456,14 +457,15 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
       return;
     }
     const node = cc.instantiate(prefab);
+    const p = cc.v3(position.x, position.y);
     node.setParent(parent);
-    node.setPosition(position);
+    node.setPosition(p);
     node.zIndex = renderOrder;
     !node.getComponent(layerComponent) && node.addComponent(layerComponent);
     return node.getComponent(FWLayer);
   }
 
-  private lifecycleProcessing(ctr: FWLayerController) {
+  private lifecycleProcessing(ctr: FW.LayerController) {
     const layer = ctr.layer;
 
     const onLoad = layer['onLoad'];
@@ -509,7 +511,7 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
     };
   }
 
-  getLayerMap(): Map<string, FWLayerData> {
+  getLayerMap(): Map<string, FW.LayerData> {
     return this.layerMap;
   }
 

package/package.json

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