@cc-component/cc-core 1.3.7 → 1.3.9

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/interface/App.ts

@@ -136,8 +136,8 @@ export class App {
     static OnLoading(param: { open: (finish: () => void) => void, close: () => void }) { App.gui.loading_call = param; }
     static OnProgess(param: { open: (finish: () => void) => void, close: () => void, progess: (progress: number) => void }) { App.gui.progess = param; }
 
-    static async Requst<T>(config: IHttpConfig, params?: any, ext?: IExtData): Promise<HttpReturn<T>> {
-        return new Promise<HttpReturn<any>>(async (originalResolve, originalReject) => {
+    static async Requst<T>(config: IHttpConfig, params?: any, ext?: IExtData): Promise<{ code: number, data: T, msg: string }> {
+        return new Promise<{ code: number, data: T, msg: string }>(async (originalResolve, originalReject) => {
             let retries = 0; // 当前重试次数
             const maxRetries = 5; // 最大重试次数
             // 内部辅助函数，用于执行请求逻辑

package/assets/core/interface/Interface.ts

@@ -42,14 +42,14 @@ 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() 方法 */
     function OnRequstNet(param: { open: (finish: (isOk: boolean) => void) => void })
     /**=====================================✅✅Http请求======================= */
     /**网络接口 */
-    function Requst<T>(config: IHttpConfig, params?: any, ext?: { is_show_alert?: boolean }): Promise<HttpReturn<T>>;
+    function Requst<T>(config: IHttpConfig, params?: any, ext?: { is_show_alert?: boolean }): Promise<{ code: number, data: T, msg: string }>;
     /**=====================================✅✅消息发送======================= */
     function Emit(eventName: string, params?: any);
     function On(eventName: string, callback: any, target?: any);

package/package.json

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