@ives_xxz/framework 1.5.5 → 1.5.8

package/manager/FWLayerManager.ts

@@ -1,11 +1,16 @@
-import { FWManager } from './FWManager';
-import { FWLayerController } from '../controller/FWLayerController';
-import { FWSystemDefine } from '../define/FWSystemDefine';
-import FWLayer from '../layer/FWLayer';
-import FWLog from '../log/FWLog';
-import { FWQueue } from '../utils/FWQueue';
-
-const ADD_EXTERNAL_REFERENCE: string = 'addExternalReference';
+import { FWManager } from "./FWManager";
+import { FWLayerController } from "../controller/FWLayerController";
+import { FWSystemDefine } from "../define/FWSystemDefine";
+import FWLayer from "../layer/FWLayer";
+import FWLog from "../log/FWLog";
+import { FWQueue } from "../utils/FWQueue";
+import FWAssetConfig from "../config/FWAssetConfig";
+import FWLogic from "../logic/FWLogic";
+import FWData from "../data/FWData";
+import FWSocketSender from "../service/socket/FWSocketSender";
+import FWSocketHandle from "../service/socket/FWSocketHandle";
+
+const ADD_EXTERNAL_REFERENCE: string = "addExternalReference";
 
 export class FWLayerManager extends FWManager implements FW.LayerManager {
   private resourceManager: FWLayerResourceManager;
@@ -29,7 +34,7 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
       this.resourceManager,
       this.createManager,
       this.stackManager,
-      this.queueManager,
+      this.queueManager
     );
   }
 
@@ -37,7 +42,7 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
    * 异步打开Layer
    */
   async openAsync<Ctr extends FW.LayerController = FW.LayerController>(
-    data: FW.LayerOpenArgs,
+    data: FW.LayerOpenArgs
   ): Promise<Ctr> {
     return this.openManager.openLayerAsync(data) as Promise<Ctr>;
   }
@@ -45,17 +50,23 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
   /**
    * 同步打开
    */
