From e709c804289eb24bf28d758912bf4e5434baa0c2 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 25 Feb 2021 13:47:04 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AB=9E=E6=8A=80=E5=9C=BA=E4=BF=AE=E6=94=B9?= 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 | 8 ++++---- .../~Lua/Modules/ArenaTopMatch/View/ATM_GuessView.lua | 4 ++-- .../~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua | 4 +--- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaRecordPopup.lua b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaRecordPopup.lua index 235fb58b41..2d38e98595 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaRecordPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaRecordPopup.lua @@ -72,7 +72,6 @@ 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 @@ -95,15 +94,13 @@ 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 b4e52bd8b0..0429f500be 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaView.lua @@ -305,8 +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, "integral") - local power = Util.GetGameObject(node, "power") + local integral = Util.GetGameObject(node, "integralTip") + local power = Util.GetGameObject(node, "powerTip") local headroot = Util.GetGameObject(node, "headroot") local bg = Util.GetGameObject(node, "bg") local btnText = Util.GetGameObject(node, "challenge/Text"):GetComponent("Text") @@ -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 = "积分:"..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 627a24cbc8..4374292ea5 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("%0.2f", redWinRate) - this.blueRate.text = string.format("%0.2f", blueWinRate) + this.redRate.text = string.format("%s%0.2f", "赔率:", redWinRate) + this.blueRate.text = string.format("%s%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 4484402a73..42b08710e3 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua @@ -16,7 +16,6 @@ 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") @@ -270,8 +269,7 @@ function this.SetWeedOutRootInfo() commonInfo.SetActive(false) local tmData = ArenaTopMatchManager.GetBaseData() this.WeedOutText.text = Language[12208] - this.WeedOutMyRank.text = Language[10104] - this.WeedOutMyRankText.text = tmData.myrank <= 0 and Language[10041] or ArenaTopMatchManager.GetRankNameByRank(tmData.myrank) + this.WeedOutMyRankText.text =Language[10104].. 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