@ives_xxz/framework 2.3.14 → 2.3.16

package/manager/FWAssetManager.ts

@@ -58,7 +58,9 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
                 return;
               }
               const fileName = FW.Entry.utils.getFileName(img);
-              const texture: cc.Texture2D = await this.loadRemote(img);
+              const texture: cc.Texture2D = await this.loadRemote(img, {
+                ext: '.png',
+              });
               var asset = new sp.SkeletonData();
               asset.atlasText = assets[0];
               asset.skeletonJson = assets[1];

package/manager/FWLayerManager.ts

@@ -1,9 +1,9 @@
-import { FWManager } from "./FWManager";
-import { FWQueue } from "../utils/FWQueue";
-import { FrameworkBase } from "../FrameworkBase";
-import { PerformanceMonitor } from "../expand/FWDecorator";
+import { FWManager } from './FWManager';
+import { FWQueue } from '../utils/FWQueue';
+import { FrameworkBase } from '../FrameworkBase';
+import { PerformanceMonitor } from '../expand/FWDecorator';
 
-const ADD_EXTERNAL_REFERENCE: string = "addExternalReference";
+const ADD_EXTERNAL_REFERENCE: string = 'addExternalReference';
 
 export class FWLayerManager extends FWManager implements FW.LayerManager {
   private resourceManager: FWLayerResourceManager;
@@ -43,7 +43,7 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
   /**
    * 异步打开Layer
    */
-  @PerformanceMonitor("openAsync")
+  @PerformanceMonitor('openAsync')
   async openAsync<Ctr extends FW.LayerController = FW.LayerController>(
     data: FW.LayerOpenArgs,
   ): Promise<Ctr> {
@@ -56,9 +56,7 @@ 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 {
     if (this.debug) {
       FW.Log.error(`同步打开Layer ->`, cc.js.getClassName(data.type));
     }
@@ -68,14 +66,10 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
   /**
    * 显示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)) {
       FW.Log.warn(`display layer failed,layer name : ${layerData.layerName}`);
       return;
     }
@@ -95,13 +89,9 @@ 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)) {
       FW.Log.warn(`hide layer failed,layer name : ${layerData.layerName}`);
       return;
     }
@@ -145,9 +135,7 @@ 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)) {
@@ -178,18 +166,14 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
   /**
    * 关闭layer
    */
-  async close<Ctr extends FW.LayerController = FW.LayerController>(
-    ctr: Ctr,
-  ): Promise<Ctr> {
+  async close<Ctr extends FW.LayerController = FW.LayerController>(ctr: Ctr): Promise<Ctr> {
     if (!ctr) return;
 
     return FW.Entry.promiseMgr.execute(async (resolve, reject) => {
       let layerData = ctr.layerData;
 
       if (this.debug) {
-        FW.Log.error(
-          `${cc.js.getClassName(layerData?.controllerConstructor)} ->关闭Layer`,
-        );
+        FW.Log.error(`${cc.js.getClassName(layerData?.controllerConstructor)} ->关闭Layer`);
       }
 
       if (cc.isValid(ctr.layer?.node)) {
@@ -289,8 +273,7 @@ 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();
+  private layerControllerFactory: FWLayerControllerFactory = new FWLayerControllerFactory();
   /**
    * 获取已存在的Layer
    */
@@ -418,7 +401,7 @@ class FWLayerDataManager {
       try {
         cb?.(null);
       } catch (e) {
-        FW.Log.error("External ref update callback error:", e);
+        FW.Log.error('External ref update callback error:', e);
       }
     });
     layerData.externalReference.clear();
@@ -443,8 +426,7 @@ class FWLayerDataManager {
 }
 
 class FWLayerCreateManager {
-  private lifecycleManager: FWLayerLifecycleManager =
-    new FWLayerLifecycleManager();
+  private lifecycleManager: FWLayerLifecycleManager = new FWLayerLifecycleManager();
 
   /**
    * 创建Layer节点
@@ -526,12 +508,7 @@ class FWLayerOpenManager {
       return proxy as Ctr;
     }
 
-    if (
-      this.queueManager.handlePopupQueue(
-        layerData,
-        this.dataManager.getLayerMap(),
-      )
-    ) {
+    if (this.queueManager.handlePopupQueue(layerData, this.dataManager.getLayerMap())) {
       return undefined;
     }
 
@@ -540,9 +517,7 @@ 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;
     }
@@ -563,12 +538,7 @@ class FWLayerOpenManager {
       return proxy as Ctr;
     }
 
-    if (
-      this.queueManager.handlePopupQueue(
-        layerData,
-        this.dataManager.getLayerMap(),
-      )
-    ) {
+    if (this.queueManager.handlePopupQueue(layerData, this.dataManager.getLayerMap())) {
       return undefined;
     }
 
@@ -591,9 +561,10 @@ 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 {
       this.stateManager.setState(
         layerData.controllerConstructor,
@@ -626,9 +597,10 @@ 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 {
       this.stateManager.setState(
         layerData.controllerConstructor,
@@ -666,6 +638,12 @@ class FWLayerOpenManager {
       data.parent,
       data.position,
     );
+
+    if (!layer) {
+      this.dataManager.removeFromRegistry(layerData.controllerConstructor);
+      return;
+    }
+
     const layerName = cc.js.getClassName(layer);
 
     this.dataManager.setupLayerData(layerData, res, layer, layerName);
@@ -674,29 +652,22 @@ class FWLayerOpenManager {
 
     this.createManager.setupLayerLifecycle(layer, layerData.controller);
 
-    if (
-      layerData.controller.layerType !== FW.SystemDefine.FWLayerType.PERMANENT
-    ) {
+    if (layerData.controller.layerType !== FW.SystemDefine.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);
       if (!res) return undefined;
       res.user = layerData.layerName;
       res.autoRelease = layerData.controller.autoRelease;
@@ -711,9 +682,7 @@ 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;
@@ -725,9 +694,7 @@ class FWLayerStackManager {
   private layerStack: FWLayerData[] = [];
 
   push(layerData: FWLayerData): void {
-    if (
-      layerData.controller.layerType !== FW.SystemDefine.FWLayerType.PERMANENT
-    ) {
+    if (layerData.controller.layerType !== FW.SystemDefine.FWLayerType.PERMANENT) {
       this.layerStack.push(layerData);
     }
   }
@@ -737,9 +704,7 @@ 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);
     }
@@ -755,24 +720,16 @@ class FWLayerStackManager {
 }
 
 class FWLayerStateManager {
-  private layerStates = new Map<
-    new () => FW.LayerController,
-    FW.SystemDefine.FWLayerState
-  >();
+  private layerStates = new Map<new () => FW.LayerController, FW.SystemDefine.FWLayerState>();
   constructor() {}
-  setState(
-    ctrType: new () => FW.LayerController,
-    state: FW.SystemDefine.FWLayerState,
-  ): void {
+  setState(ctrType: new () => FW.LayerController, state: FW.SystemDefine.FWLayerState): void {
     if (FW.Entry.layerMgr.isDebug()) {
       FW.Log.debug(`${cc.js.getClassName(ctrType)}->更新状态${state}`);
     }
     this.layerStates.set(ctrType, state);
   }
 
-  getState(
-    ctrType: new () => FW.LayerController,
-  ): FW.SystemDefine.FWLayerState {
+  getState(ctrType: new () => FW.LayerController): FW.SystemDefine.FWLayerState {
     return this.layerStates.get(ctrType) || FW.SystemDefine.FWLayerState.CLOSED;
   }
 
@@ -807,9 +764,7 @@ class FWLayerQueueManager {
     layerData: FWLayerData,
     layerMap: Map<new () => FW.LayerController, FWLayerData>,
   ): boolean {
-    if (
-      layerData.controller.layerType === FW.SystemDefine.FWLayerType.POPUP_QUEUE
-    ) {
+    if (layerData.controller.layerType === FW.SystemDefine.FWLayerType.POPUP_QUEUE) {
       const hasNonPermanentLayers = Array.from(layerMap.values()).some(
         (value) => value.layerType === FW.SystemDefine.FWLayerType.POPUP_QUEUE,
       );
@@ -849,44 +804,44 @@ class FWLayerQueueManager {
 
 class FWLayerLifecycleManager {
   setupLifecycleHooks(layer: FW.Layer, 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?.();
     };
@@ -897,9 +852,7 @@ class FWLayerControllerFactory {
   /**
    * 创建并初始化 LayerController
    */
-  createController<Ctr extends FW.LayerController = FW.LayerController>(
-    type: new () => Ctr,
-  ): Ctr {
+  createController<Ctr extends FW.LayerController = FW.LayerController>(type: new () => Ctr): Ctr {
     const ctr = new type();
 
     ctr.initializeDependencies?.();

package/package.json

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