@shimotsuki/core 2.0.38 → 2.0.40

package/dist/index.d.ts

@@ -1038,5 +1038,11 @@ declare class Manager {
     merge<K extends keyof Manager, T extends object>(target: K, source: T): this;
 }
 declare const cat: Manager;
+declare global {
+    namespace globalThis {
+        /**核心框架 */
+        var cat: Manager;
+    }
+}
 
 export { AudioEffect, AudioEventConstant, AudioManager, AudioSourceBaseComponent, AudioSourceUILayer, AudioTypeEnum, BaseComponent, BaseManager, BasePrefab, BaseStore, ButtonLock, CoreBlackMask, CoreNotice, type CoreNoticeProps, CoreReconnection, CoreShowLoading, type CoreShowLoadingProps, CoreStore, CoreToast, CoreUIContainer, CoreUIModal, type CoreUIModalProps, CoreUtil, GlobalEventConstant, Gui, GuiManager, type HOOK, type ICloseOptions, type IDirection, type IOpenOptions, type IUIOption, LayerType, Manager, ReconnectPrompt, RootUILayer, type SceneComponentType, type SceneDataType, SceneLayer, type ScenePropsType, TimerManager, type ToastProps, ToastType, type UIComponentType, UILayer, WrapperSocialGameClient, cat };

package/dist/index.js

@@ -2421,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;
@@ -2450,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);
@@ -2481,6 +2472,17 @@ class SocialGameClientManager extends BaseManager {
     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();
         }
@@ -2912,6 +2914,7 @@ class Manager {
     }
 }
 const cat = Manager.instance;
+globalThis.cat = cat;
 /**
  * 项目数据初始化之后的处理APP初始化事务
  * 执行顺序 onAppInitDelegate -> onPlugInInitDelegate

package/package.json

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