diff --git a/assets/Script/Block.ts b/assets/Script/Block.ts index ab8b194..d8e3f87 100644 --- a/assets/Script/Block.ts +++ b/assets/Script/Block.ts @@ -786,7 +786,7 @@ export default class Block extends cc.Component { this.node.active = false; this.node.removeFromParent(); //如果是锤子状态消除 - + }, 200); // console.log("消除", this.node.name, this.node.children); @@ -841,7 +841,7 @@ export default class Block extends cc.Component { // } // }, 1800); - + // MapConroler._instance.ishammer = false; } diff --git a/assets/Script/GameManager.ts b/assets/Script/GameManager.ts index 326464a..c184e3f 100644 --- a/assets/Script/GameManager.ts +++ b/assets/Script/GameManager.ts @@ -177,8 +177,16 @@ export default class GameManager extends cc.Component { cc.director.loadScene("HomeScene"); } else { console.log('music bundle 加载成功'); - // 加载成功后进入 HomeScene - cc.director.loadScene("HomeScene"); + cc.assetManager.loadBundle('shop', (err, bundle) => { + if (err) { + console.error('加载 shop 失败:', err); + } else { + console.log('shop加载成功'); + // 加载成功后进入 HomeScene + cc.director.loadScene("HomeScene"); + } + }); + } }); } diff --git a/assets/Script/JiaZai.ts b/assets/Script/JiaZai.ts index b29186c..14aa7d2 100644 --- a/assets/Script/JiaZai.ts +++ b/assets/Script/JiaZai.ts @@ -198,10 +198,17 @@ export default class JiaZai extends cc.Component { if (cc.fx.GameConfig.GM_INFO.hp < 5) { this.startHeathTimeCutDown(timeNode); } - if (cc.fx.GameConfig.GM_INFO.hp == 0 && cc.fx.GameConfig.GM_INFO.userPowerTime == 0) { - // 体力为0,显示spriteFrames[1],只显示第二个按钮 - if (switchButtons[0]) { switchButtons[0].active = false; swichs[0].active = false; } - if (switchButtons[1]) { switchButtons[1].active = true; swichs[1].active = true; } + if (cc.fx.GameConfig.GM_INFO.hp == 0) { + if (cc.fx.GameConfig.GM_INFO.userPowerTime == 0) { + // 体力为0,显示spriteFrames[1],只显示第二个按钮 + if (switchButtons[0]) { switchButtons[0].active = false; swichs[0].active = false; } + if (switchButtons[1]) { switchButtons[1].active = true; swichs[1].active = true; } + } + else { + if (switchButtons[0]) { switchButtons[0].active = true; swichs[0].active = false; } + if (switchButtons[1]) { switchButtons[1].active = false; swichs[1].active = true; } + } + } else if (cc.fx.GameConfig.GM_INFO.hp < 5 && cc.fx.GameConfig.GM_INFO.hp > 0) { // 体力小于5但大于0,显示spriteFrames[1],只显示第一个按钮 if (switchButtons[0]) { switchButtons[0].active = true; swichs[0].active = false; } @@ -367,7 +374,8 @@ export default class JiaZai extends cc.Component { startGame() { cc.fx.AudioManager._instance.playEffect("anniu_Big", null); - if (cc.fx.GameConfig.GM_INFO.hp < 1 && cc.fx.GameConfig.GM_INFO.userPowerTime == 0) { + let power = cc.fx.GameTool.getUserPowerTime(); + if (cc.fx.GameConfig.GM_INFO.hp < 1 && power == false) { MiniGameSdk.API.showToast("体力值不足"); setTimeout(() => { this.openHeath(); diff --git a/assets/shop.meta b/assets/shop.meta index 9158048..0aa27fe 100644 --- a/assets/shop.meta +++ b/assets/shop.meta @@ -4,7 +4,7 @@ "importer": "folder", "isBundle": true, "bundleName": "shop", - "priority": 6, + "priority": 8, "compressionType": { "wechatgame": "subpackage" }, diff --git a/settings/wechatgame.json b/settings/wechatgame.json index 9a85e6e..b36a79e 100644 --- a/settings/wechatgame.json +++ b/settings/wechatgame.json @@ -3,6 +3,6 @@ "orientation": "portrait", "separate_engine": false, "REMOTE_SERVER_ROOT": "", - "subContext": "SubContextView", + "subContext": "", "startSceneAssetBundle": true }