@ives_xxz/framework 2.1.28 → 2.1.30

package/entry/FWEntry.ts

@@ -16,6 +16,7 @@ import FWEngineManager from '../manager/FWEngineManager';
 import FWHotUpdateManager from '../manager/FWHotUpdateManager';
 import FWPromiseManager from '../manager/FWPromiseManager';
 import { FWPerformanceManager } from '../manager/FWPerformanceManager';
+import FWUtils from '../utils/FWUtils';
 
 /**
  * 入口脚本
@@ -90,6 +91,8 @@ export class FWEntry implements FW.Entry {
    * 性能管理器
    */
   performanceMgr: FW.PerformanceManager;
+
+  utils: FW.Utils;
   /**
    * 当前Scene
    */
@@ -119,6 +122,7 @@ export class FWEntry implements FW.Entry {
     this.hotUpdateMgr = new FWHotUpdateManager();
     this.promiseMgr = new FWPromiseManager();
     this.performanceMgr = new FWPerformanceManager();
+    this.utils = new FWUtils();
   }
 
   /**

package/manager/FWAssetManager.ts

@@ -53,12 +53,17 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
               { url: ske, ext: type },
             ],
             async (error, assets) => {
-              const texture: cc.Texture2D = await this.loadRemote();
+              if (error != null) {
+                reject(error);
+                return;
+              }
+              const fileName = FW.Entry.utils.getFileName(img);
+              const texture: cc.Texture2D = await this.loadRemote(img);
               var asset = new sp.SkeletonData();
-              asset.skeletonJson = assets[1];
               asset.atlasText = assets[0];
+              asset.skeletonJson = assets[1];
               asset.textures.push(texture);
-              asset['textureNames'] = [`${img}.png`];
+              asset['textureNames'] = [`${fileName}`];
               asset['_uuid'] = ske;
               resolve(asset);
             },
@@ -77,13 +82,17 @@ export class FWAssetManager extends FWManager implements FW.AssetManager {
   ): 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}?t=${new Date().getTime()}`,
+          { cacheEnabled: false, maxRetryCount: 3 },
+          (err, asset) => {
+            if (err || !asset) {
+              reject(err);
+            }
+            cb?.(asset as T);
+            resolve(asset as T);
+          },
+        );
       }, FWSystemConfig.PromiseConfig.loadAsset).promise,
       `loadAssets -> ${url}`,
     );

package/package.json

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

package/types/FW.d.ts

@@ -68,6 +68,8 @@ declare namespace FW {
     promiseMgr: PromiseManager;
     /** 性能管理器 */
     performanceMgr: PerformanceManager;
+    /** 通用工具类 */
+    utils: Utils;
     /** 场景组件 */
     scene: Scene;
     /** 当前bundle名称 */
@@ -2346,6 +2348,10 @@ declare namespace FW {
     $descriptorOrInitializer?: any,
   ) => void;
 
+  type Utils = {
+    getFileName(url: string): string;
+  }
+
   declare function timeScale(scale: number);
   declare let Entry: Entry;
 }

package/utils/FWUtils.ts

@@ -0,0 +1,15 @@
+export default class FWUtils {
+  /**
+   * 从 URL 中获取完整文件名（含扩展名）
+   */
+  public getFileName(url: string): string {
+    try {
+      const urlObj = new URL(url);
+      const pathname = urlObj.pathname;
+      return pathname.substring(pathname.lastIndexOf('/') + 1);
+    } catch {
+      const cleanUrl = url.split('?')[0].split('#')[0];
+      return cleanUrl.substring(cleanUrl.lastIndexOf('/') + 1);
+    }
+  }
+}

package/utils/FWUtils.ts.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "b87b47df-cb7e-47d2-9999-0b18172676ca",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}