@ives_xxz/framework 1.5.12 → 1.5.13

package/FW.d.ts

@@ -829,6 +829,11 @@ declare namespace FW {
      * @param bundleName
      */
     hasBundle(bundleName: string): boolean;
+    /**
+     * 预加载
+     * @param assetProperty
+     */
+    preLoad(assetProperty: FW.AssetProperty | FW.AssetProperty[]);
     /**
      * 加载远程资源
      * @param url
@@ -1026,7 +1031,7 @@ declare namespace FW {
       atlas: string;
       bin?: boolean;
     }): Promise<sp.SkeletonData>;
-
+    preLoad(assetProperty: FW.AssetProperty | FW.AssetProperty[]);
     /**
      * 加载资源
      * @param asset

package/entry/FWEntry.ts

@@ -1,25 +1,24 @@
-import FWUiManager from '../manager/FWUiManager';
-import Framework from '../Framework';
-import FWLog from '../log/FWLog';
-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 { FWEventDefine } from '../define/FWEventDefine';
-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 Framework from "../Framework";
+import FWLog from "../log/FWLog";
+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";
 
 /**
  * 入口脚本
@@ -125,11 +124,6 @@ export default class FWEntry implements FW.Entry {
     this.hotUpdateMgr = new FWHotUpdateManager();
     this.promiseMgr = new FWPromiseManager();
     this.performanceMgr = new FWPerformanceManager();
-    this.resMgr.initialize();
-    this.layerMgr.initialize();
-    this.timeMgr.initialize();
-    this.animationMgr.initialize();
-    this.stateMgr.initialize();
   }
 
   /**
@@ -140,6 +134,7 @@ export default class FWEntry implements FW.Entry {
   @FWSocketAutoProcessPause()
   launchScene(name: string): void {
     FW.Entry.layerMgr.clear();
+
     if (this.bundleAutoRelease(this.bundleName)) {
       this.releaseBundle(this.bundleName);
     }
@@ -147,12 +142,15 @@ export default class FWEntry implements FW.Entry {
     if (!this.hasSceneName(name)) {
       try {
         cc.director.loadScene(name);
+        this.bundleName = "";
         return;
       } catch (e) {
-        FWLog.error('launchScene failed:', name);
+        FWLog.error("launchScene failed:", name);
       }
     }
+
     this.bundleName = name;
+
     cc.director.loadScene(this.getSceneName());
   }
 
@@ -206,11 +204,13 @@ export default class FWEntry implements FW.Entry {
     return this.map.get(this.bundleName)?.sceneName || undefined;
   }
 
-  getComponent: <T>(serviceIdentifier: FW.ServiceIdentifier<T>) => T = (serviceIdentifier) =>
-    Framework.getComponent(serviceIdentifier);
+  getComponent: <T>(serviceIdentifier: FW.ServiceIdentifier<T>) => T = (
+    serviceIdentifier
+  ) => Framework.getComponent(serviceIdentifier);
 
-  getComponents: <T>(serviceIdentifier?: FW.ServiceIdentifier<T>) => T[] = (serviceIdentifier) =>
-    Framework.getComponents(serviceIdentifier);
+  getComponents: <T>(serviceIdentifier?: FW.ServiceIdentifier<T>) => T[] = (
+    serviceIdentifier
+  ) => Framework.getComponents(serviceIdentifier);
 
   update(dt: number) {
     this.timeMgr?.onUpdate(dt);

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,37 +60,101 @@ 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);
+        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}`
     );
   }
 
+  async preLoad(assetProperty: FW.AssetProperty | FW.AssetProperty[]) {
+    if (!assetProperty) {
+      FWLog.error(`加载资源失败,请检查参数列表:${assetProperty}!`);
+      return undefined;
+    }
+
+    const propertys = Array.isArray(assetProperty)
+      ? assetProperty
+      : [assetProperty];
+
+    propertys.forEach(async (property) => {
+      const bundleName = property.bundle || FW.Entry.bundleName;
+      const type = property.type;
+      const path = property.path;
+      const progress = property.progress;
+
+      if (!bundleName || bundleName === "") {
+        FWLog.error(`找不到bundle${bundleName},或者bundle未加载!`);
+        return undefined;
+      }
+
+      if (!path || path === "") {
+        FWLog.error(`找不到资源路径${path},请检查!`);
+        return undefined;
+      }
+
+      let bundle: cc.AssetManager.Bundle = await this.resMgr.loadBundle(
+        bundleName
+      );
+
+      if (!bundle) {
+        FWLog.error(`加载bundle失败,请检查!`);
+        return undefined;
+      }
+
+      return await this.invoke(
+        FW.Entry.promiseMgr.execute((resolve, reject, signal) => {
+          bundle.preload(
+            path,
+            type,
+            (
+              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!");
+              }
+              resolve(item);
+            }
+          );
+        }, FWSystemConfig.PromiseConfig.loadAsset).promise,
+        `preLoadAssets -> ${property.path}`
+      );
+    });
+  }
+
   /**
    * 加载资源
    * @param assetProperty
@@ -108,17 +172,19 @@ 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失败,请检查!`);
@@ -143,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) => {
@@ -153,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;
@@ -164,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}`
     );
   }
   /**
@@ -186,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 === "") {
       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失败,请检查!`);
@@ -206,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) {
@@ -220,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;
@@ -229,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);
 
@@ -239,7 +311,7 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
           cb?.(assetDataList);
           resolve(assetDataList);
         });
-      },
+      }
     );
   }
 
@@ -256,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 === "") {
       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;
     }
 
@@ -291,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 === "") {
       FWLog.error(`找不到bundle${bundleName},或者bundle未加载!`);
       return undefined;
     }
 
-    if (!path || path === '') {
+    if (!path || path === "") {
       FWLog.error(`找不到资源路径${path},请检查!`);
       return undefined;
     }

package/manager/FWAudioManager.ts

@@ -1,6 +1,6 @@
-import { FWManager } from './FWManager';
-import FWLog from '../log/FWLog';
-import { FWSystemDefine } from '../define/FWSystemDefine';
+import { FWManager } from "./FWManager";
+import FWLog from "../log/FWLog";
+import { FWSystemDefine } from "../define/FWSystemDefine";
 
 class FWAudioData {
   clip: cc.AudioClip;
@@ -11,10 +11,17 @@ class FWAudioData {
 }
 
 class FWAudioPoolItem {
-  constructor(public audioId: number, public startTime: number, public tag?: string) {}
+  constructor(
+    public audioId: number,
+    public startTime: number,
+    public tag?: string
+  ) {}
 }
 
-export default class FWAudioManager extends FWManager implements FW.AudioManager {
+export default class FWAudioManager
+  extends FWManager
+  implements FW.AudioManager
+{
   musicVolume: number = 1;
   effectsVolume: number = 1;
   soundVolume: number = 1;
@@ -31,13 +38,21 @@ export default class FWAudioManager extends FWManager implements FW.AudioManager
    * 播放背景音乐
    */
   async playMusic(path: string, volume?: number, loop?: boolean): Promise<void>;
-  async playMusic(music: cc.AudioClip, volume?: number, loop?: boolean): Promise<void>;
-  async playMusic(assetProperty: FW.AssetProperty, volume?: number, loop?: boolean): Promise<void>;
+  async playMusic(
+    music: cc.AudioClip,
+    volume?: number,
+    loop?: boolean
+  ): Promise<void>;
+  async playMusic(
+    assetProperty: FW.AssetProperty,
+    volume?: number,
+    loop?: boolean
+  ): Promise<void>;
   async playMusic(): Promise<void> {
     try {
       const audioData = await this.processAudioArguments(
         arguments,
-        FWSystemDefine.FWAudioType.MUSIC,
+        FWSystemDefine.FWAudioType.MUSIC
       );
       if (!audioData.clip) return;
 
@@ -50,7 +65,7 @@ export default class FWAudioManager extends FWManager implements FW.AudioManager
 
       FWLog.debug(`播放背景音乐: ${this.getAudioName(audioData.clip)}`);
     } catch (e) {
-      FWLog.error('播放音乐失败:', e);
+      FWLog.error("播放音乐失败:", e);
     }
   }
 
@@ -80,39 +95,40 @@ export default class FWAudioManager extends FWManager implements FW.AudioManager
     cb?: (id: number) => void,
     volume?: number,
     loop?: boolean,
-    tag?: string,
+    tag?: string
   ): Promise<number>;
   async play(
     audio: cc.AudioClip,
     cb?: (id: number) => void,
     volume?: number,
     loop?: boolean,
-    tag?: string,
+    tag?: string
   ): Promise<number>;
   async play(
     assetProperty: FW.AssetProperty,
     cb?: (id: number) => void,
     volume?: number,
     loop?: boolean,
-    tag?: string,
+    tag?: string
   ): Promise<number>;
   async play(): Promise<number> {
     try {
       if (this.audioPool.size >= this.maxConcurrentAudio) {
         this.clearFinishedAudio();
         if (this.audioPool.size >= this.maxConcurrentAudio) {
-          FWLog.warn('音频池已满，无法播放新音频');
+          FWLog.warn("音频池已满，无法播放新音频");
           return -1;
         }
       }
 
       const audioData = await this.processAudioArguments(
         arguments,
-        FWSystemDefine.FWAudioType.SOUND,
+        FWSystemDefine.FWAudioType.SOUND
       );
       if (!audioData.clip) return -1;
 
-      const volume = (audioData.volume ?? this.soundVolume) * this.effectsVolume;
+      const volume =
+        (audioData.volume ?? this.soundVolume) * this.effectsVolume;
       const loop = audioData.loop ?? false;
       const tag = audioData.tag;
 
@@ -127,7 +143,7 @@ export default class FWAudioManager extends FWManager implements FW.AudioManager
 
       return id;
     } catch (e) {
-      FWLog.error('播放音效失败:', e);
+      FWLog.error("播放音效失败:", e);
       return -1;
     }
   }
