@ives_xxz/framework 1.6.3 → 1.6.4

package/FW.d.ts

@@ -6,18 +6,13 @@ 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>;
   /**
@@ -63,13 +58,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>>;
   };
 
@@ -84,22 +79,18 @@ 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);
   };
@@ -159,32 +150,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;
@@ -217,7 +208,7 @@ declare namespace FW {
       address: string,
       sender: SocketSender,
       handle: SocketHandle,
-      config: SocketConfig
+      config: SocketConfig,
     ): Promise<Socket>;
     /**
      * 获取socket
@@ -313,7 +304,7 @@ declare namespace FW {
       tag: string,
       sender: SocketSender,
       handle: SocketHandle,
-      config: SocketConfig
+      config: SocketConfig,
     ): SocketPromiseProxy;
   };
 
@@ -348,7 +339,7 @@ declare namespace FW {
       args7?: FW.EventManagerArgs,
       args8?: FW.EventManagerArgs,
       args9?: FW.EventManagerArgs,
-      args10?: FW.EventManagerArgs
+      args10?: FW.EventManagerArgs,
     );
     /**
      * 比较目标
@@ -409,35 +400,19 @@ 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;
     /**
      * 自定义调度器
      * */
@@ -446,7 +421,7 @@ declare namespace FW {
       time?: number,
       repeat?: number,
       target?: TargetType,
-      tag?: string
+      tag?: string,
     ): TimerSchedule;
     /** 暂停调度器 */
     pauseSchedule(tag: string): void;
@@ -497,13 +472,13 @@ declare namespace FW {
         args7?: EventManagerArgs,
         args8?: EventManagerArgs,
         args9?: EventManagerArgs,
-        args10?: EventManagerArgs
+        args10?: EventManagerArgs,
       ) => void,
       target: TargetType,
       options?: {
         priority?: FWSystemDefine.FWPriorityOrder;
         intercept?: boolean;
-      }
+      },
     );
 
     registerOnce(
@@ -518,13 +493,13 @@ declare namespace FW {
         args7?: EventManagerArgs,
         args8?: EventManagerArgs,
         args9?: EventManagerArgs,
-        args10?: EventManagerArgs
+        args10?: EventManagerArgs,
       ) => void,
       target: TargetType,
       options?: {
         priority?: number;
         intercept?: boolean;
-      }
+      },
     ): void;
 
     /**
@@ -558,7 +533,7 @@ declare namespace FW {
       args7?: FW.EventManagerArgs,
       args8?: FW.EventManagerArgs,
       args9?: FW.EventManagerArgs,
-      args10?: FW.EventManagerArgs
+      args10?: FW.EventManagerArgs,
     ): void;
     /**
      * 注销事件
@@ -704,23 +679,19 @@ declare namespace FW {
      * @param data
      */
     openAsync<Ctr extends FWLayerController = FWLayerController>(
-      data: LayerOpenArgs<Ctr>
+      data: LayerOpenArgs<Ctr>,
     ): Promise<Ctr>;
 
     /**
      * 同步打开layer
      * @param data
      */
-    openSync<Ctr extends FWLayerController = FWLayerController>(
-      data: LayerOpenArgs<Ctr>
-    ): Ctr;
+    openSync<Ctr extends FWLayerController = FWLayerController>(data: LayerOpenArgs<Ctr>): Ctr;
     /**
      * 显示常驻layer
      * @param layer
      */
-    displayLayer<Ctr extends FWLayerController = FWLayerController>(
-      ctr: Ctr
-    ): Ctr;
+    displayLayer<Ctr extends FWLayerController = FWLayerController>(ctr: Ctr): Ctr;
     /**
      * 隐藏常驻layer
      * @param layer
@@ -730,9 +701,7 @@ declare namespace FW {
      * 关闭layer
      * @param layer
      */
