@ives_xxz/framework 1.6.0 → 1.6.2

package/FW.d.ts

@@ -1170,6 +1170,7 @@ declare namespace FW {
     enable?: boolean;
     responseTime?: number;
     lastResponseTimestamp?: number;
+    data?: any;
   };
 
   type FWEvent = {

package/controller/FWLayerController.ts

@@ -126,7 +126,7 @@ export abstract class FWLayerController
           eventName: eventName || cc.Node.EventType.TOUCH_END,
           cb: cb,
           target: target,
-          responseInterval: responseInterval,
+          responseInterval: responseInterval || this.defaultResponseInterval,
         },
       ],
     });
@@ -146,7 +146,7 @@ export abstract class FWLayerController
         {
           eventName: eventName,
           cb: cb,
-          responseInterval: responseInterval ?? this.defaultResponseInterval,
+          responseInterval: responseInterval || this.defaultResponseInterval,
         },
       ],
     });

package/expand/FWDecorator.ts

@@ -336,10 +336,15 @@ export function AutoRegisterCCEvent(nodePath: string, eventName?: string) {
       }
 
       if (targetNode) {
-        this.registerCCEvent(evt, {
-          cb: originalMethod.bind(this),
-          target: targetNode,
-        });
+        this.registerEvent({
+  CCEvent: [
+    {
+      eventName: evt,
+      cb: originalMethod.bind(this),
+      target: targetNode,
+    }
+  ]
+});
         FWLog.debug(`自动注册事件: ${nodePath} -> ${propertyKey}`);
       } else {
         FWLog.warn(`自动注册事件失败: 未找到节点 ${nodePath}`);
@@ -359,10 +364,15 @@ export function AutoRegisterFWEvent(eventName: any) {
 
     target.onInit = function (...args) {
       originalOnInit?.call(this, args);
-      this.registerCCEvent(eventName, {
-        cb: originalMethod.bind(this),
-        target: this,
-      });
+      this.registerEvent({
+  CCEvent: [
+    {
+      eventName: eventName,
+      cb: originalMethod.bind(this),
+      target: this,
+    }
+  ]
+});
     };
   };
 }

package/language/FWLanguage.ts

@@ -38,14 +38,17 @@ export default abstract class FWLanguage extends cc.Component {
   }
 
   protected onLoad(): void {
-    FW.Entry.evtMgr.register(
-      FWEventDefine.LanguageEvent.LANGUAGE_CHANGE,
-      () => {
+    this.registerEvent({
+  FWEvent: [
+    {
+      eventName: FWEventDefine.LanguageEvent.LANGUAGE_CHANGE,
+      cb: () => {
         this._language = FW.Entry.languageMgr.getLanguageIndex();
         this.onLanguageChange();
-      },
-      this
-    );
+      }
+    }
+  ]
+});
   }
 
   protected onEnable(): void {

package/manager/FWPromiseManager.ts

@@ -61,6 +61,7 @@ export default class FWPromiseManager
         }
 
         const onAbort = () => {
+          FWLog.debug("promise abort");
           timerSchedule?.unSchedule();
           if (promiseProxy.status === FWSystemDefine.FWPromiseStatus.PENDING) {
             promiseProxy.status = FWSystemDefine.FWPromiseStatus.CANCELLED;

package/package.json

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

package/service/http/FWHttp.ts

@@ -77,7 +77,9 @@ export default class FWHttp extends FWService {
           ...FWSystemConfig.PromiseConfig.http,
           retryCondition(error, retryCount) {
             return (
-              xhr.readyState != 4 || (xhr.status !== 200 && retryCount < 3)
+              error ||
+              xhr.readyState != 4 ||
+              (xhr.status !== 200 && retryCount < 3)
             );
           },
         }