diff --git a/lua/app/first/first.lua b/lua/app/first/first.lua index 0fbe2b8c..40d19c82 100644 --- a/lua/app/first/first.lua +++ b/lua/app/first/first.lua @@ -37,8 +37,8 @@ local LANGUAGES = { -- ["th"] = "th_TH", -- ["id"] = "in_ID", -- ["vi"] = "vi_VN", - -- ["ja"] = "ja_JP", - -- ["ko"] = "ko_KR", + ["ja"] = "ja_JP", + ["ko"] = "ko_KR", } function First:init() @@ -258,18 +258,38 @@ function First:loadFirstUI() local logoEn = self.firstUI.transform:Find("logo_en") local logoZH = self.firstUI.transform:Find("logo_zh") local logoCn = self.firstUI.transform:Find("logo_cn") + local logoKO = self.firstUI.transform:Find("logo_ko") + local logoJA = self.firstUI.transform:Find("logo_ja") if self.language == "zh" then logoZH.localScale = VISIBLE_SCALE logoEn.localScale = NOT_VISIBLE_SCALE logoCn.localScale = NOT_VISIBLE_SCALE + logoKO.localScale = NOT_VISIBLE_SCALE + logoJA.localScale = NOT_VISIBLE_SCALE elseif self.language == "cn" then logoCn.localScale = VISIBLE_SCALE logoEn.localScale = NOT_VISIBLE_SCALE logoZH.localScale = NOT_VISIBLE_SCALE + logoKO.localScale = NOT_VISIBLE_SCALE + logoJA.localScale = NOT_VISIBLE_SCALE + elseif self.language == "ko" then + logoKO.localScale = VISIBLE_SCALE + logoEn.localScale = NOT_VISIBLE_SCALE + logoCn.localScale = NOT_VISIBLE_SCALE + logoZH.localScale = NOT_VISIBLE_SCALE + logoJA.localScale = NOT_VISIBLE_SCALE + elseif self.language == "ja" then + logoJA.localScale = VISIBLE_SCALE + logoEn.localScale = NOT_VISIBLE_SCALE + logoCn.localScale = NOT_VISIBLE_SCALE + logoZH.localScale = NOT_VISIBLE_SCALE + logoKO.localScale = NOT_VISIBLE_SCALE else logoEn.localScale = VISIBLE_SCALE logoZH.localScale = NOT_VISIBLE_SCALE logoCn.localScale = NOT_VISIBLE_SCALE + logoKO.localScale = NOT_VISIBLE_SCALE + logoJA.localScale = NOT_VISIBLE_SCALE end self.dialogTrans = self.firstUI.transform:Find("message_box") diff --git a/lua/app/ui/battle/battle_result_ui.lua b/lua/app/ui/battle/battle_result_ui.lua index 30c48c93..4c3e85b5 100644 --- a/lua/app/ui/battle/battle_result_ui.lua +++ b/lua/app/ui/battle/battle_result_ui.lua @@ -90,7 +90,6 @@ function BattleResultUI:refreshFixedInfo() local desc3 = uiMap["battle_result_ui.unit_node.desc_3"] local rewardTitle = uiMap["battle_result_ui.reward_node.reward_title"] local continue = uiMap["battle_result_ui.continue"] - desc1:setText(I18N:getGlobalText(I18N.GlobalConst.BATTLE_DESC_4)) desc2:setText(self.combatReport.wave) desc3:setText(I18N:getGlobalText(I18N.GlobalConst.BATTLE_DESC_7, GFunc.num2Str(self.totalDmg))) rewardTitle:setText(I18N:getGlobalText(I18N.GlobalConst.REWARD_DESC)) @@ -102,6 +101,8 @@ function BattleResultUI:refreshFixedInfo() local round = self.combatReport.remainRound or 0 desc2:setText(round) desc1:setText(I18N:getGlobalText(I18N.GlobalConst.ROUND_LEFT)) + else + desc1:setText(GConst.EMPTY_STRING) end icon:setSprite(GConst.ATLAS_PATH.COMMON, iconName)