@ives_xxz/framework 2.3.5 → 2.3.6

package/manager/FWResManager.ts

@@ -1,8 +1,8 @@
-import { FWSystemConfig } from "../config/FWSystemConfig";
-import { FWLodash } from "../utils/FWLodash";
-import { FWAssetManager } from "./FWAssetManager";
-import { FWBundleManager } from "./FWBundleManager";
-import { FWManager } from "./FWManager";
+import { FWSystemConfig } from '../config/FWSystemConfig';
+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 {
   private bundleMgr: FW.BundleManager;
@@ -22,65 +22,60 @@ export class FWResManager extends FWManager implements FW.ResManager {
    * @returns
    */
   async loadBundle(bundleName: string): Promise<cc.AssetManager.Bundle> {
-    return await this.invoke<cc.AssetManager.Bundle>(
-      FW.Entry.promiseMgr.execute(async (resolve, reject, signal) => {
+    return new Promise(async (resolve, reject) => {
+      try {
         const depends = FWLodash.cloneDeep(FW.Entry.getDepend(bundleName));
-        try {
-          if (depends && depends.length > 0) {
-            for (const depend of depends) {
-              if (depend === undefined) continue;
+        if (depends && depends.length > 0) {
+          for (const depend of depends) {
+            if (depend === undefined) continue;
 
-              if (this.bundleMgr.has(depend)) continue;
+            if (this.bundleMgr.has(depend)) continue;
 
-              await this.loadBundle(depend);
+            await this.loadBundle(depend);
 
-              const config = FW.Entry.getComponent<FW.AssetConfig>(
-                `${depend}${FW.SystemDefine.FWBindTag.CONFIG}`,
-              );
-              if (!config) continue;
-              const preLoad = config.preLoad;
-              const keys = Object.keys(preLoad);
+            const config = FW.Entry.getComponent<FW.AssetConfig>(
+              `${depend}${FW.SystemDefine.FWBindTag.CONFIG}`,
+            );
+            if (!config) continue;
+            const preLoad = config.preLoad;
+            const keys = Object.keys(preLoad);
 
-              if (keys.length > 0) {
-                const preloadRecursive = async (
-                  obj: FW.LoadConfig | FW.AssetProperty,
-                ) => {
-                  for (const key of Object.keys(obj)) {
-                    const value: any = (obj as any)[key];
+            if (keys.length > 0) {
+              const preloadRecursive = async (obj: FW.LoadConfig | FW.AssetProperty) => {
+                for (const key of Object.keys(obj)) {
+                  const value: any = (obj as any)[key];
 
-                    if (value && typeof value.path === "string") {
-                      const path: string = value.path;
-                      const type: string = value.type;
-                      const d: string = value.bundle || depend;
-                      const priorityLoaded = value.priorityLoaded || false;
+                  if (value && typeof value.path === 'string') {
+                    const path: string = value.path;
+                    const type: string = value.type;
+                    const d: string = value.bundle || depend;
+                    const priorityLoaded = value.priorityLoaded || false;
 
-                      if (path && priorityLoaded) {
-                        await this.assetMgr.load({
-                          path,
-                          bundle: d,
-                          type,
-                        });
-                      }
-                    } else if (value && typeof value === "object") {
-                      await preloadRecursive(value);
+                    if (path && priorityLoaded) {
+                      await this.assetMgr.load({
+                        path,
+                        bundle: d,
+                        type,
+                      });
                     }
+                  } else if (value && typeof value === 'object') {
+                    await preloadRecursive(value);
                   }
-                };
-                await preloadRecursive(config.preLoad);
-              }
+                }
+              };
+              await preloadRecursive(config.preLoad);
             }
           }
+        }
 
-          const bundle = await this.bundleMgr.load(bundleName);
+        const bundle = await this.bundleMgr.load(bundleName);
 
-          resolve(bundle);
-        } catch (e) {
-          this.rejectHandlerListener?.loadBundleHandler?.(e, bundleName);
-          reject(e);
-        }
-      }, FWSystemConfig.PromiseConfig.loadBundle).promise,
-      `loadBundle -> ${bundleName}`,
-    );
+        resolve(bundle);
+      } catch (e) {
+        this.rejectHandlerListener?.loadBundleHandler?.(e, bundleName);
+        reject(e);
+      }
+    });
   }
   /**
    * 从远程加载spine动画
@@ -96,10 +91,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,
-    texture?: boolean,
-  ): Promise<T> {
+  async loadRemote<T extends cc.Asset = cc.Asset>(url: string, texture?: boolean): Promise<T> {
     try {
       const asset = await this.assetMgr.loadRemote(url);
       if (texture) {
@@ -191,10 +183,7 @@ export class FWResManager extends FWManager implements FW.ResManager {
    * @param bundleName
    * @returns
    */
-  getAssetData<T extends cc.Asset>(
-    assetProperty: FW.AssetProperty,
-    texture?: boolean,
-  ) {
+  getAssetData<T extends cc.Asset>(assetProperty: FW.AssetProperty, texture?: boolean) {
     const res = this.assetMgr.get(assetProperty);
     if (texture) {
       return res;
@@ -206,10 +195,7 @@ export class FWResManager extends FWManager implements FW.ResManager {
    * @param assetProperty
    * @returns
    */
-  getAsset<T extends cc.Asset>(
-    assetProperty: FW.AssetProperty,
-    texture?: boolean,
-  ): T {
+  getAsset<T extends cc.Asset>(assetProperty: FW.AssetProperty, texture?: boolean): T {
     const res = this.assetMgr.get(assetProperty);
     if (texture) {
       return res.asset as T;

package/package.json

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