@cc-component/cc-core 1.2.6 → 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 +1 -0
- package/assets/core/config/CommonEnum.ts.meta +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 +2 -2
- package/assets/core/config/LayerUI.ts.meta +1 -1
- package/assets/core/config.meta +1 -1
- package/assets/core/editor/LanguageManager.ts +1 -1
- package/assets/core/editor/LanguageManager.ts.meta +1 -1
- package/assets/core/editor/SpineRunner.ts.meta +1 -1
- package/assets/core/editor/i18nEditorComponent.ts +8 -8
- 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 +1 -1
- package/assets/core/home/BaseBoxView.ts.meta +1 -1
- package/assets/core/home/BaseLaunchComponent.ts.meta +1 -1
- package/assets/core/home/BaseLoading.ts +14 -14
- package/assets/core/home/BaseLoading.ts.meta +1 -1
- package/assets/core/home/BaseModuleConfig.ts +24 -3
- package/assets/core/home/BaseModuleConfig.ts.meta +1 -1
- package/assets/core/home/BaseSkeleton.ts.meta +1 -1
- 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.meta +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.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.meta +1 -1
- package/assets/core/home/StateMachine.ts.meta +1 -1
- package/assets/core/home/StorageManager.ts.meta +1 -1
- package/assets/core/home/ThirdFreeLookCamera.ts.meta +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.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/{home/ExView.ts.meta → interface/App.ts.meta} +1 -1
- package/assets/core/interface/ISceneParam.ts.meta +1 -1
- package/assets/core/interface/Interface.ts +58 -77
- package/assets/core/interface/Interface.ts.meta +1 -1
- package/assets/core/interface.meta +1 -1
- package/assets/core/lib/language/Language.ts.meta +1 -1
- package/assets/core/lib/language/LanguageData.ts +2 -2
- package/assets/core/lib/language/LanguageData.ts.meta +1 -1
- package/assets/core/lib/language/LanguageLabel.ts +4 -4
- package/assets/core/lib/language/LanguageLabel.ts.meta +1 -1
- package/assets/core/lib/language/LanguagePack.ts +4 -4
- 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 +6 -6
- 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.meta +1 -1
- 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.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.meta +1 -1
- 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.meta +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.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/prefabs.meta +0 -12
- package/assets/core/interface/MainModule.ts +0 -1029
- package/assets/core/interface/MainModule.ts.meta +0 -9
|
@@ -40,9 +40,9 @@ export class LayerUI {
|
|
|
40
40
|
async loadConfig(params: IInitConfig) {
|
|
41
41
|
this.launch = await this.LoadLayerWindow(params);
|
|
42
42
|
const parent = this.launch.node
|
|
43
|
-
const data = await
|
|
43
|
+
const data = await App.LoadAsset<JsonAsset>(params.bundleName, "config", JsonAsset)
|
|
44
44
|
this.config = data.json as IConfig;
|
|
45
|
-
|
|
45
|
+
App.ReleaseAssetPath('config', params.bundleName)
|
|
46
46
|
//Logger.debug(this.config)
|
|
47
47
|
|
|
48
48
|
const config = this.config;
|
package/assets/core/config.meta
CHANGED
|
@@ -299,7 +299,7 @@
|
|
|
299
299
|
// if (this.totalBundles && this.totalBundles.length > 0) {
|
|
300
300
|
// return this.totalBundles;
|
|
301
301
|
// }
|
|
302
|
-
// this.totalBundles =
|
|
302
|
+
// this.totalBundles = App.Get_Bundles()
|
|
303
303
|
// return this.totalBundles;
|
|
304
304
|
// }
|
|
305
305
|
// /**检查路径是否是某个bundle包下 */
|
|
@@ -30,7 +30,7 @@ export class i18nEditorComponent extends Component {
|
|
|
30
30
|
LanguageData.current = language
|
|
31
31
|
|
|
32
32
|
console.log("编辑器语言设置成功", language);
|
|
33
|
-
//
|
|
33
|
+
// App.language.setLanguage('', language)
|
|
34
34
|
// this.node.children.forEach(child => {
|
|
35
35
|
// console.error(child.name)
|
|
36
36
|
// });
|
|
@@ -69,7 +69,7 @@ export class i18nEditorComponent extends Component {
|
|
|
69
69
|
|
|
70
70
|
public editorChangeBundle(language: string) {
|
|
71
71
|
console.log("bundle", language);
|
|
72
|
-
|
|
72
|
+
App.language.setLanguage('', language)
|
|
73
73
|
//i18nMgr.editorChangeBundle(language);
|
|
74
74
|
}
|
|
75
75
|
/**编辑器环境下改变多语言 */
|
|
@@ -79,8 +79,8 @@ export class i18nEditorComponent extends Component {
|
|
|
79
79
|
await new Promise<void>((resolve) => {
|
|
80
80
|
assetManager.loadAny(uuid, (err, jsonAsset: JsonAsset) => {
|
|
81
81
|
//Logger.debug("加载表格", jsonAsset, err);
|
|
82
|
-
|
|
83
|
-
//console.error(
|
|
82
|
+
App.gui.config = jsonAsset.json as IConfig;
|
|
83
|
+
//console.error(App.gui.config)
|
|
84
84
|
resolve()
|
|
85
85
|
});
|
|
86
86
|
})
|
|
@@ -88,7 +88,7 @@ export class i18nEditorComponent extends Component {
|
|
|
88
88
|
|
|
89
89
|
/**编辑器环境下改变多语言 */
|
|
90
90
|
public async changeLabel(dbUrl: string, language?: string) {
|
|
91
|
-
const db_json = dbUrl + `/${
|
|
91
|
+
const db_json = dbUrl + `/${App.gui.config.language.path.json}/${language}.json`
|
|
92
92
|
console.log(db_json)
|
|
93
93
|
let uuid = await Editor.Message.request("asset-db", "query-uuid", db_json);
|
|
94
94
|
assetManager.loadAny(uuid, (err, jsonAsset: JsonAsset) => {
|
|
@@ -96,15 +96,15 @@ export class i18nEditorComponent extends Component {
|
|
|
96
96
|
if (!jsonAsset) return;
|
|
97
97
|
let labelData = jsonAsset.json;
|
|
98
98
|
LanguageData.language.set(LanguageDataType.Json, jsonAsset.json);
|
|
99
|
-
|
|
99
|
+
App.language.labelArr.forEach((com) => {
|
|
100
100
|
com.updateContent()
|
|
101
101
|
})
|
|
102
102
|
});
|
|
103
103
|
}
|
|
104
104
|
public async changeSprite(dbUrl: string, language?: string) {
|
|
105
|
-
const db_json = dbUrl + `/${
|
|
105
|
+
const db_json = dbUrl + `/${App.gui.config.language.path.texture}/${language}/`
|
|
106
106
|
// console.error('-----', db_json)
|
|
107
|
-
|
|
107
|
+
App.language.spriteArr.forEach(async (com) => {
|
|
108
108
|
const path_jpg = db_json + com.dataID + ".jpg"
|
|
109
109
|
const path_png = db_json + com.dataID + ".png"
|
|
110
110
|
const path_wep = db_json + com.dataID + ".webp"
|
package/assets/core/editor.meta
CHANGED
|
@@ -9,13 +9,7 @@ import { BundleConfigName } from '../config/CommonEnum';
|
|
|
9
9
|
* 这是一个用于播放音频的单件类,可以很方便地在项目的任何地方调用。
|
|
10
10
|
*/
|
|
11
11
|
export class AudioUtil {
|
|
12
|
-
|
|
13
|
-
public static get inst(): AudioUtil {
|
|
14
|
-
if (this._inst == null) {
|
|
15
|
-
this._inst = new AudioUtil();
|
|
16
|
-
}
|
|
17
|
-
return this._inst;
|
|
18
|
-
}
|
|
12
|
+
|
|
19
13
|
|
|
20
14
|
private _audioSource: AudioSource;
|
|
21
15
|
private _audioSource2: AudioSource;
|
|
@@ -75,20 +69,20 @@ export class AudioUtil {
|
|
|
75
69
|
}
|
|
76
70
|
|
|
77
71
|
get sound_volume(): number {
|
|
78
|
-
const v =
|
|
72
|
+
const v = App.storage.getNumber('sound_volume', 1)
|
|
79
73
|
return v
|
|
80
74
|
}
|
|
81
75
|
set sound_volume(value: number) {
|
|
82
|
-
|
|
76
|
+
App.storage.set('sound_volume', value)
|
|
83
77
|
}
|
|
84
78
|
|
|
85
79
|
get music_volume(): number {
|
|
86
|
-
const v =
|
|
80
|
+
const v = App.storage.getNumber('music_volume', 1)
|
|
87
81
|
return v
|
|
88
82
|
}
|
|
89
83
|
set music_volume(value: number) {
|
|
90
84
|
this._audioSource.volume = value;
|
|
91
|
-
|
|
85
|
+
App.storage.set('music_volume', value)
|
|
92
86
|
}
|
|
93
87
|
/**
|
|
94
88
|
* @en
|
|
@@ -36,7 +36,7 @@ export class BaseBoxView extends Component {
|
|
|
36
36
|
// const box1 = this.GetBox(this);
|
|
37
37
|
// const box2 = this.GetBox(this.target_enemy);
|
|
38
38
|
|
|
39
|
-
// const ok =
|
|
39
|
+
// const ok = App.Collision(box1, box2);
|
|
40
40
|
// // Logger.debug("碰撞了吗?", ok, this.node.name)
|
|
41
41
|
// return ok
|
|
42
42
|
// }
|
|
@@ -35,10 +35,10 @@ export abstract class BaseLoading extends Component {
|
|
|
35
35
|
error: null
|
|
36
36
|
}
|
|
37
37
|
protected onLoad(): void {
|
|
38
|
-
this.sceneParam =
|
|
38
|
+
this.sceneParam = App.scenesParm
|
|
39
39
|
const first = this.path_list[this.path_list.length - 1]
|
|
40
40
|
const bundleName = BundleConfig[first?.bundleName] ?? BundleConfigName.home
|
|
41
|
-
|
|
41
|
+
App.gui.setBundleName(bundleName)
|
|
42
42
|
this.setLanguage()
|
|
43
43
|
this.Init();
|
|
44
44
|
}
|
|
@@ -47,14 +47,14 @@ export abstract class BaseLoading extends Component {
|
|
|
47
47
|
const count = this.path_list.length;
|
|
48
48
|
const ratio = 1 / count * this.progress_ratio;
|
|
49
49
|
this.pro_total = 0;
|
|
50
|
-
|
|
50
|
+
App.gui.progess.progess?.(0)//进度在OpenScene方法中先打开才可以 设置进度
|
|
51
51
|
for (let index = 0; index < this.path_list.length; index++) {
|
|
52
52
|
const key_path = this.path_list[index];
|
|
53
53
|
let temp_pro = 0;
|
|
54
|
-
await
|
|
54
|
+
await App.LoadDir(BundleConfig[key_path.bundleName], key_path.path, GetAssetType(key_path.type), (pro: number) => {
|
|
55
55
|
temp_pro = pro * ratio
|
|
56
56
|
const progess = (this.pro_total + pro * ratio)
|
|
57
|
-
|
|
57
|
+
App.gui.progess.progess?.(progess)//进度在OpenScene方法中先打开才可以 设置进度
|
|
58
58
|
})
|
|
59
59
|
this.pro_total = (this.pro_total + temp_pro)
|
|
60
60
|
}
|
|
@@ -67,15 +67,15 @@ export abstract class BaseLoading extends Component {
|
|
|
67
67
|
|
|
68
68
|
|
|
69
69
|
setLanguage() {
|
|
70
|
-
LanguageData.path_json =
|
|
71
|
-
LanguageData.path_texture =
|
|
72
|
-
LanguageData.path_spine =
|
|
73
|
-
|
|
70
|
+
LanguageData.path_json = App.gui.config.language.path.json;
|
|
71
|
+
LanguageData.path_texture = App.gui.config.language.path.texture;
|
|
72
|
+
LanguageData.path_spine = App.gui.config.language.path.spine;
|
|
73
|
+
App.language.setLanguage(App.bundleName, App.gui.config.language.default)
|
|
74
74
|
}
|
|
75
75
|
/**刷新进度 */
|
|
76
76
|
addProgess(progess: number): void {
|
|
77
77
|
const pro = this.getRemainingProgress()
|
|
78
|
-
|
|
78
|
+
App.gui.progess.progess?.(this.pro_total + (pro * progess))
|
|
79
79
|
}
|
|
80
80
|
|
|
81
81
|
/**获取剩余进度 */
|
|
@@ -83,7 +83,7 @@ export abstract class BaseLoading extends Component {
|
|
|
83
83
|
return (1 - this.progress_ratio) * 100
|
|
84
84
|
}
|
|
85
85
|
FinishLoad() {
|
|
86
|
-
|
|
86
|
+
App.gui.progess.close?.()
|
|
87
87
|
if (DEBUG) {
|
|
88
88
|
ResourceManager.instance.LogAssetsAll()
|
|
89
89
|
}
|
|
@@ -100,10 +100,10 @@ export abstract class BaseLoading extends Component {
|
|
|
100
100
|
if (progress >= 100) {
|
|
101
101
|
progress = 100;
|
|
102
102
|
clearInterval(timer);
|
|
103
|
-
|
|
103
|
+
App.gui.progess.progess?.(progress);
|
|
104
104
|
resolve();
|
|
105
105
|
} else {
|
|
106
|
-
|
|
106
|
+
App.gui.progess.progess?.(progress);
|
|
107
107
|
}
|
|
108
108
|
}, intervalMs);
|
|
109
109
|
});
|
|
@@ -148,5 +148,5 @@ export abstract class BaseLoading extends Component {
|
|
|
148
148
|
// }))
|
|
149
149
|
|
|
150
150
|
// //进度更新
|
|
151
|
-
// await
|
|
151
|
+
// await App.PromiseQueue(list, (completed, total) => { this.addProgess(completed / total) })
|
|
152
152
|
// }
|
|
@@ -10,16 +10,37 @@ export class BaseModuleConfig {
|
|
|
10
10
|
}
|
|
11
11
|
}
|
|
12
12
|
|
|
13
|
+
export interface ExIWindow {
|
|
14
|
+
Register(delegate: any);
|
|
15
|
+
}
|
|
13
16
|
|
|
14
17
|
export abstract class WindowHandler {
|
|
15
|
-
constructor(configMap: any, moduleName: string) {
|
|
18
|
+
constructor(configMap: any, moduleName: string, funcList: string[]) {
|
|
16
19
|
Object.keys(configMap).forEach(key => {
|
|
17
20
|
const cof = configMap[key];
|
|
18
|
-
if (cof.module
|
|
21
|
+
if (cof.module === moduleName) {
|
|
19
22
|
(this as any)[key] = async (params: any) => {
|
|
20
|
-
return await
|
|
23
|
+
return await App.OpenWindow(configMap[key], params);
|
|
21
24
|
};
|
|
22
25
|
}
|
|
23
26
|
});
|
|
27
|
+
this._impl = null
|
|
28
|
+
this.funcList = funcList
|
|
29
|
+
}
|
|
30
|
+
private _impl: any = null;
|
|
31
|
+
private funcList: string[] = [];
|
|
32
|
+
// 新增 Register 方法:自动将 impl 的方法挂到 this 上
|
|
33
|
+
public Register(impl: any) {
|
|
34
|
+
this._impl = impl;
|
|
35
|
+
// 遍历接口所有方法名
|
|
36
|
+
const methods: string[] = this.funcList;
|
|
37
|
+
for (const method of methods) {
|
|
38
|
+
if (typeof impl[method] === 'function') {
|
|
39
|
+
// 使用箭头函数保持 this 指向 impl
|
|
40
|
+
(this as any)[method] = (...args: any[]) => {
|
|
41
|
+
return impl[method].apply(impl, args);
|
|
42
|
+
};
|
|
43
|
+
}
|
|
44
|
+
}
|
|
24
45
|
}
|
|
25
46
|
}
|
|
@@ -4,20 +4,12 @@ const { ccclass } = _decorator;
|
|
|
4
4
|
|
|
5
5
|
@ccclass('EventManager')
|
|
6
6
|
export class EventManager {
|
|
7
|
-
|
|
8
|
-
private static instance: EventManager;
|
|
9
7
|
private eventTarget: EventTarget;
|
|
10
|
-
|
|
11
|
-
private constructor() {
|
|
8
|
+
constructor() {
|
|
12
9
|
this.eventTarget = new EventTarget();
|
|
13
10
|
}
|
|
14
11
|
|
|
15
|
-
|
|
16
|
-
if (!this.instance) {
|
|
17
|
-
this.instance = new EventManager();
|
|
18
|
-
}
|
|
19
|
-
return this.instance;
|
|
20
|
-
}
|
|
12
|
+
|
|
21
13
|
|
|
22
14
|
on(eventName: string, callback: any, target?: any) {
|
|
23
15
|
this.eventTarget.on(eventName, callback, target);
|