@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.
Files changed (157) hide show
  1. package/assets/core/config/CommonEnum.ts +8 -2
  2. package/assets/core/config/CommonEnum.ts.meta +1 -1
  3. package/assets/core/config/IConfig.ts +1 -1
  4. package/assets/core/config/IConfig.ts.meta +1 -1
  5. package/assets/core/config/LayerType.ts.meta +1 -1
  6. package/assets/core/config/LayerUI.ts +14 -12
  7. package/assets/core/config/LayerUI.ts.meta +1 -1
  8. package/assets/core/config.meta +1 -1
  9. package/assets/core/editor/LanguageManager.ts +5 -5
  10. package/assets/core/editor/LanguageManager.ts.meta +1 -1
  11. package/assets/core/editor/SpineRunner.ts.meta +1 -1
  12. package/assets/core/editor/i18nEditorComponent.ts +12 -12
  13. package/assets/core/editor/i18nEditorComponent.ts.meta +1 -1
  14. package/assets/core/editor.meta +1 -1
  15. package/assets/core/home/AudioUtil.ts +5 -11
  16. package/assets/core/home/AudioUtil.ts.meta +1 -1
  17. package/assets/core/home/BaseBoxView.ts +13 -16
  18. package/assets/core/home/BaseBoxView.ts.meta +1 -1
  19. package/assets/core/home/BaseLaunchComponent.ts.meta +1 -1
  20. package/assets/core/home/BaseLoading.ts +34 -18
  21. package/assets/core/home/BaseLoading.ts.meta +1 -1
  22. package/assets/core/home/BaseModuleConfig.ts +46 -0
  23. package/assets/core/home/{ProgessView.ts.meta → BaseModuleConfig.ts.meta} +9 -9
  24. package/assets/core/home/BaseSkeleton.ts +4 -4
  25. package/assets/core/home/BaseSkeleton.ts.meta +1 -1
  26. package/assets/core/home/CameraAngel.ts +41 -41
  27. package/assets/core/home/CameraAngel.ts.meta +1 -1
  28. package/assets/core/home/DouYinShow.ts +1 -1
  29. package/assets/core/home/DouYinShow.ts.meta +1 -1
  30. package/assets/core/home/EventManager.ts +2 -10
  31. package/assets/core/home/EventManager.ts.meta +1 -1
  32. package/assets/core/home/FollowCamera.ts +28 -29
  33. package/assets/core/home/FollowCamera.ts.meta +1 -1
  34. package/assets/core/home/InViewCenter.ts +1 -1
  35. package/assets/core/home/InViewCenter.ts.meta +1 -1
  36. package/assets/core/home/LoadingWindow.ts.meta +1 -1
  37. package/assets/core/home/ParabolaTween.ts.meta +1 -1
  38. package/assets/core/home/ProgessWindow.ts +109 -0
  39. package/assets/core/home/{ExView.ts.meta → ProgessWindow.ts.meta} +1 -1
  40. package/assets/core/home/Quaternion.ts.meta +1 -1
  41. package/assets/core/home/ResUtil.ts.meta +1 -1
  42. package/assets/core/home/ResourceManager.ts +13 -14
  43. package/assets/core/home/ResourceManager.ts.meta +1 -1
  44. package/assets/core/home/StateMachine.ts +9 -9
  45. package/assets/core/home/StateMachine.ts.meta +1 -1
  46. package/assets/core/home/StorageManager.ts +1 -1
  47. package/assets/core/home/StorageManager.ts.meta +1 -1
  48. package/assets/core/home/ThirdFreeLookCamera.ts +2 -2
  49. package/assets/core/home/ThirdFreeLookCamera.ts.meta +1 -1
  50. package/assets/core/home/TimeManager.ts +1 -1
  51. package/assets/core/home/TimeManager.ts.meta +1 -1
  52. package/assets/core/home/Tools.ts +209 -0
  53. package/assets/core/home/Tools.ts.meta +1 -1
  54. package/assets/core/home/util/EncryptUtil.ts.meta +1 -1
  55. package/assets/core/home/util/MathUtil.ts.meta +1 -1
  56. package/assets/core/home/util/Md5.ts.meta +1 -1
  57. package/assets/core/home/util/RandomUtil.ts +41 -41
  58. package/assets/core/home/util/RandomUtil.ts.meta +1 -1
  59. package/assets/core/home/util/ResUtil.ts.meta +1 -1
  60. package/assets/core/home/util/crypto-js.d.ts.meta +1 -1
  61. package/assets/core/home/util/crypto-js.js.meta +1 -1
  62. package/assets/core/home/util.meta +1 -1
  63. package/assets/core/home.meta +1 -1
  64. package/assets/core/interface/App.ts +545 -0
  65. package/assets/core/interface/{MainModule.ts.meta → App.ts.meta} +1 -1
  66. package/assets/core/interface/ISceneParam.ts.meta +1 -1
  67. package/assets/core/interface/Interface.ts +66 -77
  68. package/assets/core/interface/Interface.ts.meta +1 -1
  69. package/assets/core/interface.meta +1 -1
  70. package/assets/core/lib/language/Language.ts +3 -4
  71. package/assets/core/lib/language/Language.ts.meta +1 -1
  72. package/assets/core/lib/language/LanguageData.ts +4 -4
  73. package/assets/core/lib/language/LanguageData.ts.meta +1 -1
  74. package/assets/core/lib/language/LanguageLabel.ts +6 -6
  75. package/assets/core/lib/language/LanguageLabel.ts.meta +1 -1
  76. package/assets/core/lib/language/LanguagePack.ts +8 -9
  77. package/assets/core/lib/language/LanguagePack.ts.meta +1 -1
  78. package/assets/core/lib/language/LanguagePointLabel.ts.meta +1 -1
  79. package/assets/core/lib/language/LanguageSpine.ts +1 -1
  80. package/assets/core/lib/language/LanguageSpine.ts.meta +1 -1
  81. package/assets/core/lib/language/LanguageSprite.ts +7 -7
  82. package/assets/core/lib/language/LanguageSprite.ts.meta +1 -1
  83. package/assets/core/lib/language.meta +1 -1
  84. package/assets/core/lib/logger/ELoggerLevel.ts +0 -12
  85. package/assets/core/lib/logger/ELoggerLevel.ts.meta +1 -1
  86. package/assets/core/lib/logger/MLogger.ts +7 -8
  87. package/assets/core/lib/logger/MLogger.ts.meta +1 -1
  88. package/assets/core/lib/logger.meta +1 -1
  89. package/assets/core/lib/net/libs/proto/output/protobuf.d.ts.meta +1 -1
  90. package/assets/core/lib/net/libs/proto/output/protobuf.min.js.meta +1 -1
  91. package/assets/core/lib/net/libs/proto/output/protobuf_custom.d.ts.meta +1 -1
  92. package/assets/core/lib/net/libs/proto/output/protobuf_custom.js.meta +1 -1
  93. package/assets/core/lib/net/libs/proto/output.meta +1 -1
  94. package/assets/core/lib/net/libs/proto/source/Cmd.proto.meta +1 -1
  95. package/assets/core/lib/net/libs/proto/source/UserLogin.proto.meta +1 -1
  96. package/assets/core/lib/net/libs/proto/source/base.proto.meta +1 -1
  97. package/assets/core/lib/net/libs/proto/source/command.proto.meta +1 -1
  98. package/assets/core/lib/net/libs/proto/source/domain/boos_battle_info.proto.meta +1 -1
  99. package/assets/core/lib/net/libs/proto/source/domain/player_auth.proto.meta +1 -1
  100. package/assets/core/lib/net/libs/proto/source/domain.meta +1 -1
  101. package/assets/core/lib/net/libs/proto/source/message/game_push.proto.meta +1 -1
  102. package/assets/core/lib/net/libs/proto/source/message/game_request.proto.meta +1 -1
  103. package/assets/core/lib/net/libs/proto/source/message/game_response.proto.meta +1 -1
  104. package/assets/core/lib/net/libs/proto/source/message.meta +1 -1
  105. package/assets/core/lib/net/libs/proto/source/push/boss_battle_events.proto.meta +1 -1
  106. package/assets/core/lib/net/libs/proto/source/push.meta +1 -1
  107. package/assets/core/lib/net/libs/proto/source.meta +1 -1
  108. package/assets/core/lib/net/libs/proto.meta +1 -1
  109. package/assets/core/lib/net/libs.meta +1 -1
  110. package/assets/core/lib/net/net/HttpManager.ts +2 -2
  111. package/assets/core/lib/net/net/HttpManager.ts.meta +1 -1
  112. package/assets/core/lib/net/net/NetInterface.ts.meta +1 -1
  113. package/assets/core/lib/net/net/NetManager.ts.meta +1 -1
  114. package/assets/core/lib/net/net/NetNode.ts +16 -17
  115. package/assets/core/lib/net/net/NetNode.ts.meta +1 -1
  116. package/assets/core/lib/net/net/WebSock.ts +1 -2
  117. package/assets/core/lib/net/net/WebSock.ts.meta +1 -1
  118. package/assets/core/lib/net/net/custom/NetChannelManager.ts.meta +1 -1
  119. package/assets/core/lib/net/net/custom/NetConfig.ts.meta +1 -1
  120. package/assets/core/lib/net/net/custom/NetErrorCode.ts.meta +1 -1
  121. package/assets/core/lib/net/net/custom/NetGameTips.ts +8 -9
  122. package/assets/core/lib/net/net/custom/NetGameTips.ts.meta +1 -1
  123. package/assets/core/lib/net/net/custom/NetNodeGame.ts +1 -1
  124. package/assets/core/lib/net/net/custom/NetNodeGame.ts.meta +1 -1
  125. package/assets/core/lib/net/net/custom.meta +1 -1
  126. package/assets/core/lib/net/net/protocol/NetProtocolJson.ts.meta +1 -1
  127. package/assets/core/lib/net/net/protocol/NetProtocolProtobuf.ts.meta +1 -1
  128. package/assets/core/lib/net/net/protocol.meta +1 -1
  129. package/assets/core/lib/net/net.meta +1 -1
  130. package/assets/core/lib/net/prompt.meta +1 -1
  131. package/assets/core/lib/net.meta +1 -1
  132. package/assets/core/lib/old.meta +1 -1
  133. package/assets/core/lib/tabbar/TabBarComponent.ts.meta +1 -1
  134. package/assets/core/lib/tabbar/TabBarController.ts.meta +1 -1
  135. package/assets/core/lib/tabbar/TabBarItem.ts.meta +1 -1
  136. package/assets/core/lib/tabbar.meta +1 -1
  137. package/assets/core/lib.meta +1 -1
  138. package/assets/core.meta +1 -1
  139. package/assets.meta +1 -1
  140. package/index.ts +14 -0
  141. package/index.ts.meta +1 -1
  142. package/package.json +1 -1
  143. package/package.json.meta +1 -1
  144. package/assets/core/home/ExView.ts +0 -9
  145. package/assets/core/home/JsonUtil.ts +0 -102
  146. package/assets/core/home/JsonUtil.ts.meta +0 -9
  147. package/assets/core/home/ProgessView.ts +0 -96
  148. package/assets/core/home/prefabs.meta +0 -12
  149. package/assets/core/interface/MainModule.ts +0 -1019
  150. package/assets/core/lib/Logger.ts +0 -286
  151. package/assets/core/lib/Logger.ts.meta +0 -9
  152. package/assets/core/lib/old/VM2.ts +0 -619
  153. package/assets/core/lib/old/VM2.ts.meta +0 -9
  154. package/assets/core/lib/old/ViewModel.ts +0 -905
  155. package/assets/core/lib/old/ViewModel.ts.meta +0 -9
  156. package/assets/core/lib/old/ViewSearch.ts +0 -125
  157. package/assets/core/lib/old/ViewSearch.ts.meta +0 -9
