@shimotsuki/core 3.0.42 → 3.0.44
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/shimotsuki_core.js +139 -138
- package/package.json +1 -1
package/dist/shimotsuki_core.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import e from "@babel/runtime-corejs3/core-js/global-this";
|
|
2
2
|
|
|
3
|
-
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
|
|
3
|
+
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";
|
|
4
4
|
|
|
5
5
|
import D from "@babel/runtime-corejs3/core-js-stable/reflect/get";
|
|
6
6
|
|
|
@@ -36,17 +36,17 @@ import Z from "@babel/runtime-corejs3/core-js-stable/instance/map";
|
|
|
36
36
|
|
|
37
37
|
import Y from "@babel/runtime-corejs3/core-js-stable/array/from";
|
|
38
38
|
|
|
39
|
-
import ee from "@babel/runtime-corejs3/core-js-stable/
|
|
39
|
+
import ee from "@babel/runtime-corejs3/core-js-stable/instance/every";
|
|
40
40
|
|
|
41
|
-
import te from "
|
|
41
|
+
import { SocketConnectStatus as te } from "pitayaclient";
|
|
42
42
|
|
|
43
|
-
import {
|
|
43
|
+
import { DEBUG as ie, WECHAT as ne, PREVIEW as oe } from "cc/env";
|
|
44
44
|
|
|
45
|
-
import {
|
|
45
|
+
import { SocialGameClient as se } from "sgc";
|
|
46
46
|
|
|
47
|
-
import
|
|
47
|
+
import re from "crypto-es";
|
|
48
48
|
|
|
49
|
-
import ae from "
|
|
49
|
+
import ae from "@babel/runtime-corejs3/core-js-stable/date/now";
|
|
50
50
|
|
|
51
51
|
import le from "@babel/runtime-corejs3/core-js-stable/set-interval";
|
|
52
52
|
|
|
@@ -334,13 +334,13 @@ class AudioManager extends BaseManager {
|
|
|
334
334
|
}
|
|
335
335
|
}
|
|
336
336
|
|
|
337
|
-
function
|
|
337
|
+
function ge(e, t, i, n) {
|
|
338
338
|
var o = arguments.length, s = o < 3 ? t : n === null ? n = Object.getOwnPropertyDescriptor(t, i) : n, r;
|
|
339
339
|
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;
|
|
340
340
|
return o > 3 && s && Object.defineProperty(t, i, s), s;
|
|
341
341
|
}
|
|
342
342
|
|
|
343
|
-
function
|
|
343
|
+
function ye(e, t) {
|
|
344
344
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(e, t);
|
|
345
345
|
}
|
|
346
346
|
|
|
@@ -670,7 +670,7 @@ class AudioSourceBaseComponent extends BaseComponent {
|
|
|
670
670
|
}
|
|
671
671
|
playAudio() {
|
|
672
672
|
const {switchEffect: e, switchMusic: t} = this.cat.audio;
|
|
673
|
-
if (!this.audioSource.playing && (this.type === Se.BGM ? t : e) && !
|
|
673
|
+
if (!this.audioSource.playing && (this.type === Se.BGM ? t : e) && !y._paused) this.audioSource.play();
|
|
674
674
|
}
|
|
675
675
|
onPlayEffectHandler() {}
|
|
676
676
|
onStopEffectHandler() {
|
|
@@ -686,27 +686,27 @@ class AudioSourceBaseComponent extends BaseComponent {
|
|
|
686
686
|
}
|
|
687
687
|
}
|
|
688
688
|
|
|
689
|
-
|
|
689
|
+
ge([ Ee({
|
|
690
690
|
tooltip: `类型:\n EFFECT 音效\n BGM 音乐`,
|
|
691
|
-
type:
|
|
692
|
-
}),
|
|
691
|
+
type: g(Se)
|
|
692
|
+
}), ye("design:type", Number) ], AudioSourceBaseComponent.prototype, "type", void 0);
|
|
693
693
|
|
|
694
|
-
|
|
694
|
+
ge([ Ee({
|
|
695
695
|
tooltip: "音源",
|
|
696
696
|
type: n
|
|
697
|
-
}),
|
|
697
|
+
}), ye("design:type", typeof (ve = typeof n !== "undefined" && n) === "function" ? ve : Object) ], AudioSourceBaseComponent.prototype, "clip", void 0);
|
|
698
698
|
|
|
699
|
-
|
|
699
|
+
ge([ Ee({
|
|
700
700
|
tooltip: "循环"
|
|
701
|
-
}),
|
|
701
|
+
}), ye("design:type", Boolean) ], AudioSourceBaseComponent.prototype, "loop", void 0);
|
|
702
702
|
|
|
703
|
-
|
|
703
|
+
ge([ Ee({
|
|
704
704
|
tooltip: "音量"
|
|
705
|
-
}),
|
|
705
|
+
}), ye("design:type", Number) ], AudioSourceBaseComponent.prototype, "volume", void 0);
|
|
706
706
|
|
|
707
|
-
|
|
707
|
+
ge([ Ee({
|
|
708
708
|
tooltip: "是否启用自动播放"
|
|
709
|
-
}),
|
|
709
|
+
}), ye("design:type", Boolean) ], AudioSourceBaseComponent.prototype, "playOnAwake", void 0);
|
|
710
710
|
|
|
711
711
|
var we;
|
|
712
712
|
|
|
@@ -737,7 +737,7 @@ class AudioSourceUILayer extends UILayer {
|
|
|
737
737
|
}
|
|
738
738
|
playAudio() {
|
|
739
739
|
const {switchEffect: e, switchMusic: t} = this.cat.audio;
|
|
740
|
-
if (!this.audioSource.playing && (this.type === Se.BGM ? t : e) && !
|
|
740
|
+
if (!this.audioSource.playing && (this.type === Se.BGM ? t : e) && !y._paused) this.audioSource.play();
|
|
741
741
|
}
|
|
742
742
|
onPlayEffectHandler() {}
|
|
743
743
|
onStopEffectHandler() {
|
|
@@ -753,27 +753,27 @@ class AudioSourceUILayer extends UILayer {
|
|
|
753
753
|
}
|
|
754
754
|
}
|
|
755
755
|
|
|
756
|
-
|
|
756
|
+
ge([ Ie({
|
|
757
757
|
tooltip: `类型:\n EFFECT 音效\n BGM 音乐`,
|
|
758
|
-
type:
|
|
759
|
-
}),
|
|
758
|
+
type: g(Se)
|
|
759
|
+
}), ye("design:type", Number) ], AudioSourceUILayer.prototype, "type", void 0);
|
|
760
760
|
|
|
761
|
-
|
|
761
|
+
ge([ Ie({
|
|
762
762
|
tooltip: "音源",
|
|
763
763
|
type: n
|
|
764
|
-
}),
|
|
764
|
+
}), ye("design:type", typeof (we = typeof n !== "undefined" && n) === "function" ? we : Object) ], AudioSourceUILayer.prototype, "clip", void 0);
|
|
765
765
|
|
|
766
|
-
|
|
766
|
+
ge([ Ie({
|
|
767
767
|
tooltip: "循环"
|
|
768
|
-
}),
|
|
768
|
+
}), ye("design:type", Boolean) ], AudioSourceUILayer.prototype, "loop", void 0);
|
|
769
769
|
|
|
770
|
-
|
|
770
|
+
ge([ Ie({
|
|
771
771
|
tooltip: "音量"
|
|
772
|
-
}),
|
|
772
|
+
}), ye("design:type", Number) ], AudioSourceUILayer.prototype, "volume", void 0);
|
|
773
773
|
|
|
774
|
-
|
|
774
|
+
ge([ Ie({
|
|
775
775
|
tooltip: "是否启用自动播放"
|
|
776
|
-
}),
|
|
776
|
+
}), ye("design:type", Boolean) ], AudioSourceUILayer.prototype, "playOnAwake", void 0);
|
|
777
777
|
|
|
778
778
|
var Oe, Te, ke, Re;
|
|
779
779
|
|
|
@@ -841,27 +841,27 @@ let xe = class CoreToast extends BaseComponent {
|
|
|
841
841
|
}
|
|
842
842
|
};
|
|
843
843
|
|
|
844
|
-
|
|
844
|
+
ge([ Ue({
|
|
845
845
|
type: s,
|
|
846
846
|
tooltip: "固定节点"
|
|
847
|
-
}),
|
|
847
|
+
}), ye("design:type", typeof (Oe = typeof s !== "undefined" && s) === "function" ? Oe : Object) ], xe.prototype, "fixed_node", void 0);
|
|
848
848
|
|
|
849
|
-
|
|
849
|
+
ge([ Ue({
|
|
850
850
|
type: s,
|
|
851
851
|
tooltip: "滑动节点"
|
|
852
|
-
}),
|
|
852
|
+
}), ye("design:type", typeof (Te = typeof s !== "undefined" && s) === "function" ? Te : Object) ], xe.prototype, "slide_node", void 0);
|
|
853
853
|
|
|
854
|
-
|
|
854
|
+
ge([ Ue({
|
|
855
855
|
type: b,
|
|
856
856
|
tooltip: "固定标签节点"
|
|
857
|
-
}),
|
|
857
|
+
}), ye("design:type", typeof (ke = typeof b !== "undefined" && b) === "function" ? ke : Object) ], xe.prototype, "fixed_label", void 0);
|
|
858
858
|
|
|
859
|
-
|
|
859
|
+
ge([ Ue({
|
|
860
860
|
type: b,
|
|
861
861
|
tooltip: "滑动标签节点"
|
|
862
|
-
}),
|
|
862
|
+
}), ye("design:type", typeof (Re = typeof b !== "undefined" && b) === "function" ? Re : Object) ], xe.prototype, "slide_label", void 0);
|
|
863
863
|
|
|
864
|
-
xe =
|
|
864
|
+
xe = ge([ Me("CoreToast"), Ne("CATCORE/CoreToast") ], xe);
|
|
865
865
|
|
|
866
866
|
var je;
|
|
867
867
|
|
|
@@ -884,12 +884,12 @@ let Ge = class CoreBlackMask extends BaseComponent {
|
|
|
884
884
|
tween;
|
|
885
885
|
};
|
|
886
886
|
|
|
887
|
-
|
|
887
|
+
ge([ Be({
|
|
888
888
|
type: s,
|
|
889
889
|
tooltip: "动画节点"
|
|
890
|
-
}),
|
|
890
|
+
}), ye("design:type", typeof (Fe = typeof s !== "undefined" && s) === "function" ? Fe : Object) ], Ge.prototype, "tween", void 0);
|
|
891
891
|
|
|
892
|
-
Ge =
|
|
892
|
+
Ge = ge([ Le("CoreBlackMask"), Pe("CATCORE/CoreBlackMask") ], Ge);
|
|
893
893
|
|
|
894
894
|
var He, $e;
|
|
895
895
|
|
|
@@ -951,15 +951,15 @@ let ze = class CoreUIContainer extends UILayer {
|
|
|
951
951
|
}
|
|
952
952
|
};
|
|
953
953
|
|
|
954
|
-
|
|
954
|
+
ge([ We({
|
|
955
955
|
type: s
|
|
956
|
-
}),
|
|
956
|
+
}), ye("design:type", typeof (He = typeof s !== "undefined" && s) === "function" ? He : Object) ], ze.prototype, "scene_mask_node", void 0);
|
|
957
957
|
|
|
958
|
-
|
|
958
|
+
ge([ We({
|
|
959
959
|
type: s
|
|
960
|
-
}),
|
|
960
|
+
}), ye("design:type", typeof ($e = typeof s !== "undefined" && s) === "function" ? $e : Object) ], ze.prototype, "ui_container", void 0);
|
|
961
961
|
|
|
962
|
-
ze =
|
|
962
|
+
ze = ge([ Ke("CoreUIContainer"), Ve("CATCORE/CoreUIContainer") ], ze);
|
|
963
963
|
|
|
964
964
|
class RootUILayer extends UILayer {
|
|
965
965
|
onEnable() {
|
|
@@ -1002,17 +1002,17 @@ let Ye = class CoreShowLoading extends RootUILayer {
|
|
|
1002
1002
|
}
|
|
1003
1003
|
};
|
|
1004
1004
|
|
|
1005
|
-
|
|
1005
|
+
ge([ Xe({
|
|
1006
1006
|
type: b,
|
|
1007
1007
|
tooltip: "标题"
|
|
1008
|
-
}),
|
|
1008
|
+
}), ye("design:type", typeof (qe = typeof b !== "undefined" && b) === "function" ? qe : Object) ], Ye.prototype, "title", void 0);
|
|
1009
1009
|
|
|
1010
|
-
|
|
1010
|
+
ge([ Xe({
|
|
1011
1011
|
type: s,
|
|
1012
1012
|
tooltip: "动画"
|
|
1013
|
-
}),
|
|
1013
|
+
}), ye("design:type", typeof (Qe = typeof s !== "undefined" && s) === "function" ? Qe : Object) ], Ye.prototype, "loadingTween", void 0);
|
|
1014
1014
|
|
|
1015
|
-
Ye =
|
|
1015
|
+
Ye = ge([ Je("CoreShowLoading"), Ze("CATCORE/CoreShowLoading") ], Ye);
|
|
1016
1016
|
|
|
1017
1017
|
var et;
|
|
1018
1018
|
|
|
@@ -1074,22 +1074,22 @@ let at = class CoreReconnection extends RootUILayer {
|
|
|
1074
1074
|
}
|
|
1075
1075
|
};
|
|
1076
1076
|
|
|
1077
|
-
|
|
1077
|
+
ge([ st({
|
|
1078
1078
|
type: b,
|
|
1079
1079
|
tooltip: "通用提示文本"
|
|
1080
|
-
}),
|
|
1080
|
+
}), ye("design:type", typeof (tt = typeof b !== "undefined" && b) === "function" ? tt : Object) ], at.prototype, "common_prompt_text", void 0);
|
|
1081
1081
|
|
|
1082
|
-
|
|
1082
|
+
ge([ st({
|
|
1083
1083
|
type: S,
|
|
1084
1084
|
tooltip: "确定按钮"
|
|
1085
|
-
}),
|
|
1085
|
+
}), ye("design:type", typeof (it = typeof S !== "undefined" && S) === "function" ? it : Object) ], at.prototype, "btn_confirm", void 0);
|
|
1086
1086
|
|
|
1087
|
-
|
|
1087
|
+
ge([ st({
|
|
1088
1088
|
type: S,
|
|
1089
1089
|
tooltip: "关闭按钮"
|
|
1090
|
-
}),
|
|
1090
|
+
}), ye("design:type", typeof (nt = typeof S !== "undefined" && S) === "function" ? nt : Object) ], at.prototype, "btn_close", void 0);
|
|
1091
1091
|
|
|
1092
|
-
at =
|
|
1092
|
+
at = ge([ ot("CoreReconnection"), rt("CATCORE/CoreReconnection") ], at);
|
|
1093
1093
|
|
|
1094
1094
|
var lt, ct, ht;
|
|
1095
1095
|
|
|
@@ -1119,28 +1119,28 @@ let ft = class CoreNotice extends RootUILayer {
|
|
|
1119
1119
|
}
|
|
1120
1120
|
};
|
|
1121
1121
|
|
|
1122
|
-
|
|
1122
|
+
ge([ dt({
|
|
1123
1123
|
type: b,
|
|
1124
1124
|
tooltip: "提示文本"
|
|
1125
|
-
}),
|
|
1125
|
+
}), ye("design:type", typeof (lt = typeof b !== "undefined" && b) === "function" ? lt : Object) ], ft.prototype, "text", void 0);
|
|
1126
1126
|
|
|
1127
|
-
|
|
1127
|
+
ge([ dt({
|
|
1128
1128
|
type: S,
|
|
1129
1129
|
tooltip: "确定按钮"
|
|
1130
|
-
}),
|
|
1130
|
+
}), ye("design:type", typeof (ct = typeof S !== "undefined" && S) === "function" ? ct : Object) ], ft.prototype, "btn_confirm", void 0);
|
|
1131
1131
|
|
|
1132
|
-
|
|
1132
|
+
ge([ dt({
|
|
1133
1133
|
type: S,
|
|
1134
1134
|
tooltip: "关闭按钮"
|
|
1135
|
-
}),
|
|
1135
|
+
}), ye("design:type", typeof (ht = typeof S !== "undefined" && S) === "function" ? ht : Object) ], ft.prototype, "btn_close", void 0);
|
|
1136
1136
|
|
|
1137
|
-
ft =
|
|
1137
|
+
ft = ge([ ut("CoreNotice"), pt("CATCORE/CoreNotice") ], ft);
|
|
1138
1138
|
|
|
1139
1139
|
class SceneLayer extends BaseComponent {
|
|
1140
1140
|
isReload;
|
|
1141
1141
|
}
|
|
1142
1142
|
|
|
1143
|
-
var mt, _t,
|
|
1143
|
+
var mt, _t, gt, yt, bt, vt, Ct, Et;
|
|
1144
1144
|
|
|
1145
1145
|
const {ccclass: St, property: wt, menu: At} = i;
|
|
1146
1146
|
|
|
@@ -1179,7 +1179,7 @@ let Ot = class Gui extends BaseComponent {
|
|
|
1179
1179
|
_scene=null;
|
|
1180
1180
|
init(e) {
|
|
1181
1181
|
this.cat = e;
|
|
1182
|
-
|
|
1182
|
+
y.once(w.EVENT_ENGINE_INITED, () => {
|
|
1183
1183
|
this.engineReady = true;
|
|
1184
1184
|
this.tryInit();
|
|
1185
1185
|
});
|
|
@@ -1381,13 +1381,15 @@ let Ot = class Gui extends BaseComponent {
|
|
|
1381
1381
|
n?.setOptions(t);
|
|
1382
1382
|
}
|
|
1383
1383
|
createUILayer(e) {
|
|
1384
|
-
this.ui_container_component?.removeAndDestroy();
|
|
1385
1384
|
this.ui_container_component = null;
|
|
1386
1385
|
const t = h(this.ui_prefab);
|
|
1386
|
+
console.log("node", u(t), t.uuid, t);
|
|
1387
|
+
console.log("isValid(this.node)", u(this.node), this.node.uuid, this.node);
|
|
1387
1388
|
if (u(this.node)) {
|
|
1388
1389
|
this.ui_container_component = t.getComponent(ze);
|
|
1389
1390
|
this.ui_container_component?.setGui(this).addToParent(e, this.node.getSiblingIndex());
|
|
1390
1391
|
}
|
|
1392
|
+
console.log("this.ui_container_component", this.ui_container_component);
|
|
1391
1393
|
}
|
|
1392
1394
|
reloadScene() {
|
|
1393
1395
|
let e = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : () => {};
|
|
@@ -1466,47 +1468,47 @@ let Ot = class Gui extends BaseComponent {
|
|
|
1466
1468
|
}
|
|
1467
1469
|
};
|
|
1468
1470
|
|
|
1469
|
-
|
|
1471
|
+
ge([ wt({
|
|
1470
1472
|
type: c,
|
|
1471
1473
|
tooltip: "断线重连UI预制体"
|
|
1472
|
-
}),
|
|
1474
|
+
}), ye("design:type", typeof (mt = typeof c !== "undefined" && c) === "function" ? mt : Object) ], Ot.prototype, "reconnection_ui_prefab", void 0);
|
|
1473
1475
|
|
|
1474
|
-
|
|
1476
|
+
ge([ wt({
|
|
1475
1477
|
type: c,
|
|
1476
1478
|
tooltip: "提示UI预制体"
|
|
1477
|
-
}),
|
|
1479
|
+
}), ye("design:type", typeof (_t = typeof c !== "undefined" && c) === "function" ? _t : Object) ], Ot.prototype, "toast_ui_prefab", void 0);
|
|
1478
1480
|
|
|
1479
|
-
|
|
1481
|
+
ge([ wt({
|
|
1480
1482
|
type: c,
|
|
1481
1483
|
tooltip: "加载UI预制体"
|
|
1482
|
-
}),
|
|
1484
|
+
}), ye("design:type", typeof (gt = typeof c !== "undefined" && c) === "function" ? gt : Object) ], Ot.prototype, "loading_ui_prefab", void 0);
|
|
1483
1485
|
|
|
1484
|
-
|
|
1486
|
+
ge([ wt({
|
|
1485
1487
|
type: c,
|
|
1486
1488
|
tooltip: "公告UI预制体"
|
|
1487
|
-
}),
|
|
1489
|
+
}), ye("design:type", typeof (yt = typeof c !== "undefined" && c) === "function" ? yt : Object) ], Ot.prototype, "notice_ui_prefab", void 0);
|
|
1488
1490
|
|
|
1489
|
-
|
|
1491
|
+
ge([ wt({
|
|
1490
1492
|
type: c,
|
|
1491
1493
|
tooltip: "UI层预制体"
|
|
1492
|
-
}),
|
|
1494
|
+
}), ye("design:type", typeof (bt = typeof c !== "undefined" && c) === "function" ? bt : Object) ], Ot.prototype, "ui_prefab", void 0);
|
|
1493
1495
|
|
|
1494
|
-
|
|
1496
|
+
ge([ wt({
|
|
1495
1497
|
type: s,
|
|
1496
1498
|
tooltip: "root-UI层"
|
|
1497
|
-
}),
|
|
1499
|
+
}), ye("design:type", typeof (vt = typeof s !== "undefined" && s) === "function" ? vt : Object) ], Ot.prototype, "root_ui", void 0);
|
|
1498
1500
|
|
|
1499
|
-
|
|
1501
|
+
ge([ wt({
|
|
1500
1502
|
type: s,
|
|
1501
1503
|
tooltip: "root-组件层"
|
|
1502
|
-
}),
|
|
1504
|
+
}), ye("design:type", typeof (Ct = typeof s !== "undefined" && s) === "function" ? Ct : Object) ], Ot.prototype, "root_toast", void 0);
|
|
1503
1505
|
|
|
1504
|
-
|
|
1506
|
+
ge([ wt({
|
|
1505
1507
|
type: s,
|
|
1506
1508
|
tooltip: "root-mask"
|
|
1507
|
-
}),
|
|
1509
|
+
}), ye("design:type", typeof (Et = typeof s !== "undefined" && s) === "function" ? Et : Object) ], Ot.prototype, "root_mask", void 0);
|
|
1508
1510
|
|
|
1509
|
-
Ot =
|
|
1511
|
+
Ot = ge([ St("Gui"), At("CATCORE/Gui") ], Ot);
|
|
1510
1512
|
|
|
1511
1513
|
var Tt;
|
|
1512
1514
|
|
|
@@ -1542,7 +1544,7 @@ class GuiManager extends BaseManager {
|
|
|
1542
1544
|
}
|
|
1543
1545
|
}
|
|
1544
1546
|
|
|
1545
|
-
class WrapperSocialGameClient extends
|
|
1547
|
+
class WrapperSocialGameClient extends se {
|
|
1546
1548
|
showRequestErrInfo=false;
|
|
1547
1549
|
logBlackList=[];
|
|
1548
1550
|
ignore=e => {
|
|
@@ -1564,7 +1566,7 @@ class WrapperSocialGameClient extends re {
|
|
|
1564
1566
|
forwardReq: s,
|
|
1565
1567
|
forwardResp: r
|
|
1566
1568
|
}).then(e => {
|
|
1567
|
-
if (
|
|
1569
|
+
if (ie) {
|
|
1568
1570
|
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);
|
|
1569
1571
|
}
|
|
1570
1572
|
l(e);
|
|
@@ -1579,7 +1581,7 @@ class WrapperSocialGameClient extends re {
|
|
|
1579
1581
|
}
|
|
1580
1582
|
subscribe(t, i, n) {
|
|
1581
1583
|
super.subscribe(t, i, i => {
|
|
1582
|
-
if (
|
|
1584
|
+
if (ie && !this.ignore(t)) {
|
|
1583
1585
|
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);
|
|
1584
1586
|
}
|
|
1585
1587
|
e._cat.event.emit(t, i);
|
|
@@ -1631,7 +1633,7 @@ class SocialGameClientManager extends BaseManager {
|
|
|
1631
1633
|
reconnectMaxAttempts: Infinity
|
|
1632
1634
|
}, {
|
|
1633
1635
|
isAutoConnect: false,
|
|
1634
|
-
isArrayBuffer:
|
|
1636
|
+
isArrayBuffer: ne,
|
|
1635
1637
|
...t
|
|
1636
1638
|
}));
|
|
1637
1639
|
this.register(o);
|
|
@@ -1651,7 +1653,7 @@ class SocialGameClientManager extends BaseManager {
|
|
|
1651
1653
|
}
|
|
1652
1654
|
initGlobalListeners() {
|
|
1653
1655
|
this.cat.event.on(je.ONLINE, () => this.handleGlobalStateChange("online"), this).on(je.OFFLINE, () => this.handleGlobalStateChange("offline"), this);
|
|
1654
|
-
if (
|
|
1656
|
+
if (ne) {
|
|
1655
1657
|
wx.onShow(e => {
|
|
1656
1658
|
this.handleGlobalStateChange("show", e);
|
|
1657
1659
|
});
|
|
@@ -1659,8 +1661,8 @@ class SocialGameClientManager extends BaseManager {
|
|
|
1659
1661
|
this.handleGlobalStateChange("hide", e);
|
|
1660
1662
|
});
|
|
1661
1663
|
} else {
|
|
1662
|
-
|
|
1663
|
-
|
|
1664
|
+
y.on(w.EVENT_SHOW, () => this.handleGlobalStateChange("show"));
|
|
1665
|
+
y.on(w.EVENT_HIDE, () => this.handleGlobalStateChange("hide"));
|
|
1664
1666
|
}
|
|
1665
1667
|
}
|
|
1666
1668
|
async handleGlobalStateChange(e, t) {
|
|
@@ -1697,7 +1699,6 @@ class SocialGameClientManager extends BaseManager {
|
|
|
1697
1699
|
}
|
|
1698
1700
|
}
|
|
1699
1701
|
async safeTriggerReconnectAll() {
|
|
1700
|
-
ee();
|
|
1701
1702
|
if (this.reconnecting || !this.isGlobalOnline || this.isInBackground || this.managedClients.size === 0) {
|
|
1702
1703
|
console.log("[safeTriggerReconnectAll] 没有需要重连的客户端,直接 dispatch");
|
|
1703
1704
|
await this.dispatchReloadAndShow();
|
|
@@ -1735,7 +1736,7 @@ class SocialGameClientManager extends BaseManager {
|
|
|
1735
1736
|
o(`${e.name}服重连失败`, t);
|
|
1736
1737
|
}
|
|
1737
1738
|
}));
|
|
1738
|
-
const i = $(t = this.activeClients).call(t, e => e.socketConnectStatus !==
|
|
1739
|
+
const i = $(t = this.activeClients).call(t, e => e.socketConnectStatus !== te.CONNECTED);
|
|
1739
1740
|
if (i.length > 0) {
|
|
1740
1741
|
Z(i).call(i, e => {
|
|
1741
1742
|
console.error("部分WS重连失败:", e);
|
|
@@ -1753,7 +1754,7 @@ class SocialGameClientManager extends BaseManager {
|
|
|
1753
1754
|
}
|
|
1754
1755
|
disconnectAll(e) {
|
|
1755
1756
|
var t, i;
|
|
1756
|
-
if (
|
|
1757
|
+
if (ee(t = this.activeClients).call(t, e => e.socket?.readyState !== WebSocket.OPEN)) return;
|
|
1757
1758
|
H(i = this.managedClients).call(i, t => {
|
|
1758
1759
|
a("断开连接", t.name, e, t.socket);
|
|
1759
1760
|
t.disconnect(e);
|
|
@@ -1767,7 +1768,7 @@ class SocialGameClientManager extends BaseManager {
|
|
|
1767
1768
|
};
|
|
1768
1769
|
handleSingleReconnect=async () => {
|
|
1769
1770
|
var e;
|
|
1770
|
-
if (
|
|
1771
|
+
if (ee(e = this.activeClients).call(e, e => e.socketConnectStatus === te.CONNECTED)) {
|
|
1771
1772
|
var t;
|
|
1772
1773
|
a("单个WS重连成功回调===", this.managedClients);
|
|
1773
1774
|
await F.allSettled(Z(t = this.activeClients).call(t, async e => {
|
|
@@ -1991,29 +1992,29 @@ class CoreStore extends BaseManager {}
|
|
|
1991
1992
|
|
|
1992
1993
|
let kt = null;
|
|
1993
1994
|
|
|
1994
|
-
const Rt = e =>
|
|
1995
|
+
const Rt = e => re.MD5(e).toString();
|
|
1995
1996
|
|
|
1996
1997
|
const Mt = (e, t) => {
|
|
1997
|
-
kt =
|
|
1998
|
+
kt = re.enc.Hex.parse(t);
|
|
1998
1999
|
};
|
|
1999
2000
|
|
|
2000
|
-
const Ut = (e, t, i) =>
|
|
2001
|
+
const Ut = (e, t, i) => re.AES.encrypt(e, t, {
|
|
2001
2002
|
iv: kt,
|
|
2002
2003
|
format: Dt
|
|
2003
2004
|
}).toString();
|
|
2004
2005
|
|
|
2005
2006
|
const Nt = (e, t, i) => {
|
|
2006
|
-
const n =
|
|
2007
|
+
const n = re.AES.decrypt(e, t, {
|
|
2007
2008
|
iv: kt,
|
|
2008
2009
|
format: Dt
|
|
2009
2010
|
});
|
|
2010
|
-
return n.toString(
|
|
2011
|
+
return n.toString(re.enc.Utf8);
|
|
2011
2012
|
};
|
|
2012
2013
|
|
|
2013
2014
|
const Dt = {
|
|
2014
2015
|
stringify: e => {
|
|
2015
2016
|
const t = {
|
|
2016
|
-
ct: e.ciphertext.toString(
|
|
2017
|
+
ct: e.ciphertext.toString(re.enc.Base64)
|
|
2017
2018
|
};
|
|
2018
2019
|
if (e.iv) {
|
|
2019
2020
|
t.iv = e.iv.toString();
|
|
@@ -2025,14 +2026,14 @@ const Dt = {
|
|
|
2025
2026
|
},
|
|
2026
2027
|
parse: e => {
|
|
2027
2028
|
const t = JSON.parse(e);
|
|
2028
|
-
const i =
|
|
2029
|
-
ciphertext:
|
|
2029
|
+
const i = re.lib.CipherParams.create({
|
|
2030
|
+
ciphertext: re.enc.Base64.parse(t.ct)
|
|
2030
2031
|
});
|
|
2031
2032
|
if (t.iv) {
|
|
2032
|
-
i.iv =
|
|
2033
|
+
i.iv = re.enc.Hex.parse(t.iv);
|
|
2033
2034
|
}
|
|
2034
2035
|
if (t.s) {
|
|
2035
|
-
i.salt =
|
|
2036
|
+
i.salt = re.enc.Hex.parse(t.s);
|
|
2036
2037
|
}
|
|
2037
2038
|
return i;
|
|
2038
2039
|
}
|
|
@@ -2069,7 +2070,7 @@ class StorageManager extends BaseManager {
|
|
|
2069
2070
|
console.error("存储的key不能为空");
|
|
2070
2071
|
return;
|
|
2071
2072
|
}
|
|
2072
|
-
if (!
|
|
2073
|
+
if (!oe) {
|
|
2073
2074
|
e = this.cat.util.encryptUtil.md5(e);
|
|
2074
2075
|
}
|
|
2075
2076
|
if (null == t) {
|
|
@@ -2091,7 +2092,7 @@ class StorageManager extends BaseManager {
|
|
|
2091
2092
|
} else if (typeof t === "number") {
|
|
2092
2093
|
t = t + "";
|
|
2093
2094
|
}
|
|
2094
|
-
if (!
|
|
2095
|
+
if (!oe && null != this._key && null != this._iv) {
|
|
2095
2096
|
t = this.cat.util.encryptUtil.aesEncrypt(`${t}`, this._key, this._iv);
|
|
2096
2097
|
}
|
|
2097
2098
|
M.localStorage.setItem(e, t);
|
|
@@ -2102,11 +2103,11 @@ class StorageManager extends BaseManager {
|
|
|
2102
2103
|
return null;
|
|
2103
2104
|
}
|
|
2104
2105
|
e = `${e}_${this._id}`;
|
|
2105
|
-
if (!
|
|
2106
|
+
if (!oe) {
|
|
2106
2107
|
e = this.cat.util.encryptUtil.md5(e);
|
|
2107
2108
|
}
|
|
2108
2109
|
let i = M.localStorage.getItem(e);
|
|
2109
|
-
if (null != i && "" !== i && !
|
|
2110
|
+
if (null != i && "" !== i && !oe && null != this._key && null != this._iv) {
|
|
2110
2111
|
i = this.cat.util.encryptUtil.aesDecrypt(i, this._key, this._iv);
|
|
2111
2112
|
}
|
|
2112
2113
|
if (null === i) {
|
|
@@ -2133,7 +2134,7 @@ class StorageManager extends BaseManager {
|
|
|
2133
2134
|
return;
|
|
2134
2135
|
}
|
|
2135
2136
|
e = `${e}_${this._id}`;
|
|
2136
|
-
if (!
|
|
2137
|
+
if (!oe) {
|
|
2137
2138
|
e = this.cat.util.encryptUtil.md5(e);
|
|
2138
2139
|
}
|
|
2139
2140
|
M.localStorage.removeItem(e);
|
|
@@ -2321,52 +2322,52 @@ let qt = class CoreUIModal extends UILayer {
|
|
|
2321
2322
|
}
|
|
2322
2323
|
};
|
|
2323
2324
|
|
|
2324
|
-
|
|
2325
|
+
ge([ Vt({
|
|
2325
2326
|
type: U,
|
|
2326
2327
|
tooltip: "默认标题"
|
|
2327
|
-
}),
|
|
2328
|
+
}), ye("design:type", typeof (jt = typeof U !== "undefined" && U) === "function" ? jt : Object) ], qt.prototype, "default_title", void 0);
|
|
2328
2329
|
|
|
2329
|
-
|
|
2330
|
+
ge([ Vt({
|
|
2330
2331
|
type: N,
|
|
2331
2332
|
tooltip: "标题节点"
|
|
2332
|
-
}),
|
|
2333
|
+
}), ye("design:type", typeof (Ft = typeof N !== "undefined" && N) === "function" ? Ft : Object) ], qt.prototype, "title", void 0);
|
|
2333
2334
|
|
|
2334
|
-
|
|
2335
|
+
ge([ Vt({
|
|
2335
2336
|
type: b,
|
|
2336
2337
|
tooltip: "字符串内容按钮"
|
|
2337
|
-
}),
|
|
2338
|
+
}), ye("design:type", typeof (Lt = typeof b !== "undefined" && b) === "function" ? Lt : Object) ], qt.prototype, "prompt_content_str", void 0);
|
|
2338
2339
|
|
|
2339
|
-
|
|
2340
|
+
ge([ Vt({
|
|
2340
2341
|
type: N,
|
|
2341
2342
|
tooltip: "图片精灵内容按钮"
|
|
2342
|
-
}),
|
|
2343
|
+
}), ye("design:type", typeof (Bt = typeof N !== "undefined" && N) === "function" ? Bt : Object) ], qt.prototype, "prompt_content_spriteFrame", void 0);
|
|
2343
2344
|
|
|
2344
|
-
|
|
2345
|
+
ge([ Vt({
|
|
2345
2346
|
type: S,
|
|
2346
2347
|
tooltip: "确认按钮"
|
|
2347
|
-
}),
|
|
2348
|
+
}), ye("design:type", typeof (Pt = typeof S !== "undefined" && S) === "function" ? Pt : Object) ], qt.prototype, "btn_confirm", void 0);
|
|
2348
2349
|
|
|
2349
|
-
|
|
2350
|
+
ge([ Vt({
|
|
2350
2351
|
type: U,
|
|
2351
2352
|
tooltip: "确认按钮精灵图"
|
|
2352
|
-
}),
|
|
2353
|
+
}), ye("design:type", typeof (Gt = typeof U !== "undefined" && U) === "function" ? Gt : Object) ], qt.prototype, "confirm_spriteFrame", void 0);
|
|
2353
2354
|
|
|
2354
|
-
|
|
2355
|
+
ge([ Vt({
|
|
2355
2356
|
type: S,
|
|
2356
2357
|
tooltip: "取消按钮"
|
|
2357
|
-
}),
|
|
2358
|
+
}), ye("design:type", typeof (Ht = typeof S !== "undefined" && S) === "function" ? Ht : Object) ], qt.prototype, "btn_cancel", void 0);
|
|
2358
2359
|
|
|
2359
|
-
|
|
2360
|
+
ge([ Vt({
|
|
2360
2361
|
type: U,
|
|
2361
2362
|
tooltip: "取消按钮精灵图"
|
|
2362
|
-
}),
|
|
2363
|
+
}), ye("design:type", typeof ($t = typeof U !== "undefined" && U) === "function" ? $t : Object) ], qt.prototype, "cancel_spriteFrame", void 0);
|
|
2363
2364
|
|
|
2364
|
-
|
|
2365
|
+
ge([ Vt({
|
|
2365
2366
|
type: S,
|
|
2366
2367
|
tooltip: "关闭按钮"
|
|
2367
|
-
}),
|
|
2368
|
+
}), ye("design:type", typeof (Kt = typeof S !== "undefined" && S) === "function" ? Kt : Object) ], qt.prototype, "btn_close", void 0);
|
|
2368
2369
|
|
|
2369
|
-
qt =
|
|
2370
|
+
qt = ge([ Wt("CoreUIModal"), zt("CATCORE/CoreUIModal") ], qt);
|
|
2370
2371
|
|
|
2371
2372
|
var Qt;
|
|
2372
2373
|
|
|
@@ -2393,7 +2394,7 @@ class TimerEntry {
|
|
|
2393
2394
|
|
|
2394
2395
|
class TimerManager extends BaseManager {
|
|
2395
2396
|
timers=(() => new G)();
|
|
2396
|
-
lastUpdateTime=(() =>
|
|
2397
|
+
lastUpdateTime=(() => ae())();
|
|
2397
2398
|
constructor(e) {
|
|
2398
2399
|
var t;
|
|
2399
2400
|
super(e);
|
|
@@ -2402,10 +2403,10 @@ class TimerManager extends BaseManager {
|
|
|
2402
2403
|
le(V(t = this.update).call(t, this), 1e3);
|
|
2403
2404
|
}
|
|
2404
2405
|
onHandleAppBackground() {
|
|
2405
|
-
this.lastUpdateTime =
|
|
2406
|
+
this.lastUpdateTime = ae();
|
|
2406
2407
|
}
|
|
2407
2408
|
onHandleAppForeground() {
|
|
2408
|
-
const e =
|
|
2409
|
+
const e = ae();
|
|
2409
2410
|
const t = e - this.lastUpdateTime;
|
|
2410
2411
|
a("elapsedTime", t);
|
|
2411
2412
|
for (const e of ce(i = this.timers).call(i)) {
|
|
@@ -2510,7 +2511,7 @@ const Xt = function() {
|
|
|
2510
2511
|
|
|
2511
2512
|
const Zt = e._cat ??= Manager.instance;
|
|
2512
2513
|
|
|
2513
|
-
|
|
2514
|
+
y.onPostProjectInitDelegate.add(async () => {
|
|
2514
2515
|
console.time("[Init App]");
|
|
2515
2516
|
try {
|
|
2516
2517
|
await Zt.boot();
|