From 51ec98f2931e5ad59c6277a71e1f2ab46f9a63a0 Mon Sep 17 00:00:00 2001
From: dgflash <dgflash@qq.com>
Date: Thu, 11 Sep 2025 09:33:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=81=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/core/gui/layer/LayerDialog.ts  | 8 ++------
 assets/core/gui/layer/LayerManager.ts | 2 +-
 assets/core/gui/layer/LayerUI.ts      | 7 ++++---
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/assets/core/gui/layer/LayerDialog.ts b/assets/core/gui/layer/LayerDialog.ts
index 6ca32b6..f9b9ed0 100644
--- a/assets/core/gui/layer/LayerDialog.ts
+++ b/assets/core/gui/layer/LayerDialog.ts
@@ -36,11 +36,7 @@ export class LayerDialog extends LayerPopUp {
         return new Promise<Node>(async (resolve, reject) => {
             // 控制同一时间只能显示一个模式窗口
             if (this.ui_nodes.size > 0) {
-                this.params.push({
-                    uiid: uiid,
-                    config: config,
-                    params: params
-                });
+                this.params.push({ uiid: uiid, config: config, params: params });
                 resolve(this.current);
             }
             else {
@@ -54,7 +50,7 @@ export class LayerDialog extends LayerPopUp {
     private showDialog(uiid: string, config: UIConfig, param?: UIParam): Promise<Node> {
         return new Promise<Node>(async (resolve, reject) => {
             let state = this.initUIConfig(uiid, config, param);
-            let node = await this.load(state, config.bundle);
+            let node = await this.load(state);
             resolve(node);
         });
     }
diff --git a/assets/core/gui/layer/LayerManager.ts b/assets/core/gui/layer/LayerManager.ts
index 3be745e..3286ac8 100644
--- a/assets/core/gui/layer/LayerManager.ts
+++ b/assets/core/gui/layer/LayerManager.ts
@@ -215,7 +215,7 @@ export class LayerManager {
                     
         }
     };
-    oops.gui.open(UIID.Loading, null, uic);
+    oops.gui.open(UIID.Loading);
      */
     open(uiid: Uiid, param?: UIParam): Promise<Node> {
         return new Promise<Node>(async (resolve, reject) => {
diff --git a/assets/core/gui/layer/LayerUI.ts b/assets/core/gui/layer/LayerUI.ts
index f3aec98..2c24665 100644
--- a/assets/core/gui/layer/LayerUI.ts
+++ b/assets/core/gui/layer/LayerUI.ts
@@ -27,6 +27,7 @@ export class LayerUI extends Node {
 
     /**
      * 添加一个预制件节点到层容器中，该方法将返回一个唯一`uuid`来标识该操作节点
+     * @param uiid       窗口唯一标识
      * @param config     界面配置数据
      * @param params     自定义参数
      * @returns ture为成功,false为失败
@@ -40,7 +41,7 @@ export class LayerUI extends Node {
 
             // 检查缓存中是否存界面
             let state = this.initUIConfig(uiid, config, params);
-            await this.load(state, config.bundle);
+            await this.load(state);
             resolve(state.node);
         });
     }
@@ -70,13 +71,13 @@ export class LayerUI extends Node {
      * @param state        显示参数
      * @param bundle     远程资源包名，如果为空就是默认本地资源包
      */
-    protected async load(state: UIState, bundle: string = resLoader.defaultBundleName): Promise<Node> {
+    protected async load(state: UIState): Promise<Node> {
         return new Promise<Node>(async (resolve, reject) => {
             // 加载界面资源超时提示
             let timerId = setTimeout(this.onLoadingTimeoutGui, oops.config.game.loadingTimeoutGui);
             if (state.node == null) {
                 // 优先加载配置的指定资源包中资源，如果没配置则加载默认资源包资源
-                const res = await resLoader.loadAsync(bundle, state.config.prefab, Prefab);
+                const res = await resLoader.loadAsync(state.config.bundle!, state.config.prefab, Prefab);
                 if (res) {
                     state.node = instantiate(res);