@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
|
@@ -10,15 +10,15 @@ import { ISceneParam } from "./ISceneParam";
|
|
|
10
10
|
import { StorageManager } from "../home/StorageManager";
|
|
11
11
|
import { Component } from "cc";
|
|
12
12
|
import { MLogger } from "../lib/logger/MLogger";
|
|
13
|
+
import { EventManager } from "../home/EventManager";
|
|
14
|
+
import { AudioUtil } from "../home/AudioUtil";
|
|
13
15
|
|
|
14
16
|
declare global {
|
|
15
17
|
/** 日志打印类 */
|
|
16
18
|
const Logger: typeof MLogger;
|
|
17
19
|
|
|
18
20
|
/**工具中间层======================================= */
|
|
19
|
-
namespace
|
|
20
|
-
/**当前所在bundle名称 */
|
|
21
|
-
const bundleName: string;
|
|
21
|
+
namespace App {
|
|
22
22
|
/**ui */
|
|
23
23
|
const gui: LayerUI;
|
|
24
24
|
/**网络 */
|
|
@@ -28,71 +28,68 @@ declare global {
|
|
|
28
28
|
/**场景参数 */
|
|
29
29
|
const scenesParm: ISceneParam;
|
|
30
30
|
/**时间管理 */
|
|
31
|
-
const
|
|
31
|
+
const time: TimeManager;
|
|
32
32
|
/**多语言 */
|
|
33
33
|
const language: LanguageManager;
|
|
34
|
-
|
|
35
|
-
|
|
34
|
+
/**消息 */
|
|
35
|
+
const message: EventManager
|
|
36
|
+
/**声音 */
|
|
37
|
+
const sound: AudioUtil
|
|
38
|
+
/**当前所在bundle名称 */
|
|
39
|
+
const bundleName: string;
|
|
40
|
+
/**=====================================⚠️⚠️⚠️ 初始化必须实现的监听======================= */
|
|
36
41
|
/** 初始化配置*/
|
|
37
42
|
function InitGameConfig(param: IInitConfig): Promise<void>;
|
|
38
|
-
|
|
39
|
-
function OpenScene(param: ISceneParam)
|
|
40
|
-
/**打开遮罩 */
|
|
41
|
-
function OpenBlockEvents(type: LayerType, is_show: boolean)
|
|
42
|
-
|
|
43
|
-
/**=====================================✅✅✅ 必须实现的监听======================= */
|
|
43
|
+
/**=====================================⚠️⚠️⚠️ 必须实现的监听======================= */
|
|
44
44
|
/**监听:打开场景加载进度窗口 -open 回调方法需要执行 finish() 方法 */
|
|
45
45
|
function OnProgess(param: { open: (finish: () => void) => void, close: () => void, progess: (progress: number) => void })
|
|
46
46
|
/**监听:显示加载动画 -open 回调方法需要执行 finish() 方法 */
|
|
47
47
|
function OnLoading(param: { open: (finish: () => void) => void, close: () => void })
|
|
48
48
|
/**监听:是否打开网络接口重连窗口 -open 回调方法需要执行 finish() 方法 */
|
|
49
49
|
function OnRequstNet(param: { open: (finish: (isOk: boolean) => void) => void })
|
|
50
|
+
/**=====================================✅✅Http请求======================= */
|
|
51
|
+
/**网络接口 */
|
|
52
|
+
function Requst<T>(config: IHttpConfig, params?: any, ext?: { is_show_alert?: boolean }): Promise<HttpReturn<T>>;
|
|
50
53
|
/**=====================================✅✅消息发送======================= */
|
|
51
54
|
function Emit(eventName: string, params?: any);
|
|
52
55
|
function On(eventName: string, callback: any, target?: any);
|
|
53
56
|
function Off(eventName: string, callback?: any, target?: any);
|
|
54
57
|
function OffAll(target: any);
|
|
55
|
-
/**=====================================✅✅Http请求======================= */
|
|
56
|
-
/**网络接口 */
|
|
57
|
-
function Requst<T>(config: IHttpConfig, params?: any, ext?: { is_show_alert?: boolean }): Promise<HttpReturn<T>>;
|
|
58
58
|
|
|
59
59
|
/**=====================================✅✅资源加载======================= */
|
|
60
60
|
/**
|
|
61
|
-
* 加载资源并自动记录
|
|
62
|
-
* @param bundleName Bundle 名称
|
|
63
|
-
* @param path 资源路径
|
|
64
|
-
* @param type 资源类型
|
|
65
|
-
* @returns 加载的资源
|
|
66
|
-
*/
|
|
67
|
-
/**
|
|
68
|
-
* 异步
|
|
69
61
|
* 加载资源并自动记录---
|
|
70
62
|
* @param bundleName Bundle 名称
|
|
71
63
|
* @param path 资源路径
|
|
72
64
|
* @param type 资源类型
|
|
73
65
|
* @returns 加载的资源
|
|
74
66
|
*/
|
|
75
|
-
function
|
|
67
|
+
function LoadAsset<T extends Asset>(bundleName: string, path: string, type: AssetsType<T>): Promise<T>;
|
|
76
68
|
/**
|
|
77
69
|
* 获取已经加载过的资源
|
|
78
|
-
* 获取资源
|
|
79
70
|
* @param bundleName Bundle 名称
|
|
80
71
|
* @param path 资源路径
|
|
81
72
|
* @param type 资源类型
|
|
82
73
|
* @returns 加载的资源
|
|
83
74
|
*/
|
|
84
|
-
function
|
|
85
|
-
function
|
|
86
|
-
function
|
|
87
|
-
function
|
|
88
|
-
function
|
|
89
|
-
function
|
|
75
|
+
function GetAsset<T extends Asset>(bundleName: string, path: string, type?: { new(): T }): T;
|
|
76
|
+
function ReleaseAssetsByBundle(bundleName: string)
|
|
77
|
+
function ReleaseAsset(bundleName: string, node: any)
|
|
78
|
+
function ReleaseAssetPath(path: string, bundleName: string): void
|
|
79
|
+
function PreloadDir(bundleName: string, dirName: string, pre: Function): Promise<void>;
|
|
80
|
+
function LoadDir(bundleName: string, dirName: string, type: any, pre: Function): Promise<void>;
|
|
90
81
|
/**加载图片 */
|
|
91
82
|
function LoadSprite(sp: Sprite, params: { path: string, bundle?: string, callback?: () => void })
|
|
92
83
|
/**加载spine骨骼动画 */
|
|
93
84
|
function LoadSpine(spine: sp.Skeleton, params: { path: string, bundle?: string, callback?: () => void })
|
|
85
|
+
/**播放skpine动画 */
|
|
86
|
+
function PlaySpine(skeleton: sp.Skeleton, animations: { name: string, loop?: boolean, call?: (name?: string) => void, event?: (name?: string) => void }[])
|
|
94
87
|
|
|
95
88
|
/**=======================================✅✅打开Window======================= */
|
|
89
|
+
/**打开场景 */
|
|
90
|
+
function OpenScene(param: ISceneParam)
|
|
91
|
+
/**打开遮罩 */
|
|
92
|
+
function OpenBlockEvents(type: LayerType, is_show: boolean)
|
|
96
93
|
/**加载窗口 */
|
|
97
94
|
function LoadWindow<T extends Component>(config: IBundleConfig, param?: IWindowParam): Promise<T>
|
|
98
95
|
/**打开窗口 */
|
|
@@ -104,9 +101,9 @@ declare global {
|
|
|
104
101
|
/**为 target 补全缺失的方法 */
|
|
105
102
|
function RegisterModule(target: any)
|
|
106
103
|
/**✅✅✅监听窗口的打开 */
|
|
107
|
-
//
|
|
104
|
+
//App.On(SystemMessage.OpenWindow)
|
|
108
105
|
/**✅✅✅监听窗口的关闭 */
|
|
109
|
-
//
|
|
106
|
+
//App.On(SystemMessage.CloseWindow)
|
|
110
107
|
/**获取所有已打开的窗口名称 */
|
|
111
108
|
function GetOpenedWindowNames(): string[]
|
|
112
109
|
/**获取已打开的窗口实例*/
|
|
@@ -115,54 +112,38 @@ declare global {
|
|
|
115
112
|
function GetOpenWindows<T extends Component>(): T[]
|
|
116
113
|
// 获取已打开的窗口实例-配置
|
|
117
114
|
function GetOpenWindowsConfig(): IBundleConfig[];
|
|
118
|
-
/**
|
|
119
|
-
* 显示加载转圈
|
|
120
|
-
*/
|
|
115
|
+
/** 显示加载转圈*/
|
|
121
116
|
function OpenLoading(is_show: boolean);
|
|
122
117
|
/**=======================================✅✅音乐======================= */
|
|
123
|
-
function
|
|
124
|
-
function
|
|
125
|
-
function
|
|
126
|
-
function
|
|
127
|
-
function
|
|
128
|
-
function
|
|
129
|
-
function
|
|
130
|
-
function
|
|
131
|
-
function
|
|
132
|
-
/**=======================================✅✅抖音======================= */
|
|
133
|
-
|
|
134
|
-
function UpdatePlayerRankData_tt(param);//抖音排行榜
|
|
135
|
-
function IsDouYin();
|
|
136
|
-
/**=======================================微信======================= */
|
|
137
|
-
function GetWxRatio(param);
|
|
118
|
+
function PlayOneShot(sound: string, volume?: number);
|
|
119
|
+
function Play(sound: string, volume?: number);
|
|
120
|
+
function Stop();
|
|
121
|
+
function Pause();
|
|
122
|
+
function Resume();
|
|
123
|
+
function MusicVolume(volume: number);
|
|
124
|
+
function SoundVolume(volume: number);
|
|
125
|
+
function GetMusicVolume(): number;
|
|
126
|
+
function GetSoundVolume(): number;
|
|
138
127
|
|
|
139
128
|
/**=======================================✅✅常用工具======================= */
|
|
140
|
-
function
|
|
141
|
-
function
|
|
142
|
-
function Collision(param1, param2)
|
|
143
|
-
function CalculateAngle(param1, param2)
|
|
144
|
-
function LookAtTarget(param1, param2)
|
|
145
|
-
/**向量的新的位置 */
|
|
146
|
-
function DirectionPosition(start: Vec3, endPos: Vec3, scalar: number)
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
function
|
|
158
|
-
|
|
159
|
-
/**任务进度队列 */
|
|
160
|
-
function PromiseQueue<T>(promises: Promise<T>[], onProgress: (completed: number, total: number) => void): Promise<T[]>
|
|
161
|
-
/**播放skpine动画 */
|
|
162
|
-
function PlaySpine(skeleton: sp.Skeleton, animations: { name: string, loop?: boolean, call?: (name?: string) => void, event?: (name?: string) => void }[])
|
|
129
|
+
// function TwoBezier(param1, param2, param3, param4);
|
|
130
|
+
// function CustomEaseOutInWithSpeed(param)
|
|
131
|
+
// function Collision(param1, param2)
|
|
132
|
+
// function CalculateAngle(param1, param2)
|
|
133
|
+
// function LookAtTarget(param1, param2)
|
|
134
|
+
// /**向量的新的位置 */
|
|
135
|
+
// function DirectionPosition(start: Vec3, endPos: Vec3, scalar: number)
|
|
136
|
+
// /**
|
|
137
|
+
// * 开始抛物线缓动
|
|
138
|
+
// * @param item 运动节点
|
|
139
|
+
// * @param target_postion 目标位置
|
|
140
|
+
// * @param update 更新 运动中回调
|
|
141
|
+
// * @param offset_ratio 最高点 的偏移量
|
|
142
|
+
// * @param time 动画时间
|
|
143
|
+
// */
|
|
144
|
+
// function RunParabolaTween(item: any, target_postion: Vec3, update: (ratio: number) => void, param?: { offset_ratio?: number, is_random?: boolean, time?: number, start_position?: Vec3 })
|
|
145
|
+
// /**任务进度队列 */
|
|
146
|
+
// function PromiseQueue<T>(promises: Promise<T>[], onProgress: (completed: number, total: number) => void): Promise<T[]>
|
|
163
147
|
}
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
148
|
}
|
|
168
149
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"ver":"4.0.24","importer":"typescript","imported":true,"uuid":"
|
|
1
|
+
{"ver":"4.0.24","importer":"typescript","imported":true,"uuid":"3b5d9f64-db0d-470b-8f5f-37e290b09cbe","files":[],"subMetas":{},"userData":{}}
|
|
@@ -94,8 +94,8 @@ export class LanguageData {
|
|
|
94
94
|
await new Promise<void>((resolve) => {
|
|
95
95
|
assetManager.loadAny(uuid, (err, jsonAsset: JsonAsset) => {
|
|
96
96
|
// Logger.debug("2加载表格", jsonAsset, err);
|
|
97
|
-
|
|
98
|
-
//console.error(
|
|
97
|
+
App.gui.config = jsonAsset.json as IConfig;
|
|
98
|
+
//console.error(App.gui.config)
|
|
99
99
|
resolve()
|
|
100
100
|
});
|
|
101
101
|
})
|
|
@@ -140,8 +140,8 @@ export class LanguageLabel extends Component {
|
|
|
140
140
|
|
|
141
141
|
async addEditor() {
|
|
142
142
|
if (EDITOR) {
|
|
143
|
-
await
|
|
144
|
-
|
|
143
|
+
await App.InitGameConfig({ bundleName: 'resources', launchComponent: null })
|
|
144
|
+
App.language.addEditorLabel(this);
|
|
145
145
|
this.changeLabelEditor()
|
|
146
146
|
} else {
|
|
147
147
|
LanguageData.updateLanguage();
|
|
@@ -152,7 +152,7 @@ export class LanguageLabel extends Component {
|
|
|
152
152
|
public async changeLabelEditor() {
|
|
153
153
|
const dbUrl = await LanguageData.loadDBEditor(this.node)
|
|
154
154
|
await LanguageData.loadConfig()
|
|
155
|
-
const db_json = dbUrl + `/${
|
|
155
|
+
const db_json = dbUrl + `/${App.gui.config.language.path.json}/${LanguageData.current}.json`
|
|
156
156
|
|
|
157
157
|
let uuid = await Editor.Message.request("asset-db", "query-uuid", db_json);
|
|
158
158
|
assetManager.loadAny(uuid, (err, jsonAsset: JsonAsset) => {
|
|
@@ -160,7 +160,7 @@ export class LanguageLabel extends Component {
|
|
|
160
160
|
if (!jsonAsset) return;
|
|
161
161
|
let labelData = jsonAsset.json;
|
|
162
162
|
LanguageData.language.set(LanguageDataType.Json, jsonAsset.json);
|
|
163
|
-
|
|
163
|
+
App.language.labelArr.forEach((com) => {
|
|
164
164
|
com.updateContent()
|
|
165
165
|
})
|
|
166
166
|
});
|
|
@@ -60,7 +60,7 @@ export class LanguagePack {
|
|
|
60
60
|
private loadTexture(bundleName: string, lang: string): Promise<void> {
|
|
61
61
|
return new Promise((resolve, reject) => {
|
|
62
62
|
const path = `${LanguageData.path_texture}/${lang}`;
|
|
63
|
-
|
|
63
|
+
App.LoadDir(bundleName, path, SpriteFrame, () => { }).then(() => {
|
|
64
64
|
Logger.debug(path, "下载语言包 textures 资源");
|
|
65
65
|
resolve();
|
|
66
66
|
});
|
|
@@ -71,7 +71,7 @@ export class LanguagePack {
|
|
|
71
71
|
private loadJson(bundleName: string, lang: string): Promise<void> {
|
|
72
72
|
return new Promise(async (resolve, reject) => {
|
|
73
73
|
const path = `${LanguageData.path_json}/${lang}`;
|
|
74
|
-
const jsonAsset = await
|
|
74
|
+
const jsonAsset = await App.LoadAsset(bundleName, path, JsonAsset);
|
|
75
75
|
if (jsonAsset) {
|
|
76
76
|
LanguageData.language.set(LanguageDataType.Json, jsonAsset.json);
|
|
77
77
|
Logger.debug(path, "下载语言包 json 资源");
|
|
@@ -81,7 +81,7 @@ export class LanguagePack {
|
|
|
81
81
|
return;
|
|
82
82
|
}
|
|
83
83
|
|
|
84
|
-
|
|
84
|
+
App.LoadAsset(bundleName, path, TTFFont).then((font: TTFFont) => {
|
|
85
85
|
Logger.debug(path, "下载语言包 ttf 资源");
|
|
86
86
|
LanguageData.font = font;
|
|
87
87
|
resolve();
|
|
@@ -93,7 +93,7 @@ export class LanguagePack {
|
|
|
93
93
|
private loadSpine(bundleName: string, lang: string): Promise<void> {
|
|
94
94
|
return new Promise(async (resolve, reject) => {
|
|
95
95
|
const path = `${LanguageData.path_spine}/${lang}`;
|
|
96
|
-
|
|
96
|
+
App.LoadDir(bundleName, path, sp.Skeleton, () => { }).then(() => {
|
|
97
97
|
Logger.debug(path, "下载语言包 spine 资源");
|
|
98
98
|
resolve();
|
|
99
99
|
});
|
|
@@ -47,7 +47,7 @@ export class LanguageSpine extends Component {
|
|
|
47
47
|
private updateSpine() {
|
|
48
48
|
// 获取语言标记
|
|
49
49
|
let path = `language/spine/${LanguageData.current}/${this.dataID}`;
|
|
50
|
-
let res: sp.SkeletonData | null =
|
|
50
|
+
let res: sp.SkeletonData | null = App.GetAsset(App.bundleName, path, sp.SkeletonData);
|
|
51
51
|
if (res) {
|
|
52
52
|
let spine: sp.Skeleton = this.getComponent(sp.Skeleton)!;
|
|
53
53
|
spine.skeletonData = res;
|
|
@@ -60,9 +60,9 @@ export class LanguageSprite extends Component {
|
|
|
60
60
|
let path = `language/texture/${LanguageData.current}/${this.dataID}/spriteFrame`;
|
|
61
61
|
let res: SpriteFrame | null
|
|
62
62
|
// 获取语言标记
|
|
63
|
-
res =
|
|
63
|
+
res = App.GetAsset(App.bundleName, path, SpriteFrame);
|
|
64
64
|
if (!res) {
|
|
65
|
-
res = await
|
|
65
|
+
res = await App.LoadAsset(App.bundleName, path, SpriteFrame)
|
|
66
66
|
}
|
|
67
67
|
|
|
68
68
|
if (res) {
|
|
@@ -85,8 +85,8 @@ export class LanguageSprite extends Component {
|
|
|
85
85
|
//#endregion编辑器
|
|
86
86
|
async addEditor() {
|
|
87
87
|
if (EDITOR) {
|
|
88
|
-
await
|
|
89
|
-
|
|
88
|
+
await App.InitGameConfig({ bundleName: 'resources', launchComponent: null })
|
|
89
|
+
App.language.addEditorSprite(this);
|
|
90
90
|
this.changeSpriteEditor()
|
|
91
91
|
} else {
|
|
92
92
|
LanguageData.updateLanguage();
|
|
@@ -98,8 +98,8 @@ export class LanguageSprite extends Component {
|
|
|
98
98
|
const dbUrl = await LanguageData.loadDBEditor(this.node)
|
|
99
99
|
await LanguageData.loadConfig()
|
|
100
100
|
// console.error('-----', dbUrl)
|
|
101
|
-
const db_json = dbUrl + `/${
|
|
102
|
-
|
|
101
|
+
const db_json = dbUrl + `/${App.gui.config.language.path.texture}/${LanguageData.current}/`
|
|
102
|
+
App.language.spriteArr.forEach(async (com) => {
|
|
103
103
|
const path_jpg = db_json + com.dataID + ".jpg"
|
|
104
104
|
const path_png = db_json + com.dataID + ".png"
|
|
105
105
|
const path_wep = db_json + com.dataID + ".webp"
|