@shimotsuki/core 3.0.41 → 3.0.42

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 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 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";
 
@@ -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) {
@@ -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();
@@ -777,7 +777,7 @@ ye([ Ie({
 
 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({
+ye([ Ue({
     type: s,
     tooltip: "固定节点"
-}), ge("design:type", typeof (Oe = typeof s !== "undefined" && s) === "function" ? Oe : Object) ], Fe.prototype, "fixed_node", void 0);
+}), ge("design:type", typeof (Oe = typeof s !== "undefined" && s) === "function" ? Oe : Object) ], xe.prototype, "fixed_node", void 0);
 
-ye([ Ne({
+ye([ Ue({
     type: s,
     tooltip: "滑动节点"
-}), ge("design:type", typeof (Te = typeof s !== "undefined" && s) === "function" ? Te : Object) ], Fe.prototype, "slide_node", void 0);
+}), ge("design:type", typeof (Te = typeof s !== "undefined" && s) === "function" ? Te : Object) ], xe.prototype, "slide_node", void 0);
 
-ye([ Ne({
+ye([ Ue({
     type: b,
     tooltip: "固定标签节点"
-}), ge("design:type", typeof (ke = typeof b !== "undefined" && b) === "function" ? ke : Object) ], Fe.prototype, "fixed_label", void 0);
+}), ge("design:type", typeof (ke = typeof b !== "undefined" && b) === "function" ? ke : Object) ], xe.prototype, "fixed_label", void 0);
 
-ye([ Ne({
+ye([ Ue({
     type: b,
     tooltip: "滑动标签节点"
-}), ge("design:type", typeof (Re = typeof b !== "undefined" && b) === "function" ? Re : Object) ], Fe.prototype, "slide_label", void 0);
+}), ge("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 = ye([ Me("CoreToast"), Ne("CATCORE/CoreToast") ], xe);
 
-var Le;
+var je;
 
 (function(e) {
     e["EVENT_SHOW"] = "GlobalEventConstant/EVENT_SHOW";
@@ -874,11 +874,11 @@ 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;
@@ -887,9 +887,9 @@ let Ge = class CoreBlackMask extends BaseComponent {
 ye([ Be({
     type: s,
     tooltip: "动画节点"
-}), ge("design:type", typeof (xe = typeof s !== "undefined" && s) === "function" ? xe : Object) ], Ge.prototype, "tween", void 0);
+}), ge("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 = ye([ 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];
@@ -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);
     }
 }
 
@@ -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;
@@ -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,10 @@ 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());
+        if (u(this.node)) {
+            this.ui_container_component = t.getComponent(ze);
+            this.ui_container_component?.setGui(this).addToParent(e, this.node.getSiblingIndex());
+        }
     }
     reloadScene() {
         let e = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : () => {};
@@ -1463,7 +1462,7 @@ 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);
     }
 };
 
@@ -1523,7 +1522,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) {
@@ -1560,7 +1559,7 @@ 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
@@ -1628,7 +1627,7 @@ 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,
@@ -1651,7 +1650,7 @@ 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);
+        this.cat.event.on(je.ONLINE, () => this.handleGlobalStateChange("online"), this).on(je.OFFLINE, () => this.handleGlobalStateChange("offline"), this);
         if (oe) {
             wx.onShow(e => {
                 this.handleGlobalStateChange("show", e);
@@ -1729,7 +1728,7 @@ 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) {
@@ -1771,7 +1770,7 @@ class SocialGameClientManager extends BaseManager {
         if (te(e = this.activeClients).call(e, e => e.socketConnectStatus === ie.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 +1896,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 +1954,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;
@@ -1998,12 +1997,12 @@ const Mt = (e, t) => {
     kt = ae.enc.Hex.parse(t);
 };
 
-const Nt = (e, t, i) => ae.AES.encrypt(e, t, {
+const Ut = (e, t, i) => ae.AES.encrypt(e, t, {
     iv: kt,
     format: Dt
 }).toString();
 
-const Ut = (e, t, i) => {
+const Nt = (e, t, i) => {
     const n = ae.AES.decrypt(e, t, {
         iv: kt,
         format: Dt
@@ -2039,17 +2038,17 @@ const Dt = {
     }
 };
 
-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 {
@@ -2218,7 +2217,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 +2233,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 +2250,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 +2280,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 +2293,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;
             }
         } ]);
     }
@@ -2323,24 +2322,24 @@ let qt = class CoreUIModal extends UILayer {
 };
 
 ye([ Vt({
-    type: N,
+    type: U,
     tooltip: "默认标题"
-}), ge("design:type", typeof (Lt = typeof N !== "undefined" && N) === "function" ? Lt : Object) ], qt.prototype, "default_title", void 0);
+}), ge("design:type", typeof (jt = typeof U !== "undefined" && U) === "function" ? jt : Object) ], qt.prototype, "default_title", void 0);
 
 ye([ Vt({
-    type: U,
+    type: N,
     tooltip: "标题节点"
-}), ge("design:type", typeof (xt = typeof U !== "undefined" && U) === "function" ? xt : Object) ], qt.prototype, "title", void 0);
+}), ge("design:type", typeof (Ft = typeof N !== "undefined" && N) === "function" ? Ft : Object) ], qt.prototype, "title", void 0);
 
 ye([ Vt({
     type: b,
     tooltip: "字符串内容按钮"
-}), ge("design:type", typeof (jt = typeof b !== "undefined" && b) === "function" ? jt : Object) ], qt.prototype, "prompt_content_str", void 0);
+}), ge("design:type", typeof (Lt = typeof b !== "undefined" && b) === "function" ? Lt : Object) ], qt.prototype, "prompt_content_str", void 0);
 
 ye([ Vt({
-    type: U,
+    type: N,
     tooltip: "图片精灵内容按钮"
-}), ge("design:type", typeof (Bt = typeof U !== "undefined" && U) === "function" ? Bt : Object) ], qt.prototype, "prompt_content_spriteFrame", void 0);
+}), ge("design:type", typeof (Bt = typeof N !== "undefined" && N) === "function" ? Bt : Object) ], qt.prototype, "prompt_content_spriteFrame", void 0);
 
 ye([ Vt({
     type: S,
@@ -2348,9 +2347,9 @@ ye([ Vt({
 }), ge("design:type", typeof (Pt = typeof S !== "undefined" && S) === "function" ? Pt : Object) ], qt.prototype, "btn_confirm", void 0);
 
 ye([ Vt({
-    type: N,
+    type: U,
     tooltip: "确认按钮精灵图"
-}), ge("design:type", typeof (Gt = typeof N !== "undefined" && N) === "function" ? Gt : Object) ], qt.prototype, "confirm_spriteFrame", void 0);
+}), ge("design:type", typeof (Gt = typeof U !== "undefined" && U) === "function" ? Gt : Object) ], qt.prototype, "confirm_spriteFrame", void 0);
 
 ye([ Vt({
     type: S,
@@ -2358,9 +2357,9 @@ ye([ Vt({
 }), ge("design:type", typeof (Ht = typeof S !== "undefined" && S) === "function" ? Ht : Object) ], qt.prototype, "btn_cancel", void 0);
 
 ye([ Vt({
-    type: N,
+    type: U,
     tooltip: "取消按钮精灵图"
-}), ge("design:type", typeof ($t = typeof N !== "undefined" && N) === "function" ? $t : Object) ], qt.prototype, "cancel_spriteFrame", void 0);
+}), ge("design:type", typeof ($t = typeof U !== "undefined" && U) === "function" ? $t : Object) ], qt.prototype, "cancel_spriteFrame", void 0);
 
 ye([ Vt({
     type: S,
@@ -2398,8 +2397,8 @@ class TimerManager extends BaseManager {
     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() {
@@ -2525,4 +2524,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.42",
     "description": "",
     "license": "MIT",
     "main": "dist/shimotsuki_core.js",