@shimotsuki/core 2.0.37 → 2.0.39

package/dist/index.d.ts

@@ -785,6 +785,7 @@ declare class SocialGameClientManager extends BaseManager {
     private isInBackground;
     readonly onEventHideDelegate: AsyncDelegate<() => (Promise<void> | void)>;
     readonly onEventShowDelegate: AsyncDelegate<() => (Promise<void> | void)>;
+    readonly onEventReloadSceneDelegate: AsyncDelegate<() => (Promise<void> | void)>;
     get activeClients(): WrapperSocialGameClient[];
     constructor(cat: Manager);
     /**

package/dist/index.js

@@ -2350,6 +2350,7 @@ class SocialGameClientManager extends BaseManager {
     isInBackground = false;
     onEventHideDelegate = new AsyncDelegate();
     onEventShowDelegate = new AsyncDelegate();
+    onEventReloadSceneDelegate = new AsyncDelegate();
     get activeClients() {
         return Array.from(this.managedClients)
             .map(([_, client]) => client)
@@ -2420,10 +2421,10 @@ class SocialGameClientManager extends BaseManager {
             case 'show':
                 this.isInBackground = false;
                 await this.triggerReconnectAll();
-                await this.onEventHideDelegate.dispatch();
+                await this.onEventShowDelegate.dispatch();
                 break;
             case 'hide':
-                await this.onEventShowDelegate.dispatch();
+                await this.onEventHideDelegate.dispatch();
                 this.isInBackground = true;
                 this.disconnectAll(true);
                 break;
@@ -2449,15 +2450,6 @@ class SocialGameClientManager extends BaseManager {
                 cat.gui.showToast({ title: `${client.name}服重连失败` });
                 // 不抛出错误，让 Promise.allSettled 收集结果
             }
-            try {
-                // 2. 执行业务层连接请求
-                await client.connectRequest();
-            }
-            catch (err) {
-                error(`${client.name}服登录错误`, err);
-                cat.gui.showToast({ title: `登录${client.name}服错误` });
-                // 同样不抛出错误
-            }
         }));
         // 检查是否有客户端未成功连接
         const failedClients = this.activeClients.filter(client => client.socketConnectStatus !== SocketConnectStatus.CONNECTED);
@@ -2477,9 +2469,21 @@ class SocialGameClientManager extends BaseManager {
         });
     }
     // 单个WS重连成功回调
-    handleSingleReconnect = () => {
+    handleSingleReconnect = async () => {
         if (this.activeClients.every(client => client.socketConnectStatus === SocketConnectStatus.CONNECTED)) {
             log('单个WS重连成功回调===', this.managedClients);
+            await Promise.allSettled(this.activeClients.map(async (client) => {
+                // 连接社交游戏服务
+                try {
+                    // 2. 执行业务层连接请求
+                    await client.connectRequest();
+                }
+                catch (err) {
+                    error(`${client.name}服登录错误`, err);
+                    cat.gui.showToast({ title: `登录${client.name}服错误` });
+                }
+            }));
+            await this.onEventReloadSceneDelegate.dispatch();
             cat.gui.hideLoading().reloadScene();
         }
     };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@shimotsuki/core",
-    "version": "2.0.37",
+    "version": "2.0.39",
     "description": "",
     "license": "MIT",
     "main": "dist/index.js",