@@ -2,7 +2,7 @@
2
2
  "ver": "4.0.24",
3
3
  "importer": "javascript",
4
4
  "imported": true,
5
- "uuid": "1e51e9bf-372d-46ad-a452-ef95831a74dc",
5
+ "uuid": "4ccde403-aaaf-4dee-b15b-c40eaa17b2bc",
6
6
  "files": [],
7
7
  "subMetas": {},
8
8
  "userData": {}
@@ -2,7 +2,7 @@
2
2
  "ver": "1.2.0",
3
3
  "importer": "directory",
4
4
  "imported": true,
5
- "uuid": "af27dda4-779e-48b0-bd0b-e46dca736a15",
5
+ "uuid": "1c9dbc06-28d8-49d3-bcca-fcda0a92e0a5",
6
6
  "files": [],
7
7
  "subMetas": {},
8
8
  "userData": {}
@@ -2,7 +2,7 @@
2
2
  "ver": "1.0.1",
3
3
  "importer": "text",
4
4
  "imported": true,
5
- "uuid": "e354be6a-e655-4dd4-a405-a7ab48e366fd",
5
+ "uuid": "a6f74e9b-6209-4aa6-88da-5208ef93f6b0",
6
6
  "files": [
7
7
  ".json"
8
8
  ],
