diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua index 8d5014673e..1f668b11e1 100644 --- a/Assets/ManagedResources/~Lua/Common/Language.lua +++ b/Assets/ManagedResources/~Lua/Common/Language.lua @@ -2214,4 +2214,9 @@ [12213] = GetLanguageStrById("equipIdList长度是 "), [12214] = GetLanguageStrById("点击交换else语句"), [12215] = GetLanguageStrById("装备个数"), + [12216] = GetLanguageStrById("战力:"), + [12217] = GetLanguageStrById("赔率:"), + [12218] = GetLanguageStrById("收到援助:"), + [12219] = GetLanguageStrById("穿 戴"), + [12220] = GetLanguageStrById("卸 下"), } diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaRecordPopup.lua b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaRecordPopup.lua index 0b0c9cf412..f2315173a3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaRecordPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaRecordPopup.lua @@ -94,7 +94,7 @@ function this.RankNodeAdapter(node, data) local scoreStr = isWin and "+"..data.myScoreChange or data.myScoreChange local color = isWin and UIColor.GREEN or UIColor.RED result.text = resultStr - deltaScore.text ="积分:".. scoreStr + deltaScore.text =Language[11693].. scoreStr result.color = color deltaScore.color = color if data.myScoreChange == 0 then diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaView.lua b/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaView.lua index 88a522ba1d..9add8f2933 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaView.lua @@ -314,8 +314,8 @@ function this.RefreshEnemyData() local btnItemNum = Util.GetGameObject(node, "challenge/item/num"):GetComponent("Text") lv_name:GetComponent("Text").text = EnemyList[i].personInfo.name - integral:GetComponent("Text").text = "积分:".. EnemyList[i].personInfo.score - power:GetComponent("Text").text = "战力:"..EnemyList[i].personInfo.totalForce + integral:GetComponent("Text").text = Language[11693].. EnemyList[i].personInfo.score + power:GetComponent("Text").text = Language[12216]..EnemyList[i].personInfo.totalForce btnText.gameObject:SetActive(leftTimes > 0) btnText.text = Language[10099] diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_GuessView.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_GuessView.lua index 9c7d5d03cb..d86fa46a0d 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_GuessView.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_GuessView.lua @@ -265,8 +265,8 @@ function this.RefreshBetRateShow() -- 赔率 local redWinRate = ArenaTopMatchManager.rate--allCoin/betRateInfo.redCoins local blueWinRate = ArenaTopMatchManager.rate--allCoin/betRateInfo.blueCoins - this.redRate.text = string.format("%s%0.2f", "赔率:",redWinRate) - this.blueRate.text = string.format("%s%0.2f","赔率:",blueWinRate) + this.redRate.text = string.format("%s%0.2f", Language[12217],redWinRate) + this.blueRate.text = string.format("%s%0.2f",Language[12217],blueWinRate) -- 竞猜币 this.coinIcon.sprite = SetIcon(GUESS_COIN) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BattleUnit.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BattleUnit.lua index c311992fb5..be0e43e5a5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BattleUnit.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BattleUnit.lua @@ -115,4 +115,4 @@ function BattleUnit:ClearLoopFunc(t) self._LoopFuncList = {} end end ---++++++++++++++LoopFunc +--++++++++++++++LoopFunc \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_MyAid.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_MyAid.lua index 8ca4bb5362..79aef6acd8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_MyAid.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_MyAid.lua @@ -150,7 +150,7 @@ function this.SingleHelpDataShow(go,data) Util.GetGameObject(go, "heroPro/frame/chipImage"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroChipQuantityImageByquality(itemConfig[data.type].Quantity)) Util.GetGameObject(go, "heroPro/frame/proIcon"):GetComponent("Image").sprite = Util.LoadSprite(GetProStrImageByProNum(itemConfig[data.type].PropertyName)) Util.GetGameObject(go, "okAid/chipInfo"):GetComponent("Text").text = GetLanguageStrById(itemConfig[data.type].Name) - Util.GetGameObject(go, "okAid/getAidText/getAidNumText"):GetComponent("Text").text ="收到援助:"..data.num.."/"..guildHelpConfig[1].RecourseTime[2] + Util.GetGameObject(go, "okAid/getAidText/getAidNumText"):GetComponent("Text").text =Language[12218]..data.num.."/"..guildHelpConfig[1].RecourseTime[2] Util.GetGameObject(go, "okAid/getFinishText"):SetActive(data.num == data.hadtakenum and data.hadtakenum == guildHelpConfig[1].RecourseTime[2]) Util.GetGameObject(go, "okAid/progressbar/progress1"):GetComponent("Image").fillAmount = data.num/guildHelpConfig[1].RecourseTime[2] Util.GetGameObject(go, "okAid/progressbar/progress2"):GetComponent("Image").fillAmount = data.hadtakenum/guildHelpConfig[1].RecourseTime[2] diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua index b9b3947aa6..99d62fedb8 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua @@ -142,14 +142,14 @@ function RoleEquipChangePopup:OnShow() this.equipPanel[1].bg:SetActive(true) this.equipPanel[1].curEquipText:SetActive(false) this.equipPanel[1].curEquipBtnDown:SetActive(true) - this.equipPanel[1].curEquipBtnDownText.text = "穿 戴" + this.equipPanel[1].curEquipBtnDownText.text = Language[12219] this.ShowCurEquipData(1) elseif type==2 then this.equipPanel[2].bg:SetActive(false) this.equipPanel[1].bg:SetActive(true) this.curEquipText:SetActive(false) this.equipPanel[1].curEquipBtnDown:SetActive(true) - this.equipPanel[1].curEquipBtnDownText.text = "卸 下" + this.equipPanel[1].curEquipBtnDownText.text = Language[12220] this.ShowCurEquipData(1) elseif type==3 then this.equipPanel[2].bg:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua b/Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua index b24665b6d8..5e826e5fc6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua @@ -317,4 +317,3 @@ return this - diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua index c75cdde22d..90dc4f197f 100644 --- a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua @@ -267,4 +267,3 @@ return XiaoYaoYouPanel -