@cc-component/cc-core 1.3.8 → 1.4.0

package/assets/core/config/LayerUI.ts

@@ -32,7 +32,7 @@ export class LayerUI {
     bundleName: string = "";
 
     loading_call: { open: (finish: () => void) => void, close: () => void }
-    progess: { open: (finish: () => void) => void, close: () => void, progess: (progress: number) => void }
+    progess: { open: (finish: () => void) => void, close: () => void, progess: (progress: number, time?: number) => void }
 
     scene: ISceneParam
     launch: BaseLaunchComponent;

package/assets/core/home/BaseLoading.ts

@@ -72,15 +72,24 @@ export abstract class BaseLoading extends Component {
         LanguageData.path_spine = App.gui.config.language.path.spine;
         App.language.setLanguage(App.bundleName, App.gui.config.language.default)
     }
-    /**刷新进度 */
-    addProgess(progess: number): void {
-        const pro = this.getRemainingProgress()
-        App.gui.progess.progess?.(this.pro_total + (pro * progess))
+    /**刷新进度
+     * total 总进度
+     * isReset 是否开始重置为0
+     */
+    addProgess(progess: number, total: number): void {
+        const pro = this.getRemainingProgress(total)
+        this.pro_total += (pro * progess)
+        App.gui.progess.progess?.(this.pro_total)
+    }
+
+    resetProgess() {
+        this.pro_total = 0
+        App.gui.progess.progess?.(this.pro_total, 0)
     }
 
     /**获取剩余进度 */
-    getRemainingProgress() {
-        return (1 - this.progress_ratio) * 100
+    getRemainingProgress(total: number) {
+        return ((total) - this.pro_total / 100) * 100
     }
     FinishLoad() {
         App.gui.progess.close?.()

package/assets/core/home/BaseModuleConfig.ts

@@ -23,9 +23,8 @@ export abstract class WindowHandler {
         Object.keys(configMap).forEach(key => {
             const cof = configMap[key];
             if (cof.module === moduleName) {
-                (this as any)[key] = async (params: any) => {
-                    return await App.OpenWindow(configMap[key], params);
-                };
+                (this as any)[key] = async (params: any) => { return await App.OpenWindow(configMap[key], params); };
+                (this as any)[`${key}Component`] = () => { return App.GetOpenWindow(configMap[key]); };
             }
         });
         this._impl = null

package/assets/core/interface/Interface.ts

@@ -42,7 +42,7 @@ declare global {
     function InitGameConfig(param: IInitConfig): Promise<void>;
     /**=====================================⚠️⚠️⚠️ 必须实现的监听======================= */
     /**监听：打开场景加载进度窗口 -open 回调方法需要执行 finish() 方法 */
-    function OnProgess(param: { open: (finish: () => void) => void, close: () => void, progess: (progress: number) => void })
+    function OnProgess(param: { open: (finish: () => void) => void, close: () => void, progess: (progress: number, time?: number) => void })
     /**监听：显示加载动画 -open 回调方法需要执行 finish() 方法 */
     function OnLoading(param: { open: (finish: () => void) => void, close: () => void })
     /**监听：是否打开网络接口重连窗口 -open 回调方法需要执行 finish() 方法 */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cc-component/cc-core",
-    "version": "1.3.8",
+    "version": "1.4.0",
     "engine": ">=3.8.6",
     "description": "系统组件添加常用扩展方法",
     "main": "index.ts",