@ives_xxz/framework 2.1.15 → 2.1.17

package/FrameworkInitialize.ts

@@ -47,7 +47,7 @@ export function initializeFramework() {
   FW.Registry = require('./registry/FWRegistry').FWRegistry;
   FW.Framework = new (require('./Framework').Framework)();
   FW.FrameworkBase = require('./FrameworkBase').FrameworkBase;
-  FW.Object = require('./object/FWObject').FWObject;
+  FW.Object = require('./utils/FWObject').FWObject;
   FW.Entry = new (require('./entry/FWEntry').FWEntry)();
   FW.Scene = require('./scene/FWScene').FWScene;
   FW.Logic = require('./logic/FWLogic').FWLogic;

package/item/FWVirtualListItem.ts

@@ -1,5 +1,4 @@
 import FWVirtualViewComponent from '../component/FWVirtualViewComponent';
-import FWObject from '../utils/FWObject';
 
 const { ccclass, property, disallowMultiple, menu, executionOrder } = cc._decorator;
 
@@ -13,7 +12,7 @@ enum SelectedType {
 @disallowMultiple()
 @menu('CustomComponent/FWVirtualListItem')
 @executionOrder(-5001) //先于List
-export default class FWVirtualListItem extends FWObject {
+export default class FWVirtualListItem extends FW.Object {
   onGet(args: any) {}
   onPut() {}
   onInit() {}

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;
@@ -21,7 +21,6 @@ export class FWResManager extends FWManager implements FW.ResManager {
   async loadBundle(bundleName: string): Promise<cc.AssetManager.Bundle> {
     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) {
@@ -31,7 +30,7 @@ export class FWResManager extends FWManager implements FW.ResManager {
               await this.loadBundle(depend);
 
               const config = FW.Entry.getComponent<FW.AssetConfig>(
-                `${depend}${FW.SystemDefine.FWBindTag.CONFIG}`
+                `${depend}${FW.SystemDefine.FWBindTag.CONFIG}`,
               );
               if (!config) continue;
               const preLoad = config.preLoad;
@@ -62,12 +61,15 @@ export class FWResManager extends FWManager implements FW.ResManager {
               }
             }
           }
+
+          const bundle = await this.bundleMgr.load(bundleName);
+
           resolve(bundle);
         } catch (e) {
           reject(e);
         }
       }, FWSystemConfig.PromiseConfig.loadBundle).promise,
-      `loadBundle -> ${bundleName}`
+      `loadBundle -> ${bundleName}`,
     );
   }
   /**
@@ -84,10 +86,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,
-    cb: (asset: any) => T
-  ): Promise<T> {
+  async loadRemote<T extends cc.Asset = cc.Asset>(url: string, cb: (asset: any) => T): Promise<T> {
     const asset = await this.assetMgr.loadRemote(url);
     if (asset instanceof cc.Texture2D) {
       return new cc.SpriteFrame(asset) as unknown as T;
@@ -134,9 +133,7 @@ export class FWResManager extends FWManager implements FW.ResManager {
    * @param assetProperty
    * @returns
    */
-  async loadAsset<T extends cc.Asset>(
-    assetProperty: FW.AssetProperty
-  ): Promise<T> {
+  async loadAsset<T extends cc.Asset>(assetProperty: FW.AssetProperty): Promise<T> {
     const res = await this.assetMgr.load(assetProperty);
     return this.process<T>(res).asset as T;
   }

package/package.json

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

package/registry/FWRegistry.ts

@@ -40,16 +40,7 @@ export abstract class FWRegistry implements FW.Registry {
   readonly handle?: FW.Newable<FW.Handle>;
 
   register(): void {
-    this.bundleEnabled(true);
-  }
-  unRegister(): void {
-    this.bundleEnabled(false);
-  }
-
-  bundleEnabled(enable?: boolean) {
-    const frameworkInvoke = enable ? FW.Framework.register : FW.Framework.unRegister;
-    const entryInvoke = enable ? FW.Entry.register : FW.Entry.unRegister;
-    frameworkInvoke.bind(FW.Framework)({
+    FW.Framework.register.bind(FW.Framework)({
       bundleName: this.bundleName,
       logic: this.logic,
       data: this.data,
@@ -57,11 +48,15 @@ export abstract class FWRegistry implements FW.Registry {
       sender: this.sender,
       handle: this.handle,
     });
-    entryInvoke.bind(FW.Entry)({
+  }
+  unRegister(): void {
+    FW.Framework.unRegister.bind(FW.Framework)({
       bundleName: this.bundleName,
-      sceneName: this.sceneName,
-      autoRelease: this.autoRelease,
-      depend: this.depend,
+      logic: this.logic,
+      data: this.data,
+      config: this.config,
+      sender: this.sender,
+      handle: this.handle,
     });
   }
 }

package/types/FW.d.ts

@@ -2779,18 +2779,6 @@ declare namespace FW {
      * bundle名字
      */
     abstract readonly bundleName: string;
-    /**
-     * 是否自动释放
-     */
-    readonly autoRelease?: boolean;
-    /**
-     * 场景名字
-     */
-    readonly sceneName?: string;
-    /**
-     * 依赖
-     */
-    readonly depend?: string[];
     /**
      * 逻辑
      */
@@ -2820,10 +2808,6 @@ declare namespace FW {
      * 卸载
      */
     unRegister(): void;
-    /**
-     * 启用bundle
-     */
-    bundleEnabled(enable?: boolean);
   }
 }
 

package/utils/FWObjectPool.ts

@@ -1,8 +1,6 @@
-import FWObject from './FWObject';
-
 const POOL_DISABLE_POSITION: cc.Vec3 = cc.v3(50000, 50000);
 
-export class FWObjectPool<T extends FWObject = FWObject> implements FW.ObjectPool {
+export class FWObjectPool<T extends FW.Object = FW.Object> implements FW.ObjectPool {
   private uniqueId: number;
   private type: FW.SystemDefine.FWObjectType;
   private enablePoolMap: Map<number, FW.ObjectProperty>;
@@ -51,7 +49,7 @@ export class FWObjectPool<T extends FWObject = FWObject> implements FW.ObjectPoo
         if (property.node.uuid == uuid) {
           return property;
         }
-      } else if (arguments[0] instanceof FWObject) {
+      } else if (arguments[0] instanceof FW.Object) {
         if (uniqueId == arguments[0]?.uniqueId) {
           return property;
         }
@@ -77,7 +75,7 @@ export class FWObjectPool<T extends FWObject = FWObject> implements FW.ObjectPoo
     };
     if (this.isEmpty()) {
       node = cc.instantiate(this.node);
-      element = (node.getComponent(FWObject) as T) || undefined;
+      element = (node.getComponent(FW.Object) as T) || undefined;
       ObjectProperty.uniqueId = ++this.uniqueId;
       ObjectProperty.node = node;
       ObjectProperty.component = element;
@@ -142,7 +140,7 @@ export class FWObjectPool<T extends FWObject = FWObject> implements FW.ObjectPoo
     let property: FW.ObjectProperty = this.findObjectProperty(arguments[0]);
 
     const node: cc.Node = property.node;
-    const element = (node.getComponent(FWObject) as T) || undefined;
+    const element = (node.getComponent(FW.Object) as T) || undefined;
 
     if (!cc.isValid(node)) {
       return;