@ives_xxz/framework 2.1.24 → 2.1.26

package/manager/FWResManager.ts

@@ -7,12 +7,15 @@ import { FWManager } from './FWManager';
 export class FWResManager extends FWManager implements FW.ResManager {
   private bundleMgr: FW.BundleManager;
   private assetMgr: FW.AssetManager;
-
+  private rejectHandlerListener: FW.ResRejectHandlerListener;
   public initialize() {
     this.bundleMgr = new FWBundleManager(this);
     this.assetMgr = new FWAssetManager(this);
   }
 
+  registerRejectHandler(listener: FW.ResRejectHandlerListener): void {
+    this.rejectHandlerListener = listener;
+  }
   /**
    * 加载bundle
    * @param bundleName
@@ -66,6 +69,7 @@ export class FWResManager extends FWManager implements FW.ResManager {
 
           resolve(bundle);
         } catch (e) {
+          this.rejectHandlerListener?.loadBundleHandler?.(e, bundleName);
           reject(e);
         }
       }, FWSystemConfig.PromiseConfig.loadBundle).promise,
@@ -87,15 +91,19 @@ export class FWResManager extends FWManager implements FW.ResManager {
   }
 
   async loadRemote<T extends cc.Asset = cc.Asset>(url: string, texture?: boolean): Promise<T> {
-    const asset = await this.assetMgr.loadRemote(url);
-    if (texture) {
-      return asset as T;
-    } else {
-      if (asset instanceof cc.Texture2D) {
-        return new cc.SpriteFrame(asset) as unknown as T;
-      } else {
+    try {
+      const asset = await this.assetMgr.loadRemote(url);
+      if (texture) {
         return asset as T;
+      } else {
+        if (asset instanceof cc.Texture2D) {
+          return new cc.SpriteFrame(asset) as unknown as T;
+        } else {
+          return asset as T;
+        }
       }
+    } catch (e) {
+      this.rejectHandlerListener?.loadResHandler?.(e, url);
     }
   }
 
@@ -141,11 +149,15 @@ export class FWResManager extends FWManager implements FW.ResManager {
     assetProperty: FW.AssetProperty,
     texture?: boolean,
   ): Promise<T> {
-    const res = await this.assetMgr.load(assetProperty);
-    if (texture) {
-      return res.asset as T;
+    try {
+      const res = await this.assetMgr.load(assetProperty);
+      if (texture) {
+        return res.asset as T;
+      }
+      return this.process<T>(res).asset as T;
+    } catch (e) {
+      this.rejectHandlerListener?.loadResHandler?.(e, assetProperty.path);
     }
-    return this.process<T>(res).asset as T;
   }
 
   async preLoad(assetProperty: FW.AssetProperty | FW.AssetProperty[]) {

package/package.json

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

package/types/FW.d.ts

@@ -1007,6 +1007,10 @@ declare namespace FW {
     assetProperty: AssetProperty;
   };
 
+  type ResRejectHandlerListener = {
+    loadResHandler:(err: Error | null, asset: AssetProperty | string | null) => void;
+    loadBundleHandler:(err: Error | null, bundle: string | null) => void;
+  }
   /**
    * 资源管理器 - 负责游戏资源的加载、获取和释放等操作
    */
@@ -1016,7 +1020,8 @@ declare namespace FW {
 
     /** 销毁方法 */
     onDestroy(): void;
-
+    /** 注册拒绝处理器 */
+    registerRejectHandler(listener: ResRejectHandlerListener): void;
     /**
      * 加载指定bundle
      * @param bundleName - bundle名称
@@ -1606,6 +1611,7 @@ declare namespace FW {
    * Spine骨骼动画对象 - 用于控制Spine骨骼动画的播放和设置
    */
   type Skeleton = {
+    animation: sp.Skeleton;
     /**
      * 播放动画
      * @param args - 骨骼动画参数