From 968024d85cff86e3ea9a7402cda06c157ebcb963 Mon Sep 17 00:00:00 2001
From: dgflash <dgflash@qq.com>
Date: Sat, 5 Oct 2024 17:37:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DResLoader=E5=AF=B9=E8=B1=A1?=
 =?UTF-8?q?=E7=9A=84=E4=BA=A4=E5=8F=89=E5=BC=95=E7=94=A8=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/core/Root.ts                    | 2 +-
 assets/core/common/loader/ResLoader.ts | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/assets/core/Root.ts b/assets/core/Root.ts
index 0b9449d..231ea90 100644
--- a/assets/core/Root.ts
+++ b/assets/core/Root.ts
@@ -69,7 +69,7 @@ export class Root extends Component {
 
             // 设置默认资源包
             oops.res.defaultBundleName = oops.config.game.bundleDefault;
-            oops.res.init(oops.config.game.bundlePackages);
+            oops.res.init(oops.config.game.data.bundle);
 
             // 本地存储模块
             oops.storage = new StorageManager();
diff --git a/assets/core/common/loader/ResLoader.ts b/assets/core/common/loader/ResLoader.ts
index 9a1f1c3..0ce681c 100644
--- a/assets/core/common/loader/ResLoader.ts
+++ b/assets/core/common/loader/ResLoader.ts
@@ -1,5 +1,4 @@
 import { Asset, AssetManager, __private, assetManager, error, js, resources, warn } from "cc";
-import { oops } from "../../Oops";
 
 export type AssetType<T = Asset> = __private.__types_globals__Constructor<T> | null;
 export type Paths = string | string[];
@@ -480,7 +479,7 @@ oops.res.loadDir("game", onProgressCallback, onCompleteCallback);
             }
             // 自动加载资源包
             else {
-                const v = oops.config.game.bundleEnable ? this.bundles.get(args.bundle) : "";
+                const v = this.cdn ? this.bundles.get(args.bundle) : "";
                 bundle = await this.loadBundle(args.bundle, v);
                 if (bundle) this.loadByBundleAndArgs(bundle, args);
             }