@@ -2,7 +2,7 @@
2
2
  "ver": "1.0.1",
3
3
  "importer": "text",
4
4
  "imported": true,
5
- "uuid": "0dc3cea2-b1f0-4f18-a659-62dcd6a1d3e5",
5
+ "uuid": "3790d1c9-eb90-430d-b4b4-548c41725c22",
6
6
  "files": [
7
7
  ".json"
8
8
  ],
@@ -2,7 +2,7 @@
2
2
  "ver": "1.0.1",
3
3
  "importer": "text",
4
4
  "imported": true,
5
- "uuid": "aa4456da-9112-4dd0-8d9c-00a4077f9120",
5
+ "uuid": "42182b5d-c2e1-4bfd-a3c0-c476a6a989c4",
6
6
  "files": [
7
7
  ".json"
8
8
  ],
@@ -2,7 +2,7 @@
2
2
  "ver": "1.0.1",
3
3
  "importer": "text",
4
4
  "imported": true,
5
- "uuid": "4db8881d-a16f-4c79-92a2-096dbfadeeef",
5
+ "uuid": "0f185eee-e9db-40ab-a5d6-f774d43ae430",
6
6
  "files": [
7
7
  ".json"
8
8
  ],
@@ -2,7 +2,7 @@
2
2
  "ver": "1.0.1",