-  openSync<Ctr extends FW.LayerController = FW.LayerController>(data: FW.LayerOpenArgs): Ctr {
+  openSync<Ctr extends FW.LayerController = FW.LayerController>(
+    data: FW.LayerOpenArgs
+  ): Ctr {
     return this.openManager.openLayerSync(data) as unknown as Ctr;
   }
 
   /**
    * 显示layer并恢复所有节点事件
    */
-  displayLayer<Ctr extends FW.LayerController = FW.LayerController>(ctr: Ctr): Ctr {
+  displayLayer<Ctr extends FW.LayerController = FW.LayerController>(
+    ctr: Ctr
+  ): Ctr {
     const layerData = ctr.layerData;
 
-    if (!this.dataManager.getLayerMap().has(ctr.layerData.controllerConstructor)) {
+    if (
+      !this.dataManager.getLayerMap().has(ctr.layerData.controllerConstructor)
+    ) {
       FWLog.warn(`display layer failed,layer name : ${layerData.layerName}`);
       return;
     }
@@ -75,9 +86,13 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
   /**
    * 隐藏layer并隐藏所有节点事件
    */
-  hideLayer<Ctr extends FW.LayerController = FW.LayerController>(ctr: Ctr): Ctr {
+  hideLayer<Ctr extends FW.LayerController = FW.LayerController>(
+    ctr: Ctr
+  ): Ctr {
     const layerData = ctr.layerData;
-    if (!this.dataManager.getLayerMap().has(ctr.layerData.controllerConstructor)) {
+    if (
+      !this.dataManager.getLayerMap().has(ctr.layerData.controllerConstructor)
+    ) {
       FWLog.warn(`hide layer failed,layer name : ${layerData.layerName}`);
       return;
     }
@@ -121,7 +136,9 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
     for (let i = 0; i < count; i++) {
       let layerData = this.stackManager.pop();
       let ctr = layerData.controller;
-      if (!this.dataManager.getLayerMap().has(layerData.controllerConstructor)) {
+      if (
+        !this.dataManager.getLayerMap().has(layerData.controllerConstructor)
+      ) {
         return;
       }
       if (cc.isValid(ctr.layer?.node)) {
@@ -153,7 +170,7 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
    * 关闭layer
    */
   async close<Ctr extends FW.LayerController = FW.LayerController>(
-    ctr: Ctr,
+    ctr: Ctr
   ): Promise<FW.LayerController> {
     if (!ctr) return;
 
@@ -246,7 +263,7 @@ class FWLayerDataManager {
    * 获取已存在的Layer
    */
   getExistingLayer<Ctr extends FW.LayerController = FW.LayerController>(
-    type: new () => Ctr,
+    type: new () => Ctr
   ): Ctr | undefined {
     for (const [key, value] of this.layerMap) {
       if (value.controllerConstructor === type) {
@@ -260,11 +277,11 @@ class FWLayerDataManager {
    * 从类型创建Layer数据
    */
   createLayerData<Ctr extends FW.LayerController = FW.LayerController>(
-    type: new () => Ctr,
+    type: new () => Ctr
   ): FW.LayerData {
     const ctr = new type();
     const ctrName = cc.js.getClassName(ctr);
-    const layerData = this.createBaseLayerData(ctr);
+    const layerData = this.generationData(ctr);
 
     layerData.controllerConstructor = type;
     layerData.controller = ctr;
@@ -280,12 +297,18 @@ class FWLayerDataManager {
   }
 
   /**
-   * 创建基础Layer数据
+   * 生成数据
    */
-  private createBaseLayerData(ctr: FW.LayerController): FWLayerData {
+  private generationData(ctr: FW.LayerController): FWLayerData {
     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;
@@ -311,7 +334,7 @@ class FWLayerDataManager {
    * 获取已存在的代理
    */
   getExistingProxy<Ctr extends FW.LayerController = FW.LayerController>(
-    type: new () => Ctr,
+    type: new () => Ctr
   ): Ctr | undefined {
     return this.layerMap.get(type)?.controllerProxy as Ctr;
   }
@@ -323,7 +346,7 @@ class FWLayerDataManager {
     layerData: FWLayerData,
     res: { asset: cc.Prefab; uuid: string },
     layer: FWLayer,
-    layerName: string,
+    layerName: string
   ): void {
     layerData.loaded = true;
     layerData.layer = layer;
@@ -369,7 +392,7 @@ class FWLayerDataManager {
       try {
         cb?.(null);
       } catch (e) {
-        FWLog.error('External ref update callback error:', e);
+        FWLog.error("External ref update callback error:", e);
       }
     });
     layerData.externalReference.clear();
@@ -394,7 +417,8 @@ class FWLayerDataManager {
 }
 
 class FWLayerCreateManager {
-  private lifecycleManager: FWLayerLifecycleManager = new FWLayerLifecycleManager();
+  private lifecycleManager: FWLayerLifecycleManager =
+    new FWLayerLifecycleManager();
 
   /**
    * 创建Layer节点
@@ -404,7 +428,7 @@ class FWLayerCreateManager {
     layerComponent: string,
     renderOrder: number,
     parent: cc.Node,
-    position: FW.Vec3,
+    position: FW.Vec3
   ): FWLayer {
     parent = parent || FW.Entry.scene?.node;
     position = position || cc.Vec3.ZERO;
@@ -446,14 +470,14 @@ class FWLayerOpenManager {
     private resourceManager: FWLayerResourceManager,
     private createManager: FWLayerCreateManager,
     private stackManager: FWLayerStackManager,
-    private queueManager: FWLayerQueueManager,
+    private queueManager: FWLayerQueueManager
   ) {}
 
   /**
    * 统一的Layer打开方法
    */
   async openLayerAsync<Ctr extends FW.LayerController = FW.LayerController>(
-    data: FW.LayerOpenArgs,
+    data: FW.LayerOpenArgs
   ): Promise<Ctr> {
     if (!this.validateOpenData(data)) {
       return undefined;
@@ -475,7 +499,12 @@ class FWLayerOpenManager {
       return proxy as Ctr;
     }
 
-    if (this.queueManager.handlePopupQueue(layerData, this.dataManager.getLayerMap())) {
+    if (
+      this.queueManager.handlePopupQueue(
+        layerData,
+        this.dataManager.getLayerMap()
+      )
+    ) {
       return undefined;
     }
 
@@ -484,7 +513,9 @@ class FWLayerOpenManager {
     return this.asyncGenerationLayer(layerData, data);
   }
 
-  openLayerSync<Ctr extends FW.LayerController = FW.LayerController>(data: FW.LayerOpenArgs): Ctr {
+  openLayerSync<Ctr extends FW.LayerController = FW.LayerController>(
+    data: FW.LayerOpenArgs
+  ): Ctr {
     if (!this.validateOpenData(data)) {
       return undefined;
     }
@@ -505,7 +536,12 @@ class FWLayerOpenManager {
       return proxy as Ctr;
     }
 
-    if (this.queueManager.handlePopupQueue(layerData, this.dataManager.getLayerMap())) {
+    if (
+      this.queueManager.handlePopupQueue(
+        layerData,
+        this.dataManager.getLayerMap()
+      )
+    ) {
       return undefined;
     }
 
@@ -542,10 +578,9 @@ class FWLayerOpenManager {
   /**
    * 异步生成Layer
    */
-  private async asyncGenerationLayer<Ctr extends FW.LayerController = FW.LayerController>(
-    layerData: FWLayerData,
-    data: FW.LayerOpenArgs,
-  ): Promise<Ctr> {
+  private async asyncGenerationLayer<
+    Ctr extends FW.LayerController = FW.LayerController
+  >(layerData: FWLayerData, data: FW.LayerOpenArgs): Promise<Ctr> {
     try {
       const res = await this.resourceManager.loadLayerAsync(layerData);
       const ctr = this.createLayer(layerData, res, data) as Ctr;
@@ -561,10 +596,9 @@ class FWLayerOpenManager {
   /**
    * 同步创建Layer
    */
-  private syncGenerationLayer<Ctr extends FW.LayerController = FW.LayerController>(
-    layerData: FWLayerData,
-    data: FW.LayerOpenArgs,
-  ): Ctr {
+  private syncGenerationLayer<
+    Ctr extends FW.LayerController = FW.LayerController
+  >(layerData: FWLayerData, data: FW.LayerOpenArgs): Ctr {
     try {
       const res = this.resourceManager.loadLayerSync(layerData);
       const ctr = this.createLayer(layerData, res, data) as Ctr;
@@ -583,14 +617,14 @@ class FWLayerOpenManager {
   private createLayer<Ctr extends FW.LayerController = FW.LayerController>(
     layerData: FWLayerData,
     res: { asset: cc.Prefab; uuid: string },
-    data: FW.LayerOpenArgs,
+    data: FW.LayerOpenArgs
   ): Ctr {
     const layer = this.createManager.createLayer(
       res.asset,
       res.asset.name,
       layerData.controller.renderOrder,
       data.parent,
-      data.position,
+      data.position
     );
     const layerName = cc.js.getClassName(layer);
 
@@ -600,22 +634,29 @@ class FWLayerOpenManager {
 
     this.createManager.setupLayerLifecycle(layer, layerData.controller);
 
-    if (layerData.controller.layerType !== FWSystemDefine.FWLayerType.PERMANENT) {
+    if (
+      layerData.controller.layerType !== FWSystemDefine.FWLayerType.PERMANENT
+    ) {
       this.stackManager.push(layerData);
     }
 
     this.dataManager.removeFromRegistry(layerData.controllerConstructor);
 
-    layerData.controllerProxy = this.dataManager.createControllerProxy(layerData);
+    layerData.controllerProxy =
+      this.dataManager.createControllerProxy(layerData);
 
     return layerData.controllerProxy as Ctr;
   }
 }
 
 class FWLayerResourceManager {
-  async loadLayerAsync(layerData: FWLayerData): Promise<{ asset: cc.Prefab; uuid: string }> {
+  async loadLayerAsync(
+    layerData: FWLayerData
+  ): Promise<{ asset: cc.Prefab; uuid: string }> {
     try {
-      const res = await FW.Entry.resMgr.loadAssetData<cc.Prefab>(layerData.layerAssetProperty);
+      const res = await FW.Entry.resMgr.loadAssetData<cc.Prefab>(
+        layerData.layerAssetProperty
+      );
       res.user = layerData.layerName;
       res.autoRelease = layerData.controller.autoRelease;
       res.dependentBundle = layerData.controller.layerAssetProperty.bundle;
@@ -629,7 +670,9 @@ class FWLayerResourceManager {
   loadLayerSync(layerData: FWLayerData): { asset: cc.Prefab; uuid: string } {
     layerData.layerAssetProperty.bundle =
       layerData.layerAssetProperty.bundle || FW.Entry.bundleName;
-    const res = FW.Entry.resMgr.getAssetData<cc.Prefab>(layerData.layerAssetProperty);
+    const res = FW.Entry.resMgr.getAssetData<cc.Prefab>(
+      layerData.layerAssetProperty
+    );
     res.user = layerData.layerName;
     res.autoRelease = layerData.controller.autoRelease;
     res.dependentBundle = layerData.controller.layerAssetProperty.bundle;
@@ -641,7 +684,9 @@ class FWLayerStackManager {
   private layerStack: FWLayerData[] = [];
 
   push(layerData: FWLayerData): void {
-    if (layerData.controller.layerType !== FWSystemDefine.FWLayerType.PERMANENT) {
+    if (
+      layerData.controller.layerType !== FWSystemDefine.FWLayerType.PERMANENT
+    ) {
       this.layerStack.push(layerData);
     }
   }
@@ -651,7 +696,9 @@ class FWLayerStackManager {
   }
 
   remove(layerData: FWLayerData): void {
-    const index = this.layerStack.findIndex((v) => v.controller === layerData.controller);
+    const index = this.layerStack.findIndex(
+      (v) => v.controller === layerData.controller
+    );
     if (index > -1) {
       this.layerStack.splice(index, 1);
     }
@@ -667,9 +714,15 @@ class FWLayerStackManager {
 }
 
 class FWLayerStateManager {
-  private layerStates = new Map<new () => FW.LayerController, FWSystemDefine.FWLayerState>();
-
-  setState(ctrType: new () => FW.LayerController, state: FWSystemDefine.FWLayerState): void {
+  private layerStates = new Map<
+    new () => FW.LayerController,
+    FWSystemDefine.FWLayerState
+  >();
+
+  setState(
+    ctrType: new () => FW.LayerController,
+    state: FWSystemDefine.FWLayerState
+  ): void {
     this.layerStates.set(ctrType, state);
   }
 
@@ -703,11 +756,13 @@ class FWLayerQueueManager {
 
   handlePopupQueue(
     layerData: FWLayerData,
-    layerMap: Map<new () => FW.LayerController, FWLayerData>,
+    layerMap: Map<new () => FW.LayerController, FWLayerData>
   ): boolean {
-    if (layerData.controller.layerType === FWSystemDefine.FWLayerType.POPUP_QUEUE) {
+    if (
+      layerData.controller.layerType === FWSystemDefine.FWLayerType.POPUP_QUEUE
+    ) {
       const hasNonPermanentLayers = Array.from(layerMap.values()).some(
-        (value) => value.layerType === FWSystemDefine.FWLayerType.POPUP_QUEUE,
+        (value) => value.layerType === FWSystemDefine.FWLayerType.POPUP_QUEUE
       );
 
       if (hasNonPermanentLayers) {
@@ -745,44 +800,44 @@ class FWLayerQueueManager {
 
 class FWLayerLifecycleManager {
   setupLifecycleHooks(layer: FWLayer, ctr: FW.LayerController): void {
-    const originalOnLoad = layer['onLoad'];
-    layer['onLoad'] = function () {
+    const originalOnLoad = layer["onLoad"];
+    layer["onLoad"] = function () {
       originalOnLoad?.call(this);
       ctr.onLoad?.();
     };
 
-    const originalStart = layer['start'];
-    layer['start'] = function () {
+    const originalStart = layer["start"];
+    layer["start"] = function () {
       originalStart?.call(this);
       ctr.onStart?.();
     };
 
-    const originalOnEnable = layer['onEnable'];
-    layer['onEnable'] = function () {
+    const originalOnEnable = layer["onEnable"];
+    layer["onEnable"] = function () {
       originalOnEnable?.call(this);
       ctr.onEnable?.();
     };
 
-    const originalOnDisable = layer['onDisable'];
-    layer['onDisable'] = function () {
+    const originalOnDisable = layer["onDisable"];
+    layer["onDisable"] = function () {
       originalOnDisable?.call(this);
       ctr.onDisable?.();
     };
 
-    const originalOnDestroy = layer['onDestroy'];
-    layer['onDestroy'] = function () {
+    const originalOnDestroy = layer["onDestroy"];
+    layer["onDestroy"] = function () {
       originalOnDestroy?.call(this);
       ctr.onDestroy?.();
     };
 
-    const originalUpdate = layer['update'];
-    layer['update'] = function (dt: number) {
+    const originalUpdate = layer["update"];
+    layer["update"] = function (dt: number) {
       originalUpdate?.call(this, dt);
       ctr.onUpdate?.(dt);
     };
 
-    const originalLateUpdate = layer['lateUpdate'];
-    layer['lateUpdate'] = function () {
+    const originalLateUpdate = layer["lateUpdate"];
+    layer["lateUpdate"] = function () {
       originalLateUpdate?.call(this);
       ctr.onLateUpdate?.();
     };