@@ -145,24 +161,24 @@ export default class FWAudioManager extends FWManager implements FW.AudioManager
 
   pauseAll(): void {
     cc.audioEngine.pauseAll();
-    FWLog.debug('暂停所有音效');
+    FWLog.debug("暂停所有音效");
   }
 
   resumeAll(): void {
     cc.audioEngine.resumeAll();
-    FWLog.debug('恢复所有音效');
+    FWLog.debug("恢复所有音效");
   }
 
   stopAll(): void {
     cc.audioEngine.stopAll();
     this.audioPool.clear();
-    FWLog.debug('停止所有音效');
+    FWLog.debug("停止所有音效");
   }
 
   /** 设置播放音效是否静音 */
   setSoundMute(mute: boolean): void {
     this.soundVolume = mute ? 0 : 1;
-    FWLog.debug(`音效${mute ? '静音' : '取消静音'}`);
+    FWLog.debug(`音效${mute ? "静音" : "取消静音"}`);
   }
 
   /**
@@ -172,7 +188,7 @@ export default class FWAudioManager extends FWManager implements FW.AudioManager
     try {
       let clip: cc.AudioClip;
 
-      if (typeof assetProperty === 'string') {
+      if (typeof assetProperty === "string") {
         clip = await FW.Entry.resMgr.loadAsset<cc.AudioClip>({
           path: assetProperty,
           bundle: FW.Entry.bundleName,
@@ -233,7 +249,7 @@ export default class FWAudioManager extends FWManager implements FW.AudioManager
    */
   private async processAudioArguments(
     args: IArguments,
-    type: FWSystemDefine.FWAudioType,
+    type: FWSystemDefine.FWAudioType
   ): Promise<FWAudioData> {
     const audioData = new FWAudioData();
     const argsArray = Array.from(args);
@@ -262,7 +278,7 @@ export default class FWAudioManager extends FWManager implements FW.AudioManager
    * 标准化资源属性
    */
   private normalizeAssetProperty(input: any): FW.AssetProperty {
-    if (typeof input === 'string') {
+    if (typeof input === "string") {
       return {
         path: input,
         bundle: FW.Entry.bundleName,
@@ -274,7 +290,9 @@ export default class FWAudioManager extends FWManager implements FW.AudioManager
   /**
    * 加载音频片段
    */
-  private async loadAudioClip(assetProperty: FW.AssetProperty): Promise<cc.AudioClip> {
+  private async loadAudioClip(
+    assetProperty: FW.AssetProperty
+  ): Promise<cc.AudioClip> {
     try {
       return await FW.Entry.resMgr.loadAsset<cc.AudioClip>(assetProperty);
     } catch (e) {
@@ -286,17 +304,19 @@ export default class FWAudioManager extends FWManager implements FW.AudioManager
    * 生成缓存键
    */
   private getCacheKey(assetProperty: FW.AssetProperty): string {
-    if (typeof assetProperty === 'string') {
+    if (typeof assetProperty === "string") {
       return `${FW.Entry.bundleName}_${assetProperty}`;
     }
-    return `${assetProperty.bundle || FW.Entry.bundleName}_${assetProperty.path}`;
+    return `${assetProperty.bundle || FW.Entry.bundleName}_${
+      assetProperty.path
+    }`;
   }
 
   /**
    * 获取音频名称
    */
   private getAudioName(clip: cc.AudioClip): string {
-    return clip.name || '未知音频';
+    return clip.name || "未知音频";
   }
 
   /**
@@ -324,7 +344,7 @@ export default class FWAudioManager extends FWManager implements FW.AudioManager
       this.clearFinishedAudio,
       this.cleanupInterval,
       cc.macro.REPEAT_FOREVER,
-      this,
+      this
     );
   }
 

package/manager/FWResManager.ts

@@ -1,6 +1,6 @@
-import { FWAssetManager } from './FWAssetManager';
-import { FWBundleManager } from './FWBundleManager';
-import { FWManager } from './FWManager';
+import { FWAssetManager } from "./FWAssetManager";
+import { FWBundleManager } from "./FWBundleManager";
+import { FWManager } from "./FWManager";
 
 export class FWResManager extends FWManager implements FW.ResManager {
   bundleMgr: FW.BundleManager;
@@ -35,7 +35,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;
@@ -82,11 +85,17 @@ 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;
   }
 
+  async preLoad(assetProperty: FW.AssetProperty | FW.AssetProperty[]) {
+    return this.assetMgr.preLoad(assetProperty);
+  }
+
   /**
    * 加载文件夹
    */

package/manager/FWTimeManager.ts

@@ -1,5 +1,5 @@
-import FWLog from '../log/FWLog';
-import { FWManager } from './FWManager';
+import FWLog from "../log/FWLog";
+import { FWManager } from "./FWManager";
 
 class FWTimer implements FW.Timer {
   constructor() {
@@ -70,13 +70,13 @@ export class FWTimeManager extends FWManager implements FW.TimeManager {
     time?: number,
     repeat?: number,
     target?: FW.TargetType,
-    tag?: string,
+    tag?: string
   ): FW.TimerSchedule {
     const timer = new FWTimer();
 
     timer.internal = time || 0;
     timer.repeat = repeat || 0;
-    timer.tag = tag || '';
+    timer.tag = tag || "";
     timer.target = target || FW.Entry.scene;
     timer.cb = cb;
     timer.id = this.uniqueId++;
@@ -134,14 +134,12 @@ export class FWTimeManager extends FWManager implements FW.TimeManager {
     let tag: string;
     let target: any;
 
-    const config: any = {};
-
     for (const arg of arguments) {
-      if (typeof arg === 'function') {
+      if (typeof arg === "function") {
         cb = arg;
-      } else if (typeof arg === 'number') {
+      } else if (typeof arg === "number") {
         time = arg;
-      } else if (typeof arg === 'string') {
+      } else if (typeof arg === "string") {
         tag = arg;
       } else if (arg) {
         target = arg;
@@ -195,9 +193,9 @@ export class FWTimeManager extends FWManager implements FW.TimeManager {
     const args = arguments;
     if (!args || args?.length == 0) return;
 
-    if (typeof args[0] == 'string') {
+    if (typeof args[0] == "string") {
       this.removeTimerFromTag(args[0]);
-    } else if (typeof args[0] == 'number') {
+    } else if (typeof args[0] == "number") {
       this.removeTimerFromId(args[0]);
     } else {
       this.removeTimerFromTarget(args[0]);
@@ -226,9 +224,9 @@ export class FWTimeManager extends FWManager implements FW.TimeManager {
   pauseSchedule() {
     const args = arguments;
     if (!args || args?.length == 0) return;
-    if (typeof args[0] == 'string') {
+    if (typeof args[0] == "string") {
       this.pauseTimerFromTag(args[0], true);
-    } else if (typeof args[0] == 'number') {
+    } else if (typeof args[0] == "number") {
       this.pauseTimerFromId(args[0], true);
     } else {
       this.pauseTimerFromTarget(args[0], true);
@@ -256,9 +254,9 @@ export class FWTimeManager extends FWManager implements FW.TimeManager {
   resumeSchedule() {
     const args = arguments;
     if (!args || args?.length == 0) return;
-    if (typeof args[0] == 'string') {
+    if (typeof args[0] == "string") {
       this.pauseTimerFromTag(args[0], false);
-    } else if (typeof args[0] == 'number') {
+    } else if (typeof args[0] == "number") {
       this.pauseTimerFromId(args[0], false);
     } else {
       this.pauseTimerFromTarget(args[0], false);
@@ -299,7 +297,7 @@ export class FWTimeManager extends FWManager implements FW.TimeManager {
     var target: FW.TargetType;
     var tag: string;
     if (args.length == 2) {
-      if (typeof args[1] == 'string') {
+      if (typeof args[1] == "string") {
         tag = args[1];
       } else {
         target = args[1];
@@ -313,7 +311,7 @@ export class FWTimeManager extends FWManager implements FW.TimeManager {
     timer.cb = cb;
     timer.executeTime = 0;
     timer.internal = 0;
-    timer.tag = tag || '';
+    timer.tag = tag || "";
     timer.target = target || undefined;
     timer.pause = false;
     timer.repeat = cc.macro.REPEAT_FOREVER;
@@ -332,7 +330,7 @@ export class FWTimeManager extends FWManager implements FW.TimeManager {
 
       if (v.executeTime > v.internal) {
         v.executeTime = 0;
-        v.cb?.(dt);
+        v.cb?.call(v.target, dt);
         v.resolve?.();
 
         if (v.repeat > 0) {

package/package.json

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