3
3
  "importer": "text",
4
4
  "imported": true,
5
- "uuid": "fa040ce8-fe32-4f7b-99c1-e2a578f2da7e",
5
+ "uuid": "a0b9b3a3-edaa-4855-b49f-9abbff576c5a",
6
6
  "files": [
7
7
  ".json"
8
8
  ],
@@ -2,7 +2,7 @@
2
2
  "ver": "1.0.1",
3
3
  "importer": "text",
4
4
  "imported": true,
5
- "uuid": "2f5b5896-889b-4591-8fd6-5b1de5db3cd9",
5
+ "uuid": "e0c1d596-120e-480f-8758-30c90105e13e",
6
6
  "files": [
7
7
  ".json"
8
8
  ],
@@ -2,7 +2,7 @@
2
2
  "ver": "1.2.0",
3
3
  "importer": "directory",
4
4
  "imported": true,
5
- "uuid": "54ee8686-699f-41a1-9e92-d5f5919d795d",
5
+ "uuid": "8e4b0754-7e5d-47ff-876d-73b36afbcbe7",
6
6
  "files": [],
7
7
  "subMetas": {},
8
8
  "userData": {}
@@ -2,7 +2,7 @@
2
2
  "ver": "1.0.1",
3
3
  "importer": "text",
4
4
  "imported": true,
