@ives_xxz/framework 2.1.14 → 2.1.15

package/FrameworkInitialize.ts

@@ -47,6 +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.Entry = new (require('./entry/FWEntry').FWEntry)();
   FW.Scene = require('./scene/FWScene').FWScene;
   FW.Logic = require('./logic/FWLogic').FWLogic;

package/package.json

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

package/types/FW.d.ts

@@ -266,32 +266,32 @@ declare namespace FW {
 
   type ObjectManager = {
     /** 创建一个对象池 */
-    createObjectPool<T extends FWObject = FWObject>(
+    createObjectPool<T extends FW.Object = FWObject>(
       node: cc.Node,
       parent: cc.Node,
       tag?: string,
     ): Promise<ObjectPool<T>>;
-    createObjectPool<T extends FWObject = FWObject>(
+    createObjectPool<T extends FW.Object = FWObject>(
       prefab: cc.Prefab,
       parent: cc.Node,
       tag?: string,
     ): Promise<ObjectPool<T>>;
-    createObjectPool<T extends FWObject = FWObject>(
+    createObjectPool<T extends FW.Object = FWObject>(
       assetProperty: FW.AssetProperty,
       parent: cc.Node,
       tag?: string,
     ): Promise<ObjectPool<T>>;
-    createObjectPool<T extends FWObject = FWObject>(
+    createObjectPool<T extends FW.Object = FWObject>(
       node: cc.Node,
       parent: cc.Node,
       type?: number,
     ): Promise<ObjectPool<T>>;
-    createObjectPool<T extends FWObject = FWObject>(
+    createObjectPool<T extends FW.Object = FWObject>(
       prefab: cc.Prefab,
       parent: cc.Node,
       type?: number,
     ): Promise<ObjectPool<T>>;
-    createObjectPool<T extends FWObject = FWObject>(
+    createObjectPool<T extends FW.Object = FWObject>(
       assetProperty: FW.AssetProperty,
       parent: cc.Node,
       type?: number,
@@ -1975,19 +1975,6 @@ declare namespace FW {
     getAllReports(): Map<string, FW.PerformanceReport>;
   };
 
-  type Object = {
-    /** 是否已经初始化 */
-    initialize: boolean;
-    /** 对象唯一id */
-    uniqueId: number;
-    /** 对象是否启用 */
-    enable: boolean;
-    onGet(...args: any);
-    onPut();
-    onInit();
-    onDestroy();
-  };
-
   type ObjectProperty<T extends Object = Object> = {
     /** 对象节点 */
     node?: cc.Node;
@@ -2968,3 +2955,18 @@ declare namespace FW {
     public static updateMockResponses(mockResponses: {});
   }
 }
+
+declare namespace FW {
+  export abstract class Object extends cc.Component {
+    /** 是否已经初始化 */
+    initialize: boolean;
+    /** 对象唯一id */
+    uniqueId: number;
+    /** 对象是否启用 */
+    enable: boolean;
+    onGet(...args: any);
+    onPut();
+    onInit();
+    onDestroy();
+  }
+}

package/utils/FWObject.ts

@@ -1,4 +1,4 @@
-export default abstract class FWObject extends cc.Component implements FW.Object {
+export abstract class FWObject extends cc.Component {
   /** 是否已经初始化 */
   public initialize: boolean;
   /** 对象唯一id */
@@ -18,5 +18,10 @@ export default abstract class FWObject extends cc.Component implements FW.Object
   abstract onGet(args: any);
   abstract onPut();
   abstract onInit();
-  abstract onDestroy();
+  onDestroy() {
+    FW.Entry.timeMgr?.unSchedule(this);
+    FW.Entry.evtMgr?.targetOff(this);
+    this?.unscheduleAllCallbacks();
+    this?.node?.stopAllActions();
+  }
 }