diff --git a/lua/app/common/audio_manager.lua b/lua/app/common/audio_manager.lua index 15482a16..094eb6d5 100644 --- a/lua/app/common/audio_manager.lua +++ b/lua/app/common/audio_manager.lua @@ -29,17 +29,13 @@ AudioManager.EFFECT_ID = { LINK_SKILL = "assets/arts/sounds/sfx/battle/link_skill.wav", BATTLE_VICTORY = "assets/arts/sounds/sfx/ui/battle_victory.wav", BATTLE_DEFEAT = "assets/arts/sounds/sfx/ui/battle_defeat.wav", - SUMMON_START = "assets/arts/sounds/sfx/ui/ui_summon_start.wav", - REWARD = "assets/arts/sounds/sfx/ui/reward.wav", - HERO_UP = "assets/arts/sounds/sfx/ui/hero_up.wav", - PLAYER_UP = "assets/arts/sounds/sfx/ui/player_up.wav", + SUMMON_START = "assets/arts/sounds/sfx/ui/summon_start.wav", + REWARD = "assets/arts/sounds/sfx/ui/reward.wav", + HERO_UP = "assets/arts/sounds/sfx/ui/hero_up.wav", + PLAYER_UP = "assets/arts/sounds/sfx/ui/player_up.wav", BOSS_WARNING = "assets/arts/sounds/sfx/battle/warning_boss.wav", LINK_CANCEL = "assets/arts/sounds/sfx/battle/link_cancel.wav", - UI_FUNC_OPEN = "assets/arts/sounds/sfx/ui/ui_func_open.wav", -- 功能解锁 - UI_HERO_LV_UP = "assets/arts/sounds/sfx/ui/ui_hero_lv_up.wav", -- 英雄升级 - UI_PLAYER_LV_UP = "assets/arts/sounds/sfx/ui/ui_player_lv_up.wav", -- 角色升级 - UI_REWARD_GET = "assets/arts/sounds/sfx/ui/ui_reward_get.wav", -- 奖励获取 - UI_SUMMON_START = "assets/arts/sounds/sfx/ui/ui_summon_start.wav", -- 抽卡 + FUNC_OPEN = "assets/arts/sounds/sfx/ui/func_open.wav", } AudioManager.BO_EFFECT_ID = { diff --git a/lua/app/module/battle/controller/battle_controller.lua b/lua/app/module/battle/controller/battle_controller.lua index adf9994f..b113436a 100644 --- a/lua/app/module/battle/controller/battle_controller.lua +++ b/lua/app/module/battle/controller/battle_controller.lua @@ -2560,7 +2560,9 @@ function BattleController:battleEnd() self.battleUI:enableUITouch() end self:controllBattleEnd() - ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_BATTLE_VICTORY) + if self.victory then + ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_BATTLE_VICTORY) + end end, 1) end diff --git a/lua/app/module/hero/hero_manager.lua b/lua/app/module/hero/hero_manager.lua index d4fa1c99..f2619e96 100644 --- a/lua/app/module/hero/hero_manager.lua +++ b/lua/app/module/hero/hero_manager.lua @@ -20,7 +20,6 @@ function HeroManager:upgradeHero(heroId, heroEntity) if state == GConst.HeroConst.CHECK_LV_UP_STATE.COIN_NOT_ENOUGH then ModuleManager.ShopManager:tryTriggerCoinGift() end - return end diff --git a/lua/app/ui/main_city/module_unlock_ui.lua b/lua/app/ui/main_city/module_unlock_ui.lua index 86b0d336..a27b159f 100644 --- a/lua/app/ui/main_city/module_unlock_ui.lua +++ b/lua/app/ui/main_city/module_unlock_ui.lua @@ -85,6 +85,7 @@ function ModuleUnlockUI:checkShowNext() end end self:showModuleUnlockAppearAnim() + AudioManager:playEffect(AudioManager.EFFECT_ID.FUNC_OPEN) end -- 出现 diff --git a/lua/app/ui/shop/cell/box_sell_cell.lua b/lua/app/ui/shop/cell/box_sell_cell.lua index 450e6fa1..1ec1add4 100644 --- a/lua/app/ui/shop/cell/box_sell_cell.lua +++ b/lua/app/ui/shop/cell/box_sell_cell.lua @@ -93,7 +93,7 @@ function BoxSellCell:refreshCost() self.boxBuyBtnCoin1:setSprite(GFunc.getIconRes(costItem1.id)) local totalCount = DataManager.BagData.ItemData:getItemNumById(GConst.ItemConst.ITEM_ID_BOX_KEY_LV_1) local totalCountStr = totalCount <= 99 and tostring(totalCount) or "99" - self.boxBuyBtnTx1:setText(tostring(costItem1.num) .. "/" .. totalCountStr) + self.boxBuyBtnTx1:setText(totalCountStr .. "/" .. tostring(costItem1.num)) else self.boxBuyBtnCoin1:setSprite(GFunc.getIconRes(cost1.id)) self.boxBuyBtnTx1:setText(cost1.num) @@ -104,7 +104,7 @@ function BoxSellCell:refreshCost() self.boxBuyBtnCoin2:setSprite(GFunc.getIconRes(costItem2.id)) local totalCount = DataManager.BagData.ItemData:getItemNumById(GConst.ItemConst.ITEM_ID_BOX_KEY_LV_2) local totalCountStr = totalCount <= 99 and tostring(totalCount) or "99" - self.boxBuyBtnTx2:setText(tostring(costItem2.num) .. "/" .. totalCountStr) + self.boxBuyBtnTx2:setText(totalCountStr .. "/" .. tostring(costItem2.num)) else self.boxBuyBtnCoin2:setSprite(GFunc.getIconRes(cost2.id)) self.boxBuyBtnTx2:setText(cost2.num) @@ -115,7 +115,7 @@ function BoxSellCell:refreshCost() self.boxBuyBtnCoin3:setSprite(GFunc.getIconRes(costItem3.id)) local totalCount = DataManager.BagData.ItemData:getItemNumById(GConst.ItemConst.ITEM_ID_BOX_KEY_LV_3) local totalCountStr = totalCount <= 99 and tostring(totalCount) or "99" - self.boxBuyBtnTx3:setText(tostring(costItem3.num) .. "/" .. totalCountStr) + self.boxBuyBtnTx3:setText(totalCountStr .. "/" .. tostring(costItem3.num)) else self.boxBuyBtnCoin3:setSprite(GFunc.getIconRes(cost3.id)) self.boxBuyBtnTx3:setText(cost3.num)