5
- "uuid": "bb01edca-4fe2-48d8-9d7f-83a698a54d29",
5
+ "uuid": "48b67ef0-ee1e-4fcb-9f6e-3708d9e6d5cd",
6
6
  "files": [
7
7
  ".json"
8
8
  ],
@@ -2,7 +2,7 @@
2
2
  "ver": "1.0.1",
3
3
  "importer": "text",
4
4
  "imported": true,
5
- "uuid": "f36044ec-001a-409d-bcbf-81bfcf6c5b25",
5
+ "uuid": "8ac26bd1-41b2-4858-aac2-df9b4c76dc4b",
6
6
  "files": [
7
7
  ".json"
8
8
  ],
@@ -2,7 +2,7 @@
2
2
  "ver": "1.0.1",
3
3
  "importer": "text",
4
4
  "imported": true,
5
- "uuid": "d80c8802-494c-4e72-a771-5700e91b24c3",
5
+ "uuid": "0c94197e-d786-4c41-a5ca-724afd8099d5",
6
6
  "files": [
7
7
  ".json"
8
8
  ],
@@ -2,7 +2,7 @@
2
2
  "ver": "1.2.0",
3
3
  "importer": "directory",
4
4
  "imported": true,
5
- "uuid": "b9f88a5d-267f-4e3f-af2b-20a028d7a0dc",
5
+ "uuid": "7649fb67-2975-4c72-9113-e0ae477cfbd3",
6
6
  "files": [],
7
7
  "subMetas": {},
8
8
  "userData": {}
@@ -2,7 +2,7 @@
2
2
  "ver": "1.0.1",
3
3
  "importer": "text",
4
4
  "imported": true,
5
- "uuid": "237a9f59-fa62-483d-931f-0e346d574848",
5
+ "uuid": "0a2cac35-a9bf-4d73-8cf4-8888905b460f",
6
6
  "files": [
7
7
  ".json"
8
8
  ],
@@ -2,7 +2,7 @@
2
2
  "ver": "1.2.0",
3
3
  "importer": "directory",
4
4
  "imported": true,
5
- "uuid": "25ee18de-ff6f-43e1-bee4-d342a08cdfb9",
5
+ "uuid": "5aee32d3-975a-4afc-96eb-545be836f472",
6
6
  "files": [],
7
7
  "subMetas": {},
8
8
  "userData": {}
@@ -2,7 +2,7 @@
2
2
  "ver": "1.2.0",
3
3
  "importer": "directory",
4
4
  "imported": true,
5
- "uuid": "c5aff8e1-992b-41fa-802b-ac5692bcf9ef",
5
+ "uuid": "a9ae6f24-7e9a-4975-95b1-8b00fa08df43",
6
6
  "files": [],
7
7
  "subMetas": {},
