@shimotsuki/core 3.0.41 → 3.0.43

package/dist/shimotsuki_core.js

@@ -1,16 +1,16 @@
 import e from "@babel/runtime-corejs3/core-js/global-this";
 
-import { AudioSource as t, _decorator as i, AudioClip as n, error as o, Node as s, director as r, log as a, Component as l, Prefab as c, instantiate as h, isValid as u, Layers as d, view as p, Widget as f, v3 as m, tween as _, Enum as y, game as g, Label as b, UIOpacity as v, Tween as C, BlockInputEvents as E, Button as S, Game as w, Director as A, assetManager as I, warn as O, AsyncDelegate as T, Asset as k, resources as R, sys as M, SpriteFrame as N, Sprite as U } from "cc";
+import { AudioSource as t, _decorator as i, AudioClip as n, error as o, Node as s, director as r, log as a, Component as l, Prefab as c, instantiate as h, isValid as u, Layers as d, view as p, Widget as f, v3 as m, tween as _, Enum as g, game as y, Label as b, UIOpacity as v, Tween as C, BlockInputEvents as E, Button as S, Game as w, Director as A, assetManager as I, warn as O, AsyncDelegate as T, Asset as k, resources as R, sys as M, SpriteFrame as U, Sprite as N } from "cc";
 
 import D from "@babel/runtime-corejs3/core-js-stable/reflect/get";
 
-import F from "@babel/runtime-corejs3/core-js-stable/reflect/set";
+import x from "@babel/runtime-corejs3/core-js-stable/reflect/set";
 
-import L from "@babel/runtime-corejs3/core-js-stable/object/assign";
+import j from "@babel/runtime-corejs3/core-js-stable/object/assign";
 
-import x from "@babel/runtime-corejs3/core-js-stable/promise";
+import F from "@babel/runtime-corejs3/core-js-stable/promise";
 
-import j from "eventemitter3";
+import L from "eventemitter3";
 
 import B from "@babel/runtime-corejs3/core-js-stable/instance/includes";
 
@@ -36,17 +36,17 @@ import Z from "@babel/runtime-corejs3/core-js-stable/instance/map";
 
 import Y from "@babel/runtime-corejs3/core-js-stable/array/from";
 
-import ee from "@babel/runtime-corejs3/core-js-stable/date/now";
+import ee from "@babel/runtime-corejs3/core-js-stable/instance/every";
 
-import te from "@babel/runtime-corejs3/core-js-stable/instance/every";
+import { SocketConnectStatus as te } from "pitayaclient";
 
-import { SocketConnectStatus as ie } from "pitayaclient";
+import { DEBUG as ie, WECHAT as ne, PREVIEW as oe } from "cc/env";
 
-import { DEBUG as ne, WECHAT as oe, PREVIEW as se } from "cc/env";
+import { SocialGameClient as se } from "sgc";
 
-import { SocialGameClient as re } from "sgc";
+import re from "crypto-es";
 
-import ae from "crypto-es";
+import ae from "@babel/runtime-corejs3/core-js-stable/date/now";
 
 import le from "@babel/runtime-corejs3/core-js-stable/set-interval";
 
