@ives_xxz/framework 2.3.11 → 2.3.13

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';
 
 /**
  * 资源数据
@@ -46,7 +46,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 },
@@ -63,33 +63,44 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
               asset.atlasText = assets[0];
               asset.skeletonJson = assets[1];
               asset.textures.push(texture);
-              asset["textureNames"] = [`${fileName}`];
-              asset["_uuid"] = ske;
+              asset['textureNames'] = [`${fileName}`];
+              asset['_uuid'] = ske;
               resolve(asset);
             },
           );
         }, 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,
+    options?: {
+      ext?: string;
+      enableCache?: boolean;
+      maxRetryCount?: number;
+      cb?: (asset: T) => void;
+    },
   ): Promise<T> {
     return await this.invoke(
       FW.Entry.promiseMgr.execute((resolve, reject, signal) => {
         cc.assetManager.loadRemote(
-          `${url}?t=${new Date().getTime()}`,
-          { cacheEnabled: false, maxRetryCount: 3 },
+          options?.enableCache === undefined || !options?.enableCache
+            ? `${url}?t=${new Date().getTime()}`
+            : `${url}`,
+          {
+            ext: options?.ext,
+            cacheEnabled: options?.enableCache || false,
+            maxRetryCount: options?.maxRetryCount || 3,
+          },
           (err, asset) => {
             if (err || !asset) {
               reject(err);
             }
-            cb?.(asset as T);
+            options.cb?.(asset as T);
             resolve(asset as T);
           },
         );
@@ -104,9 +115,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) => {
@@ -115,18 +124,17 @@ 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失败,请检查!`);
@@ -138,16 +146,12 @@ 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);
               },
@@ -176,18 +180,17 @@ 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失败,请检查!`);
@@ -215,11 +218,7 @@ 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) => {
@@ -229,7 +228,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;
@@ -261,18 +260,17 @@ 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失败,请检查!`);
@@ -296,7 +294,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;
@@ -305,7 +303,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);
 
@@ -332,18 +330,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("获取资源失败,请先加载!", assetProperty);
+      FW.Log.error('获取资源失败,请先加载!', assetProperty);
       return undefined;
     }
 
@@ -366,12 +364,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;
     }
@@ -424,7 +422,7 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
     const type = assetProperty.type;
 
     let typeKey: string | undefined;
-    if (typeof type === "string") {
+    if (typeof type === 'string') {
       typeKey = type;
     } else if (type) {
       typeKey = (type as any).name;

package/manager/FWResManager.ts

@@ -91,10 +91,18 @@ export class FWResManager extends FWManager implements FW.ResManager {
     return await this.assetMgr.loadSpineDataFromRemote(data);
   }
 
-  async loadRemote<T extends cc.Asset = cc.Asset>(url: string, texture?: boolean): Promise<T> {
+  async loadRemote<T extends cc.Asset = cc.Asset>(
+    url: string,
+    options?: {
+      ext?: string;
+      enableCache?: boolean;
+      maxRetryCount?: number;
+      cb?: (asset: T) => void;
+    },
+  ): Promise<T> {
     try {
-      const asset = await this.assetMgr.loadRemote(url);
-      if (texture) {
+      const asset = await this.assetMgr.loadRemote(url, options);
+      if (options?.ext) {
         return asset as T;
       } else {
         if (asset instanceof cc.Texture2D) {

package/package.json

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

package/types/FW.d.ts

@@ -1076,7 +1076,12 @@ declare namespace FW {
      * @param cb - 回调函数
      * @returns Promise返回加载的资源
      */
-    loadRemote<T extends cc.Asset = cc.Asset>(url: string, texutre?: boolean): Promise<T>;
+    loadRemote<T extends cc.Asset = cc.Asset>(url: string, options?: {
+      ext?: string;
+      enableCache?: boolean;
+      maxRetryCount?: number;
+      cb?: (asset: T) => void;
+    },): Promise<T>;
 
     /**
      * 从远程加载spine动画数据
@@ -1260,7 +1265,12 @@ 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, options?: {
+      ext?: string;
+      enableCache?: boolean;
+      maxRetryCount?: number;
+      cb?: (asset: T) => void;
+    }): Promise<T>;
     /**
      * 从远程加载spine动画
      * @param data