-    close<Ctr extends FWLayerController = FWLayerController>(
-      ctr: Ctr
-    ): FWLayerController;
+    close<Ctr extends FWLayerController = FWLayerController>(ctr: Ctr): FWLayerController;
 
     /**
      * 从栈关闭
@@ -801,8 +770,6 @@ declare namespace FW {
   };
 
   type ResManager = {
-    assetMgr: AssetManager;
-    bundleMgr: BundleManager;
     initialize(): void;
     onDestroy(): void;
 
@@ -840,10 +807,7 @@ 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
@@ -859,18 +823,13 @@ 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>;
 
     /**
      * 获取资源
@@ -1018,10 +977,7 @@ 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
@@ -1137,7 +1093,7 @@ declare namespace FW {
       referenceNode: cc.Node,
       type?: {
         prototype: T;
-      }
+      },
     ): T;
     registerEvent(args: RegisterArgs): void;
     unRegisterEvent(args: RegisterArgs);
@@ -1314,7 +1270,7 @@ declare namespace FW {
      */
     register(
       state: FW.StateMachineRegisterArgs | FW.StateMachineRegisterArgs[],
-      stateMachineName?: string
+      stateMachineName?: string,
     );
     /**
      * 注销指定状态机的某个状态
@@ -1370,22 +1326,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;
   };
@@ -1630,11 +1586,7 @@ declare namespace FW {
      * @param volume
      * @param loop
      */
-    playMusic(
-      assetProperty: AssetProperty,
-      volume?: number,
-      loop?: boolean
-    ): void;
+    playMusic(assetProperty: AssetProperty, volume?: number, loop?: boolean): void;
     /**
      * 停止背景音乐
      */
@@ -1663,36 +1615,21 @@ 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);
     /**
      * 暂停所有
      */
@@ -1713,11 +1650,7 @@ 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>;
   };
@@ -2016,7 +1949,7 @@ declare namespace FW {
     abort?: (reason?: any) => void;
     addAbortEventListener?: (
       listener: (this: AbortSignal, ev: Event) => any,
-      options?: boolean | AddEventListenerOptions
+      options?: boolean | AddEventListenerOptions,
     ) => void;
   };
 
