shop 从首场景拆分完毕

assets/Script/GameManager.ts

@@ -219,9 +219,9 @@ export default class GameManager extends cc.Component {
         cc.tween(this.lizi)
             .to(0.5, { position: cc.v3(410, -516.426, 0) })
             .start();
-        cc.assetManager.loadBundle('shop', (shopError) => {
-            if (shopError) {
-                console.error('加载 shop 失败:', shopError);
+        cc.assetManager.loadBundle('publicUI', (publicUIError) => {
+            if (publicUIError) {
+                console.error('加载 publicUI 失败:', publicUIError);
                 return;
             }
             cc.director.loadScene("HomeScene");

assets/Script/JiaZai.ts

@@ -596,7 +596,7 @@ export default class JiaZai extends cc.Component {
     private preloadHomePopupPrefabs(): void {
         const entries: Array<[string, string, string, number]> = [
             // 第二阶段先准备补发窗口及其图片，成功后才允许开始补发。
-            ["shop", "prefab/RewardWindow", "cachedRewardPrefab", 2],
+            ["publicUI", "prefab/RewardWindow", "cachedRewardPrefab", 2],
             ["action_bundle", "prefab/newbieGift", "cachedActionPrefab", 1],
             ["shop", "prefab/monthlyCard", "cachedMonthlyCardPrefab", 1],
             ["shop", "prefab/passCheck", "cachedPassCheckPrefab", 1],
@@ -2193,7 +2193,7 @@ export default class JiaZai extends cc.Component {
 
     //打开奖励弹窗
     openRewardWindow(data, month?: number) {
-        if (!this.ensureHomePopupPrefab("shop", "prefab/RewardWindow", "cachedRewardPrefab",
+        if (!this.ensureHomePopupPrefab("publicUI", "prefab/RewardWindow", "cachedRewardPrefab",
             () => this.openRewardWindow(data, month))) return;
         if (!this.RewardNode) {
             // 第一次使用，创建节点

assets/Script/SceneManager.ts

@@ -890,7 +890,6 @@ export default class SceneManager extends cc.Component {
         // 预加载 shop 预制体
         SceneManager.clearInvalidShopPrefabCaches();
         if (!SceneManager.cachedShopPrefab
-            || !SceneManager.cachedRewardPrefab
             || !SceneManager.cachedMonthlyCardPrefab) {
             cc.assetManager.loadBundle('shop', (err: Error, bundle: cc.AssetManager.Bundle) => {
                 if (err) {
@@ -906,15 +905,6 @@ export default class SceneManager extends cc.Component {
                         SceneManager.cachedShopPrefab = prefab;
                     });
                 }
-                if (!SceneManager.cachedRewardPrefab) {
-                    bundle.load('prefab/RewardWindow', cc.Prefab, (err: Error, prefab: cc.Prefab) => {
-                        if (err) {
-                            cc.error(err.message || err);
-                            return;
-                        }
-                        SceneManager.cachedRewardPrefab = prefab;
-                    });
-                }
                 if (!SceneManager.cachedMonthlyCardPrefab) {
                     bundle.load('prefab/monthlyCard', cc.Prefab, (err: Error, prefab: cc.Prefab) => {
                         if (err) {
@@ -926,6 +916,21 @@ export default class SceneManager extends cc.Component {
                 }
             });
         }
+        if (!SceneManager.cachedRewardPrefab) {
+            cc.assetManager.loadBundle('publicUI', (err: Error, bundle: cc.AssetManager.Bundle) => {
+                if (err) {
+                    cc.error(err.message || err);
+                    return;
+                }
+                bundle.load('prefab/RewardWindow', cc.Prefab, (err: Error, prefab: cc.Prefab) => {
+                    if (err) {
+                        cc.error(err.message || err);
+                        return;
+                    }
+                    SceneManager.cachedRewardPrefab = prefab;
+                });
+            });
+        }
         if (!cc.fx.GameTool.isLowMemoryIOSDevice()) {
             setTimeout(() => {
                 cc.director.preloadScene("HomeScene", (err) => {