diff --git a/assets/Script/GameManager.ts b/assets/Script/GameManager.ts index 3b8afd3..51edead 100644 --- a/assets/Script/GameManager.ts +++ b/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"); diff --git a/assets/Script/JiaZai.ts b/assets/Script/JiaZai.ts index d900c73..fd68554 100644 --- a/assets/Script/JiaZai.ts +++ b/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) { // 第一次使用,创建节点 diff --git a/assets/Script/SceneManager.ts b/assets/Script/SceneManager.ts index 81cb101..f23340d 100644 --- a/assets/Script/SceneManager.ts +++ b/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) => { diff --git a/assets/effect/hp.meta b/assets/effect/hp.meta deleted file mode 100644 index 22ead53..0000000 --- a/assets/effect/hp.meta +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ver": "1.1.3", - "uuid": "6cf5ea5a-e66e-4b12-bb69-bb226ae3cc92", - "importer": "folder", - "isBundle": false, - "bundleName": "", - "priority": 1, - "compressionType": {}, - "optimizeHotUpdate": {}, - "inlineSpriteFrames": {}, - "isRemoteBundle": {}, - "subMetas": {} -} \ No newline at end of file diff --git a/assets/UI/load.meta b/assets/publicUI/prefab.meta similarity index 81% rename from assets/UI/load.meta rename to assets/publicUI/prefab.meta index 8067594..abab490 100644 --- a/assets/UI/load.meta +++ b/assets/publicUI/prefab.meta @@ -1,6 +1,6 @@ { "ver": "1.1.3", - "uuid": "d6f6519f-68f0-43ab-a8b1-3194fce85a6f", + "uuid": "10b8da17-1df3-40d3-8e0c-401e860d2e58", "importer": "folder", "isBundle": false, "bundleName": "", diff --git a/assets/shop/prefab/RewardWindow.prefab b/assets/publicUI/prefab/RewardWindow.prefab similarity index 100% rename from assets/shop/prefab/RewardWindow.prefab rename to assets/publicUI/prefab/RewardWindow.prefab diff --git a/assets/shop/prefab/RewardWindow.prefab.meta b/assets/publicUI/prefab/RewardWindow.prefab.meta similarity index 100% rename from assets/shop/prefab/RewardWindow.prefab.meta rename to assets/publicUI/prefab/RewardWindow.prefab.meta diff --git a/assets/shop/prefab/rewardNode.prefab b/assets/publicUI/prefab/rewardNode.prefab similarity index 98% rename from assets/shop/prefab/rewardNode.prefab rename to assets/publicUI/prefab/rewardNode.prefab index bcf4263..edd588d 100644 --- a/assets/shop/prefab/rewardNode.prefab +++ b/assets/publicUI/prefab/rewardNode.prefab @@ -305,8 +305,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 86, - "height": 98 + "width": 84, + "height": 95 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -358,7 +358,7 @@ "_srcBlendFactor": 770, "_dstBlendFactor": 771, "_spriteFrame": { - "__uuid__": "b94c323b-3d26-4684-ba64-0f00a13438d2" + "__uuid__": "d22678f9-a73b-4c94-af07-62a134fd2d30" }, "_type": 0, "_sizeMode": 1, @@ -371,9 +371,7 @@ "_fillStart": 0, "_fillRange": 0, "_isTrimmedMode": true, - "_atlas": { - "__uuid__": "52d3eb5b-948f-403a-aafa-1c8f1a40a8c8" - }, + "_atlas": null, "_id": "" }, { @@ -1180,8 +1178,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 86, - "height": 98 + "width": 106, + "height": 122 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1233,7 +1231,7 @@ "_srcBlendFactor": 770, "_dstBlendFactor": 771, "_spriteFrame": { - "__uuid__": "24adad9c-1a33-44bd-b471-d615817acdb1" + "__uuid__": "73a886ef-de32-4216-8f4d-70d7144b011c" }, "_type": 0, "_sizeMode": 1, @@ -1246,9 +1244,7 @@ "_fillStart": 0, "_fillRange": 0, "_isTrimmedMode": true, - "_atlas": { - "__uuid__": "52d3eb5b-948f-403a-aafa-1c8f1a40a8c8" - }, + "_atlas": null, "_id": "" }, { diff --git a/assets/shop/prefab/rewardNode.prefab.meta b/assets/publicUI/prefab/rewardNode.prefab.meta similarity index 100% rename from assets/shop/prefab/rewardNode.prefab.meta rename to assets/publicUI/prefab/rewardNode.prefab.meta diff --git a/assets/effect/getSpine/starzha.atlas b/assets/publicUI/starzha.atlas similarity index 100% rename from assets/effect/getSpine/starzha.atlas rename to assets/publicUI/starzha.atlas diff --git a/assets/effect/getSpine/starzha.atlas.meta b/assets/publicUI/starzha.atlas.meta similarity index 100% rename from assets/effect/getSpine/starzha.atlas.meta rename to assets/publicUI/starzha.atlas.meta diff --git a/assets/effect/getSpine/starzha.json b/assets/publicUI/starzha.json similarity index 100% rename from assets/effect/getSpine/starzha.json rename to assets/publicUI/starzha.json diff --git a/assets/effect/getSpine/starzha.json.meta b/assets/publicUI/starzha.json.meta similarity index 100% rename from assets/effect/getSpine/starzha.json.meta rename to assets/publicUI/starzha.json.meta diff --git a/assets/effect/getSpine/starzha.png b/assets/publicUI/starzha.png similarity index 100% rename from assets/effect/getSpine/starzha.png rename to assets/publicUI/starzha.png diff --git a/assets/effect/getSpine/starzha.png.meta b/assets/publicUI/starzha.png.meta similarity index 100% rename from assets/effect/getSpine/starzha.png.meta rename to assets/publicUI/starzha.png.meta diff --git a/assets/effect/getSpine/starzha.spine b/assets/publicUI/starzha.spine similarity index 100% rename from assets/effect/getSpine/starzha.spine rename to assets/publicUI/starzha.spine diff --git a/assets/effect/getSpine/starzha.spine.meta b/assets/publicUI/starzha.spine.meta similarity index 100% rename from assets/effect/getSpine/starzha.spine.meta rename to assets/publicUI/starzha.spine.meta diff --git a/assets/publicUI/yaoshi.png b/assets/publicUI/yaoshi.png new file mode 100644 index 0000000..26c3988 Binary files /dev/null and b/assets/publicUI/yaoshi.png differ diff --git a/assets/publicUI/yaoshi.png.meta b/assets/publicUI/yaoshi.png.meta new file mode 100644 index 0000000..664d25b --- /dev/null +++ b/assets/publicUI/yaoshi.png.meta @@ -0,0 +1,38 @@ +{ + "ver": "2.3.7", + "uuid": "ba72c4e9-3ba4-4330-9efe-aedc99789d34", + "importer": "texture", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 106, + "height": 122, + "platformSettings": {}, + "subMetas": { + "yaoshi": { + "ver": "1.0.6", + "uuid": "73a886ef-de32-4216-8f4d-70d7144b011c", + "importer": "sprite-frame", + "rawTextureUuid": "ba72c4e9-3ba4-4330-9efe-aedc99789d34", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 106, + "height": 122, + "rawWidth": 106, + "rawHeight": 122, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/shop/spin/chuizi.meta b/assets/shop/spin/chuizi.meta deleted file mode 100644 index fa626fa..0000000 --- a/assets/shop/spin/chuizi.meta +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ver": "1.1.3", - "uuid": "5d6b428c-f644-41df-b3c7-2e63b9609538", - "importer": "folder", - "isBundle": false, - "bundleName": "", - "priority": 1, - "compressionType": {}, - "optimizeHotUpdate": {}, - "inlineSpriteFrames": {}, - "isRemoteBundle": {}, - "subMetas": {} -} \ No newline at end of file diff --git a/assets/shop/spin/dongjie.meta b/assets/shop/spin/dongjie.meta deleted file mode 100644 index 771740d..0000000 --- a/assets/shop/spin/dongjie.meta +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ver": "1.1.3", - "uuid": "2ed0f367-e2cc-40a0-8d17-b64fae553330", - "importer": "folder", - "isBundle": false, - "bundleName": "", - "priority": 1, - "compressionType": {}, - "optimizeHotUpdate": {}, - "inlineSpriteFrames": {}, - "isRemoteBundle": {}, - "subMetas": {} -} \ No newline at end of file diff --git a/assets/shop/spin/mofabang_texiao.meta b/assets/shop/spin/mofabang_texiao.meta deleted file mode 100644 index f1e923b..0000000 --- a/assets/shop/spin/mofabang_texiao.meta +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ver": "1.1.3", - "uuid": "3e2b9e78-1f47-4725-8f09-bb8491cd05d0", - "importer": "folder", - "isBundle": false, - "bundleName": "", - "priority": 1, - "compressionType": {}, - "optimizeHotUpdate": {}, - "inlineSpriteFrames": {}, - "isRemoteBundle": {}, - "subMetas": {} -} \ No newline at end of file