@shimotsuki/core 3.0.45 → 3.0.47

package/dist/index.d.ts

@@ -521,6 +521,7 @@ declare class Gui extends BaseComponent {
     hideNotice(): this;
     findBundleBySceneUUID(sceneUUID: string): AssetManager.Bundle | null;
     findSceneByUUIDFromBundle(bundle: AssetManager.Bundle, sceneUUID: string): void;
+    private _sceneChanging;
     /**
      * 加载并切换游戏场景
      * @param sceneName 场景名称、场景实例或场景资源，用于指定要加载的场景

package/dist/shimotsuki_core.js

@@ -1,6 +1,6 @@
 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 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 { 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 g, Enum as _, 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";
 
@@ -164,7 +164,7 @@ class BaseManager {
     }
 }
 
-var _e;
+var ge;
 
 (function(e) {
     e["MUSIC_ON"] = "AudioEventConstant/MUSIC_ON";
@@ -173,7 +173,7 @@ var _e;
     e["EFFECT_OFF"] = "AudioEventConstant/EFFECT_OFF";
     e["PAUSE_AUDIO"] = "AudioEventConstant/PAUSE_AUDIO";
     e["RESUME_AUDIO"] = "AudioEventConstant/RESUME_AUDIO";
-})(_e || (_e = {}));
+})(ge || (ge = {}));
 
 class AudioManager extends BaseManager {
     local_data={};
@@ -250,7 +250,7 @@ class AudioManager extends BaseManager {
         if (e == this._switch_music) return;
         this._switch_music = e;
         e ? this.resumeMusic() : this.pauseMusic();
-        const t = e ? _e.MUSIC_ON : _e.MUSIC_OFF;
+        const t = e ? ge.MUSIC_ON : ge.MUSIC_OFF;
         this.cat.event.emit(t);
         this.save();
     }
@@ -286,7 +286,7 @@ class AudioManager extends BaseManager {
         if (e == this._switch_effect) return;
         this._switch_effect = e;
         e ? this.effect?.play() : this.effect?.stop();
-        const t = e ? _e.EFFECT_ON : _e.EFFECT_OFF;
+        const t = e ? ge.EFFECT_ON : ge.EFFECT_OFF;
         this.cat.event.emit(t);
         this.save();
     }
@@ -334,7 +334,7 @@ class AudioManager extends BaseManager {
     }
 }
 
-function ge(e, t, i, n) {
+function _e(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;
@@ -502,6 +502,7 @@ class BaseComponent extends l {
         if (u(this?.node)) {
             this.node.removeFromParent();
             this.node.destroy();
+            console.log(this.node.name, this.node.uuid, this.node);
         }
     }
     setPosition(e) {
@@ -589,7 +590,7 @@ class UILayer extends BaseComponent {
         i = i || this.lastEnterDirection;
         if (this.isClosing) return;
         this.isClosing = true;
-        _(this.node).removeSelf();
+        g(this.node).removeSelf();
         if (t) {
             const e = this.node.getComponent(f);
             if (e) e.enabled = false;
@@ -626,7 +627,7 @@ class UILayer extends BaseComponent {
     }
     deftween(e, t, i, n) {
         return new F((i, n) => {
-            _(this.node).to(e, t).call(() => {
+            g(this.node).to(e, t).call(() => {
                 i();
             }).start();
         });
@@ -657,7 +658,7 @@ class AudioSourceBaseComponent extends BaseComponent {
         this.audioSource.loop = this.loop;
         this.audioSource.volume = this.volume;
         this.audioSource.playOnAwake = this.playOnAwake;
-        this.cat.event.on(_e.EFFECT_ON, this.onPlayEffectHandler, this).on(_e.EFFECT_OFF, this.onStopEffectHandler, this).on(_e.MUSIC_ON, this.onPlayMusicHandler, this).on(_e.MUSIC_OFF, this.onStopMusicHandler, this);
+        this.cat.event.on(ge.EFFECT_ON, this.onPlayEffectHandler, this).on(ge.EFFECT_OFF, this.onStopEffectHandler, this).on(ge.MUSIC_ON, this.onPlayMusicHandler, this).on(ge.MUSIC_OFF, this.onStopMusicHandler, this);
     }
     __preload() {
         super.__preload();
@@ -686,25 +687,25 @@ class AudioSourceBaseComponent extends BaseComponent {
     }
 }
 
-ge([ Ee({
+_e([ Ee({
     tooltip: `类型:\n        EFFECT 音效\n        BGM    音乐`,
-    type: g(Se)
+    type: _(Se)
 }), ye("design:type", Number) ], AudioSourceBaseComponent.prototype, "type", void 0);
 
-ge([ Ee({
+_e([ Ee({
     tooltip: "音源",
     type: n
 }), ye("design:type", typeof (ve = typeof n !== "undefined" && n) === "function" ? ve : Object) ], AudioSourceBaseComponent.prototype, "clip", void 0);
 
-ge([ Ee({
+_e([ Ee({
     tooltip: "循环"
 }), ye("design:type", Boolean) ], AudioSourceBaseComponent.prototype, "loop", void 0);
 
-ge([ Ee({
+_e([ Ee({
     tooltip: "音量"
 }), ye("design:type", Number) ], AudioSourceBaseComponent.prototype, "volume", void 0);
 
-ge([ Ee({
+_e([ Ee({
     tooltip: "是否启用自动播放"
 }), ye("design:type", Boolean) ], AudioSourceBaseComponent.prototype, "playOnAwake", void 0);
 
@@ -721,7 +722,7 @@ class AudioSourceUILayer extends UILayer {
     audioSource=(() => new t)();
     onEnable() {
         super.onEnable();
-        this.cat.event.on(_e.EFFECT_ON, this.onPlayEffectHandler, this).on(_e.EFFECT_OFF, this.onStopEffectHandler, this).on(_e.MUSIC_ON, this.onPlayMusicHandler, this).on(_e.MUSIC_OFF, this.onStopMusicHandler, this);
+        this.cat.event.on(ge.EFFECT_ON, this.onPlayEffectHandler, this).on(ge.EFFECT_OFF, this.onStopEffectHandler, this).on(ge.MUSIC_ON, this.onPlayMusicHandler, this).on(ge.MUSIC_OFF, this.onStopMusicHandler, this);
     }
     __preload() {
         this.clip && (this.audioSource.clip = this.clip);
@@ -753,25 +754,25 @@ class AudioSourceUILayer extends UILayer {
     }
 }
 
-ge([ Ie({
+_e([ Ie({
     tooltip: `类型:\n        EFFECT 音效\n        BGM    音乐`,
-    type: g(Se)
+    type: _(Se)
 }), ye("design:type", Number) ], AudioSourceUILayer.prototype, "type", void 0);
 
-ge([ Ie({
+_e([ Ie({
     tooltip: "音源",
     type: n
 }), ye("design:type", typeof (we = typeof n !== "undefined" && n) === "function" ? we : Object) ], AudioSourceUILayer.prototype, "clip", void 0);
 
-ge([ Ie({
+_e([ Ie({
     tooltip: "循环"
 }), ye("design:type", Boolean) ], AudioSourceUILayer.prototype, "loop", void 0);
 
-ge([ Ie({
+_e([ Ie({
     tooltip: "音量"
 }), ye("design:type", Number) ], AudioSourceUILayer.prototype, "volume", void 0);
 
-ge([ Ie({
+_e([ Ie({
     tooltip: "是否启用自动播放"
 }), ye("design:type", Boolean) ], AudioSourceUILayer.prototype, "playOnAwake", void 0);
 
@@ -821,14 +822,14 @@ let xe = class CoreToast extends BaseComponent {
             const n = 1.2;
             const o = .5;
             const s = this.node.getComponent(v);
-            const r = _(s).delay(n).to(o, {
+            const r = g(s).delay(n).to(o, {
                 opacity: 0
             }).call(() => {
                 C.stopAllByTarget(e);
                 this.node.destroy();
                 t();
             });
-            _(e).by(o, {
+            g(e).by(o, {
                 position: m(0, 400, 0)
             }).call(() => {
                 r.start();
@@ -841,27 +842,27 @@ let xe = class CoreToast extends BaseComponent {
     }
 };
 
-ge([ Ue({
+_e([ Ue({
     type: s,
     tooltip: "固定节点"
 }), ye("design:type", typeof (Oe = typeof s !== "undefined" && s) === "function" ? Oe : Object) ], xe.prototype, "fixed_node", void 0);
 
-ge([ Ue({
+_e([ Ue({
     type: s,
     tooltip: "滑动节点"
 }), ye("design:type", typeof (Te = typeof s !== "undefined" && s) === "function" ? Te : Object) ], xe.prototype, "slide_node", void 0);
 
-ge([ Ue({
+_e([ Ue({
     type: b,
     tooltip: "固定标签节点"
 }), ye("design:type", typeof (ke = typeof b !== "undefined" && b) === "function" ? ke : Object) ], xe.prototype, "fixed_label", void 0);
 
-ge([ Ue({
+_e([ Ue({
     type: b,
     tooltip: "滑动标签节点"
 }), ye("design:type", typeof (Re = typeof b !== "undefined" && b) === "function" ? Re : Object) ], xe.prototype, "slide_label", void 0);
 
-xe = ge([ Me("CoreToast"), Ne("CATCORE/CoreToast") ], xe);
+xe = _e([ Me("CoreToast"), Ne("CATCORE/CoreToast") ], xe);
 
 var je;
 
@@ -884,12 +885,12 @@ let Ge = class CoreBlackMask extends BaseComponent {
     tween;
 };
 
-ge([ Be({
+_e([ Be({
     type: s,
     tooltip: "动画节点"
 }), ye("design:type", typeof (Fe = typeof s !== "undefined" && s) === "function" ? Fe : Object) ], Ge.prototype, "tween", void 0);
 
-Ge = ge([ Le("CoreBlackMask"), Pe("CATCORE/CoreBlackMask") ], Ge);
+Ge = _e([ Le("CoreBlackMask"), Pe("CATCORE/CoreBlackMask") ], Ge);
 
 var He, $e;
 
@@ -951,15 +952,15 @@ let ze = class CoreUIContainer extends UILayer {
     }
 };
 
-ge([ We({
+_e([ We({
     type: s
 }), ye("design:type", typeof (He = typeof s !== "undefined" && s) === "function" ? He : Object) ], ze.prototype, "scene_mask_node", void 0);
 
-ge([ We({
+_e([ We({
     type: s
 }), ye("design:type", typeof ($e = typeof s !== "undefined" && s) === "function" ? $e : Object) ], ze.prototype, "ui_container", void 0);
 
-ze = ge([ Ke("CoreUIContainer"), Ve("CATCORE/CoreUIContainer") ], ze);
+ze = _e([ Ke("CoreUIContainer"), Ve("CATCORE/CoreUIContainer") ], ze);
 
 class RootUILayer extends UILayer {
     onEnable() {
@@ -1002,17 +1003,17 @@ let Ye = class CoreShowLoading extends RootUILayer {
     }
 };
 
-ge([ Xe({
+_e([ Xe({
     type: b,
     tooltip: "标题"
 }), ye("design:type", typeof (qe = typeof b !== "undefined" && b) === "function" ? qe : Object) ], Ye.prototype, "title", void 0);
 
-ge([ Xe({
+_e([ Xe({
     type: s,
     tooltip: "动画"
 }), ye("design:type", typeof (Qe = typeof s !== "undefined" && s) === "function" ? Qe : Object) ], Ye.prototype, "loadingTween", void 0);
 
-Ye = ge([ Je("CoreShowLoading"), Ze("CATCORE/CoreShowLoading") ], Ye);
+Ye = _e([ Je("CoreShowLoading"), Ze("CATCORE/CoreShowLoading") ], Ye);
 
 var et;
 
@@ -1074,22 +1075,22 @@ let at = class CoreReconnection extends RootUILayer {
     }
 };
 
-ge([ st({
+_e([ st({
     type: b,
     tooltip: "通用提示文本"
 }), ye("design:type", typeof (tt = typeof b !== "undefined" && b) === "function" ? tt : Object) ], at.prototype, "common_prompt_text", void 0);
 
-ge([ st({
+_e([ st({
     type: S,
     tooltip: "确定按钮"
 }), ye("design:type", typeof (it = typeof S !== "undefined" && S) === "function" ? it : Object) ], at.prototype, "btn_confirm", void 0);
 
-ge([ st({
+_e([ st({
     type: S,
     tooltip: "关闭按钮"
 }), ye("design:type", typeof (nt = typeof S !== "undefined" && S) === "function" ? nt : Object) ], at.prototype, "btn_close", void 0);
 
-at = ge([ ot("CoreReconnection"), rt("CATCORE/CoreReconnection") ], at);
+at = _e([ ot("CoreReconnection"), rt("CATCORE/CoreReconnection") ], at);
 
 var lt, ct, ht;
 
@@ -1119,28 +1120,28 @@ let ft = class CoreNotice extends RootUILayer {
     }
 };
 
-ge([ dt({
+_e([ dt({
     type: b,
     tooltip: "提示文本"
 }), ye("design:type", typeof (lt = typeof b !== "undefined" && b) === "function" ? lt : Object) ], ft.prototype, "text", void 0);
 
-ge([ dt({
+_e([ dt({
     type: S,
     tooltip: "确定按钮"
 }), ye("design:type", typeof (ct = typeof S !== "undefined" && S) === "function" ? ct : Object) ], ft.prototype, "btn_confirm", void 0);
 
-ge([ dt({
+_e([ dt({
     type: S,
     tooltip: "关闭按钮"
 }), ye("design:type", typeof (ht = typeof S !== "undefined" && S) === "function" ? ht : Object) ], ft.prototype, "btn_close", void 0);
 
-ft = ge([ ut("CoreNotice"), pt("CATCORE/CoreNotice") ], ft);
+ft = _e([ ut("CoreNotice"), pt("CATCORE/CoreNotice") ], ft);
 
 class SceneLayer extends BaseComponent {
     isReload;
 }
 
-var mt, _t, gt, yt, bt, vt, Ct, Et;
+var mt, gt, _t, yt, bt, vt, Ct, Et;
 
 const {ccclass: St, property: wt, menu: At} = i;
 
@@ -1326,6 +1327,7 @@ let Ot = class Gui extends BaseComponent {
     findSceneByUUIDFromBundle(e, t) {
         return;
     }
+    _sceneChanging=false;
     loadScene(e, t, i, n) {
         a("[加载场景参数]", e, t, i, n);
         let s;
@@ -1335,6 +1337,11 @@ 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;
         }
+        if (this._sceneChanging) {
+            O("scene is changing, ignore");
+            return this;
+        }
+        this._sceneChanging = true;
         r.once(A.EVENT_BEFORE_SCENE_LAUNCH, e => {
             this.changeScene(e, s ?? {}, l);
         });
@@ -1381,9 +1388,6 @@ let Ot = class Gui extends BaseComponent {
         n?.setOptions(t);
     }
     createUILayer(e) {
-        if (this.ui_container_component && u(this.ui_container_component.node) && this.ui_container_component.node.scene === e) {
-            return;
-        }
         this.ui_container_component?.removeAndDestroy();
         this.ui_container_component = null;
         if (u(this.node)) {
@@ -1472,47 +1476,47 @@ let Ot = class Gui extends BaseComponent {
     }
 };
 
-ge([ wt({
+_e([ wt({
     type: c,
     tooltip: "断线重连UI预制体"
 }), ye("design:type", typeof (mt = typeof c !== "undefined" && c) === "function" ? mt : Object) ], Ot.prototype, "reconnection_ui_prefab", void 0);
 
-ge([ wt({
+_e([ wt({
     type: c,
     tooltip: "提示UI预制体"
-}), ye("design:type", typeof (_t = typeof c !== "undefined" && c) === "function" ? _t : Object) ], Ot.prototype, "toast_ui_prefab", void 0);
+}), ye("design:type", typeof (gt = typeof c !== "undefined" && c) === "function" ? gt : Object) ], Ot.prototype, "toast_ui_prefab", void 0);
 
-ge([ wt({
+_e([ wt({
     type: c,
     tooltip: "加载UI预制体"
-}), ye("design:type", typeof (gt = typeof c !== "undefined" && c) === "function" ? gt : Object) ], Ot.prototype, "loading_ui_prefab", void 0);
+}), ye("design:type", typeof (_t = typeof c !== "undefined" && c) === "function" ? _t : Object) ], Ot.prototype, "loading_ui_prefab", void 0);
 
-ge([ wt({
+_e([ wt({
     type: c,
     tooltip: "公告UI预制体"
 }), ye("design:type", typeof (yt = typeof c !== "undefined" && c) === "function" ? yt : Object) ], Ot.prototype, "notice_ui_prefab", void 0);
 
-ge([ wt({
+_e([ wt({
     type: c,
     tooltip: "UI层预制体"
 }), ye("design:type", typeof (bt = typeof c !== "undefined" && c) === "function" ? bt : Object) ], Ot.prototype, "ui_prefab", void 0);
 
-ge([ wt({
+_e([ wt({
     type: s,
     tooltip: "root-UI层"
 }), ye("design:type", typeof (vt = typeof s !== "undefined" && s) === "function" ? vt : Object) ], Ot.prototype, "root_ui", void 0);
 
-ge([ wt({
+_e([ wt({
     type: s,
     tooltip: "root-组件层"
 }), ye("design:type", typeof (Ct = typeof s !== "undefined" && s) === "function" ? Ct : Object) ], Ot.prototype, "root_toast", void 0);
 
-ge([ wt({
+_e([ wt({
     type: s,
     tooltip: "root-mask"
 }), ye("design:type", typeof (Et = typeof s !== "undefined" && s) === "function" ? Et : Object) ], Ot.prototype, "root_mask", void 0);
 
-Ot = ge([ St("Gui"), At("CATCORE/Gui") ], Ot);
+Ot = _e([ St("Gui"), At("CATCORE/Gui") ], Ot);
 
 var Tt;
 
@@ -2326,52 +2330,52 @@ let qt = class CoreUIModal extends UILayer {
     }
 };
 
-ge([ Vt({
+_e([ Vt({
     type: U,
     tooltip: "默认标题"
 }), ye("design:type", typeof (jt = typeof U !== "undefined" && U) === "function" ? jt : Object) ], qt.prototype, "default_title", void 0);
 
-ge([ Vt({
+_e([ Vt({
     type: N,
     tooltip: "标题节点"
 }), ye("design:type", typeof (Ft = typeof N !== "undefined" && N) === "function" ? Ft : Object) ], qt.prototype, "title", void 0);
 
-ge([ Vt({
+_e([ Vt({
     type: b,
     tooltip: "字符串内容按钮"
 }), ye("design:type", typeof (Lt = typeof b !== "undefined" && b) === "function" ? Lt : Object) ], qt.prototype, "prompt_content_str", void 0);
 
-ge([ Vt({
+_e([ Vt({
     type: N,
     tooltip: "图片精灵内容按钮"
 }), ye("design:type", typeof (Bt = typeof N !== "undefined" && N) === "function" ? Bt : Object) ], qt.prototype, "prompt_content_spriteFrame", void 0);
 
-ge([ Vt({
+_e([ Vt({
     type: S,
     tooltip: "确认按钮"
 }), ye("design:type", typeof (Pt = typeof S !== "undefined" && S) === "function" ? Pt : Object) ], qt.prototype, "btn_confirm", void 0);
 
-ge([ Vt({
+_e([ Vt({
     type: U,
     tooltip: "确认按钮精灵图"
 }), ye("design:type", typeof (Gt = typeof U !== "undefined" && U) === "function" ? Gt : Object) ], qt.prototype, "confirm_spriteFrame", void 0);
 
-ge([ Vt({
+_e([ Vt({
     type: S,
     tooltip: "取消按钮"
 }), ye("design:type", typeof (Ht = typeof S !== "undefined" && S) === "function" ? Ht : Object) ], qt.prototype, "btn_cancel", void 0);
 
-ge([ Vt({
+_e([ Vt({
     type: U,
     tooltip: "取消按钮精灵图"
 }), ye("design:type", typeof ($t = typeof U !== "undefined" && U) === "function" ? $t : Object) ], qt.prototype, "cancel_spriteFrame", void 0);
 
-ge([ Vt({
+_e([ Vt({
     type: S,
     tooltip: "关闭按钮"
 }), ye("design:type", typeof (Kt = typeof S !== "undefined" && S) === "function" ? Kt : Object) ], qt.prototype, "btn_close", void 0);
 
-qt = ge([ Wt("CoreUIModal"), zt("CATCORE/CoreUIModal") ], qt);
+qt = _e([ Wt("CoreUIModal"), zt("CATCORE/CoreUIModal") ], qt);
 
 var Qt;
 
@@ -2529,4 +2533,4 @@ y.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, 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 };
+export { Jt as AudioEffect, ge 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.45",
+    "version": "3.0.47",
     "description": "",
     "license": "MIT",
     "main": "dist/shimotsuki_core.js",