From 39a41f45f970b95dfc183409730faa07664f724f Mon Sep 17 00:00:00 2001 From: JieLing Date: Mon, 1 Mar 2021 19:48:34 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=9B=9E=E6=BB=9A=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Arena/ArenaRecordPopup.lua | 5 ++++- .../~Lua/Modules/Arena/View/ArenaView.lua | 10 ++++------ .../~Lua/Modules/ArenaTopMatch/View/ATM_GuessView.lua | 4 ++-- .../Modules/ArenaTopMatch/View/ATM_MainMatchView.lua | 4 +++- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaRecordPopup.lua b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaRecordPopup.lua index 2d38e98595..235fb58b41 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaRecordPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaRecordPopup.lua @@ -72,6 +72,7 @@ function this.RankNodeAdapter(node, data) local time = Util.GetGameObject(node, "time"):GetComponent("Text") local deltaScore = Util.GetGameObject(node, "deltaScore"):GetComponent("Text") local deltaScoreGo = Util.GetGameObject(node, "deltaScore") + local scoreTipGo = Util.GetGameObject(node, "scoreTip") lv_name.text = "lv"..data.attackInfo.level.." "..data.attackInfo.name integral.text = data.attackInfo.score @@ -94,13 +95,15 @@ 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 = scoreStr result.color = color deltaScore.color = color if data.myScoreChange == 0 then deltaScoreGo:SetActive(false) + scoreTipGo:SetActive(false) else deltaScoreGo:SetActive(true) + scoreTipGo:SetActive(true) end -- 给回放按钮添加事件 diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaView.lua b/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaView.lua index 32d52393f6..b4e52bd8b0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaView.lua @@ -305,10 +305,8 @@ function this.RefreshEnemyData() if EnemyList[i] then table.insert(prefab,node) local lv_name = Util.GetGameObject(node, "name") - local integral = Util.GetGameObject(node, "integralTip") - Util.GetGameObject(node, "power"):SetActive(false) - Util.GetGameObject(node, "integral"):SetActive(false) - local power = Util.GetGameObject(node, "powerTip") + local integral = Util.GetGameObject(node, "integral") + local power = Util.GetGameObject(node, "power") local headroot = Util.GetGameObject(node, "headroot") local bg = Util.GetGameObject(node, "bg") local btnText = Util.GetGameObject(node, "challenge/Text"):GetComponent("Text") @@ -316,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 = EnemyList[i].personInfo.score + power:GetComponent("Text").text = EnemyList[i].personInfo.totalForce btnText.gameObject:SetActive(leftTimes > 0) btnText.text = Language[10103] diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_GuessView.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_GuessView.lua index 4374292ea5..627a24cbc8 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("%0.2f", redWinRate) + this.blueRate.text = string.format("%0.2f", blueWinRate) -- 竞猜币 this.coinIcon.sprite = SetIcon(GUESS_COIN) diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua index 38dd6a00e5..4484402a73 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua @@ -16,6 +16,7 @@ function ATM_MainMatchView:InitComponent() this.lockTip = Util.GetGameObject(this.lockPanel, "JoinRoot/tip"):GetComponent("Text") this.outTip = Util.GetGameObject(this.lockPanel, "OutRoot/Text"):GetComponent("Text") this.WeedOutText = Util.GetGameObject(this.lockPanel, "WeedOutRoot/Text"):GetComponent("Text") + this.WeedOutMyRank = Util.GetGameObject(this.lockPanel, "WeedOutRoot/MyRank"):GetComponent("Text") this.WeedOutMyRankText = Util.GetGameObject(this.lockPanel, "WeedOutRoot/MyRank/Text"):GetComponent("Text") this.WeedOutBestRank = Util.GetGameObject(this.lockPanel, "WeedOutRoot/BestRank"):GetComponent("Text") this.WeedOutBestRankText = Util.GetGameObject(this.lockPanel, "WeedOutRoot/BestRank/Text"):GetComponent("Text") @@ -269,7 +270,8 @@ function this.SetWeedOutRootInfo() commonInfo.SetActive(false) local tmData = ArenaTopMatchManager.GetBaseData() this.WeedOutText.text = Language[12208] - this.WeedOutMyRankText.text =Language[10104].. (tmData.myrank <= 0 and Language[10041] or ArenaTopMatchManager.GetRankNameByRank(tmData.myrank)) + this.WeedOutMyRank.text = Language[10104] + this.WeedOutMyRankText.text = tmData.myrank <= 0 and Language[10041] or ArenaTopMatchManager.GetRankNameByRank(tmData.myrank) this.WeedOutBestRank.text = Language[12245] this.WeedOutBestRankText.text = tmData.maxRank <= 0 and Language[10094] or this.GetRankName(tmData.maxRank) end