From f63a2bf876de76411e0f29cfb5a9a9b18a7238d8 Mon Sep 17 00:00:00 2001 From: chenxi Date: Tue, 6 Jun 2023 11:29:34 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=9F=B3=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/common/audio_manager.lua | 14 +++++--------- lua/app/module/hero/hero_manager.lua | 1 - lua/app/ui/main_city/module_unlock_ui.lua | 1 + 3 files changed, 6 insertions(+), 10 deletions(-) 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/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 -- 出现 From 24a853e31a911389e4963728a7ca1761d751339f Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Tue, 6 Jun 2023 11:32:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/config/localization/localization_global_const.lua | 1 + lua/app/config/strings/cn/global.lua | 1 + lua/app/ui/main_city/component/chapter_comp.lua | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index 9ed00191..f46b3d28 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -215,6 +215,7 @@ local LocalizationGlobalConst = BIND_TIPS_DESC = "BIND_TIPS_DESC", GET_SEVER_ERROR = "GET_SEVER_ERROR", PAY_FAILED_DESC_1 = "PAY_FAILED_DESC_1", + CHAPTER_DESC_2 = "CHAPTER_DESC_2", } return LocalizationGlobalConst \ No newline at end of file diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index 6b63695b..5772a4af 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -215,6 +215,7 @@ local localization_global = ["BIND_TIPS_DESC"] = "为了您的帐户安全，请绑定账号", ["GET_SEVER_ERROR"] = "请求服务器失败，请重试", ["PAY_FAILED_DESC_1"] = "订单异常，请联系客服处理", + ["CHAPTER_DESC_2"] = "神秘宝箱{0}/{1}", } return localization_global \ No newline at end of file diff --git a/lua/app/ui/main_city/component/chapter_comp.lua b/lua/app/ui/main_city/component/chapter_comp.lua index c8616269..833d1b68 100644 --- a/lua/app/ui/main_city/component/chapter_comp.lua +++ b/lua/app/ui/main_city/component/chapter_comp.lua @@ -103,7 +103,8 @@ function ChapterComp:refreshChapter(force) mysteryBoxIcon:setVisible(mysteryBoxCount > 0) if mysteryBoxCount > 0 then local gotCount = DataManager.ChapterData:getChapterMysteryBoxGotCount(chapterId) - self.uiMap["chapter.img.mystery_box_icon.desc"]:setText(gotCount .. "/" .. mysteryBoxCount) + local desc = I18N:getGlobalText(I18N.GlobalConst.CHAPTER_DESC_2, gotCount, mysteryBoxCount) + self.uiMap["chapter.img.mystery_box_icon.desc"]:setText(desc) end local rewardChapterId = DataManager.ChapterData:getIsHaveRewardsMinId() From 83a22c48b84a514f8a0ecd1fb83c4fa23889bf4b Mon Sep 17 00:00:00 2001 From: chenxi Date: Tue, 6 Jun 2023 11:42:57 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=82=B9=E5=87=BB=E9=9F=B3=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/hero/cell/hero_list_cell.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lua/app/ui/hero/cell/hero_list_cell.lua b/lua/app/ui/hero/cell/hero_list_cell.lua index 5633db94..145c88d9 100644 --- a/lua/app/ui/hero/cell/hero_list_cell.lua +++ b/lua/app/ui/hero/cell/hero_list_cell.lua @@ -55,6 +55,7 @@ function HeroListCell:refresh(index, heroList, stageFormation, allHeroCount, act self.heroCells[i]:refresh(heroEntity, not heroEntity:isActived()) self.heroCells[i]:showCheck(stageFormation[matchType] == heroId) self.heroCells[i]:addClickListener(function() + AudioManager:playEffect(AudioManager.CLICK_ID[GConst.CLICK_SOUND.NORMAL]) if func then func(self.heroCells[i], heroId) end @@ -68,6 +69,7 @@ function HeroListCell:refresh(index, heroList, stageFormation, allHeroCount, act self.heroCells[i]:setVisible(true) self.heroCells[i]:refresh(heroEntity, true) self.heroCells[i]:addClickListener(function() + AudioManager:playEffect(AudioManager.CLICK_ID[GConst.CLICK_SOUND.NORMAL]) if func then func(self.heroCells[i], heroId) end