8
8
  "userData": {
@@ -2,7 +2,7 @@
2
2
  "ver": "1.2.0",
3
3
  "importer": "directory",
4
4
  "imported": true,
5
- "uuid": "b619fb46-6e26-4842-a8ca-363d9136f629",
5
+ "uuid": "b2c3a7e9-ee2c-4b20-8df0-ca86880e5f4c",
6
6
  "files": [],
7
7
  "subMetas": {},
8
8
  "userData": {}
@@ -2,7 +2,7 @@
2
2
  "ver": "1.2.0",
3
3
  "importer": "directory",
4
4
  "imported": true,
5
- "uuid": "8414e4ad-c3ab-4a49-8b9a-8fc9c935dd7c",
5
+ "uuid": "4324ba25-9540-4cd8-8e63-fe982767af30",
6
6
  "files": [],
7
7
  "subMetas": {},
8
8
  "userData": {}
@@ -166,7 +166,7 @@ export class HttpManager {
166
166
 
167
167
  let hrd = urls.get(key);
168
168
  if (hrd && hrd.pss == pss) {
169
- console.warn(`地址【${key}】已正在请求中,不能重复请求`);
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
- //console.warn(ext && ext.query ? key : url)
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
@@ -2,7 +2,7 @@
2
2
  "ver": "4.0.24",
3
3
  "importer": "typescript",
4
4
  "imported": true,
5
- "uuid": "42b714af-f09e-4aba-94f8-0033dd8a1321",
5
+ "uuid": "7a410a72-518e-4a0d-89e2-0a2e33d0eddb",
6
6
  "files": [],
7
7
  "subMetas": {},
8
8
  "userData": {}
@@ -2,7 +2,7 @@
2
2
  "ver": "4.0.24",
3
3
  "importer": "typescript",
4
4
  "imported": true,
5
- "uuid": "30df3d0f-b563-43c6-8a8c-59e4fd5652b0",
5
+ "uuid": "60e7847d-69e1-42a2-bff4-52bedbb4012b",
6
6
  "files": [],
7
7
  "subMetas": {},
8
8
  "userData": {}
@@ -2,7 +2,7 @@
2
2
  "ver": "4.0.24",
3
3
  "importer": "typescript",
4
4
  "imported": true,
5
- "uuid": "4e807495-5d3d-4a54-bffb-85196cfa2489",
5
+ "uuid": "634ec195-a543-433e-a365-3fc0184ab964",
6
6
  "files": [],
7
7
  "subMetas": {},
8
8
  "userData": {}
@@ -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.logNet(`网络初始化`);
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.logNet(`网络节点已断开`);
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.logNet("网络已连接")
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.logNet(`网络已连接当前状态为【${NetNodeStateStrs[this._state]}】`);
206
+ Logger.debug(`网络已连接当前状态为【${NetNodeStateStrs[this._state]}】`);
208
207
  }
209
208
 
210
209
  /** 连接验证成功,进入工作状态 */
211
210
  protected onChecked() {
212
- Logger.logNet("连接验证成功,进入工作状态");
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.logNet(`请求【${this._requests.length}】个待发送的信息`);
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.logNet(`接受消息状态为【${NetNodeStateStrs[this._state]}】`);
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.logNet(`接受到命令【${cmd}】的消息`);
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.logNet(`触发请求命令【${cmd}】的回调`);
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.logNet(`请求队列中还有【${this._requests.length}】个请求在等待`);
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.logNet(`触发监听命令【${cmd}】的回调`);
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.logNet(`断开连接`);
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.logNet(`命令【${reqProtocol.cmd}】重复请求`);
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.logNet(`队列命令为【${reqProtocol.cmd}】的请求,等待请求数据的回调`);
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.logNet("接收消息定时器关闭网络连接");
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.logNet("网络节点发送心跳信息");
450
+ Logger.debug("网络节点发送心跳信息");
452
451
  if (this._state == NetNodeState.Working) {
453
452
  this._protocolHelper.onHearbeat();
454
453
  }
@@ -2,7 +2,7 @@
2
2
  "ver": "4.0.24",
3
3
  "importer": "typescript",
4
4
  "imported": true,
5
- "uuid": "e7d169e6-a1fb-4216-a01e-96acda541c6f",
5
+ "uuid": "8b63b153-6aa2-402d-ba89-00bd4d6cab8a",
6
6
  "files": [],
7
7
  "subMetas": {},
8
8
  "userData": {}
@@ -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.logNet("websocket connecting, wait for a moment...")
31
+ Logger.debug("websocket connecting, wait for a moment...")
33
32
  return false;
34
33
  }
35
34
  }
@@ -2,7 +2,7 @@
2
2
  "ver": "4.0.24",
3
3
  "importer": "typescript",
4
4
  "imported": true,
5
- "uuid": "cc0b4757-b227-4bbb-8cfe-5df29532f1b7",
5
+ "uuid": "fd6723cd-96ff-4dde-a559-d1d48b056e5b",
6
6
  "files": [],
7
7
  "subMetas": {},
8
8
  "userData": {}
@@ -2,7 +2,7 @@
2
2
  "ver": "4.0.24",
3
3
  "importer": "typescript",
4
4
  "imported": true,
5
- "uuid": "ac861aa1-8743-466a-9fc6-d36e1b13ad94",
5
+ "uuid": "ed715e24-08b4-4a37-b866-ca28e9a85b2f",
6
6
  "files": [],
7
7
  "subMetas": {},
8
8
  "userData": {}
@@ -2,7 +2,7 @@
2
2
  "ver": "4.0.24",
3
3
  "importer": "typescript",
4
4
  "imported": true,
5
- "uuid": "de66c7dd-a7e3-4f76-84ea-97c4cafc43cf",
5
+ "uuid": "9e91090d-c89c-48fc-9797-52cbc4bdaebe",
6
6
  "files": [],
7
7
  "subMetas": {},
8
8
  "userData": {}
@@ -2,7 +2,7 @@
2
2
  "ver": "4.0.24",
3
3
  "importer": "typescript",
4
4
  "imported": true,
5
- "uuid": "e0963301-1c82-429e-b1e1-c991aa324211",
5
+ "uuid": "682cfce4-5fbc-4e84-a82c-f32a55130ace",
6
6
  "files": [],
7
7
  "subMetas": {},
8
8
  "userData": {}
@@ -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.logNet("游戏服务器正在连接");
15
+ Logger.debug("游戏服务器正在连接");
17
16
  }
