@cc-component/cc-core 1.5.8 → 1.6.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, time?: number) => void }
+    progess: { open: (param: ISceneParam, finish: () => void) => void, close: (param: ISceneParam) => void, progess: (param: ISceneParam, progress: number, time?: number) => void }
 
     scene: ISceneParam
     launch: BaseLaunchComponent;

package/assets/core/home/BaseLoading.ts

@@ -47,14 +47,14 @@ export abstract class BaseLoading extends Component {
         const count = this.path_list.length;
         const ratio = 1 / count * this.progress_ratio;
         this.pro_total = 0;
-        App.gui.progess.progess?.(0)//进度在OpenScene方法中先打开才可以 设置进度
+        App.gui.progess.progess?.(App.scenesParm.param, 0)//进度在OpenScene方法中先打开才可以 设置进度
         for (let index = 0; index < this.path_list.length; index++) {
             const key_path = this.path_list[index];
             let temp_pro = 0;
             await App.LoadDir(BundleConfig[key_path.bundleName], key_path.path, GetAssetType(key_path.type), (pro: number) => {
                 temp_pro = pro * ratio
                 const progess = (this.pro_total + pro * ratio)
-                App.gui.progess.progess?.(progess)//进度在OpenScene方法中先打开才可以 设置进度
+                App.gui.progess.progess?.(App.scenesParm.param, progess)//进度在OpenScene方法中先打开才可以 设置进度
             })
             this.pro_total = (this.pro_total + temp_pro)
         }
@@ -79,12 +79,12 @@ export abstract class BaseLoading extends Component {
     addProgess(progess: number, total: number): void {
         const pro = this.getRemainingProgress(total)
         this.pro_total += (pro * progess)
-        App.gui.progess.progess?.(this.pro_total)
+        App.gui.progess.progess?.(App.scenesParm.param, this.pro_total)
     }
 
     resetProgess() {
         this.pro_total = 0
-        App.gui.progess.progess?.(this.pro_total, 0)
+        App.gui.progess.progess?.(App.scenesParm.param, this.pro_total, 0)
     }
 
     /**获取剩余进度 */
@@ -92,7 +92,7 @@ export abstract class BaseLoading extends Component {
         return ((total) - this.pro_total / 100) * 100
     }
     FinishLoad() {
-        App.gui.progess.close?.()
+        App.gui.progess.close?.(App.scenesParm.param)
         if (DEBUG) {
             ResourceManager.instance.LogAssetsAll()
         }
@@ -109,10 +109,10 @@ export abstract class BaseLoading extends Component {
                 if (progress >= 100) {
                     progress = 100;
                     clearInterval(timer);
-                    App.gui.progess.progess?.(progress);
+                    App.gui.progess.progess?.(App.scenesParm.param, progress);
                     resolve();
                 } else {
-                    App.gui.progess.progess?.(progress);
+                    App.gui.progess.progess?.(App.scenesParm.param, progress);
                 }
             }, intervalMs);
         });

package/assets/core/home/ResourceManager.ts

@@ -308,11 +308,11 @@ export class ResourceManager {
         return new Promise<T>((resolve, reject) => {
             bundle.load(path, type, (err, asset) => {
                 if (err) {
-                    console.error(`${bundleName}-加载资源失败: ${path}`);
+                    Logger.error(`${bundleName}-加载资源失败: ${path}`);
                     resolve(null);
                     return;
                 }
-                Logger.debug('--加载', path)
+                //Logger.debug('--加载', path)
                 // 记录加载的资源
                 ResourceManager.instance.trackAsset(path, asset, bundleName);
                 ResourceManager.instance.LogAssets(bundleName)

package/assets/core/interface/App.ts

@@ -147,7 +147,7 @@ export class App {
     //#region 监听模块消息
     static OnRequstNet(param: { open: (finish: (isOk: boolean) => void) => void }) { App.http.param = param; }
     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 OnProgess(param: { open: (param: ISceneParam, finish: () => void) => void, close: (param: ISceneParam) => void, progess: (param: ISceneParam, progress: number, time?: number) => void }) { App.gui.progess = param; }
 
     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) => {
@@ -363,7 +363,7 @@ export class App {
 
     static async OpenScene(param: ISceneParam) {
         App.OpenBlockEvents(LayerType.LayerBlockEventsUI, true)
-        await new Promise<void>(resolve => { App.gui.progess?.open?.(() => { resolve() }) })
+        await new Promise<void>(resolve => { App.gui.progess?.open?.(param, () => { resolve() }) })
         //关闭所有窗口
         await App.CloseAll([LayerType.LayerUI, LayerType.LayerDialog, LayerType.LayerPopUp, LayerType.LayerGame])
         App.scenesParm.param = param

package/assets/core/interface/Interface.ts

@@ -51,7 +51,7 @@ declare global {
     function InitGameConfig(param: IInitConfig): Promise<void>;
     /**=====================================⚠️⚠️⚠️ 必须实现的监听======================= */
     /**监听：打开场景加载进度窗口 -open 回调方法需要执行 finish() 方法 */
-    function OnProgess(param: { open: (finish: () => void) => void, close: () => void, progess: (progress: number, time?: number) => void })
+    function OnProgess(param: { open: (param: ISceneParam, finish: () => void) => void, close: (param: ISceneParam) => void, progess: (param: ISceneParam, 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.5.8",
+    "version": "1.6.0",
     "engine": ">=3.8.6",
     "description": "系统组件添加常用扩展方法",
     "main": "index.ts",