@cc-component/cc-core 1.1.9 → 1.2.1

package/assets/core/home/BaseModuleConfig.ts

@@ -16,8 +16,8 @@ export abstract class WindowHandler {
         Object.keys(configMap).forEach(key => {
             const cof = configMap[key];
             if (cof.module = moduleName) {
-                (this as any)[key] = (params: any) => {
-                    MainModule.OpenWindow(configMap[key], params);
+                (this as any)[key] = async (params: any) => {
+                    return await MainModule.OpenWindow(configMap[key], params);
                 };
             }
         });

package/assets/core/home/ProgessWindow.ts

@@ -1,5 +1,6 @@
 
 import { tween } from 'cc';
+import { Label } from 'cc';
 import { ProgressBar } from 'cc';
 import { _decorator, Component, Node, game, find, director } from 'cc';
 const { ccclass, property, menu } = _decorator;
@@ -25,8 +26,17 @@ export class ProgessWindow extends Component {
         type: ProgressBar,
         displayName: "进度条"
     })
-    pro_bar!: ProgressBar;
-    stop = false
+    pro_bar: ProgressBar;
+
+    @property({
+        type: Label,
+        displayName: "进度条文本"
+    })
+    pro_lb: Label;
+    /**监听进度 
+     * pro:0-100
+    */
+    public onProgress: (pro: number) => void
 
     protected onLoad(): void {
 
@@ -37,27 +47,18 @@ export class ProgessWindow extends Component {
     }
 
     /***更新进度--假的进度 */
-    async ProgessValueAuto(isOk) {
-        this.stop = isOk
-        if (isOk) {
-            for (var i = 90; i < 101; i++) {
-                await MainModule.timeManager.AwaitMS(1);
-                this.ProgessValue((i));
-            }
-            this.Hide()
-        } else {
-            for (var i = 0; i < 90; i++) {
-                if (this.stop) { return }
-                await MainModule.timeManager.AwaitMS(1);
-                this.ProgessValue((i));
-            }
-        }
+    async ProgessValueAuto(param: { startTime: number, endTime: number }) {
+        await this.loadProgress(param.startTime, param.endTime, (pro: number) => { this.ProgessValue((pro)); })
     }
 
     /***更新进度 */
     public ProgessValue(value: number) {
         if (this.pro_bar) {
-            this.pro(this.pro_bar, value, 100);
+            this.onProgress?.(value)
+            if (this.pro_lb) {
+                this.pro_lb.string = `${value}%`
+            }
+            this.pro(this.pro_bar, value, 100, 0);
         }
     }
 
@@ -84,5 +85,25 @@ export class ProgessWindow extends Component {
             proBar.progress = pro;
         }
     }
+
+    /** 模拟假加载进度（仅用于调试） */
+    loadProgress(startTime: number = 0, durationSeconds: number = 2, pro: (pro: number) => void): Promise<void> {
+        return new Promise((resolve) => {
+            let progress = startTime;
+            const step = 1; // 每次增加 1%
+            const intervalMs = (durationSeconds * 1000) / 100; // 总毫秒数 / 100 步
+            const timer = setInterval(() => {
+                progress += step;
+                if (progress >= 100) {
+                    progress = 100;
+                    clearInterval(timer);
+                    pro?.(progress);
+                    resolve();
+                } else {
+                    pro?.(progress);
+                }
+            }, intervalMs);
+        });
+    }
 }
 

package/package.json

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