18
17
  else {
19
- Logger.logNet("游戏服务器连接成功");
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
- // console.log(`收到服务器【${proto.Cmd.UserLogin}】协议返回数据`, ret1.res); // 处理正常逻辑
26
+ // Logger.debug(`收到服务器【${proto.Cmd.UserLogin}】协议返回数据`, ret1.res); // 处理正常逻辑
28
27
  // }
29
28
  // else {
30
- // console.log(`收到服务器【${proto.Cmd.UserLogin}】协议返回错误码`, ret1.err); // 服务器错误码客户端出对应的提示
29
+ // Logger.debug(`收到服务器【${proto.Cmd.UserLogin}】协议返回错误码`, ret1.err); // 服务器错误码客户端出对应的提示
31
30
  // }
32
31
  }
33
32
  }
34
33
 
35
34
  /** 重连接提示 */
36
35
  reconnectTips(): void {
37
- console.log("重连接提示");
36
+ Logger.debug("重连接提示");
38
37
  }
39
38
 
40
39
  /** 请求提示 */
41
40
  requestTips(isShow: boolean): void {
42
41
  if (isShow) {
43
- console.log("有请求处理中");
42
+ Logger.debug("有请求处理中");
44
43
  }
45
44
  else {
46
- console.log("所有请求结束");
45
+ Logger.debug("所有请求结束");
47
46
  }
48
47
  }
49
48
 
50
49
  disconnectTips(isShow: boolean): void {
51
- console.log("断网", isShow);
50
+ Logger.debug("断网", isShow);
52
51
  }
53
52
  }
@@ -2,7 +2,7 @@
2
2
  "ver": "4.0.24",
3
3
  "importer": "typescript",
4
4
  "imported": true,
5
- "uuid": "446e8905-8cfa-49c2-af78-5c60459754dc",
5
+ "uuid": "dd3605e2-606d-4523-af2d-79f7c8b8695f",
6
6
  "files": [],
7
7
  "subMetas": {},
8
8
  "userData": {}
@@ -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
- // console.log(ret.res);
20
+ // Logger.debug(ret.res);
21
21
  // }
22
22
  }
23
23
  }
@@ -2,7 +2,7 @@
2
2
  "ver": "4.0.24",
3
3
  "importer": "typescript",
4
4
  "imported": true,
5
- "uuid": "bcdefa1e-679e-4d17-96f4-f5c25417a5e2",
5
+ "uuid": "741fdb26-b7c5-4a5e-9847-cf263e84f7b4",
6
6
  "files": [],
7
7
  "subMetas": {},
8
8
  "userData": {}
@@ -2,7 +2,7 @@
2
2
  "ver": "1.2.0",
3
3
  "importer": "directory",
4
4
  "imported": true,
5
- "uuid": "7cd38610-8bc0-424d-be94-a0c93770304b",
5
+ "uuid": "521de43e-8342-442c-bf52-0765f3ffd59f",
6
6
  "files": [],
