@ives_xxz/framework 1.5.15 → 1.5.17

package/expand/FWDecorator.ts

@@ -7,7 +7,7 @@ type PropertyDecorator = (
   $descriptorOrInitializer?: any
 ) => void;
 
-const searchChild = function (node: cc.Node, name: string) {
+export const searchChild = function (node: cc.Node, name: string) {
   let ret = node.getChildByName(name);
   if (ret) return ret;
   for (let i = 0; i < node.children.length; i++) {
@@ -289,7 +289,6 @@ export function RegisterEvents(events: FW.RegisterEventArgs[]) {
     const originalMethod = descriptor.value;
 
     descriptor.value = function (...args: any[]) {
-      // 在初始化时自动注册事件
       if (this.registerEvent) {
         this.registerEvent(events);
       }

package/manager/FWBundleManager.ts

@@ -1,7 +1,8 @@
-import { FWManager } from './FWManager';
-import FWLog from '../log/FWLog';
-import Framework from '../Framework';
-import { FWSystemConfig } from '../config/FWSystemConfig';
+import { FWManager } from "./FWManager";
+import FWLog from "../log/FWLog";
+import Framework from "../Framework";
+import { FWSystemConfig } from "../config/FWSystemConfig";
+import { FWLodash } from "../utils/FWLodash";
 
 export class FWBundleManager extends FWManager implements FW.BundleManager {
   bundleMap: Map<string, cc.AssetManager.Bundle>;
@@ -35,25 +36,28 @@ export class FWBundleManager extends FWManager implements FW.BundleManager {
     return await this.invoke(
       FW.Entry.promiseMgr.execute((resolve, reject, signal) => {
         const remote = this.remoteBundleConfigMap.get(bundleName);
-        const url = remote ? remote.url : '';
+        const url = remote ? remote.url : "";
         const path = `${url}${bundleName}`;
         cc.assetManager.loadBundle(
           path,
-          { version: this.remoteBundleConfigMap.get(bundleName)?.version || '' },
-          (err: Error, bundle: cc.AssetManager.Bundle) => {
+          {
+            version: this.remoteBundleConfigMap.get(bundleName)?.version || "",
+          },
+          async (err: Error, bundle: cc.AssetManager.Bundle) => {
             if (err || !bundle) {
               FWLog.error(`"加载bundle失败:"${bundleName}!`);
               reject(err);
             }
-            this.bundleMap.set(bundleName, bundle);
 
             Framework.createRegistry(bundleName)?.register();
 
+            this.bundleMap.set(bundleName, bundle);
+
             resolve(bundle);
-          },
+          }
         );
       }, FWSystemConfig.PromiseConfig.loadBundle).promise,
-      `loadBundle -> ${bundleName}`,
+      `loadBundle -> ${bundleName}`
     );
   }
 
@@ -64,7 +68,7 @@ export class FWBundleManager extends FWManager implements FW.BundleManager {
    */
   get(bundleName: string): cc.AssetManager.Bundle {
     if (!this.has(bundleName)) {
-      FWLog.error('获取bundle失败,请先加载!');
+      FWLog.error("获取bundle失败,请先加载!");
       return undefined;
     }
     return this.bundleMap.get(bundleName);

package/manager/FWLayerManager.ts

@@ -54,11 +54,10 @@ export class FWLayerManager extends FWManager implements FW.LayerManager {
   /**
    * 同步打开
    */
-  @PerformanceMonitor("openSync")
   openSync<Ctr extends FW.LayerController = FW.LayerController>(
     data: FW.LayerOpenArgs
   ): Ctr {
-    return this.openManager.openLayerSync(data) as unknown as Ctr;
+    return this.openManager.openLayerSync(data) as Ctr;
   }
 
   /**

package/manager/FWResManager.ts

@@ -1,3 +1,8 @@
+import FWAssetConfig from "../config/FWAssetConfig";
+import { FWSystemConfig } from "../config/FWSystemConfig";
+import { FWSystemDefine } from "../define/FWSystemDefine";
+import FWLog from "../log/FWLog";
+import { FWLodash } from "../utils/FWLodash";
 import { FWAssetManager } from "./FWAssetManager";
 import { FWBundleManager } from "./FWBundleManager";
 import { FWManager } from "./FWManager";
@@ -19,7 +24,56 @@ export class FWResManager extends FWManager implements FW.ResManager {
    * @returns
    */
   async loadBundle(bundleName: string): Promise<cc.AssetManager.Bundle> {
-    return this.bundleMgr.load(bundleName);
+    return await this.invoke<cc.AssetManager.Bundle>(
+      FW.Entry.promiseMgr.execute(async (resolve, reject, signal) => {
+        const bundle = await this.bundleMgr.load(bundleName);
+        const depends = FWLodash.cloneDeep(FW.Entry.getDepend(bundleName));
+        try {
+          if (depends && depends.length > 0) {
+            for (const depend of depends) {
+              if (this.bundleMgr.has(depend)) continue;
+
+              await this.loadBundle(depend);
+
+              const config = FW.Entry.getComponent<FWAssetConfig>(
+                `${depend}${FWSystemDefine.FWBindTag.CONFIG}`
+              );
+              if (!config) continue;
+              const preLoad = config.preLoad;
+              const keys = Object.keys(preLoad);
+
+              if (keys.length > 0) {
+                const find = (o) => {
+                  Object.keys(o).forEach(async (key) => {
+                    const value: FW.AssetProperty = o[key];
+                    const path: string = value.path;
+                    const type: string = value.type;
+                    const d: string = value.bundle || depend;
+                    const priorityLoaded = value.priorityLoaded || false;
+                    if (path) {
+                      if (priorityLoaded) {
+                        await this.assetMgr.load({
+                          path: path,
+                          bundle: d,
+                          type: type,
+                        });
+                      }
+                    } else {
+                      find(value);
+                    }
+                  });
+                };
+                find(config.preLoad);
+              }
+            }
+          }
+          resolve(bundle);
+        } catch (e) {
+          reject(e);
+        }
+      }, FWSystemConfig.PromiseConfig.loadBundle).promise,
+      `loadBundleDepend -> ${bundleName}`
+    );
   }
   /**
    * 从远程加载spine动画

package/package.json

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