@ives_xxz/framework 2.0.4 → 2.0.6

package/FrameworkBase.ts

@@ -1,4 +1,4 @@
-import { injectable } from 'inversify';
+import { injectable } from "inversify";
 
 @injectable()
 export abstract class FrameworkBase {
@@ -18,7 +18,11 @@ export abstract class FrameworkBase {
 
   constructor() {
     this.initialize?.();
-    // this.entry.evtMgr.register(FW.EventDefine.SystemEvent.SYSTEM_RESTART, this.onRestart, this);
+    this.entry.evtMgr.register(
+      FW.EventDefine.SystemEvent.SYSTEM_RESTART,
+      this.onRestart,
+      this
+    );
   }
 
   protected get moduleName(): string {
@@ -58,36 +62,39 @@ export abstract class FrameworkBase {
 
     if (tag !== FW.SystemDefine.FWBindTag.LOGIC) {
       this.logic = FW.Framework.getComponent<FW.Logic>(
-        `${bundleName}${FW.SystemDefine.FWBindTag.LOGIC}`,
+        `${bundleName}${FW.SystemDefine.FWBindTag.LOGIC}`
       );
     }
 
     if (tag !== FW.SystemDefine.FWBindTag.DATA) {
       this.data = FW.Framework.getComponent<FW.Data>(
-        `${bundleName}${FW.SystemDefine.FWBindTag.DATA}`,
+        `${bundleName}${FW.SystemDefine.FWBindTag.DATA}`
       );
     }
 
     if (tag !== FW.SystemDefine.FWBindTag.CONFIG) {
       this.config = FW.Framework.getComponent<FW.AssetConfig>(
-        `${bundleName}${FW.SystemDefine.FWBindTag.CONFIG}`,
+        `${bundleName}${FW.SystemDefine.FWBindTag.CONFIG}`
       );
     }
 
     if (tag !== FW.SystemDefine.FWBindTag.SENDER) {
       this.sender = FW.Framework.getComponent<FW.Sender>(
-        `${bundleName}${FW.SystemDefine.FWBindTag.SENDER}`,
+        `${bundleName}${FW.SystemDefine.FWBindTag.SENDER}`
       );
     }
 
     if (tag !== FW.SystemDefine.FWBindTag.HANDLE) {
       this.handle = FW.Framework.getComponent<FW.Handle>(
-        `${bundleName}${FW.SystemDefine.FWBindTag.HANDLE}`,
+        `${bundleName}${FW.SystemDefine.FWBindTag.HANDLE}`
       );
     }
   }
 
-  protected async invoke<T>(operation: Promise<T>, operationName: string = 'unknown'): Promise<T> {
+  protected async invoke<T>(
+    operation: Promise<T>,
+    operationName: string = "unknown"
+  ): Promise<T> {
     const startTime = this.getCurrentTime();
 
     try {
@@ -101,16 +108,25 @@ export abstract class FrameworkBase {
     }
   }
 
-  private recordPerformanceMetric(operationName: string, duration: number): void {
+  private recordPerformanceMetric(
+    operationName: string,
+    duration: number
+  ): void {
     if (FW.Entry.performanceMgr) {
-      FW.Entry.performanceMgr.recordOperationMetric(this.moduleName, operationName, duration);
+      FW.Entry.performanceMgr.recordOperationMetric(
+        this.moduleName,
+        operationName,
+        duration
+      );
     }
 
     const shouldWarn = duration > 1000;
 
     if (FW.Entry.engineMgr.debug || shouldWarn) {
       const log = shouldWarn ? FW.Log.warn : FW.Log.debug;
-      log(`[${this.moduleName?.toUpperCase()}] Operation ${operationName} took ${duration}ms`);
+      log(
+        `[${this.moduleName?.toUpperCase()}] Operation ${operationName} took ${duration}ms`
+      );
     }
   }
 
@@ -143,7 +159,10 @@ export abstract class FrameworkBase {
     return undefined;
   }
 
-  private doesClassNameContainBundleName(className: string, bundleName: string): boolean {
+  private doesClassNameContainBundleName(
+    className: string,
+    bundleName: string
+  ): boolean {
     const bundleNameLower = bundleName.toLowerCase();
     const classNameLower = className.toLowerCase();
     return classNameLower.includes(bundleNameLower);
@@ -151,13 +170,13 @@ export abstract class FrameworkBase {
 
   private getClassTag(): FW.SystemDefine.FWBindTag {
     const className = this.moduleName;
-    if (className.endsWith('Logic')) return FW.SystemDefine.FWBindTag.LOGIC;
-    if (className.endsWith('Data')) return FW.SystemDefine.FWBindTag.DATA;
-    if (className.endsWith('Config') || className.endsWith('AssetConfig'))
+    if (className.endsWith("Logic")) return FW.SystemDefine.FWBindTag.LOGIC;
+    if (className.endsWith("Data")) return FW.SystemDefine.FWBindTag.DATA;
+    if (className.endsWith("Config") || className.endsWith("AssetConfig"))
       return FW.SystemDefine.FWBindTag.CONFIG;
-    if (className.endsWith('Sender') || className.endsWith('SocketSender'))
+    if (className.endsWith("Sender") || className.endsWith("SocketSender"))
       return FW.SystemDefine.FWBindTag.SENDER;
-    if (className.endsWith('Handle') || className.endsWith('SocketHandle'))
+    if (className.endsWith("Handle") || className.endsWith("SocketHandle"))
       return FW.SystemDefine.FWBindTag.HANDLE;
     return;
   }

package/entry/FWEntry.ts

@@ -1,22 +1,21 @@
-import FWUiManager from '../manager/FWUiManager';
-import FWAnimationManager from '../manager/FWAnimationManager';
-import FWAudioManager from '../manager/FWAudioManager';
-import FWComponentManager from '../manager/FWComponentManager';
-import FWEventManager from '../manager/FWEventManager';
-import FWLanguageManager from '../manager/FWLanguageManager';
-import { FWLayerManager } from '../manager/FWLayerManager';
-import FWObjectManager from '../manager/FWObjectManager';
-import { FWResManager } from '../manager/FWResManager';
-import FWSocketManager from '../manager/FWSocketManager';
-import { FWStateManager } from '../manager/FWStateManager';
-import { FWTimeManager } from '../manager/FWTimeManager';
-import FWScene from '../scene/FWScene';
-import { FWSocketAutoProcessPause } from '../expand/FWDecorator';
-import FWTaskManager from '../manager/FWTaskManager';
-import FWEngineManager from '../manager/FWEngineManager';
-import FWHotUpdateManager from '../manager/FWHotUpdateManager';
-import FWPromiseManager from '../manager/FWPromiseManager';
-import { FWPerformanceManager } from '../manager/FWPerformanceManager';
+import FWUiManager from "../manager/FWUiManager";
+import FWAnimationManager from "../manager/FWAnimationManager";
+import FWAudioManager from "../manager/FWAudioManager";
+import FWComponentManager from "../manager/FWComponentManager";
+import FWEventManager from "../manager/FWEventManager";
+import FWLanguageManager from "../manager/FWLanguageManager";
+import { FWLayerManager } from "../manager/FWLayerManager";
+import FWObjectManager from "../manager/FWObjectManager";
+import { FWResManager } from "../manager/FWResManager";
+import FWSocketManager from "../manager/FWSocketManager";
+import { FWStateManager } from "../manager/FWStateManager";
+import { FWTimeManager } from "../manager/FWTimeManager";
+import { FWSocketAutoProcessPause } from "../expand/FWDecorator";
+import FWTaskManager from "../manager/FWTaskManager";
+import FWEngineManager from "../manager/FWEngineManager";
+import FWHotUpdateManager from "../manager/FWHotUpdateManager";
+import FWPromiseManager from "../manager/FWPromiseManager";
+import { FWPerformanceManager } from "../manager/FWPerformanceManager";
 
 /**
  * 入口脚本
@@ -94,7 +93,7 @@ export class FWEntry implements FW.Entry {
   /**
    * 当前Scene
    */
-  scene: FWScene;
+  scene: FW.Scene;
   /**
    * bundle名字
    */
@@ -140,10 +139,10 @@ export class FWEntry implements FW.Entry {
     if (!this.hasSceneName(name)) {
       try {
         cc.director.loadScene(name);
-        this.bundleName = '';
+        this.bundleName = "";
         return;
       } catch (e) {
-        FW.Log.error('launchScene failed:', name);
+        FW.Log.error("launchScene failed:", name);
       }
     }
 
@@ -202,11 +201,13 @@ export class FWEntry implements FW.Entry {
     return this.map.get(this.bundleName)?.sceneName || undefined;
   }
 
-  getComponent: <T>(serviceIdentifier: FW.ServiceIdentifier<T>) => T = (serviceIdentifier) =>
-    FW.Framework.getComponent(serviceIdentifier);
+  getComponent: <T>(serviceIdentifier: FW.ServiceIdentifier<T>) => T = (
+    serviceIdentifier
+  ) => FW.Framework.getComponent(serviceIdentifier);
 
-  getComponents: <T>(serviceIdentifier?: FW.ServiceIdentifier<T>) => T[] = (serviceIdentifier) =>
-    FW.Framework.getComponents(serviceIdentifier);
+  getComponents: <T>(serviceIdentifier?: FW.ServiceIdentifier<T>) => T[] = (
+    serviceIdentifier
+  ) => FW.Framework.getComponents(serviceIdentifier);
 
   update(dt: number) {
     this.timeMgr?.onUpdate(dt);

package/manager/FWAssetManager.ts

@@ -1,5 +1,5 @@
-import { FWSystemConfig } from '../config/FWSystemConfig';
-import { FWManager } from './FWManager';
+import { FWSystemConfig } from "../config/FWSystemConfig";
+import { FWManager } from "./FWManager";
 
 /**
  * 资源数据
@@ -47,7 +47,7 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
           const img = data.img;
           const ske = data.ske;
           const atlas = data.atlas;
-          const type = bin ? '.bin' : '.txt';
+          const type = bin ? ".bin" : ".txt";
           cc.assetManager.loadAny(
             [
               { url: atlas, ext: type },
@@ -59,34 +59,38 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
               asset.skeletonJson = assets[1];
               asset.atlasText = assets[0];
               asset.textures.push(texture);
-              asset['textureNames'] = [`${img}.png`];
-              asset['_uuid'] = ske;
+              asset["textureNames"] = [`${img}.png`];
+              asset["_uuid"] = ske;
               resolve(asset);
-            },
+            }
           );
-        }, FWSystemConfig.PromiseConfig.loadAsset).promise,
+        }, FWSystemConfig.PromiseConfig.loadAsset).promise
       );
     } catch (e) {
-      FW.Log.error('从远程加载spine动画资源失败!');
+      FW.Log.error("从远程加载spine动画资源失败!");
     }
   }
 
   /** 加载远程资源 */
   async loadRemote<T extends cc.Asset = cc.Asset>(
     url?: string,
-    cb?: (asset: cc.Asset) => void,
+    cb?: (asset: cc.Asset) => void
   ): Promise<T> {
     return await this.invoke(
       FW.Entry.promiseMgr.execute((resolve, reject, signal) => {
-        cc.assetManager.loadRemote(url, { cacheEnabled: true, maxRetryCount: 3 }, (err, asset) => {
-          if (err || !asset) {
-            reject(err);
+        cc.assetManager.loadRemote(
+          url,
+          { cacheEnabled: true, maxRetryCount: 3 },
+          (err, asset) => {
+            if (err || !asset) {
+              reject(err);
+            }
+            cb?.(asset as T);
+            resolve(asset as T);
           }
-          cb?.(asset as T);
-          resolve(asset as T);
-        });
+        );
       }, FWSystemConfig.PromiseConfig.loadAsset).promise,
-      `loadAssets -> ${url}`,
+      `loadAssets -> ${url}`
     );
   }
 
@@ -96,7 +100,9 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
       return undefined;
     }
 
-    const propertys = Array.isArray(assetProperty) ? assetProperty : [assetProperty];
+    const propertys = Array.isArray(assetProperty)
+      ? assetProperty
+      : [assetProperty];
 
     await Promise.all(
       propertys.map(async (property) => {
@@ -105,17 +111,19 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
         const path = property.path;
         const progress = property.progress;
 
-        if (!bundleName || bundleName === '') {
+        if (!bundleName || bundleName === "") {
           FW.Log.error(`找不到bundle${bundleName},或者bundle未加载!`);
           return undefined;
         }
 
-        if (!path || path === '') {
+        if (!path || path === "") {
           FW.Log.error(`找不到资源路径${path},请检查!`);
           return undefined;
         }
 
-        let bundle: cc.AssetManager.Bundle = await this.resMgr.loadBundle(bundleName);
+        let bundle: cc.AssetManager.Bundle = await this.resMgr.loadBundle(
+          bundleName
+        );
 
         if (!bundle) {
           FW.Log.error(`加载bundle失败,请检查!`);
@@ -127,20 +135,24 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
             bundle.preload(
               path,
               type,
-              (finish: number, total: number, item: cc.AssetManager.RequestItem) => {
+              (
+                finish: number,
+                total: number,
+                item: cc.AssetManager.RequestItem
+              ) => {
                 progress?.(finish, total, item);
               },
               (err: Error, item: cc.AssetManager.RequestItem[]) => {
                 if (err || !item || item?.length == 0) {
-                  reject(err || 'preload failed!');
+                  reject(err || "preload failed!");
                 }
                 resolve(item);
-              },
+              }
             );
           }, FWSystemConfig.PromiseConfig.loadAsset).promise,
-          `preLoadAssets -> ${property.path}`,
+          `preLoadAssets -> ${property.path}`
         );
-      }),
+      })
     );
   }
 
@@ -161,17 +173,19 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
     const progress = assetProperty.progress;
     const autoRelease = assetProperty.autoRelease;
 
-    if (!bundleName || bundleName === '') {
+    if (!bundleName || bundleName === "") {
       FW.Log.error(`找不到bundle${bundleName},或者bundle未加载!`);
       return undefined;
     }
 
-    if (!path || path === '') {
+    if (!path || path === "") {
       FW.Log.error(`找不到资源路径${path},请检查!`);
       return undefined;
     }
 
-    let bundle: cc.AssetManager.Bundle = await this.resMgr.loadBundle(bundleName);
+    let bundle: cc.AssetManager.Bundle = await this.resMgr.loadBundle(
+      bundleName
+    );
 
     if (!bundle) {
       FW.Log.error(`加载bundle失败,请检查!`);
@@ -195,7 +209,11 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
         bundle.load(
           path,
           type,
-          (finish: number, total: number, item: cc.AssetManager.RequestItem) => {
+          (
+            finish: number,
+            total: number,
+            item: cc.AssetManager.RequestItem
+          ) => {
             progress?.(finish, total, item);
           },
           (err: Error, asset: cc.Asset) => {
@@ -205,7 +223,7 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
             }
             assetData.loaded = true;
             assetData.dependentBundle = bundleName;
-            assetData.uuid = asset['_uuid'];
+            assetData.uuid = asset["_uuid"];
             assetData.autoRelease = autoRelease;
             assetData.asset = asset;
             assetData.user = assetProperty.user;
@@ -216,10 +234,10 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
 
             cb?.(assetData);
             resolve(assetData);
-          },
+          }
         );
       }, FWSystemConfig.PromiseConfig.loadAsset).promise,
-      `loadAssets -> ${assetProperty.path}`,
+      `loadAssets -> ${assetProperty.path}`
     );
   }
   /**
@@ -238,17 +256,19 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
     const cb = assetProperty.cb;
     const autoRelease = assetProperty.autoRelease;
 
-    if (!bundleName || bundleName === '') {
+    if (!bundleName || bundleName === "") {
       FW.Log.error(`找不到bundle${bundleName},或者bundle未加载!`);
       return undefined;
     }
 
-    if (!path || path === '') {
+    if (!path || path === "") {
       FW.Log.error(`找不到资源路径${path},请检查!`);
       return undefined;
     }
 
-    const bundle: cc.AssetManager.Bundle = await this.resMgr.loadBundle(bundleName);
+    const bundle: cc.AssetManager.Bundle = await this.resMgr.loadBundle(
+      bundleName
+    );
 
     if (!bundle) {
       FW.Log.error(`加载bundle失败,请检查!`);
@@ -258,7 +278,7 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
     return new Promise(
       (
         resolve: (value: FW.AssetData[] | PromiseLike<FW.AssetData[]>) => void,
-        reject: (reason?: any) => void,
+        reject: (reason?: any) => void
       ) => {
         bundle.loadDir(path, type, (err: Error, assets: cc.Asset[]) => {
           if (err || assets.length === 0) {
@@ -272,7 +292,7 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
             const assetData = new FWAssetData();
             assetData.loaded = true;
             assetData.dependentBundle = bundleName;
-            assetData.uuid = asset['_uuid'];
+            assetData.uuid = asset["_uuid"];
             assetData.autoRelease = autoRelease;
             assetData.asset = asset;
             assetData.type = type;
@@ -281,7 +301,7 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
             const key = `${this.createAssetMapKey({
               bundle: bundleName,
               path: path,
-            })}/${asset.name}${type ? `_${type?.name}` : ''}`;
+            })}/${asset.name}${type ? `_${type?.name}` : ""}`;
 
             this.assetsMap.set(key, assetData);
 
@@ -291,7 +311,7 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
           cb?.(assetDataList);
           resolve(assetDataList);
         });
-      },
+      }
     );
   }
 
@@ -308,18 +328,18 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
     const bundleName = assetProperty.bundle || FW.Entry.bundleName;
     const path = assetProperty.path;
 
-    if (!bundleName || bundleName === '') {
+    if (!bundleName || bundleName === "") {
       FW.Log.error(`找不到bundle${bundleName},或者bundle未加载!`);
       return undefined;
     }
 
-    if (!path || path === '') {
+    if (!path || path === "") {
       FW.Log.error(`找不到资源路径${path},请检查!`);
       return undefined;
     }
 
     if (!this.has(assetProperty)) {
-      FW.Log.error('获取资源失败,请先加载!');
+      FW.Log.error("获取资源失败,请先加载!");
       return undefined;
     }
 
@@ -343,12 +363,12 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
     const path = assetProperty.path;
     const autoRelease = assetProperty.autoRelease;
 
-    if (!bundleName || bundleName === '') {
+    if (!bundleName || bundleName === "") {
       FW.Log.error(`找不到bundle${bundleName},或者bundle未加载!`);
       return undefined;
     }
 
-    if (!path || path === '') {
+    if (!path || path === "") {
       FW.Log.error(`找不到资源路径${path},请检查!`);
       return undefined;
     }
@@ -401,9 +421,6 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
   }
 
   public onDestroy(): void {
-    this.assetsMap.forEach((v) => {
-      this.release(v.assetProperty);
-    });
     this.assetsMap.clear();
   }
 }

package/manager/FWBundleManager.ts

@@ -1,5 +1,5 @@
-import { FWManager } from './FWManager';
-import { FWSystemConfig } from '../config/FWSystemConfig';
+import { FWManager } from "./FWManager";
+import { FWSystemConfig } from "../config/FWSystemConfig";
 
 export class FWBundleManager extends FWManager implements FW.BundleManager {
   bundleMap: Map<string, cc.AssetManager.Bundle>;
@@ -33,12 +33,12 @@ export class FWBundleManager extends FWManager implements FW.BundleManager {
     return await this.invoke(
       FW.Entry.promiseMgr.execute((resolve, reject, signal) => {
         const remote = this.remoteBundleConfigMap.get(bundleName);
-        const url = remote ? remote.url : '';
+        const url = remote ? remote.url : "";
         const path = `${url}${bundleName}`;
         cc.assetManager.loadBundle(
           path,
           {
-            version: this.remoteBundleConfigMap.get(bundleName)?.version || '',
+            version: this.remoteBundleConfigMap.get(bundleName)?.version || "",
           },
           async (err: Error, bundle: cc.AssetManager.Bundle) => {
             if (err || !bundle) {
@@ -51,10 +51,10 @@ export class FWBundleManager extends FWManager implements FW.BundleManager {
             this.bundleMap.set(bundleName, bundle);
 
             resolve(bundle);
-          },
+          }
         );
       }, FWSystemConfig.PromiseConfig.loadBundle).promise,
-      `loadBundle -> ${bundleName}`,
+      `loadBundle -> ${bundleName}`
     );
   }
 
@@ -65,7 +65,7 @@ export class FWBundleManager extends FWManager implements FW.BundleManager {
    */
   get(bundleName: string): cc.AssetManager.Bundle {
     if (!this.has(bundleName)) {
-      FW.Log.error('获取bundle失败,请先加载!');
+      FW.Log.error("获取bundle失败,请先加载!");
       return undefined;
     }
     return this.bundleMap.get(bundleName);
@@ -92,9 +92,6 @@ export class FWBundleManager extends FWManager implements FW.BundleManager {
   }
 
   public onDestroy(): void {
-    this.bundleMap.forEach((bundle) => {
-      cc.assetManager.removeBundle(bundle);
-    });
     this.bundleMap.clear();
   }
 }

package/manager/FWResManager.ts

@@ -1,9 +1,8 @@
-import FWAssetConfig from '../config/FWAssetConfig';
-import { FWSystemConfig } from '../config/FWSystemConfig';
-import { FWLodash } from '../utils/FWLodash';
-import { FWAssetManager } from './FWAssetManager';
-import { FWBundleManager } from './FWBundleManager';
-import { FWManager } from './FWManager';
+import { FWSystemConfig } from "../config/FWSystemConfig";
+import { FWLodash } from "../utils/FWLodash";
+import { FWAssetManager } from "./FWAssetManager";
+import { FWBundleManager } from "./FWBundleManager";
+import { FWManager } from "./FWManager";
 
 export class FWResManager extends FWManager implements FW.ResManager {
   private bundleMgr: FW.BundleManager;
@@ -31,8 +30,8 @@ export class FWResManager extends FWManager implements FW.ResManager {
 
               await this.loadBundle(depend);
 
-              const config = FW.Entry.getComponent<FWAssetConfig>(
-                `${depend}${FW.SystemDefine.FWBindTag.CONFIG}`,
+              const config = FW.Entry.getComponent<FW.AssetConfig>(
+                `${depend}${FW.SystemDefine.FWBindTag.CONFIG}`
               );
               if (!config) continue;
               const preLoad = config.preLoad;
@@ -68,7 +67,7 @@ export class FWResManager extends FWManager implements FW.ResManager {
           reject(e);
         }
       }, FWSystemConfig.PromiseConfig.loadBundle).promise,
-      `loadBundle -> ${bundleName}`,
+      `loadBundle -> ${bundleName}`
     );
   }
   /**
@@ -85,7 +84,10 @@ export class FWResManager extends FWManager implements FW.ResManager {
     return await this.assetMgr.loadSpineDataFromRemote(data);
   }
 
-  async loadRemote<T extends cc.Asset = cc.Asset>(url: string, cb: (asset: any) => T): Promise<T> {
+  async loadRemote<T extends cc.Asset = cc.Asset>(
+    url: string,
+    cb: (asset: any) => T
+  ): Promise<T> {
     const asset = await this.assetMgr.loadRemote(url);
     if (asset instanceof cc.Texture2D) {
       return new cc.SpriteFrame(asset) as unknown as T;
@@ -132,7 +134,9 @@ export class FWResManager extends FWManager implements FW.ResManager {
    * @param assetProperty
    * @returns
    */
-  async loadAsset<T extends cc.Asset>(assetProperty: FW.AssetProperty): Promise<T> {
+  async loadAsset<T extends cc.Asset>(
+    assetProperty: FW.AssetProperty
+  ): Promise<T> {
     const res = await this.assetMgr.load(assetProperty);
     return this.process<T>(res).asset as T;
   }
@@ -222,5 +226,6 @@ export class FWResManager extends FWManager implements FW.ResManager {
   public onDestroy(): void {
     this.assetMgr.onDestroy();
     this.bundleMgr.onDestroy();
+    cc.assetManager.releaseAll();
   }
 }

package/package.json

@@ -1,9 +1,11 @@
 {
   "name": "@ives_xxz/framework",
-  "version": "2.0.4",
+  "version": "2.0.6",
   "description": "cocoscreator 2.x mvc framework",
   "main": "index.js",
-  "keywords": ["123456"],
+  "keywords": [
+    "123456"
+  ],
   "author": "ives",
   "license": "ISC"
 }

package/types/FW.d.ts

@@ -8,13 +8,18 @@ declare namespace FW {
     prototype: T;
   };
 
-  type ServiceIdentifierData<TInstance = unknown> = string | symbol | Newable<TInstance> | Function;
-
-  type CommonNewable<TInstance = unknown, TArgs extends unknown[] = any[]> = Newable<
-    TInstance,
-    TArgs
-  >;
-  type CommonServiceIdentifier<TInstance = unknown> = ServiceIdentifierData<TInstance>;
+  type ServiceIdentifierData<TInstance = unknown> =
+    | string
+    | symbol
+    | Newable<TInstance>
+    | Function;
+
+  type CommonNewable<
+    TInstance = unknown,
+    TArgs extends unknown[] = any[]
+  > = Newable<TInstance, TArgs>;
+  type CommonServiceIdentifier<TInstance = unknown> =
+    ServiceIdentifierData<TInstance>;
 
   type ServiceIdentifier<T = unknown> = CommonServiceIdentifier<T>;
   /**
@@ -60,13 +65,13 @@ declare namespace FW {
         resolve: (value: T | PromiseLike<T>) => void,
         reject: (reason?: any) => void,
         signal?: AbortSignal,
-        reason?: any,
+        reason?: any
       ) => void = PromiseExcutor,
-      options: PromiseExecuteOptions = {},
+      options: PromiseExecuteOptions = {}
     ): PromiseProxy<T>;
     all<T = any>(
       promises: FW.PromiseProxy<T>[],
-      options: FW.PromiseExecuteOptions = {},
+      options: FW.PromiseExecuteOptions = {}
     ): FW.PromiseProxy<FW.PromiseResult<T>>;
   };
 
@@ -74,18 +79,22 @@ declare namespace FW {
     registerLanguagePackageEnum(
       bundleName: string,
       language: any,
-      getter: (key: string, language?: string) => string,
+      getter: (key: string, language?: string) => string
     ): void;
     getSupportedLanguages(): string[];
     setSupportedLanguages(languages: string[]): void;
     getBundles(): string[];
     getLanguage(): string;
     getLanguageIndex(): number;
-    getLanguagePackageValue(bundleName: string, key: string, language?: string): string;
+    getLanguagePackageValue(
+      bundleName: string,
+      key: string,
+      language?: string
+    ): string;
     getLanguagePackageEnumKeys(bundleName: string): string[];
     getLanguagePackageEnumValues(bundleName: string): string[];
     getLanguagePackageEnum<K extends keyof ILanguageBundleAccessor>(
-      bundleName: K,
+      bundleName: K
     ): ILanguageBundleAccessor[K];
     initializeLanguage(language: string);
   };
@@ -103,32 +112,32 @@ declare namespace FW {
     createObjectPool<T extends FWObject = FWObject>(
       node: cc.Node,
       parent: cc.Node,
-      tag?: string,
+      tag?: string
     ): Promise<ObjectPool<T>>;
     createObjectPool<T extends FWObject = FWObject>(
       prefab: cc.Prefab,
       parent: cc.Node,
-      tag?: string,
+      tag?: string
     ): Promise<ObjectPool<T>>;
     createObjectPool<T extends FWObject = FWObject>(
       assetProperty: FW.AssetProperty,
       parent: cc.Node,
-      tag?: string,
+      tag?: string
     ): Promise<ObjectPool<T>>;
     createObjectPool<T extends FWObject = FWObject>(
       node: cc.Node,
       parent: cc.Node,
-      type?: number,
+      type?: number
     ): Promise<ObjectPool<T>>;
     createObjectPool<T extends FWObject = FWObject>(
       prefab: cc.Prefab,
       parent: cc.Node,
-      type?: number,
+      type?: number
     ): Promise<ObjectPool<T>>;
     createObjectPool<T extends FWObject = FWObject>(
       assetProperty: FW.AssetProperty,
       parent: cc.Node,
-      type?: number,
+      type?: number
     ): Promise<ObjectPool<T>>;
     /** 获取已经创建的对象池 */
     getObjectPool(tag: string): ObjectPool;
@@ -161,7 +170,7 @@ declare namespace FW {
       address: string,
       sender: Sender,
       handle: Handle,
-      config: SocketConfig,
+      config: SocketConfig
     ): Promise<Socket>;
     /**
      * 获取socket
@@ -257,7 +266,7 @@ declare namespace FW {
       tag: string,
       sender: Sender,
       handle: SocketHandle,
-      config: SocketConfig,
+      config: SocketConfig
     ): SocketPromiseProxy;
   };
 
@@ -292,7 +301,7 @@ declare namespace FW {
       args7?: FW.EventManagerArgs,
       args8?: FW.EventManagerArgs,
       args9?: FW.EventManagerArgs,
-      args10?: FW.EventManagerArgs,
+      args10?: FW.EventManagerArgs
     );
     /**
      * 比较目标
@@ -353,19 +362,35 @@ declare namespace FW {
     /**
      * 一次性调度器
      */
-    scheduleOnce(cb?: () => void, time?: number, tag?: string): FW.TimerSchedule;
+    scheduleOnce(
+      cb?: () => void,
+      time?: number,
+      tag?: string
+    ): FW.TimerSchedule;
     /**
      * 一次性调度器
      */
-    scheduleOnce(time?: number, cb?: () => void, tag?: string): FW.TimerSchedule;
+    scheduleOnce(
+      time?: number,
+      cb?: () => void,
+      tag?: string
+    ): FW.TimerSchedule;
     /**
      * 一次性调度器
      */
-    scheduleOnce(time?: number, cb?: () => void, target?: any): FW.TimerSchedule;
+    scheduleOnce(
+      time?: number,
+      cb?: () => void,
+      target?: any
+    ): FW.TimerSchedule;
     /**
      * 一次性调度器
      */
-    scheduleOnce(cb?: () => void, time?: number, target?: any): FW.TimerSchedule;
+    scheduleOnce(
+      cb?: () => void,
+      time?: number,
+      target?: any
+    ): FW.TimerSchedule;
     /**
      * 自定义调度器
      * */
@@ -374,7 +399,7 @@ declare namespace FW {
       time?: number,
       repeat?: number,
       target?: TargetType,
-      tag?: string,
+      tag?: string
     ): TimerSchedule;
     /** 暂停调度器 */
     pauseSchedule(tag: string): void;
@@ -425,13 +450,13 @@ declare namespace FW {
         args7?: EventManagerArgs,
         args8?: EventManagerArgs,
         args9?: EventManagerArgs,
-        args10?: EventManagerArgs,
+        args10?: EventManagerArgs
       ) => void,
       target: TargetType,
       options?: {
         priority?: FW.SystemDefine.FWPriorityOrder;
         intercept?: boolean;
-      },
+      }
     );
 
     registerOnce(
@@ -446,13 +471,13 @@ declare namespace FW {
         args7?: EventManagerArgs,
         args8?: EventManagerArgs,
         args9?: EventManagerArgs,
-        args10?: EventManagerArgs,
+        args10?: EventManagerArgs
       ) => void,
       target: TargetType,
       options?: {
         priority?: number;
         intercept?: boolean;
-      },
+      }
     ): void;
 
     /**
@@ -486,7 +511,7 @@ declare namespace FW {
       args7?: FW.EventManagerArgs,
       args8?: FW.EventManagerArgs,
       args9?: FW.EventManagerArgs,
-      args10?: FW.EventManagerArgs,
+      args10?: FW.EventManagerArgs
     ): void;
     /**
      * 注销事件
@@ -632,29 +657,37 @@ declare namespace FW {
      * @param data
      */
     openAsync<Ctr extends FW.LayerController = FWLayerController>(
-      data: LayerOpenArgs<Ctr>,
+      data: LayerOpenArgs<Ctr>
     ): Promise<Ctr>;
 
     /**
      * 同步打开layer
      * @param data
      */
-    openSync<Ctr extends FW.LayerController = FWLayerController>(data: LayerOpenArgs<Ctr>): Ctr;
+    openSync<Ctr extends FW.LayerController = FWLayerController>(
+      data: LayerOpenArgs<Ctr>
+    ): Ctr;
     /**
      * 显示常驻layer
      * @param layer
      */
-    displayLayer<Ctr extends FW.LayerController = FWLayerController>(ctr: Ctr): Ctr;
+    displayLayer<Ctr extends FW.LayerController = FWLayerController>(
+      ctr: Ctr
+    ): Ctr;
     /**
      * 隐藏常驻layer
      * @param layer
      */
-    hideLayer<Ctr extends FW.LayerController = FWLayerController>(ctr: Ctr): Ctr;
+    hideLayer<Ctr extends FW.LayerController = FWLayerController>(
+      ctr: Ctr
+    ): Ctr;
     /**
      * 关闭layer
      * @param layer
      */
-    close<Ctr extends FW.LayerController = FWLayerController>(ctr: Ctr): FWLayerController;
+    close<Ctr extends FW.LayerController = FWLayerController>(
+      ctr: Ctr
+    ): FWLayerController;
 
     /**
      * 从栈关闭
@@ -760,7 +793,10 @@ declare namespace FW {
      * @param url
      * @param cb
      */
-    loadRemote<T extends cc.Asset = cc.Asset>(url: string, cb?: (asset: cc.Asset) => T): Promise<T>;
+    loadRemote<T extends cc.Asset = cc.Asset>(
+      url: string,
+      cb?: (asset: cc.Asset) => T
+    ): Promise<T>;
     /**
      * 从远程加载spine动画
      * @param data
@@ -776,13 +812,18 @@ declare namespace FW {
      * 加载资源返回数据
      * @param assetProperty
      */
-    loadAssetData<T extends cc.Asset>(assetProperty: AssetProperty): Promise<AssetData>;
+    loadAssetData<T extends cc.Asset>(
+      assetProperty: AssetProperty
+    ): Promise<AssetData>;
 
     /**
      * 加载资源
      * @param assetProperty
      */
-    loadAsset<T extends cc.Asset>(assetProperty: AssetProperty, cb?: () => void): Promise<T>;
+    loadAsset<T extends cc.Asset>(
+      assetProperty: AssetProperty,
+      cb?: () => void
+    ): Promise<T>;
 
     /**
      * 获取资源
@@ -930,7 +971,10 @@ declare namespace FW {
      * @param url
      * @param cb
      */
-    loadRemote<T extends cc.Asset = cc.Asset>(url: string, cb?: (asset: cc.Asset) => T): Promise<T>;
+    loadRemote<T extends cc.Asset = cc.Asset>(
+      url: string,
+      cb?: (asset: cc.Asset) => T
+    ): Promise<T>;
     /**
      * 从远程加载spine动画
      * @param data
@@ -1133,7 +1177,7 @@ declare namespace FW {
      */
     register(
       state: FW.StateMachineRegisterArgs | FW.StateMachineRegisterArgs[],
-      stateMachineName?: string,
+      stateMachineName?: string
     );
     /**
      * 注销指定状态机的某个状态
@@ -1189,22 +1233,22 @@ declare namespace FW {
         progress: Function;
         easing: Function | String;
         onUpdate: Function;
-      }>,
+      }>
     >(
       duration: number,
       props: ConstructorType<T>,
-      opts?: OPTS,
+      opts?: OPTS
     ): FW.Tween;
     by<
       OPTS extends Partial<{
         progress: Function;
         easing: Function | String;
         onUpdate: Function;
-      }>,
+      }>
     >(
       duration: number,
       props: ConstructorType<T>,
-      opts?: OPTS,
+      opts?: OPTS
     ): FW.Tween;
     set(props: ConstructorType<T>): FW.Tween;
   };
@@ -1444,7 +1488,11 @@ declare namespace FW {
      * @param volume
      * @param loop
      */
-    playMusic(assetProperty: AssetProperty, volume?: number, loop?: boolean): void;
+    playMusic(
+      assetProperty: AssetProperty,
+      volume?: number,
+      loop?: boolean
+    ): void;
     /**
      * 停止背景音乐
      */
@@ -1473,21 +1521,36 @@ declare namespace FW {
      * @param volume
      * @param loop
      */
-    play(path: string, cb?: (id: number) => void, volume?: number, loop?: boolean);
+    play(
+      path: string,
+      cb?: (id: number) => void,
+      volume?: number,
+      loop?: boolean
+    );
     /**
      * 播放音效
      * @param audio
      * @param volume
      * @param loop
      */
-    play(audio: cc.AudioClip, cb?: (id: number) => void, volume?: number, loop?: boolean);
+    play(
+      audio: cc.AudioClip,
+      cb?: (id: number) => void,
+      volume?: number,
+      loop?: boolean
+    );
     /**
      * 播放音效
      * @param assetProperty
      * @param volume
      * @param loop
      */
-    play(assetProperty: AssetProperty, cb?: (id: number) => void, volume?: number, loop?: boolean);
+    play(
+      assetProperty: AssetProperty,
+      cb?: (id: number) => void,
+      volume?: number,
+      loop?: boolean
+    );
     /**
      * 暂停所有
      */
@@ -1508,7 +1571,11 @@ declare namespace FW {
   };
 
   type PerformanceManager = {
-    recordOperationMetric(manager: string, operation: string, duration: number): void;
+    recordOperationMetric(
+      manager: string,
+      operation: string,
+      duration: number
+    ): void;
     getModuleReport(manager: string): PerformanceReport;
     getAllReports(): Map<string, FW.PerformanceReport>;
   };
@@ -1807,7 +1874,7 @@ declare namespace FW {
     abort?: (reason?: any) => void;
     addAbortEventListener?: (
       listener: (this: AbortSignal, ev: Event) => any,
-      options?: boolean | AddEventListenerOptions,
+      options?: boolean | AddEventListenerOptions
     ) => void;
   };
 
@@ -1815,7 +1882,7 @@ declare namespace FW {
     resolve: (value: T | PromiseLike<T>) => void,
     reject: (reason?: any) => void,
     signal: AbortSignal,
-    reason?: any,
+    reason?: any
   ) => void;
 
   type PromiseExecuteOptions = {
@@ -1826,7 +1893,10 @@ declare namespace FW {
     retryCondition?: (error: any, retryCount: number) => boolean;
   };
 
-  type Promise = (resolve: (value: any) => void, reject: (reason?: any) => void) => void;
+  type Promise = (
+    resolve: (value: any) => void,
+    reject: (reason?: any) => void
+  ) => void;
 
   type PromiseResult<T = any> = {
     success: PromiseProxy<T>[];
@@ -1834,7 +1904,7 @@ declare namespace FW {
     cancelled: number[];
   };
 
-  type PromiseStatus = 'pending' | 'fulfilled' | 'rejected' | 'cancelled';
+  type PromiseStatus = "pending" | "fulfilled" | "rejected" | "cancelled";
 
   /**
    * 性能管理器配置
@@ -1882,7 +1952,7 @@ declare namespace FW {
   type PropertyDecorator = (
     $class: Record<string, any>,
     $propertyKey: string | symbol,
-    $descriptorOrInitializer?: any,
+    $descriptorOrInitializer?: any
   ) => void;
 
   declare function timeScale(scale: number);
@@ -1930,7 +2000,10 @@ declare namespace FW {
     public config?: FW.AssetConfig;
     public sender?: FW.Sender;
     public handle?: FW.Handle;
-    public invoke<T>(operation: Promise<T>, operationName: string = 'unknown'): Promise<T>;
+    public invoke<T>(
+      operation: Promise<T>,
+      operationName: string = "unknown"
+    ): Promise<T>;
     public getLogic<T extends FW.Logic = FWLogic>();
     public getData<T extends FW.Data = FWData>();
     public getSender<T extends FW.Sender>();
@@ -1988,10 +2061,10 @@ declare namespace FW {
     }
 
     export class FWTaskStatus {
-      static IDLE = 'IDLE';
-      static RUNNING = 'RUNNING';
-      static PAUSED = 'PAUSED';
-      static COMPLETED = 'COMPLETED';
+      static IDLE = "IDLE";
+      static RUNNING = "RUNNING";
+      static PAUSED = "PAUSED";
+      static COMPLETED = "COMPLETED";
     }
 
     export class FWPriorityOrder {
@@ -2035,17 +2108,17 @@ declare namespace FW {
      * HTTP请求类型
      */
     export class FWHttpRequestType {
-      static GET = 'GET';
-      static POST = 'POST';
+      static GET = "GET";
+      static POST = "POST";
     }
 
     /**
      * 动画机类型
      */
     export class FWAnimationMachineType {
-      static TWEEN = 'TWEEN';
-      static SKELETON = 'SKELETON';
-      static ANIMATION = 'ANIMATION';
+      static TWEEN = "TWEEN";
+      static SKELETON = "SKELETON";
+      static ANIMATION = "ANIMATION";
     }
 
     export class FWScrollViewTemplateType {
@@ -2066,23 +2139,23 @@ declare namespace FW {
     }
 
     export class FWLanguageAssetType {
-      static LABEL = 'label';
-      static SPRITE = 'sprite';
-      static SKELETON = 'skeleton';
+      static LABEL = "label";
+      static SPRITE = "sprite";
+      static SKELETON = "skeleton";
     }
 
     export class FWPromiseStatus {
-      static PENDING = 'pending';
-      static FULFILLED = 'fulfilled';
-      static REJECTED = 'rejected';
-      static CANCELLED = 'cancelled';
+      static PENDING = "pending";
+      static FULFILLED = "fulfilled";
+      static REJECTED = "rejected";
+      static CANCELLED = "cancelled";
     }
 
     export class FWLayerState {
-      static CLOSED = 'closed';
-      static OPENING = 'opening';
-      static OPENED = 'opened';
-      static CLOSING = 'closing';
+      static CLOSED = "closed";
+      static OPENING = "opening";
+      static OPENED = "opened";
+      static CLOSING = "closing";
     }
 
     export class FWAudioType {
@@ -2093,21 +2166,21 @@ declare namespace FW {
   namespace EventDefine {
     export class LanguageEvent {
       /** 语言变更 */
-      static LANGUAGE_CHANGE = 'LANGUAGE_CHANGE';
+      static LANGUAGE_CHANGE = "LANGUAGE_CHANGE";
     }
 
     export class TaskEvent {
-      static START = 'START';
-      static PROGRESS = 'PROGRESS';
-      static COMPLETE = 'COMPLETE';
-      static YIELDED = 'YIELDED';
-      static PAUSE = 'PAUSE';
-      static RESUME = 'RESUME';
-      static FRAME_START = 'FRAME_START';
-      static FRAME_END = 'FRAME_END';
-      static QUEUE = 'QUEUE';
-      static ALL_COMPLETE = 'ALL_COMPLETE';
-      static ERROR = 'ERROR';
+      static START = "START";
+      static PROGRESS = "PROGRESS";
+      static COMPLETE = "COMPLETE";
+      static YIELDED = "YIELDED";
+      static PAUSE = "PAUSE";
+      static RESUME = "RESUME";
+      static FRAME_START = "FRAME_START";
+      static FRAME_END = "FRAME_END";
+      static QUEUE = "QUEUE";
+      static ALL_COMPLETE = "ALL_COMPLETE";
+      static ERROR = "ERROR";
     }
 
     export class SystemEvent {
@@ -2115,8 +2188,8 @@ declare namespace FW {
     }
 
     export class CCEvent {
-      static ON_SHOW = 'ON_SHOW';
-      static ON_HIDE = 'ON_HIDE';
+      static ON_SHOW = "ON_SHOW";
+      static ON_HIDE = "ON_HIDE";
     }
   }
   export const SystemDefine: SystemDefine;
@@ -2170,6 +2243,19 @@ declare namespace FW {
     onDisable?();
     onDestroy?();
     onClose?();
+    cc(
+      target: cc.Node,
+      cb: (event: cc.Event) => void,
+      responseInterval?: number,
+      eventName?: string
+    ): this;
+
+    fw(
+      eventName: string,
+      cb: (event: cc.Event) => void,
+      target?: cc.Node,
+      responseInterval?: number
+    ): this;
 
     /**
      * 查找节点
@@ -2190,7 +2276,7 @@ declare namespace FW {
       referenceNode: cc.Node,
       type?: {
         prototype: T;
-      },
+      }
     ): T;
     registerEvent(args: RegisterArgs): void;
     unRegisterEvent(args: RegisterArgs);