@ives_xxz/framework 1.3.6 → 1.3.8

package/FW.d.ts

@@ -113,7 +113,7 @@ declare namespace FW {
     /** 获取协议Key值 */
     getProtocolKey?(msg: any): string;
     /** 消息收到前回调函数 */
-    onBeforeReceivingMessage?(msg: any): Promise<object>;
+    onBeforeReceivingMessage?(msg: any): Promise<SocketMessage>;
   };
 
   type ObjectManager = {
@@ -169,6 +169,11 @@ declare namespace FW {
     onDestroy();
   };
 
+  type SocketMessage = {
+    data:any;
+    error:boolean;
+  }
+
   type SocketManager = {
     createSocket(
       tag: string,
@@ -1174,6 +1179,11 @@ declare namespace FW {
     unRegister(stateType: number, stateMachineName?: string);
   };
 
+  type SocketMessage = {
+    data:any;
+    error:boolean;
+  }
+
   type AnimationManager = {
     initialize(): void;
     onDestroy(): void;

package/entry/FWEntry.ts

@@ -146,6 +146,11 @@ export default class FWEntry implements FW.Entry {
 
   releaseBundle(bundleName: string) {
     this.resMgr.releaseBundle(bundleName);
+    const depend = this.getDepend(bundleName);
+    for(const d of depend){
+      this.resMgr.releaseBundle(d);
+      this.evtMgr.dispatch(`${FWEventDefine.SystemEvent.BUNDLE_RELEASE}-${d}`);
+    }
     this.evtMgr.dispatch(`${FWEventDefine.SystemEvent.BUNDLE_RELEASE}-${bundleName}`);
   }
 

package/expand/FWRollingViewNesting.ts

@@ -59,9 +59,9 @@ export default class FWRollingViewNesting extends cc.Component {
           let touch = event.touch;
           if (viewGroup.content) {
             if (viewGroup instanceof cc.PageView) {
-              } else {
-                viewGroup._handleReleaseLogic(touch);
+                viewGroup['_touchEndPosition'] = touch.getLocation();
               }
+              viewGroup._handleReleaseLogic(touch);
           }
         }
         if (
@@ -72,9 +72,9 @@ export default class FWRollingViewNesting extends cc.Component {
             let touch = event.touch;
             if (viewGroup.content) {
               if (viewGroup instanceof cc.PageView) {
-              } else {
-                viewGroup._handleReleaseLogic(touch);
+                viewGroup['_touchEndPosition'] = touch.getLocation();
               }
+              viewGroup._handleReleaseLogic(touch);
             }
           }
         }

package/package.json

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

package/service/socket/FWSocket.ts

@@ -310,12 +310,17 @@ export default class FWSocket implements FW.Socket {
   /** 消息处理 */
   private async onSocketMessage(originalMsg: any) {
     const msg = await this.handle.onBeforeReceivingMessage(originalMsg);
+    
+    if(msg.error){
+      this.remoteProtocol(msg);
+      return;
+    }
 
     if (await this.handle?.onHeart?.(msg)) {
       this.receiveTimeStamp = new Date().getTime();
       return;
     }
-
+    
     this.remoteProtocol(msg);
 
     if (this.isPausedMessageHandle) return;

package/service/socket/FWSocketHandle.ts

@@ -15,5 +15,5 @@ export default abstract class FWSocketHandle implements FW.SocketHandle {
   onError?(msg: any): void;
   onTimeout?(): void;
   getProtocolKey?(msg: any): string;
-  onBeforeReceivingMessage?(msg: any): Promise<object>;
+  onBeforeReceivingMessage?(msg: any): Promise<FW.SocketMessage>;
 }