7
7
  "subMetas": {},
8
8
  "userData": {}
@@ -2,7 +2,7 @@
2
2
  "ver": "4.0.24",
3
3
  "importer": "typescript",
4
4
  "imported": true,
5
- "uuid": "ef0b1e0c-f9a8-40c0-81d0-f64049599bff",
5
+ "uuid": "245e7a4f-60f6-4240-b02c-b516af592916",
6
6
  "files": [],
7
7
  "subMetas": {},
8
8
  "userData": {}
@@ -2,7 +2,7 @@
2
2
  "ver": "4.0.24",
3
3
  "importer": "typescript",
4
4
  "imported": true,
5
- "uuid": "00b03846-5045-4dd8-92ed-28e98179b863",
5
+ "uuid": "8a3b5a19-5297-4ef3-8e94-60cfc572af79",
6
6
  "files": [],
7
7
  "subMetas": {},
8
8
  "userData": {}
@@ -2,7 +2,7 @@
2
2
  "ver": "1.2.0",
3
3
  "importer": "directory",
4
4
  "imported": true,
5
- "uuid": "3063c4b0-90d0-43f6-bff2-5fd2b11054b5",
5
+ "uuid": "42c511aa-1aaa-4a4e-b9aa-2a1cebb10982",
6
6
  "files": [],
7
7
  "subMetas": {},
8
8
  "userData": {}
@@ -2,7 +2,7 @@
2
2
  "ver": "1.2.0",
3
3
  "importer": "directory",
4
4
  "imported": true,
5
- "uuid": "3a1732a0-fa1f-44a5-a2cb-e07ae9ea7c6b",
5
+ "uuid": "0fa83dbd-3e47-41d5-8ee9-16890c14e2f9",
6
6
  "files": [],
7
7
  "subMetas": {},
8
8
  "userData": {}
@@ -2,7 +2,7 @@
2
2
  "ver": "1.2.0",
3
3
  "importer": "directory",
4
4
  "imported": true,
5
- "uuid": "a3d34cc7-df4f-4928-85c4-e55b44f9b76f",
5
+ "uuid": "41bbf772-00ea-403a-9ced-b419c7bc1622",
6
6
  "files": [],
7
7
  "subMetas": {},
8
8
  "userData": {}
@@ -2,7 +2,7 @@
2
2
  "ver": "1.2.0",
3
3
  "importer": "directory",
4
4
  "imported": true,
5
- "uuid": "5f47f111-187e-44ff-83bd-f51698fc389b",
5
+ "uuid": "0f7b6a3f-3d95-4efb-a44d-f594171bdd2f",
6
6
  "files": [],
7
7
  "subMetas": {},
8
8
  "userData": {}
@@ -2,7 +2,7 @@
2
2
  "ver": "1.2.0",
3
3
  "importer": "directory",
4
4
  "imported": true,
5
- "uuid": "72fe6f43-b640-4a13-97a1-bf8cd014be48",
5
+ "uuid": "b6e6a2af-7981-45ca-b48e-be71a3e0c1df",
6
6
  "files": [],
7
7
  "subMetas": {},
8
8
  "userData": {}
@@ -2,7 +2,7 @@
2
2
  "ver": "4.0.24",
3
3
  "importer": "typescript",
4
4
  "imported": true,
5
- "uuid": "b8cbcf1b-4d1a-4da9-8611-f35d1fe8812b",
5
+ "uuid": "67a9e5c3-272e-41bf-885f-ea74d5212bd8",
6
6
  "files": [],
7
7
  "subMetas": {},
8
8
  "userData": {}
@@ -2,7 +2,7 @@
2
2
  "ver": "4.0.24",
3
3
  "importer": "typescript",
4
4
  "imported": true,
5
- "uuid": "bf47bf0e-82f7-4af2-bd19-bff5f42513e5",
5
+ "uuid": "dd917dae-2d09-4a62-be87-c5beb1f1c0d3",
6
6
  "files": [],
7
7
  "subMetas": {},
8
8
  "userData": {}