@cc-component/cc-core 1.2.8 → 1.2.9
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/assets/core/config/CommonEnum.ts +8 -2
- package/assets/core/config/CommonEnum.ts.meta +1 -1
- package/assets/core/config/IConfig.ts +1 -1
- package/assets/core/config/IConfig.ts.meta +1 -1
- package/assets/core/config/LayerType.ts.meta +1 -1
- package/assets/core/config/LayerUI.ts +14 -12
- package/assets/core/config/LayerUI.ts.meta +1 -1
- package/assets/core/config.meta +1 -1
- package/assets/core/editor/LanguageManager.ts +5 -5
- package/assets/core/editor/LanguageManager.ts.meta +1 -1
- package/assets/core/editor/SpineRunner.ts.meta +1 -1
- package/assets/core/editor/i18nEditorComponent.ts +12 -12
- package/assets/core/editor/i18nEditorComponent.ts.meta +1 -1
- package/assets/core/editor.meta +1 -1
- package/assets/core/home/AudioUtil.ts +5 -11
- package/assets/core/home/AudioUtil.ts.meta +1 -1
- package/assets/core/home/BaseBoxView.ts +13 -16
- package/assets/core/home/BaseBoxView.ts.meta +1 -1
- package/assets/core/home/BaseLaunchComponent.ts.meta +1 -1
- package/assets/core/home/BaseLoading.ts +34 -18
- package/assets/core/home/BaseLoading.ts.meta +1 -1
- package/assets/core/home/BaseModuleConfig.ts +46 -0
- package/assets/core/home/{ProgessView.ts.meta → BaseModuleConfig.ts.meta} +9 -9
- package/assets/core/home/BaseSkeleton.ts +4 -4
- package/assets/core/home/BaseSkeleton.ts.meta +1 -1
- package/assets/core/home/CameraAngel.ts +41 -41
- package/assets/core/home/CameraAngel.ts.meta +1 -1
- package/assets/core/home/DouYinShow.ts +1 -1
- package/assets/core/home/DouYinShow.ts.meta +1 -1
- package/assets/core/home/EventManager.ts +2 -10
- package/assets/core/home/EventManager.ts.meta +1 -1
- package/assets/core/home/FollowCamera.ts +28 -29
- package/assets/core/home/FollowCamera.ts.meta +1 -1
- package/assets/core/home/InViewCenter.ts +1 -1
- package/assets/core/home/InViewCenter.ts.meta +1 -1
- package/assets/core/home/LoadingWindow.ts.meta +1 -1
- package/assets/core/home/ParabolaTween.ts.meta +1 -1
- package/assets/core/home/ProgessWindow.ts +109 -0
- package/assets/core/home/{ExView.ts.meta → ProgessWindow.ts.meta} +1 -1
- package/assets/core/home/Quaternion.ts.meta +1 -1
- package/assets/core/home/ResUtil.ts.meta +1 -1
- package/assets/core/home/ResourceManager.ts +13 -14
- package/assets/core/home/ResourceManager.ts.meta +1 -1
- package/assets/core/home/StateMachine.ts +9 -9
- package/assets/core/home/StateMachine.ts.meta +1 -1
- package/assets/core/home/StorageManager.ts +1 -1
- package/assets/core/home/StorageManager.ts.meta +1 -1
- package/assets/core/home/ThirdFreeLookCamera.ts +2 -2
- package/assets/core/home/ThirdFreeLookCamera.ts.meta +1 -1
- package/assets/core/home/TimeManager.ts +1 -1
- package/assets/core/home/TimeManager.ts.meta +1 -1
- package/assets/core/home/Tools.ts +209 -0
- package/assets/core/home/Tools.ts.meta +1 -1
- package/assets/core/home/util/EncryptUtil.ts.meta +1 -1
- package/assets/core/home/util/MathUtil.ts.meta +1 -1
- package/assets/core/home/util/Md5.ts.meta +1 -1
- package/assets/core/home/util/RandomUtil.ts +41 -41
- package/assets/core/home/util/RandomUtil.ts.meta +1 -1
- package/assets/core/home/util/ResUtil.ts.meta +1 -1
- package/assets/core/home/util/crypto-js.d.ts.meta +1 -1
- package/assets/core/home/util/crypto-js.js.meta +1 -1
- package/assets/core/home/util.meta +1 -1
- package/assets/core/home.meta +1 -1
- package/assets/core/interface/App.ts +545 -0
- package/assets/core/interface/{MainModule.ts.meta → App.ts.meta} +1 -1
- package/assets/core/interface/ISceneParam.ts.meta +1 -1
- package/assets/core/interface/Interface.ts +66 -77
- package/assets/core/interface/Interface.ts.meta +1 -1
- package/assets/core/interface.meta +1 -1
- package/assets/core/lib/language/Language.ts +3 -4
- package/assets/core/lib/language/Language.ts.meta +1 -1
- package/assets/core/lib/language/LanguageData.ts +4 -4
- package/assets/core/lib/language/LanguageData.ts.meta +1 -1
- package/assets/core/lib/language/LanguageLabel.ts +6 -6
- package/assets/core/lib/language/LanguageLabel.ts.meta +1 -1
- package/assets/core/lib/language/LanguagePack.ts +8 -9
- package/assets/core/lib/language/LanguagePack.ts.meta +1 -1
- package/assets/core/lib/language/LanguagePointLabel.ts.meta +1 -1
- package/assets/core/lib/language/LanguageSpine.ts +1 -1
- package/assets/core/lib/language/LanguageSpine.ts.meta +1 -1
- package/assets/core/lib/language/LanguageSprite.ts +7 -7
- package/assets/core/lib/language/LanguageSprite.ts.meta +1 -1
- package/assets/core/lib/language.meta +1 -1
- package/assets/core/lib/logger/ELoggerLevel.ts +0 -12
- package/assets/core/lib/logger/ELoggerLevel.ts.meta +1 -1
- package/assets/core/lib/logger/MLogger.ts +7 -8
- package/assets/core/lib/logger/MLogger.ts.meta +1 -1
- package/assets/core/lib/logger.meta +1 -1
- package/assets/core/lib/net/libs/proto/output/protobuf.d.ts.meta +1 -1
- package/assets/core/lib/net/libs/proto/output/protobuf.min.js.meta +1 -1
- package/assets/core/lib/net/libs/proto/output/protobuf_custom.d.ts.meta +1 -1
- package/assets/core/lib/net/libs/proto/output/protobuf_custom.js.meta +1 -1
- package/assets/core/lib/net/libs/proto/output.meta +1 -1
- package/assets/core/lib/net/libs/proto/source/Cmd.proto.meta +1 -1
- package/assets/core/lib/net/libs/proto/source/UserLogin.proto.meta +1 -1
- package/assets/core/lib/net/libs/proto/source/base.proto.meta +1 -1
- package/assets/core/lib/net/libs/proto/source/command.proto.meta +1 -1
- package/assets/core/lib/net/libs/proto/source/domain/boos_battle_info.proto.meta +1 -1
- package/assets/core/lib/net/libs/proto/source/domain/player_auth.proto.meta +1 -1
- package/assets/core/lib/net/libs/proto/source/domain.meta +1 -1
- package/assets/core/lib/net/libs/proto/source/message/game_push.proto.meta +1 -1
- package/assets/core/lib/net/libs/proto/source/message/game_request.proto.meta +1 -1
- package/assets/core/lib/net/libs/proto/source/message/game_response.proto.meta +1 -1
- package/assets/core/lib/net/libs/proto/source/message.meta +1 -1
- package/assets/core/lib/net/libs/proto/source/push/boss_battle_events.proto.meta +1 -1
- package/assets/core/lib/net/libs/proto/source/push.meta +1 -1
- package/assets/core/lib/net/libs/proto/source.meta +1 -1
- package/assets/core/lib/net/libs/proto.meta +1 -1
- package/assets/core/lib/net/libs.meta +1 -1
- package/assets/core/lib/net/net/HttpManager.ts +2 -2
- package/assets/core/lib/net/net/HttpManager.ts.meta +1 -1
- package/assets/core/lib/net/net/NetInterface.ts.meta +1 -1
- package/assets/core/lib/net/net/NetManager.ts.meta +1 -1
- package/assets/core/lib/net/net/NetNode.ts +16 -17
- package/assets/core/lib/net/net/NetNode.ts.meta +1 -1
- package/assets/core/lib/net/net/WebSock.ts +1 -2
- package/assets/core/lib/net/net/WebSock.ts.meta +1 -1
- package/assets/core/lib/net/net/custom/NetChannelManager.ts.meta +1 -1
- package/assets/core/lib/net/net/custom/NetConfig.ts.meta +1 -1
- package/assets/core/lib/net/net/custom/NetErrorCode.ts.meta +1 -1
- package/assets/core/lib/net/net/custom/NetGameTips.ts +8 -9
- package/assets/core/lib/net/net/custom/NetGameTips.ts.meta +1 -1
- package/assets/core/lib/net/net/custom/NetNodeGame.ts +1 -1
- package/assets/core/lib/net/net/custom/NetNodeGame.ts.meta +1 -1
- package/assets/core/lib/net/net/custom.meta +1 -1
- package/assets/core/lib/net/net/protocol/NetProtocolJson.ts.meta +1 -1
- package/assets/core/lib/net/net/protocol/NetProtocolProtobuf.ts.meta +1 -1
- package/assets/core/lib/net/net/protocol.meta +1 -1
- package/assets/core/lib/net/net.meta +1 -1
- package/assets/core/lib/net/prompt.meta +1 -1
- package/assets/core/lib/net.meta +1 -1
- package/assets/core/lib/old.meta +1 -1
- package/assets/core/lib/tabbar/TabBarComponent.ts.meta +1 -1
- package/assets/core/lib/tabbar/TabBarController.ts.meta +1 -1
- package/assets/core/lib/tabbar/TabBarItem.ts.meta +1 -1
- package/assets/core/lib/tabbar.meta +1 -1
- package/assets/core/lib.meta +1 -1
- package/assets/core.meta +1 -1
- package/assets.meta +1 -1
- package/index.ts +14 -0
- package/index.ts.meta +1 -1
- package/package.json +1 -1
- package/package.json.meta +1 -1
- package/assets/core/home/ExView.ts +0 -9
- package/assets/core/home/JsonUtil.ts +0 -102
- package/assets/core/home/JsonUtil.ts.meta +0 -9
- package/assets/core/home/ProgessView.ts +0 -96
- package/assets/core/home/prefabs.meta +0 -12
- package/assets/core/interface/MainModule.ts +0 -1019
- package/assets/core/lib/Logger.ts +0 -286
- package/assets/core/lib/Logger.ts.meta +0 -9
- package/assets/core/lib/old/VM2.ts +0 -619
- package/assets/core/lib/old/VM2.ts.meta +0 -9
- package/assets/core/lib/old/ViewModel.ts +0 -905
- package/assets/core/lib/old/ViewModel.ts.meta +0 -9
- package/assets/core/lib/old/ViewSearch.ts +0 -125
- package/assets/core/lib/old/ViewSearch.ts.meta +0 -9
|
@@ -166,7 +166,7 @@ export class HttpManager {
|
|
|
166
166
|
|
|
167
167
|
let hrd = urls.get(key);
|
|
168
168
|
if (hrd && hrd.pss == pss) {
|
|
169
|
-
|
|
169
|
+
Logger.warn(`地址【${key}】已正在请求中,不能重复请求`);
|
|
170
170
|
return;
|
|
171
171
|
}
|
|
172
172
|
|
|
@@ -174,7 +174,7 @@ export class HttpManager {
|
|
|
174
174
|
|
|
175
175
|
// 防重复请求功能
|
|
176
176
|
urls.set(key, { xhr, pss });
|
|
177
|
-
//
|
|
177
|
+
//Logger.warn(ext && ext.query ? key : url)
|
|
178
178
|
if (method == HttpMethod.POST)
|
|
179
179
|
xhr.open(HttpMethod.POST, ext && ext.query ? key : url);
|
|
180
180
|
else
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { error } from "cc";
|
|
2
2
|
import { CallbackObject, INetworkTips, IProtocolHelper, IRequestProtocol, IResponseProtocol, ISocket, NetCallFunc, NetData } from "./NetInterface";
|
|
3
|
-
import { Logger } from "../../Logger";
|
|
4
3
|
|
|
5
4
|
/*
|
|
6
5
|
* CocosCreator网络节点基类,以及网络相关接口定义
|
|
@@ -80,7 +79,7 @@ export class NetNode {
|
|
|
80
79
|
|
|
81
80
|
/********************** 网络相关处理 *********************/
|
|
82
81
|
init(socket: ISocket, protocol: IProtocolHelper, networkTips: INetworkTips | null = null, execFunc: ExecuterFunc | null = null) {
|
|
83
|
-
Logger.
|
|
82
|
+
Logger.debug(`网络初始化`);
|
|
84
83
|
this._socket = socket;
|
|
85
84
|
this._protocolHelper = protocol;
|
|
86
85
|
this._networkTips = networkTips;
|
|
@@ -137,7 +136,7 @@ export class NetNode {
|
|
|
137
136
|
*/
|
|
138
137
|
close(code?: number, reason?: string) {
|
|
139
138
|
if (this._state == NetNodeState.Closed) {
|
|
140
|
-
Logger.
|
|
139
|
+
Logger.debug(`网络节点已断开`);
|
|
141
140
|
return;
|
|
142
141
|
}
|
|
143
142
|
|
|
@@ -194,7 +193,7 @@ export class NetNode {
|
|
|
194
193
|
|
|
195
194
|
/** 网络连接成功 */
|
|
196
195
|
protected onConnected(event: any) {
|
|
197
|
-
Logger.
|
|
196
|
+
Logger.debug("网络已连接")
|
|
198
197
|
this._isSocketOpen = true;
|
|
199
198
|
// 如果设置了鉴权回调,在连接完成后进入鉴权阶段,等待鉴权结束
|
|
200
199
|
if (this._connectedCallback !== null) {
|
|
@@ -204,18 +203,18 @@ export class NetNode {
|
|
|
204
203
|
else {
|
|
205
204
|
this.onChecked();
|
|
206
205
|
}
|
|
207
|
-
Logger.
|
|
206
|
+
Logger.debug(`网络已连接当前状态为【${NetNodeStateStrs[this._state]}】`);
|
|
208
207
|
}
|
|
209
208
|
|
|
210
209
|
/** 连接验证成功,进入工作状态 */
|
|
211
210
|
protected onChecked() {
|
|
212
|
-
Logger.
|
|
211
|
+
Logger.debug("连接验证成功,进入工作状态");
|
|
213
212
|
this._state = NetNodeState.Working;
|
|
214
213
|
|
|
215
214
|
// 重发待发送信息
|
|
216
215
|
var requests = this._requests.concat();
|
|
217
216
|
if (requests.length > 0) {
|
|
218
|
-
Logger.
|
|
217
|
+
Logger.debug(`请求【${this._requests.length}】个待发送的信息`);
|
|
219
218
|
|
|
220
219
|
for (var i = 0; i < requests.length;) {
|
|
221
220
|
let req = requests[i];
|
|
@@ -237,7 +236,7 @@ export class NetNode {
|
|
|
237
236
|
|
|
238
237
|
/** 接收到一个完整的消息包 */
|
|
239
238
|
protected onMessage(msg: NetData): void {
|
|
240
|
-
// Logger.
|
|
239
|
+
// Logger.debug(`接受消息状态为【${NetNodeStateStrs[this._state]}】`);
|
|
241
240
|
|
|
242
241
|
var iresp: IResponseProtocol = this._protocolHelper.decodeCommon(msg);
|
|
243
242
|
|
|
@@ -249,14 +248,14 @@ export class NetNode {
|
|
|
249
248
|
var id = iresp.id;
|
|
250
249
|
var cmd = iresp.cmd;
|
|
251
250
|
|
|
252
|
-
Logger.
|
|
251
|
+
Logger.debug(`接受到命令【${cmd}】的消息`);
|
|
253
252
|
|
|
254
253
|
// 触发请求队列中的回调函数
|
|
255
254
|
if (this._requests.length > 0) {
|
|
256
255
|
for (let reqIdx in this._requests) {
|
|
257
256
|
let ireqp = this._requests[reqIdx];
|
|
258
257
|
if (ireqp.id == id) {
|
|
259
|
-
Logger.
|
|
258
|
+
Logger.debug(`触发请求命令【${cmd}】的回调`);
|
|
260
259
|
this._protocolHelper.decodeCustom(ireqp, iresp);
|
|
261
260
|
this._callbackExecuter(ireqp.callback, iresp);
|
|
262
261
|
this._requests.splice(parseInt(reqIdx), 1);
|
|
@@ -269,7 +268,7 @@ export class NetNode {
|
|
|
269
268
|
this.updateNetTips(NetTipsType.Requesting, false);
|
|
270
269
|
}
|
|
271
270
|
else {
|
|
272
|
-
Logger.
|
|
271
|
+
Logger.debug(`请求队列中还有【${this._requests.length}】个请求在等待`);
|
|
273
272
|
}
|
|
274
273
|
}
|
|
275
274
|
|
|
@@ -277,7 +276,7 @@ export class NetNode {
|
|
|
277
276
|
let listeners = this._listener[cmd];
|
|
278
277
|
if (null != listeners) {
|
|
279
278
|
for (const ireqp of listeners) {
|
|
280
|
-
Logger.
|
|
279
|
+
Logger.debug(`触发监听命令【${cmd}】的回调`);
|
|
281
280
|
this._protocolHelper.decodeCustom(ireqp, iresp);
|
|
282
281
|
this._callbackExecuter(ireqp.callback, iresp.data);
|
|
283
282
|
}
|
|
@@ -297,7 +296,7 @@ export class NetNode {
|
|
|
297
296
|
|
|
298
297
|
// 执行断线回调,返回false表示不进行重连
|
|
299
298
|
if (this._disconnectCallback && !this._disconnectCallback()) {
|
|
300
|
-
Logger.
|
|
299
|
+
Logger.debug(`断开连接`);
|
|
301
300
|
return;
|
|
302
301
|
}
|
|
303
302
|
|
|
@@ -342,7 +341,7 @@ export class NetNode {
|
|
|
342
341
|
|
|
343
342
|
for (let i = 0; i < this._requests.length; ++i) {
|
|
344
343
|
if (this._requests[i].cmd == reqProtocol.cmd) {
|
|
345
|
-
Logger.
|
|
344
|
+
Logger.debug(`命令【${reqProtocol.cmd}】重复请求`);
|
|
346
345
|
return false;
|
|
347
346
|
}
|
|
348
347
|
}
|
|
@@ -356,7 +355,7 @@ export class NetNode {
|
|
|
356
355
|
this._socket.send(reqProtocol.buffer!);
|
|
357
356
|
}
|
|
358
357
|
|
|
359
|
-
Logger.
|
|
358
|
+
Logger.debug(`队列命令为【${reqProtocol.cmd}】的请求,等待请求数据的回调`);
|
|
360
359
|
|
|
361
360
|
// 进入发送缓存列表
|
|
362
361
|
this._requests.push(reqProtocol);
|
|
@@ -437,7 +436,7 @@ export class NetNode {
|
|
|
437
436
|
}
|
|
438
437
|
|
|
439
438
|
this._receiveMsgTimer = setTimeout(() => {
|
|
440
|
-
Logger.
|
|
439
|
+
Logger.debug("接收消息定时器关闭网络连接");
|
|
441
440
|
this._socket.close();
|
|
442
441
|
}, this._receiveTime);
|
|
443
442
|
}
|
|
@@ -448,7 +447,7 @@ export class NetNode {
|
|
|
448
447
|
}
|
|
449
448
|
|
|
450
449
|
this._keepAliveTimer = setTimeout(() => {
|
|
451
|
-
Logger.
|
|
450
|
+
Logger.debug("网络节点发送心跳信息");
|
|
452
451
|
if (this._state == NetNodeState.Working) {
|
|
453
452
|
this._protocolHelper.onHearbeat();
|
|
454
453
|
}
|
|
@@ -4,7 +4,6 @@
|
|
|
4
4
|
* @LastEditors: dgflash
|
|
5
5
|
* @LastEditTime: 2022-09-09 17:42:19
|
|
6
6
|
*/
|
|
7
|
-
import { Logger } from "../../Logger";
|
|
8
7
|
import { ISocket, MessageFunc, NetData } from "./NetInterface";
|
|
9
8
|
|
|
10
9
|
/**
|
|
@@ -29,7 +28,7 @@ export class WebSock implements ISocket {
|
|
|
29
28
|
connect(options: any) {
|
|
30
29
|
if (this._ws) {
|
|
31
30
|
if (this._ws.readyState === WebSocket.CONNECTING) {
|
|
32
|
-
Logger.
|
|
31
|
+
Logger.debug("websocket connecting, wait for a moment...")
|
|
33
32
|
return false;
|
|
34
33
|
}
|
|
35
34
|
}
|
|
@@ -4,7 +4,6 @@
|
|
|
4
4
|
* @LastEditTime: 2022-07-22 18:09:52
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
-
import { Logger } from "../../../Logger";
|
|
8
7
|
import { INetworkTips } from "../NetInterface";
|
|
9
8
|
import { netChannel } from "./NetChannelManager";
|
|
10
9
|
|
|
@@ -13,10 +12,10 @@ export class NetGameTips implements INetworkTips {
|
|
|
13
12
|
/** 连接提示 */
|
|
14
13
|
async connectTips(isShow: boolean) {
|
|
15
14
|
if (isShow) {
|
|
16
|
-
Logger.
|
|
15
|
+
Logger.debug("游戏服务器正在连接");
|
|
17
16
|
}
|
|
18
17
|
else {
|
|
19
|
-
Logger.
|
|
18
|
+
Logger.debug("游戏服务器连接成功");
|
|
20
19
|
|
|
21
20
|
// 连接成功后向服务器发数据
|
|
22
21
|
// var ulq = new proto.UserLoginReq();
|
|
@@ -24,30 +23,30 @@ export class NetGameTips implements INetworkTips {
|
|
|
24
23
|
// ulq.serverId = 8888;
|
|
25
24
|
// var ret1 = await netChannel.game.req<proto.UserLoginReq>(proto.Cmd.UserLogin, "UserLoginReq", "UserLoginReq", ulq);
|
|
26
25
|
// if (ret1.isSucc) {
|
|
27
|
-
//
|
|
26
|
+
// Logger.debug(`收到服务器【${proto.Cmd.UserLogin}】协议返回数据`, ret1.res); // 处理正常逻辑
|
|
28
27
|
// }
|
|
29
28
|
// else {
|
|
30
|
-
//
|
|
29
|
+
// Logger.debug(`收到服务器【${proto.Cmd.UserLogin}】协议返回错误码`, ret1.err); // 服务器错误码客户端出对应的提示
|
|
31
30
|
// }
|
|
32
31
|
}
|
|
33
32
|
}
|
|
34
33
|
|
|
35
34
|
/** 重连接提示 */
|
|
36
35
|
reconnectTips(): void {
|
|
37
|
-
|
|
36
|
+
Logger.debug("重连接提示");
|
|
38
37
|
}
|
|
39
38
|
|
|
40
39
|
/** 请求提示 */
|
|
41
40
|
requestTips(isShow: boolean): void {
|
|
42
41
|
if (isShow) {
|
|
43
|
-
|
|
42
|
+
Logger.debug("有请求处理中");
|
|
44
43
|
}
|
|
45
44
|
else {
|
|
46
|
-
|
|
45
|
+
Logger.debug("所有请求结束");
|
|
47
46
|
}
|
|
48
47
|
}
|
|
49
48
|
|
|
50
49
|
disconnectTips(isShow: boolean): void {
|
|
51
|
-
|
|
50
|
+
Logger.debug("断网", isShow);
|
|
52
51
|
}
|
|
53
52
|
}
|
|
@@ -17,7 +17,7 @@ class GameProtocol extends NetProtocolProtobuf {
|
|
|
17
17
|
async onHearbeat() {
|
|
18
18
|
// var ret = await netChannel.game.req(proto.ClientCmd.HEART.toString(), null!, "GameHeartResp");
|
|
19
19
|
// if (ret.isSucc) {
|
|
20
|
-
//
|
|
20
|
+
// Logger.debug(ret.res);
|
|
21
21
|
// }
|
|
22
22
|
}
|
|
23
23
|
}
|
package/assets/core/lib/net.meta
CHANGED
package/assets/core/lib/old.meta
CHANGED