@@ -67,7 +67,7 @@ const {ccclass: ue, menu: de} = i;
 let pe = class AudioEffect extends CommonAudio {
     effects=(() => new G)();
     load(e, t) {
-        return new x((i, o) => {
+        return new F((i, o) => {
             let s = null;
             let r;
             if (t !== undefined) {
@@ -111,7 +111,7 @@ class AudioMusic extends CommonAudio {
         this.currentTime = e * this.duration;
     }
     load(e, t) {
-        return new x((i, s) => {
+        return new F((i, s) => {
             let r = null;
             let a;
             if (t !== undefined) {
@@ -334,13 +334,13 @@ class AudioManager extends BaseManager {
     }
 }
 
-function ye(e, t, i, n) {
+function ge(e, t, i, n) {
     var o = arguments.length, s = o < 3 ? t : n === null ? n = Object.getOwnPropertyDescriptor(t, i) : n, r;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") s = Reflect.decorate(e, t, i, n); else for (var a = e.length - 1; a >= 0; a--) if (r = e[a]) s = (o < 3 ? r(s) : o > 3 ? r(t, i, s) : r(t, i)) || s;
     return o > 3 && s && Object.defineProperty(t, i, s), s;
 }
 
-function ge(e, t) {
+function ye(e, t) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(e, t);
 }
 
@@ -479,12 +479,12 @@ class BaseComponent extends l {
     }
     setUpdateData(e) {
         if (!this.data) return;
-        e && L(this.data, this.toPlainObject(e));
+        e && j(this.data, this.toPlainObject(e));
         return this;
     }
     setUpdateProps(e) {
         if (!this.props) return;
-        e && L(this.props, this.toPlainObject(e));
+        e && j(this.props, this.toPlainObject(e));
         return this;
     }
     toPlainObject(e) {
@@ -625,7 +625,7 @@ class UILayer extends BaseComponent {
         }, o);
     }
     deftween(e, t, i, n) {
-        return new x((i, n) => {
+        return new F((i, n) => {
             _(this.node).to(e, t).call(() => {
                 i();
             }).start();
@@ -670,7 +670,7 @@ class AudioSourceBaseComponent extends BaseComponent {
     }
     playAudio() {
         const {switchEffect: e, switchMusic: t} = this.cat.audio;
-        if (!this.audioSource.playing && (this.type === Se.BGM ? t : e) && !g._paused) this.audioSource.play();
+        if (!this.audioSource.playing && (this.type === Se.BGM ? t : e) && !y._paused) this.audioSource.play();
     }
     onPlayEffectHandler() {}
     onStopEffectHandler() {
@@ -686,27 +686,27 @@ class AudioSourceBaseComponent extends BaseComponent {
     }
 }
 
-ye([ Ee({
+ge([ Ee({
     tooltip: `类型:\n        EFFECT 音效\n        BGM    音乐`,
-    type: y(Se)
-}), ge("design:type", Number) ], AudioSourceBaseComponent.prototype, "type", void 0);
+    type: g(Se)
+}), ye("design:type", Number) ], AudioSourceBaseComponent.prototype, "type", void 0);
 
-ye([ Ee({
+ge([ Ee({
     tooltip: "音源",
     type: n
-}), ge("design:type", typeof (ve = typeof n !== "undefined" && n) === "function" ? ve : Object) ], AudioSourceBaseComponent.prototype, "clip", void 0);
+}), ye("design:type", typeof (ve = typeof n !== "undefined" && n) === "function" ? ve : Object) ], AudioSourceBaseComponent.prototype, "clip", void 0);
 
-ye([ Ee({
+ge([ Ee({
     tooltip: "循环"
-}), ge("design:type", Boolean) ], AudioSourceBaseComponent.prototype, "loop", void 0);
+}), ye("design:type", Boolean) ], AudioSourceBaseComponent.prototype, "loop", void 0);
 
-ye([ Ee({
+ge([ Ee({
     tooltip: "音量"
-}), ge("design:type", Number) ], AudioSourceBaseComponent.prototype, "volume", void 0);
+}), ye("design:type", Number) ], AudioSourceBaseComponent.prototype, "volume", void 0);
 
-ye([ Ee({
+ge([ Ee({
     tooltip: "是否启用自动播放"
-}), ge("design:type", Boolean) ], AudioSourceBaseComponent.prototype, "playOnAwake", void 0);
+}), ye("design:type", Boolean) ], AudioSourceBaseComponent.prototype, "playOnAwake", void 0);
 
 var we;
 
@@ -737,7 +737,7 @@ class AudioSourceUILayer extends UILayer {
     }
     playAudio() {
         const {switchEffect: e, switchMusic: t} = this.cat.audio;
-        if (!this.audioSource.playing && (this.type === Se.BGM ? t : e) && !g._paused) this.audioSource.play();
+        if (!this.audioSource.playing && (this.type === Se.BGM ? t : e) && !y._paused) this.audioSource.play();
     }
     onPlayEffectHandler() {}
     onStopEffectHandler() {
@@ -753,31 +753,31 @@ class AudioSourceUILayer extends UILayer {
     }
 }
 
-ye([ Ie({
+ge([ Ie({
     tooltip: `类型:\n        EFFECT 音效\n        BGM    音乐`,
-    type: y(Se)
-}), ge("design:type", Number) ], AudioSourceUILayer.prototype, "type", void 0);
+    type: g(Se)
+}), ye("design:type", Number) ], AudioSourceUILayer.prototype, "type", void 0);
 
-ye([ Ie({
+ge([ Ie({
     tooltip: "音源",
     type: n
-}), ge("design:type", typeof (we = typeof n !== "undefined" && n) === "function" ? we : Object) ], AudioSourceUILayer.prototype, "clip", void 0);
+}), ye("design:type", typeof (we = typeof n !== "undefined" && n) === "function" ? we : Object) ], AudioSourceUILayer.prototype, "clip", void 0);
 
-ye([ Ie({
+ge([ Ie({
     tooltip: "循环"
-}), ge("design:type", Boolean) ], AudioSourceUILayer.prototype, "loop", void 0);
+}), ye("design:type", Boolean) ], AudioSourceUILayer.prototype, "loop", void 0);
 
-ye([ Ie({
+ge([ Ie({
     tooltip: "音量"
-}), ge("design:type", Number) ], AudioSourceUILayer.prototype, "volume", void 0);
+}), ye("design:type", Number) ], AudioSourceUILayer.prototype, "volume", void 0);
 
-ye([ Ie({
+ge([ Ie({
     tooltip: "是否启用自动播放"
-}), ge("design:type", Boolean) ], AudioSourceUILayer.prototype, "playOnAwake", void 0);
+}), ye("design:type", Boolean) ], AudioSourceUILayer.prototype, "playOnAwake", void 0);
 
 var Oe, Te, ke, Re;
 
-const {ccclass: Me, property: Ne, menu: Ue} = i;
+const {ccclass: Me, property: Ue, menu: Ne} = i;
 
 var De;
 
@@ -786,7 +786,7 @@ var De;
     e[e["SLIDE"] = 1] = "SLIDE";
 })(De || (De = {}));
 
-let Fe = class CoreToast extends BaseComponent {
+let xe = class CoreToast extends BaseComponent {
     fixed_node;
     slide_node;
     fixed_label;
@@ -798,7 +798,7 @@ let Fe = class CoreToast extends BaseComponent {
         this.show();
     }
     async show() {
-        return new x(async (e, t) => {
+        return new F(async (e, t) => {
             const {title: i, type: n, fixed_time: o} = this.props;
             if (n == De.FIXED) {
                 this.fixed_node.active = true;
@@ -817,7 +817,7 @@ let Fe = class CoreToast extends BaseComponent {
         });
     }
     playAnim(e) {
-        return new x((t, i) => {
+        return new F((t, i) => {
             const n = 1.2;
             const o = .5;
             const s = this.node.getComponent(v);
@@ -841,29 +841,29 @@ let Fe = class CoreToast extends BaseComponent {
     }
 };
 
-ye([ Ne({
+ge([ Ue({
     type: s,
     tooltip: "固定节点"
-}), ge("design:type", typeof (Oe = typeof s !== "undefined" && s) === "function" ? Oe : Object) ], Fe.prototype, "fixed_node", void 0);
+}), ye("design:type", typeof (Oe = typeof s !== "undefined" && s) === "function" ? Oe : Object) ], xe.prototype, "fixed_node", void 0);
 
-ye([ Ne({
+ge([ Ue({
     type: s,
     tooltip: "滑动节点"
-}), ge("design:type", typeof (Te = typeof s !== "undefined" && s) === "function" ? Te : Object) ], Fe.prototype, "slide_node", void 0);
+}), ye("design:type", typeof (Te = typeof s !== "undefined" && s) === "function" ? Te : Object) ], xe.prototype, "slide_node", void 0);
 
-ye([ Ne({
+ge([ Ue({
     type: b,
     tooltip: "固定标签节点"
-}), ge("design:type", typeof (ke = typeof b !== "undefined" && b) === "function" ? ke : Object) ], Fe.prototype, "fixed_label", void 0);
+}), ye("design:type", typeof (ke = typeof b !== "undefined" && b) === "function" ? ke : Object) ], xe.prototype, "fixed_label", void 0);
 
-ye([ Ne({
+ge([ Ue({
     type: b,
     tooltip: "滑动标签节点"
-}), ge("design:type", typeof (Re = typeof b !== "undefined" && b) === "function" ? Re : Object) ], Fe.prototype, "slide_label", void 0);
+}), ye("design:type", typeof (Re = typeof b !== "undefined" && b) === "function" ? Re : Object) ], xe.prototype, "slide_label", void 0);
 
-Fe = ye([ Me("CoreToast"), Ue("CATCORE/CoreToast") ], Fe);
+xe = ge([ Me("CoreToast"), Ne("CATCORE/CoreToast") ], xe);
 
-var Le;
+var je;
 
 (function(e) {
     e["EVENT_SHOW"] = "GlobalEventConstant/EVENT_SHOW";
@@ -874,22 +874,22 @@ var Le;
     e["OFFLINE"] = "GlobalEventConstant/OFFLINE";
     e["ROOT_MASK_UPDATE"] = "GlobalEventConstant/ROOT_MASK_UPDATE";
     e["ROOT_MASK_CHANGE"] = "GlobalEventConstant/ROOT_MASK_CHANGE";
-})(Le || (Le = {}));
+})(je || (je = {}));
 
-var xe;
+var Fe;
 
-const {ccclass: je, property: Be, menu: Pe} = i;
+const {ccclass: Le, property: Be, menu: Pe} = i;
 
 let Ge = class CoreBlackMask extends BaseComponent {
     tween;
 };
 
-ye([ Be({
+ge([ Be({
     type: s,
     tooltip: "动画节点"
-}), ge("design:type", typeof (xe = typeof s !== "undefined" && s) === "function" ? xe : Object) ], Ge.prototype, "tween", void 0);
+}), ye("design:type", typeof (Fe = typeof s !== "undefined" && s) === "function" ? Fe : Object) ], Ge.prototype, "tween", void 0);
 
-Ge = ye([ je("CoreBlackMask"), Pe("CATCORE/CoreBlackMask") ], Ge);
+Ge = ge([ Le("CoreBlackMask"), Pe("CATCORE/CoreBlackMask") ], Ge);
 
 var He, $e;
 
@@ -912,7 +912,7 @@ let ze = class CoreUIContainer extends UILayer {
         return this.scene_mask.tween.children;
     }
     onEventListener() {
-        this.cat.event.on(Le.ROOT_MASK_CHANGE, this.uiMaskChanged, this);
+        this.cat.event.on(je.ROOT_MASK_CHANGE, this.uiMaskChanged, this);
     }
     addMask() {
         const e = this.brother[this.brother.length - 1];
@@ -951,15 +951,15 @@ let ze = class CoreUIContainer extends UILayer {
     }
 };
 
-ye([ We({
+ge([ We({
     type: s
-}), ge("design:type", typeof (He = typeof s !== "undefined" && s) === "function" ? He : Object) ], ze.prototype, "scene_mask_node", void 0);
+}), ye("design:type", typeof (He = typeof s !== "undefined" && s) === "function" ? He : Object) ], ze.prototype, "scene_mask_node", void 0);
 
-ye([ We({
+ge([ We({
     type: s
-}), ge("design:type", typeof ($e = typeof s !== "undefined" && s) === "function" ? $e : Object) ], ze.prototype, "ui_container", void 0);
+}), ye("design:type", typeof ($e = typeof s !== "undefined" && s) === "function" ? $e : Object) ], ze.prototype, "ui_container", void 0);
 
-ze = ye([ Ke("CoreUIContainer"), Ve("CATCORE/CoreUIContainer") ], ze);
+ze = ge([ Ke("CoreUIContainer"), Ve("CATCORE/CoreUIContainer") ], ze);
 
 class RootUILayer extends UILayer {
     onEnable() {
@@ -971,7 +971,7 @@ class RootUILayer extends UILayer {
         this.updateMask();
     }
     updateMask() {
-        this.cat.event.emit(Le.ROOT_MASK_UPDATE);
+        this.cat.event.emit(je.ROOT_MASK_UPDATE);
     }
 }
 
@@ -1002,17 +1002,17 @@ let Ye = class CoreShowLoading extends RootUILayer {
     }
 };
 
-ye([ Xe({
+ge([ Xe({
     type: b,
     tooltip: "标题"
-}), ge("design:type", typeof (qe = typeof b !== "undefined" && b) === "function" ? qe : Object) ], Ye.prototype, "title", void 0);
+}), ye("design:type", typeof (qe = typeof b !== "undefined" && b) === "function" ? qe : Object) ], Ye.prototype, "title", void 0);
 
-ye([ Xe({
+ge([ Xe({
     type: s,
     tooltip: "动画"
-}), ge("design:type", typeof (Qe = typeof s !== "undefined" && s) === "function" ? Qe : Object) ], Ye.prototype, "loadingTween", void 0);
+}), ye("design:type", typeof (Qe = typeof s !== "undefined" && s) === "function" ? Qe : Object) ], Ye.prototype, "loadingTween", void 0);
 
-Ye = ye([ Je("CoreShowLoading"), Ze("CATCORE/CoreShowLoading") ], Ye);
+Ye = ge([ Je("CoreShowLoading"), Ze("CATCORE/CoreShowLoading") ], Ye);
 
 var et;
 
@@ -1074,22 +1074,22 @@ let at = class CoreReconnection extends RootUILayer {
     }
 };
 
-ye([ st({
+ge([ st({
     type: b,
     tooltip: "通用提示文本"
-}), ge("design:type", typeof (tt = typeof b !== "undefined" && b) === "function" ? tt : Object) ], at.prototype, "common_prompt_text", void 0);
+}), ye("design:type", typeof (tt = typeof b !== "undefined" && b) === "function" ? tt : Object) ], at.prototype, "common_prompt_text", void 0);
 
-ye([ st({
+ge([ st({
     type: S,
     tooltip: "确定按钮"
-}), ge("design:type", typeof (it = typeof S !== "undefined" && S) === "function" ? it : Object) ], at.prototype, "btn_confirm", void 0);
+}), ye("design:type", typeof (it = typeof S !== "undefined" && S) === "function" ? it : Object) ], at.prototype, "btn_confirm", void 0);
 
-ye([ st({
+ge([ st({
     type: S,
     tooltip: "关闭按钮"
-}), ge("design:type", typeof (nt = typeof S !== "undefined" && S) === "function" ? nt : Object) ], at.prototype, "btn_close", void 0);
+}), ye("design:type", typeof (nt = typeof S !== "undefined" && S) === "function" ? nt : Object) ], at.prototype, "btn_close", void 0);
 
-at = ye([ ot("CoreReconnection"), rt("CATCORE/CoreReconnection") ], at);
+at = ge([ ot("CoreReconnection"), rt("CATCORE/CoreReconnection") ], at);
 
 var lt, ct, ht;
 
@@ -1119,28 +1119,28 @@ let ft = class CoreNotice extends RootUILayer {
     }
 };
 
-ye([ dt({
+ge([ dt({
     type: b,
     tooltip: "提示文本"
-}), ge("design:type", typeof (lt = typeof b !== "undefined" && b) === "function" ? lt : Object) ], ft.prototype, "text", void 0);
+}), ye("design:type", typeof (lt = typeof b !== "undefined" && b) === "function" ? lt : Object) ], ft.prototype, "text", void 0);
 
-ye([ dt({
+ge([ dt({
     type: S,
     tooltip: "确定按钮"
-}), ge("design:type", typeof (ct = typeof S !== "undefined" && S) === "function" ? ct : Object) ], ft.prototype, "btn_confirm", void 0);
+}), ye("design:type", typeof (ct = typeof S !== "undefined" && S) === "function" ? ct : Object) ], ft.prototype, "btn_confirm", void 0);
 
-ye([ dt({
+ge([ dt({
     type: S,
     tooltip: "关闭按钮"
-}), ge("design:type", typeof (ht = typeof S !== "undefined" && S) === "function" ? ht : Object) ], ft.prototype, "btn_close", void 0);
+}), ye("design:type", typeof (ht = typeof S !== "undefined" && S) === "function" ? ht : Object) ], ft.prototype, "btn_close", void 0);
 
-ft = ye([ ut("CoreNotice"), pt("CATCORE/CoreNotice") ], ft);
+ft = ge([ ut("CoreNotice"), pt("CATCORE/CoreNotice") ], ft);
 
 class SceneLayer extends BaseComponent {
     isReload;
 }
 
-var mt, _t, yt, gt, bt, vt, Ct, Et;
+var mt, _t, gt, yt, bt, vt, Ct, Et;
 
 const {ccclass: St, property: wt, menu: At} = i;
 
@@ -1171,7 +1171,7 @@ let Ot = class Gui extends BaseComponent {
     currentScene;
     currentSceneUUID;
     onEventListener() {
-        this.cat.event.on(Le.ROOT_MASK_UPDATE, this.onRootUpdate, this);
+        this.cat.event.on(je.ROOT_MASK_UPDATE, this.onRootUpdate, this);
     }
     initedScene=false;
     engineReady=false;
@@ -1179,7 +1179,7 @@ let Ot = class Gui extends BaseComponent {
     _scene=null;
     init(e) {
         this.cat = e;
-        g.once(w.EVENT_ENGINE_INITED, () => {
+        y.once(w.EVENT_ENGINE_INITED, () => {
             this.engineReady = true;
             this.tryInit();
         });
@@ -1218,7 +1218,7 @@ let Ot = class Gui extends BaseComponent {
         const e = this.toastQueue.shift();
         const t = () => {
             const t = h(this.toast_ui_prefab);
-            const i = t.getComponent(Fe);
+            const i = t.getComponent(xe);
             i.addToParent(this.root_toast, {
                 props: e
             });
@@ -1236,7 +1236,7 @@ let Ot = class Gui extends BaseComponent {
         if (this.root_toast) {
             var e;
             H(e = this.root_toast.children).call(e, e => {
-                e.getComponent(Fe)?.removeAndDestroy();
+                e.getComponent(xe)?.removeAndDestroy();
             });
         }
         this.toastQueue = [];
@@ -1335,12 +1335,9 @@ let Ot = class Gui extends BaseComponent {
         for (const e of h) {
             if (typeof e === "boolean") l = e; else if (typeof e === "function") c = e; else if (e && typeof e === "object") s = e;
         }
-        r.off(A.EVENT_BEFORE_SCENE_LAUNCH);
         r.once(A.EVENT_BEFORE_SCENE_LAUNCH, e => {
-            a("监听场景事件", e);
             this.changeScene(e, s ?? {}, l);
         });
-        r.off(A.EVENT_AFTER_SCENE_LAUNCH);
         r.once(A.EVENT_AFTER_SCENE_LAUNCH, () => {
             c?.();
         });
@@ -1387,8 +1384,13 @@ let Ot = class Gui extends BaseComponent {
         this.ui_container_component?.removeAndDestroy();
         this.ui_container_component = null;
         const t = h(this.ui_prefab);
-        this.ui_container_component = t.getComponent(ze);
-        this.ui_container_component?.setGui(this).addToParent(e, this.node.getSiblingIndex());
+        console.log("node", u(t), t.uuid, t);
+        console.log("isValid(this.node)", u(this.node), this.node.uuid, this.node);
+        if (u(this.node)) {
+            this.ui_container_component = t.getComponent(ze);
+            this.ui_container_component?.setGui(this).addToParent(e, this.node.getSiblingIndex());
+        }
+        console.log("this.ui_container_component", this.ui_container_component);
     }
     reloadScene() {
         let e = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : () => {};
@@ -1463,51 +1465,51 @@ let Ot = class Gui extends BaseComponent {
             const i = t.getSiblingIndex() - 1;
             this.root_mask.setSiblingIndex(i < 0 ? 0 : i);
         }
-        this.cat.event.emit(Le.ROOT_MASK_CHANGE);
+        this.cat.event.emit(je.ROOT_MASK_CHANGE);
     }
 };
 
-ye([ wt({
+ge([ wt({
     type: c,
     tooltip: "断线重连UI预制体"
-}), ge("design:type", typeof (mt = typeof c !== "undefined" && c) === "function" ? mt : Object) ], Ot.prototype, "reconnection_ui_prefab", void 0);
+}), ye("design:type", typeof (mt = typeof c !== "undefined" && c) === "function" ? mt : Object) ], Ot.prototype, "reconnection_ui_prefab", void 0);
 
-ye([ wt({
+ge([ wt({
     type: c,
     tooltip: "提示UI预制体"
-}), ge("design:type", typeof (_t = typeof c !== "undefined" && c) === "function" ? _t : Object) ], Ot.prototype, "toast_ui_prefab", void 0);
+}), ye("design:type", typeof (_t = typeof c !== "undefined" && c) === "function" ? _t : Object) ], Ot.prototype, "toast_ui_prefab", void 0);
 
-ye([ wt({
+ge([ wt({
     type: c,
     tooltip: "加载UI预制体"
-}), ge("design:type", typeof (yt = typeof c !== "undefined" && c) === "function" ? yt : Object) ], Ot.prototype, "loading_ui_prefab", void 0);
+}), ye("design:type", typeof (gt = typeof c !== "undefined" && c) === "function" ? gt : Object) ], Ot.prototype, "loading_ui_prefab", void 0);
 
-ye([ wt({
+ge([ wt({
     type: c,
     tooltip: "公告UI预制体"
-}), ge("design:type", typeof (gt = typeof c !== "undefined" && c) === "function" ? gt : Object) ], Ot.prototype, "notice_ui_prefab", void 0);
+}), ye("design:type", typeof (yt = typeof c !== "undefined" && c) === "function" ? yt : Object) ], Ot.prototype, "notice_ui_prefab", void 0);
 
-ye([ wt({
+ge([ wt({
     type: c,
     tooltip: "UI层预制体"
-}), ge("design:type", typeof (bt = typeof c !== "undefined" && c) === "function" ? bt : Object) ], Ot.prototype, "ui_prefab", void 0);
+}), ye("design:type", typeof (bt = typeof c !== "undefined" && c) === "function" ? bt : Object) ], Ot.prototype, "ui_prefab", void 0);
 
-ye([ wt({
+ge([ wt({
     type: s,
     tooltip: "root-UI层"
-}), ge("design:type", typeof (vt = typeof s !== "undefined" && s) === "function" ? vt : Object) ], Ot.prototype, "root_ui", void 0);
+}), ye("design:type", typeof (vt = typeof s !== "undefined" && s) === "function" ? vt : Object) ], Ot.prototype, "root_ui", void 0);
 
-ye([ wt({
+ge([ wt({
     type: s,
     tooltip: "root-组件层"
-}), ge("design:type", typeof (Ct = typeof s !== "undefined" && s) === "function" ? Ct : Object) ], Ot.prototype, "root_toast", void 0);
+}), ye("design:type", typeof (Ct = typeof s !== "undefined" && s) === "function" ? Ct : Object) ], Ot.prototype, "root_toast", void 0);
 
-ye([ wt({
+ge([ wt({
     type: s,
     tooltip: "root-mask"
-}), ge("design:type", typeof (Et = typeof s !== "undefined" && s) === "function" ? Et : Object) ], Ot.prototype, "root_mask", void 0);
+}), ye("design:type", typeof (Et = typeof s !== "undefined" && s) === "function" ? Et : Object) ], Ot.prototype, "root_mask", void 0);
 
-Ot = ye([ St("Gui"), At("CATCORE/Gui") ], Ot);
+Ot = ge([ St("Gui"), At("CATCORE/Gui") ], Ot);
 
 var Tt;
 
@@ -1523,7 +1525,7 @@ var Tt;
 class GuiManager extends BaseManager {
     gui;
     #e="core";
-    getGuiPrefabByType=(e, t) => new x((i, n) => {
+    getGuiPrefabByType=(e, t) => new F((i, n) => {
         a(e, `${t}`);
         this.cat.res.load(e, t, (e, t) => {
             if (e) {
@@ -1543,7 +1545,7 @@ class GuiManager extends BaseManager {
     }
 }
 
-class WrapperSocialGameClient extends re {
+class WrapperSocialGameClient extends se {
     showRequestErrInfo=false;
     logBlackList=[];
     ignore=e => {
@@ -1560,12 +1562,12 @@ class WrapperSocialGameClient extends re {
     }
     async GameRequest(t, i, n) {
         let {forwardReq: s = false, forwardResp: r = false} = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
-        return new x((l, c) => {
+        return new F((l, c) => {
             super.GameRequest(t, i, n, {
                 forwardReq: s,
                 forwardResp: r
             }).then(e => {
-                if (ne) {
+                if (ie) {
                     a(`%c ws服务端消息 %c [Response][${new Date}] %c ${t} %c`, "background:#ff00ff ; padding: 1px; border-radius: 3px 0 0 3px;  color: #fff", "background:#3d7daa ; padding: 1px; color: #fff", "background:#ff00ff ; padding: 1px; border-radius: 0 3px 3px 0;  color: #fff", "background:transparent", i);
                 }
                 l(e);
@@ -1580,7 +1582,7 @@ class WrapperSocialGameClient extends re {
     }
     subscribe(t, i, n) {
         super.subscribe(t, i, i => {
-            if (ne && !this.ignore(t)) {
+            if (ie && !this.ignore(t)) {
                 a(`%c ws服务端消息:[subscribe][${new Date}] %c ${t} %c`, "background:#35495e ; padding: 1px; border-radius: 3px 0 0 3px;  color: #fff", "background:#410083 ; padding: 1px; border-radius: 0 3px 3px 0;  color: #fff", "background:transparent", i);
             }
             e._cat.event.emit(t, i);
@@ -1628,11 +1630,11 @@ class SocialGameClientManager extends BaseManager {
             t.destroy();
             a(`清理旧的 ${e} 客户端`);
         }
-        const o = new WrapperSocialGameClient(e, i, n, L({
+        const o = new WrapperSocialGameClient(e, i, n, j({
             reconnectMaxAttempts: Infinity
         }, {
             isAutoConnect: false,
-            isArrayBuffer: oe,
+            isArrayBuffer: ne,
             ...t
         }));
         this.register(o);
@@ -1651,8 +1653,8 @@ class SocialGameClientManager extends BaseManager {
         this.managedClients.delete(e.name);
     }
     initGlobalListeners() {
-        this.cat.event.on(Le.ONLINE, () => this.handleGlobalStateChange("online"), this).on(Le.OFFLINE, () => this.handleGlobalStateChange("offline"), this);
-        if (oe) {
+        this.cat.event.on(je.ONLINE, () => this.handleGlobalStateChange("online"), this).on(je.OFFLINE, () => this.handleGlobalStateChange("offline"), this);
+        if (ne) {
             wx.onShow(e => {
                 this.handleGlobalStateChange("show", e);
             });
@@ -1660,8 +1662,8 @@ class SocialGameClientManager extends BaseManager {
                 this.handleGlobalStateChange("hide", e);
             });
         } else {
-            g.on(w.EVENT_SHOW, () => this.handleGlobalStateChange("show"));
-            g.on(w.EVENT_HIDE, () => this.handleGlobalStateChange("hide"));
+            y.on(w.EVENT_SHOW, () => this.handleGlobalStateChange("show"));
+            y.on(w.EVENT_HIDE, () => this.handleGlobalStateChange("hide"));
         }
     }
     async handleGlobalStateChange(e, t) {
@@ -1698,7 +1700,6 @@ class SocialGameClientManager extends BaseManager {
         }
     }
     async safeTriggerReconnectAll() {
-        ee();
         if (this.reconnecting || !this.isGlobalOnline || this.isInBackground || this.managedClients.size === 0) {
             console.log("[safeTriggerReconnectAll] 没有需要重连的客户端，直接 dispatch");
             await this.dispatchReloadAndShow();
@@ -1729,14 +1730,14 @@ class SocialGameClientManager extends BaseManager {
         });
         try {
             var e, t;
-            await x.allSettled(Z(e = this.activeClients).call(e, async e => {
+            await F.allSettled(Z(e = this.activeClients).call(e, async e => {
                 try {
                     await e.reconnectPromise();
                 } catch (t) {
                     o(`${e.name}服重连失败`, t);
                 }
             }));
-            const i = $(t = this.activeClients).call(t, e => e.socketConnectStatus !== ie.CONNECTED);
+            const i = $(t = this.activeClients).call(t, e => e.socketConnectStatus !== te.CONNECTED);
             if (i.length > 0) {
                 Z(i).call(i, e => {
                     console.error("部分WS重连失败：", e);
@@ -1754,7 +1755,7 @@ class SocialGameClientManager extends BaseManager {
     }
     disconnectAll(e) {
         var t, i;
-        if (te(t = this.activeClients).call(t, e => e.socket?.readyState !== WebSocket.OPEN)) return;
+        if (ee(t = this.activeClients).call(t, e => e.socket?.readyState !== WebSocket.OPEN)) return;
         H(i = this.managedClients).call(i, t => {
             a("断开连接", t.name, e, t.socket);
             t.disconnect(e);
@@ -1768,10 +1769,10 @@ class SocialGameClientManager extends BaseManager {
     };
     handleSingleReconnect=async () => {
         var e;
-        if (te(e = this.activeClients).call(e, e => e.socketConnectStatus === ie.CONNECTED)) {
+        if (ee(e = this.activeClients).call(e, e => e.socketConnectStatus === te.CONNECTED)) {
             var t;
             a("单个WS重连成功回调===", this.managedClients);
-            await x.allSettled(Z(t = this.activeClients).call(t, async e => {
+            await F.allSettled(Z(t = this.activeClients).call(t, async e => {
                 try {
                     await e.connectRequest();
                 } catch (t) {
@@ -1897,7 +1898,7 @@ class ResLoader {
             ...t
         }, i);
     }
-    loadBundle=(e, t) => new x((i, n) => {
+    loadBundle=(e, t) => new F((i, n) => {
         const o = (e, t) => {
             if (e) {
                 return n(e);
@@ -1955,7 +1956,7 @@ class ResLoader {
         a(`当前资源总数:${I.assets.count}`);
     };
     loadAssetsWithProgress(e, t) {
-        return new x((i, n) => {
+        return new F((i, n) => {
             const o = e.getDirWithPath("");
             const s = o.length;
             let r = 0;
@@ -1992,29 +1993,29 @@ class CoreStore extends BaseManager {}
 
 let kt = null;
 
-const Rt = e => ae.MD5(e).toString();
+const Rt = e => re.MD5(e).toString();
 
 const Mt = (e, t) => {
-    kt = ae.enc.Hex.parse(t);
+    kt = re.enc.Hex.parse(t);
 };
 
-const Nt = (e, t, i) => ae.AES.encrypt(e, t, {
+const Ut = (e, t, i) => re.AES.encrypt(e, t, {
     iv: kt,
     format: Dt
 }).toString();
 
-const Ut = (e, t, i) => {
-    const n = ae.AES.decrypt(e, t, {
+const Nt = (e, t, i) => {
+    const n = re.AES.decrypt(e, t, {
         iv: kt,
         format: Dt
     });
-    return n.toString(ae.enc.Utf8);
+    return n.toString(re.enc.Utf8);
 };
 
 const Dt = {
     stringify: e => {
         const t = {
-            ct: e.ciphertext.toString(ae.enc.Base64)
+            ct: e.ciphertext.toString(re.enc.Base64)
         };
         if (e.iv) {
             t.iv = e.iv.toString();
@@ -2026,30 +2027,30 @@ const Dt = {
     },
     parse: e => {
         const t = JSON.parse(e);
-        const i = ae.lib.CipherParams.create({
-            ciphertext: ae.enc.Base64.parse(t.ct)
+        const i = re.lib.CipherParams.create({
+            ciphertext: re.enc.Base64.parse(t.ct)
         });
         if (t.iv) {
-            i.iv = ae.enc.Hex.parse(t.iv);
+            i.iv = re.enc.Hex.parse(t.iv);
         }
         if (t.s) {
-            i.salt = ae.enc.Hex.parse(t.s);
+            i.salt = re.enc.Hex.parse(t.s);
         }
         return i;
     }
 };
 
-var Ft = Object.freeze({
+var xt = Object.freeze({
     __proto__: null,
     JsonFormatter: Dt,
-    aesDecrypt: Ut,
-    aesEncrypt: Nt,
+    aesDecrypt: Nt,
+    aesEncrypt: Ut,
     initCrypto: Mt,
     md5: Rt
 });
 
 class CoreUtil extends BaseManager {
-    encryptUtil=(() => Ft)();
+    encryptUtil=(() => xt)();
 }
 
 class StorageManager extends BaseManager {
@@ -2070,7 +2071,7 @@ class StorageManager extends BaseManager {
             console.error("存储的key不能为空");
             return;
         }
-        if (!se) {
+        if (!oe) {
             e = this.cat.util.encryptUtil.md5(e);
         }
         if (null == t) {
@@ -2092,7 +2093,7 @@ class StorageManager extends BaseManager {
         } else if (typeof t === "number") {
             t = t + "";
         }
-        if (!se && null != this._key && null != this._iv) {
+        if (!oe && null != this._key && null != this._iv) {
             t = this.cat.util.encryptUtil.aesEncrypt(`${t}`, this._key, this._iv);
         }
         M.localStorage.setItem(e, t);
@@ -2103,11 +2104,11 @@ class StorageManager extends BaseManager {
             return null;
         }
         e = `${e}_${this._id}`;
-        if (!se) {
+        if (!oe) {
             e = this.cat.util.encryptUtil.md5(e);
         }
         let i = M.localStorage.getItem(e);
-        if (null != i && "" !== i && !se && null != this._key && null != this._iv) {
+        if (null != i && "" !== i && !oe && null != this._key && null != this._iv) {
             i = this.cat.util.encryptUtil.aesDecrypt(i, this._key, this._iv);
         }
         if (null === i) {
@@ -2134,7 +2135,7 @@ class StorageManager extends BaseManager {
             return;
         }
         e = `${e}_${this._id}`;
-        if (!se) {
+        if (!oe) {
             e = this.cat.util.encryptUtil.md5(e);
         }
         M.localStorage.removeItem(e);
@@ -2218,7 +2219,7 @@ class Manager {
             this.#a = new ResLoader;
             this.#l = new CoreUtil(this);
             this.#r = new StorageManager(this);
-            this.#o = new j;
+            this.#o = new L;
             this.#n = new AudioManager(this);
             this.#c = new SocialGameClientManager(this);
             this.#s = (await new GuiManager(this).init()).gui;
@@ -2234,14 +2235,14 @@ class Manager {
             throw new Error(`merge方法第一个参数应该为string类型`);
         }
         if (!D(this, e)) {
-            F(this, e, t);
+            x(this, e, t);
         }
-        L(D(this, e), t);
+        j(D(this, e), t);
         return this;
     }
     appendPlugInInitDelegate(e) {
         if (this.#i) {
-            x.resolve().then(e).catch(e => {
+            F.resolve().then(e).catch(e => {
                 console.error("[CAT] appendPlugInInitDelegate 回调执行失败:", e);
             });
         } else {
@@ -2251,7 +2252,7 @@ class Manager {
     }
 }
 
-var Lt, xt, jt, Bt, Pt, Gt, Ht, $t, Kt;
+var jt, Ft, Lt, Bt, Pt, Gt, Ht, $t, Kt;
 
 const {ccclass: Wt, property: Vt, menu: zt} = i;
 
@@ -2281,7 +2282,7 @@ let qt = class CoreUIModal extends UILayer {
             this.title.spriteFrame = this.props?.title || this.default_title;
         }, () => {
             if (this.props.content) {
-                if (this.props.content instanceof N) {
+                if (this.props.content instanceof U) {
                     this.prompt_content_spriteFrame.spriteFrame = this.props.content;
                 } else if (typeof this.props.content === "string") {
                     this.prompt_content_str.string = this.props.content;
@@ -2294,13 +2295,13 @@ let qt = class CoreUIModal extends UILayer {
                 this.btn_confirm.node.active = false;
             } else {
                 this.btn_confirm.node.active = true;
-                this.btn_confirm.getComponent(U).spriteFrame = this.props.style?.confirm || this.confirm_spriteFrame;
+                this.btn_confirm.getComponent(N).spriteFrame = this.props.style?.confirm || this.confirm_spriteFrame;
             }
             if (this.props?.style?.cancel === null) {
                 this.btn_cancel.node.active = false;
             } else {
                 this.btn_cancel.node.active = true;
-                this.btn_cancel.getComponent(U).spriteFrame = this.props.style?.cancel || this.cancel_spriteFrame;
+                this.btn_cancel.getComponent(N).spriteFrame = this.props.style?.cancel || this.cancel_spriteFrame;
             }
         } ]);
     }
@@ -2322,52 +2323,52 @@ let qt = class CoreUIModal extends UILayer {
     }
 };
 
-ye([ Vt({
-    type: N,
+ge([ Vt({
+    type: U,
     tooltip: "默认标题"
-}), ge("design:type", typeof (Lt = typeof N !== "undefined" && N) === "function" ? Lt : Object) ], qt.prototype, "default_title", void 0);
+}), ye("design:type", typeof (jt = typeof U !== "undefined" && U) === "function" ? jt : Object) ], qt.prototype, "default_title", void 0);
 
-ye([ Vt({
-    type: U,
+ge([ Vt({
+    type: N,
     tooltip: "标题节点"
-}), ge("design:type", typeof (xt = typeof U !== "undefined" && U) === "function" ? xt : Object) ], qt.prototype, "title", void 0);
+}), ye("design:type", typeof (Ft = typeof N !== "undefined" && N) === "function" ? Ft : Object) ], qt.prototype, "title", void 0);
 
-ye([ Vt({
+ge([ Vt({
     type: b,
     tooltip: "字符串内容按钮"
-}), ge("design:type", typeof (jt = typeof b !== "undefined" && b) === "function" ? jt : Object) ], qt.prototype, "prompt_content_str", void 0);
+}), ye("design:type", typeof (Lt = typeof b !== "undefined" && b) === "function" ? Lt : Object) ], qt.prototype, "prompt_content_str", void 0);
 
-ye([ Vt({
-    type: U,
+ge([ Vt({
+    type: N,
     tooltip: "图片精灵内容按钮"
-}), ge("design:type", typeof (Bt = typeof U !== "undefined" && U) === "function" ? Bt : Object) ], qt.prototype, "prompt_content_spriteFrame", void 0);
+}), ye("design:type", typeof (Bt = typeof N !== "undefined" && N) === "function" ? Bt : Object) ], qt.prototype, "prompt_content_spriteFrame", void 0);
 
-ye([ Vt({
+ge([ Vt({
     type: S,
     tooltip: "确认按钮"
-}), ge("design:type", typeof (Pt = typeof S !== "undefined" && S) === "function" ? Pt : Object) ], qt.prototype, "btn_confirm", void 0);
+}), ye("design:type", typeof (Pt = typeof S !== "undefined" && S) === "function" ? Pt : Object) ], qt.prototype, "btn_confirm", void 0);
 
-ye([ Vt({
-    type: N,
+ge([ Vt({
+    type: U,
     tooltip: "确认按钮精灵图"
-}), ge("design:type", typeof (Gt = typeof N !== "undefined" && N) === "function" ? Gt : Object) ], qt.prototype, "confirm_spriteFrame", void 0);
+}), ye("design:type", typeof (Gt = typeof U !== "undefined" && U) === "function" ? Gt : Object) ], qt.prototype, "confirm_spriteFrame", void 0);
 
-ye([ Vt({
+ge([ Vt({
     type: S,
     tooltip: "取消按钮"
-}), ge("design:type", typeof (Ht = typeof S !== "undefined" && S) === "function" ? Ht : Object) ], qt.prototype, "btn_cancel", void 0);
+}), ye("design:type", typeof (Ht = typeof S !== "undefined" && S) === "function" ? Ht : Object) ], qt.prototype, "btn_cancel", void 0);
 
-ye([ Vt({
-    type: N,
+ge([ Vt({
+    type: U,
     tooltip: "取消按钮精灵图"
-}), ge("design:type", typeof ($t = typeof N !== "undefined" && N) === "function" ? $t : Object) ], qt.prototype, "cancel_spriteFrame", void 0);
+}), ye("design:type", typeof ($t = typeof U !== "undefined" && U) === "function" ? $t : Object) ], qt.prototype, "cancel_spriteFrame", void 0);
 
-ye([ Vt({
+ge([ Vt({
     type: S,
     tooltip: "关闭按钮"
-}), ge("design:type", typeof (Kt = typeof S !== "undefined" && S) === "function" ? Kt : Object) ], qt.prototype, "btn_close", void 0);
+}), ye("design:type", typeof (Kt = typeof S !== "undefined" && S) === "function" ? Kt : Object) ], qt.prototype, "btn_close", void 0);
 
-qt = ye([ Wt("CoreUIModal"), zt("CATCORE/CoreUIModal") ], qt);
+qt = ge([ Wt("CoreUIModal"), zt("CATCORE/CoreUIModal") ], qt);
 
 var Qt;
 
@@ -2394,19 +2395,19 @@ class TimerEntry {
 
 class TimerManager extends BaseManager {
     timers=(() => new G)();
-    lastUpdateTime=(() => ee())();
+    lastUpdateTime=(() => ae())();
     constructor(e) {
         var t;
         super(e);
-        e.event.on(Le.EVENT_HIDE, this.onHandleAppBackground, this);
-        e.event.on(Le.EVENT_SHOW, this.onHandleAppForeground, this);
+        e.event.on(je.EVENT_HIDE, this.onHandleAppBackground, this);
+        e.event.on(je.EVENT_SHOW, this.onHandleAppForeground, this);
         le(V(t = this.update).call(t, this), 1e3);
     }
     onHandleAppBackground() {
-        this.lastUpdateTime = ee();
+        this.lastUpdateTime = ae();
     }
     onHandleAppForeground() {
-        const e = ee();
+        const e = ae();
         const t = e - this.lastUpdateTime;
         a("elapsedTime", t);
         for (const e of ce(i = this.timers).call(i)) {
@@ -2511,7 +2512,7 @@ const Xt = function() {
 
 const Zt = e._cat ??= Manager.instance;
 
-g.onPostProjectInitDelegate.add(async () => {
+y.onPostProjectInitDelegate.add(async () => {
     console.time("[Init App]");
     try {
         await Zt.boot();
@@ -2525,4 +2526,4 @@ g.onPostProjectInitDelegate.add(async () => {
     }
 });
 
-export { Jt as AudioEffect, _e as AudioEventConstant, AudioManager, AudioSourceBaseComponent, AudioSourceUILayer, Se as AudioTypeEnum, BaseComponent, BaseManager, Tt as BasePrefab, BaseStore, Xt as ButtonLock, Ge as CoreBlackMask, ft as CoreNotice, at as CoreReconnection, Ye as CoreShowLoading, CoreStore, Fe as CoreToast, ze as CoreUIContainer, qt as CoreUIModal, CoreUtil, Le as GlobalEventConstant, Ot as Gui, GuiManager, It as LayerType, Manager, et as ReconnectPrompt, RootUILayer, SceneLayer, TimerManager, De as ToastType, UILayer, WrapperSocialGameClient, Zt as cat };
+export { Jt as AudioEffect, _e as AudioEventConstant, AudioManager, AudioSourceBaseComponent, AudioSourceUILayer, Se as AudioTypeEnum, BaseComponent, BaseManager, Tt as BasePrefab, BaseStore, Xt as ButtonLock, Ge as CoreBlackMask, ft as CoreNotice, at as CoreReconnection, Ye as CoreShowLoading, CoreStore, xe as CoreToast, ze as CoreUIContainer, qt as CoreUIModal, CoreUtil, je as GlobalEventConstant, Ot as Gui, GuiManager, It as LayerType, Manager, et as ReconnectPrompt, RootUILayer, SceneLayer, TimerManager, De as ToastType, UILayer, WrapperSocialGameClient, Zt as cat };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@shimotsuki/core",
-    "version": "3.0.41",
+    "version": "3.0.43",
     "description": "",
     "license": "MIT",
     "main": "dist/shimotsuki_core.js",