@@ -2024,7 +1957,7 @@ declare namespace FW {
     resolve: (value: T | PromiseLike<T>) => void,
     reject: (reason?: any) => void,
     signal: AbortSignal,
-    reason?: any
+    reason?: any,
   ) => void;
 
   type PromiseExecuteOptions = {
@@ -2035,10 +1968,7 @@ 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>[];
@@ -2046,7 +1976,7 @@ declare namespace FW {
     cancelled: number[];
   };
 
-  type PromiseStatus = "pending" | "fulfilled" | "rejected" | "cancelled";
+  type PromiseStatus = 'pending' | 'fulfilled' | 'rejected' | 'cancelled';
 
   /**
    * 性能管理器配置

package/config/FWSystemConfig.ts

@@ -11,13 +11,13 @@ export namespace FWSystemConfig {
 
   export const PromiseConfig = {
     loadAsset: {
-      retryCount: 3,
-      retryInterval: 5,
+      retryCount: 0,
+      retryInterval: 0,
       timeout: 10,
     },
     loadBundle: {
-      retryCount: 3,
-      retryInterval: 5,
+      retryCount: 0,
+      retryInterval: 0,
       timeout: 10,
     },
     http: {

package/manager/FWAssetManager.ts

@@ -1,6 +1,6 @@
-import { FWSystemConfig } from "../config/FWSystemConfig";
-import FWLog from "../log/FWLog";
-import { FWManager } from "./FWManager";
+import { FWSystemConfig } from '../config/FWSystemConfig';
+import FWLog from '../log/FWLog';
+import { FWManager } from './FWManager';
 
 /**
  * 资源数据
@@ -48,7 +48,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 },
@@ -60,38 +60,34 @@ 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) {
-      FWLog.error("从远程加载spine动画资源失败!");
+      FWLog.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);
-            }
-            cb?.(asset as T);
-            resolve(asset as T);
+        cc.assetManager.loadRemote(url, { cacheEnabled: true, maxRetryCount: 3 }, (err, asset) => {
+          if (err || !asset) {
+            reject(err);
           }
-        );
+          cb?.(asset as T);
+          resolve(asset as T);
+        });
       }, FWSystemConfig.PromiseConfig.loadAsset).promise,
-      `loadAssets -> ${url}`
+      `loadAssets -> ${url}`,
     );
   }
 
@@ -101,9 +97,7 @@ 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) => {
@@ -112,19 +106,17 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
         const path = property.path;
         const progress = property.progress;
 
-        if (!bundleName || bundleName === "") {
+        if (!bundleName || bundleName === '') {
           FWLog.error(`找不到bundle${bundleName},或者bundle未加载!`);
           return undefined;
         }
 
-        if (!path || path === "") {
+        if (!path || path === '') {
           FWLog.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) {
           FWLog.error(`加载bundle失败,请检查!`);
@@ -136,24 +128,20 @@ 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}`,
         );
-      })
+      }),
     );
   }
 
@@ -174,19 +162,17 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
     const progress = assetProperty.progress;
     const autoRelease = assetProperty.autoRelease;
 
-    if (!bundleName || bundleName === "") {
+    if (!bundleName || bundleName === '') {
       FWLog.error(`找不到bundle${bundleName},或者bundle未加载!`);
       return undefined;
     }
 
-    if (!path || path === "") {
+    if (!path || path === '') {
       FWLog.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) {
       FWLog.error(`加载bundle失败,请检查!`);
@@ -204,18 +190,13 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
 
     assetData.loaded = false;
 
-    return await this.invoke(
+    return this.invoke(
       FW.Entry.promiseMgr.execute((resolve, reject, signal) => {
         const self = this;
-
         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) => {
@@ -225,7 +206,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;
@@ -236,10 +217,10 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
 
             cb?.(assetData);
             resolve(assetData);
-          }
+          },
         );
       }, FWSystemConfig.PromiseConfig.loadAsset).promise,
-      `loadAssets -> ${assetProperty.path}`
+      `loadAssets -> ${assetProperty.path}`,
     );
   }
   /**
@@ -258,19 +239,17 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
     const cb = assetProperty.cb;
     const autoRelease = assetProperty.autoRelease;
 
-    if (!bundleName || bundleName === "") {
+    if (!bundleName || bundleName === '') {
       FWLog.error(`找不到bundle${bundleName},或者bundle未加载!`);
       return undefined;
     }
 
-    if (!path || path === "") {
+    if (!path || path === '') {
       FWLog.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) {
       FWLog.error(`加载bundle失败,请检查!`);
@@ -280,7 +259,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) {
@@ -294,7 +273,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;
@@ -303,7 +282,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);
 
@@ -313,7 +292,7 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
           cb?.(assetDataList);
           resolve(assetDataList);
         });
-      }
+      },
     );
   }
 
@@ -330,18 +309,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 === '') {
       FWLog.error(`找不到bundle${bundleName},或者bundle未加载!`);
       return undefined;
     }
 
-    if (!path || path === "") {
+    if (!path || path === '') {
       FWLog.error(`找不到资源路径${path},请检查!`);
       return undefined;
     }
 
     if (!this.has(assetProperty)) {
-      FWLog.error("获取资源失败,请先加载!");
+      FWLog.error('获取资源失败,请先加载!');
       return undefined;
     }
 
@@ -365,12 +344,12 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
     const path = assetProperty.path;
     const autoRelease = assetProperty.autoRelease;
 
-    if (!bundleName || bundleName === "") {
+    if (!bundleName || bundleName === '') {
       FWLog.error(`找不到bundle${bundleName},或者bundle未加载!`);
       return undefined;
     }
 
-    if (!path || path === "") {
+    if (!path || path === '') {
       FWLog.error(`找不到资源路径${path},请检查!`);
       return undefined;
     }

package/manager/FWPromiseManager.ts

@@ -1,11 +1,8 @@
-import { FWSystemDefine } from "../define/FWSystemDefine";
-import FWLog from "../log/FWLog";
-import { FWManager } from "./FWManager";
-
-export default class FWPromiseManager
-  extends FWManager
-  implements FW.PromiseManager
-{
+import { FWSystemDefine } from '../define/FWSystemDefine';
+import FWLog from '../log/FWLog';
+import { FWManager } from './FWManager';
+
+export default class FWPromiseManager extends FWManager implements FW.PromiseManager {
   private promiseRegistry: Map<number, FW.PromiseProxy>;
   private uniqueId: number = 0;
 
@@ -21,7 +18,7 @@ export default class FWPromiseManager
   /** 创建Promise执行器 */
   public execute<T = any>(
     executor: FW.PromiseExcutor<T>,
-    options: FW.PromiseExecuteOptions = {}
+    options: FW.PromiseExecuteOptions = {},
   ): FW.PromiseProxy<T> {
     const id = this.uniqueId++;
     const abortController = new AbortController();
@@ -34,18 +31,13 @@ export default class FWPromiseManager
       return new Promise<T>((resolve, reject) => {
         if (options.timeout && options.timeout > 0) {
           timerSchedule = FW.Entry.timeMgr.scheduleOnce(() => {
-            const timeoutError = new Error(
-              `Promise ${id} timeout after ${options.timeout} s`
-            );
+            const timeoutError = new Error(`Promise ${id} timeout after ${options.timeout} s`);
             if (
               retryCount < maxRetryTimes &&
-              (!options.retryCondition ||
-                options.retryCondition(timeoutError, retryCount))
+              (!options.retryCondition || options.retryCondition(timeoutError, retryCount))
             ) {
               retryCount++;
-              FWLog.debug(
-                `Promise ${id} timeout, retrying (${retryCount}/${maxRetryTimes})`
-              );
+              FWLog.debug(`Promise ${id} timeout, retrying (${retryCount}/${maxRetryTimes})`);
               if (retryInterval > 0) {
                 FW.Entry.timeMgr.scheduleOnce(() => {
                   createPromise().then(resolve, reject);
@@ -61,7 +53,7 @@ export default class FWPromiseManager
         }
 
         const onAbort = () => {
-          FWLog.debug("promise abort");
+          FWLog.debug('promise abort');
           timerSchedule?.unSchedule();
           if (promiseProxy.status === FWSystemDefine.FWPromiseStatus.PENDING) {
             promiseProxy.status = FWSystemDefine.FWPromiseStatus.CANCELLED;
@@ -74,11 +66,11 @@ export default class FWPromiseManager
           return;
         }
 
-        abortController.signal.addEventListener("abort", onAbort);
+        abortController.signal.addEventListener('abort', onAbort);
 
         const wrappedResolve = (value: T | PromiseLike<T>) => {
           promiseProxy.status = FWSystemDefine.FWPromiseStatus.FULFILLED;
-          abortController.signal.removeEventListener("abort", onAbort);
+          abortController.signal.removeEventListener('abort', onAbort);
           this.removePromise(id);
           timerSchedule?.unSchedule();
           resolve(value);
@@ -88,14 +80,10 @@ export default class FWPromiseManager
           timerSchedule?.unSchedule();
           if (
             retryCount < maxRetryTimes &&
-            (!options.retryCondition ||
-              options.retryCondition(reason, retryCount))
+            (!options.retryCondition || options.retryCondition(reason, retryCount))
           ) {
             retryCount++;
-            FWLog.debug(
-              `Promise ${id} failed, retrying (${retryCount}/${maxRetryTimes}):`,
-              reason
-            );
+            FWLog.debug(`Promise ${id} failed, retrying (${retryCount}/${maxRetryTimes}):`, reason);
             if (retryInterval > 0) {
               FW.Entry.timeMgr.scheduleOnce(() => {
                 createPromise().then(resolve, reject);
@@ -104,29 +92,18 @@ export default class FWPromiseManager
               createPromise().then(resolve, reject);
             }
           } else {
-            if (
-              promiseProxy.status === FWSystemDefine.FWPromiseStatus.PENDING
-            ) {
-              promiseProxy.status = FWSystemDefine.FWPromiseStatus.REJECTED;
-              abortController.signal.removeEventListener("abort", onAbort);
-              this.removePromise(id);
-              reject(reason);
-            }
+            abortController.signal.removeEventListener('abort', onAbort);
+            this.removePromise(id);
+            reject(reason);
           }
         };
         try {
-          executor(
-            wrappedResolve,
-            wrappedReject,
-            abortController.signal,
-            options.reason
-          );
+          executor(wrappedResolve, wrappedReject, abortController.signal, options.reason);
         } catch (error) {
           wrappedReject(error);
         }
       });
     };
-
     const promise = createPromise();
     const promiseProxy: FW.PromiseProxy<T> = {
       id,
@@ -135,19 +112,18 @@ export default class FWPromiseManager
       abortController,
       abort: (reason?: any) => {
         if (promiseProxy.status === FWSystemDefine.FWPromiseStatus.PENDING) {
-          FWLog.debug(reason || "promise cancelled");
+          FWLog.debug(reason || 'promise cancelled');
           abortController.abort(reason);
         }
       },
 
       addAbortEventListener: (
         listener: (this: AbortSignal, ev: Event) => any,
-        options?: boolean | AddEventListenerOptions
+        options?: boolean | AddEventListenerOptions,
       ) => {
-        abortController.signal.addEventListener("abort", listener, options);
+        abortController.signal.addEventListener('abort', listener, options);
       },
     };
-
     this.promiseRegistry.set(id, promiseProxy);
     return promiseProxy;
   }
@@ -155,7 +131,7 @@ export default class FWPromiseManager
   /** 批量执行Promise并等待所有完成 */
   public all<T = any>(
     promises: FW.PromiseProxy<T>[],
-    options: FW.PromiseExecuteOptions = {}
+    options: FW.PromiseExecuteOptions = {},
   ): FW.PromiseProxy<FW.PromiseResult<T>> {
     const id = this.uniqueId++;
     const abortController = new AbortController();
@@ -169,18 +145,13 @@ export default class FWPromiseManager
         if (options.timeout && options.timeout > 0) {
           timerSchedule?.unSchedule();
           timerSchedule = FW.Entry.timeMgr.scheduleOnce(() => {
-            const timeoutError = new Error(
-              `All Promise ${id} timeout after ${options.timeout} s`
-            );
+            const timeoutError = new Error(`All Promise ${id} timeout after ${options.timeout} s`);
             if (
               retryCount < maxRetryTimes &&
-              (!options.retryCondition ||
-                options.retryCondition(timeoutError, retryCount))
+              (!options.retryCondition || options.retryCondition(timeoutError, retryCount))
             ) {
               retryCount++;
-              FWLog.debug(
-                `All Promise ${id} timeout, retrying (${retryCount}/${maxRetryTimes})`
-              );
+              FWLog.debug(`All Promise ${id} timeout, retrying (${retryCount}/${maxRetryTimes})`);
               if (retryInterval > 0) {
                 FW.Entry.timeMgr.scheduleOnce(() => {
                   createPromise().then(resolve, reject);
@@ -208,7 +179,7 @@ export default class FWPromiseManager
           return;
         }
 
-        abortController.signal.addEventListener("abort", onAbort);
+        abortController.signal.addEventListener('abort', onAbort);
 
         const processAll = async () => {
           const result: FW.PromiseResult<T> = {
@@ -225,8 +196,8 @@ export default class FWPromiseManager
                   .filter(
                     (id) =>
                       !result.success.some((s) => s.id === id) &&
-                      !result.failed.some((f) => f.id === id)
-                  )
+                      !result.failed.some((f) => f.id === id),
+                  ),
               );
               break;
             }
@@ -235,9 +206,7 @@ export default class FWPromiseManager
               const value = await promiseProxy.promise;
               result.success.push(value);
             } catch (error) {
-              if (
-                promiseProxy.status === FWSystemDefine.FWPromiseStatus.CANCELLED
-              ) {
+              if (promiseProxy.status === FWSystemDefine.FWPromiseStatus.CANCELLED) {
                 result.cancelled.push(promiseProxy.id);
               } else {
                 result.failed.push({
@@ -254,7 +223,7 @@ export default class FWPromiseManager
         processAll()
           .then((result) => {
             promiseProxy.status = FWSystemDefine.FWPromiseStatus.FULFILLED;
-            abortController.signal.removeEventListener("abort", onAbort);
+            abortController.signal.removeEventListener('abort', onAbort);
             this.removePromise(id);
             timerSchedule?.unSchedule();
             resolve(result);
@@ -263,13 +232,12 @@ export default class FWPromiseManager
             timerSchedule?.unSchedule();
             if (
               retryCount < maxRetryTimes &&
-              (!options.retryCondition ||
-                options.retryCondition(error, retryCount))
+              (!options.retryCondition || options.retryCondition(error, retryCount))
             ) {
               retryCount++;
               FWLog.debug(
                 `All Promise ${id} failed, retrying (${retryCount}/${maxRetryTimes}):`,
-                error
+                error,
               );
               if (retryInterval > 0) {
                 FW.Entry.timeMgr.scheduleOnce(() => {
@@ -279,11 +247,9 @@ export default class FWPromiseManager
                 createPromise().then(resolve, reject);
               }
             } else {
-              if (
-                promiseProxy.status === FWSystemDefine.FWPromiseStatus.PENDING
-              ) {
+              if (promiseProxy.status === FWSystemDefine.FWPromiseStatus.PENDING) {
                 promiseProxy.status = FWSystemDefine.FWPromiseStatus.REJECTED;
-                abortController.signal.removeEventListener("abort", onAbort);
+                abortController.signal.removeEventListener('abort', onAbort);
                 this.removePromise(id);
                 reject(error);
               }
@@ -300,15 +266,15 @@ export default class FWPromiseManager
       abortController,
       abort: (reason?: any) => {
         if (promiseProxy.status === FWSystemDefine.FWPromiseStatus.PENDING) {
-          FWLog.debug(reason || "all promise cancelled");
+          FWLog.debug(reason || 'all promise cancelled');
           abortController.abort(reason);
         }
       },
       addAbortEventListener: (
         listener: (this: AbortSignal, ev: Event) => any,
-        options?: boolean | AddEventListenerOptions
+        options?: boolean | AddEventListenerOptions,
       ) => {
-        abortController.signal.addEventListener("abort", listener, options);
+        abortController.signal.addEventListener('abort', listener, options);
       },
     };
 
@@ -319,10 +285,7 @@ export default class FWPromiseManager
   /** 取消指定Promise */
   public cancel(id: number, reason?: any): boolean {
     const promiseProxy = this.promiseRegistry.get(id);
-    if (
-      promiseProxy &&
-      promiseProxy.status === FWSystemDefine.FWPromiseStatus.PENDING
-    ) {
+    if (promiseProxy && promiseProxy.status === FWSystemDefine.FWPromiseStatus.PENDING) {
       promiseProxy.abort(reason);
       return true;
     }
@@ -373,7 +336,7 @@ export default class FWPromiseManager
   /** 获取正在执行的Promise数量 */
   public getActiveCount(): number {
     return Array.from(this.promiseRegistry.values()).filter(
-      (p) => p.status === FWSystemDefine.FWPromiseStatus.PENDING
+      (p) => p.status === FWSystemDefine.FWPromiseStatus.PENDING,
     ).length;
   }
 

package/manager/FWResManager.ts

@@ -1,21 +1,19 @@
-import FWAssetConfig from "../config/FWAssetConfig";
-import { FWSystemConfig } from "../config/FWSystemConfig";
-import { FWSystemDefine } from "../define/FWSystemDefine";
-import FWLog from "../log/FWLog";
-import { FWLodash } from "../utils/FWLodash";
-import { FWAssetManager } from "./FWAssetManager";
-import { FWBundleManager } from "./FWBundleManager";
-import { FWManager } from "./FWManager";
+import FWAssetConfig from '../config/FWAssetConfig';
+import { FWSystemConfig } from '../config/FWSystemConfig';
+import { FWSystemDefine } from '../define/FWSystemDefine';
+import FWLog from '../log/FWLog';
+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 {
-  bundleMgr: FW.BundleManager;
-  assetMgr: FW.AssetManager;
+  private bundleMgr: FW.BundleManager;
+  private assetMgr: FW.AssetManager;
 
   public initialize() {
     this.bundleMgr = new FWBundleManager(this);
     this.assetMgr = new FWAssetManager(this);
-    this.bundleMgr.initialize();
-    this.assetMgr.initialize();
   }
 
   /**
@@ -36,7 +34,7 @@ export class FWResManager extends FWManager implements FW.ResManager {
               await this.loadBundle(depend);
 
               const config = FW.Entry.getComponent<FWAssetConfig>(
-                `${depend}${FWSystemDefine.FWBindTag.CONFIG}`
+                `${depend}${FWSystemDefine.FWBindTag.CONFIG}`,
               );
               if (!config) continue;
               const preLoad = config.preLoad;
@@ -72,7 +70,7 @@ export class FWResManager extends FWManager implements FW.ResManager {
           reject(e);
         }
       }, FWSystemConfig.PromiseConfig.loadBundle).promise,
-      `loadBundleDepend -> ${bundleName}`
+      `loadBundle -> ${bundleName}`,
     );
   }
   /**
@@ -89,10 +87,7 @@ 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;
@@ -139,9 +134,7 @@ 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;
   }

package/manager/FWUiManager.ts

@@ -1,6 +1,6 @@
-import { searchChild } from "../expand/FWDecorator";
-import FWLog from "../log/FWLog";
-import { FWManager } from "./FWManager";
+import { searchChild } from '../expand/FWDecorator';
+import FWLog from '../log/FWLog';
+import { FWManager } from './FWManager';
 
 export default class FWUiManager extends FWManager implements FW.UiManager {
   private eventMap: Map<
@@ -113,7 +113,7 @@ export default class FWUiManager extends FWManager implements FW.UiManager {
 
   register(args: FW.RegisterArgs) {
     if (!args.target) {
-      FWLog.error("注册事件失败,目标为空!");
+      FWLog.error('注册事件失败,目标为空!');
       return;
     }
 
@@ -131,11 +131,7 @@ export default class FWUiManager extends FWManager implements FW.UiManager {
 
               if (!evt.enable) return;
 
-              /** 检测触发间隔 */
-              if (
-                Date.now() - evt.lastResponseTimestamp <
-                evt.responseInterval
-              ) {
+              if (Date.now() - evt.lastResponseTimestamp < evt.responseInterval) {
                 return;
               }
 
@@ -143,9 +139,9 @@ export default class FWUiManager extends FWManager implements FW.UiManager {
               if (button && !button.interactable) return;
 
               evt.lastResponseTimestamp = Date.now();
-              evt.cb?.bind(args.target)?.(e, c);
+              evt.cb?.bind(args.target)?.(e, c, evt.data);
             },
-            args.target
+            args.target,
           );
           this.eventMap.set(this.uniqueId, {
             uniqueId: this.uniqueId,
@@ -168,12 +164,9 @@ export default class FWUiManager extends FWManager implements FW.UiManager {
             args7?: FW.EventManagerArgs,
             args8?: FW.EventManagerArgs,
             args9?: FW.EventManagerArgs,
-            args10?: FW.EventManagerArgs
+            args10?: FW.EventManagerArgs,
           ) => {
-            if (
-              Date.now() - evt.lastResponseTimestamp <
-              (evt.responseInterval || 0)
-            ) {
+            if (Date.now() - evt.lastResponseTimestamp < (evt.responseInterval || 0)) {
               return;
             }
             evt.lastResponseTimestamp = Date.now();
@@ -187,10 +180,10 @@ export default class FWUiManager extends FWManager implements FW.UiManager {
               args7,
               args8,
               args9,
-              args10
+              args10,
             );
           },
-          args.target
+          args.target,
         );
 
         this.eventMap.set(this.uniqueId, {

package/package.json

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

package/service/http/FWHttp.ts

@@ -1,7 +1,7 @@
-import { FWSystemConfig } from "../../config/FWSystemConfig";
-import { FWSystemDefine } from "../../define/FWSystemDefine";
-import FWLog from "../../log/FWLog";
-import FWService from "../FWService";
+import { FWSystemConfig } from '../../config/FWSystemConfig';
+import { FWSystemDefine } from '../../define/FWSystemDefine';
+import FWLog from '../../log/FWLog';
+import FWService from '../FWService';
 
 export default class FWHttp extends FWService {
   public initialize() {}
@@ -12,30 +12,18 @@ export default class FWHttp extends FWService {
     url: string,
     params?: string,
     cb?: (response: string) => void,
-    tag?: string
+    tag?: string,
   ): Promise<string> {
-    return this.process(
-      url,
-      params,
-      cb,
-      tag,
-      FWSystemDefine.FWHttpRequestType.GET
-    );
+    return this.process(url, params, cb, tag, FWSystemDefine.FWHttpRequestType.GET);
   }
 
   protected async postMessage(
     url: string,
     params?: string,
     cb?: (response: string) => void,
-    tag?: string
+    tag?: string,
   ): Promise<string> {
-    return this.process(
-      url,
-      params,
-      cb,
-      tag,
-      FWSystemDefine.FWHttpRequestType.POST
-    );
+    return this.process(url, params, cb, tag, FWSystemDefine.FWHttpRequestType.POST);
   }
 
   private async process(
@@ -43,56 +31,48 @@ export default class FWHttp extends FWService {
     params: string,
     cb: (response: any) => void,
     tag: string,
-    type: FWSystemDefine.FWHttpRequestType
+    type: FWSystemDefine.FWHttpRequestType,
   ): Promise<string> {
     let xhr: XMLHttpRequest;
 
-    const promiseProxy: FW.PromiseProxy<string> =
-      FW.Entry.promiseMgr.execute<string>(
-        (resolve, reject, signal, reason) => {
-          xhr = new XMLHttpRequest();
+    const promiseProxy: FW.PromiseProxy<string> = FW.Entry.promiseMgr.execute<string>(
+      (resolve, reject, signal, reason) => {
+        xhr = new XMLHttpRequest();
 
-          xhr.onreadystatechange = () => {
-            if (xhr.readyState == 4 && xhr.status === 200) {
-              cb?.(xhr.response);
-              resolve(xhr.response);
-            }
-          };
+        xhr.onreadystatechange = () => {
+          if (xhr.readyState == 4 && xhr.status === 200) {
+            cb?.(xhr.response);
+            resolve(xhr.response);
+          }
+        };
 
-          xhr.onerror = (err: any) => {
-            FWLog.error(err);
-            this.onError?.(err);
-            reject(`http request error:${err}`);
-          };
+        xhr.onerror = (err: any) => {
+          FWLog.error(err);
+          this.onError?.(err);
+          reject(`http request error:${err}`);
+        };
 
-          xhr.ontimeout = () => {
-            this.onTimeout?.();
-            reject(`http request timeout!`);
-          };
+        xhr.ontimeout = () => {
+          this.onTimeout?.();
+          reject(`http request timeout!`);
+        };
 
-          xhr.open(type, url, true);
-          xhr.send(params);
+        xhr.open(type, url, true);
+        xhr.send(params);
+      },
+      {
+        ...FWSystemConfig.PromiseConfig.http,
+        retryCondition(error, retryCount) {
+          return error || xhr.readyState != 4 || (xhr.status !== 200 && retryCount < 3);
         },
-        {
-          ...FWSystemConfig.PromiseConfig.http,
-          retryCondition(error, retryCount) {
-            return (
-              error ||
-              xhr.readyState != 4 ||
-              (xhr.status !== 200 && retryCount < 3)
-            );
-          },
-        }
-      );
+      },
+    );
 
     promiseProxy.addAbortEventListener(() => {
       xhr.abort();
     });
 
-    return await this.invoke(
-      promiseProxy.promise,
-      tag ? `http request ->${tag}` : ""
-    );
+    return await this.invoke(promiseProxy.promise, tag ? `http request ->${tag}` : '');
   }
 
   onError?(err: any);