From de49d604ad4723be1a4e9c9dd2c15284bba90b5d Mon Sep 17 00:00:00 2001 From: Fang Date: Mon, 28 Aug 2023 10:14:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A1=A3=E4=BD=8D=E5=A5=96=E5=8A=B1=E8=BF=9B?= =?UTF-8?q?=E5=BA=A6=E6=98=BE=E7=A4=BAfix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/arena/cell/arena_grading_reward_cell.lua | 3 ++- lua/app/userdata/arena/arena_data.lua | 7 ++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/lua/app/ui/arena/cell/arena_grading_reward_cell.lua b/lua/app/ui/arena/cell/arena_grading_reward_cell.lua index 3b9f2112..8b13f80c 100644 --- a/lua/app/ui/arena/cell/arena_grading_reward_cell.lua +++ b/lua/app/ui/arena/cell/arena_grading_reward_cell.lua @@ -110,13 +110,14 @@ function ArenaGradingRewardCell:refresh(id) local posY = rootHeight * curProg -- 高度超框处理 - if self.id == 1 or self.id == #table.keys(cfg) then + if self.id == 1 or self.id == #DataManager.ArenaData:getGradingRewardCfg() then local tagHeight = self.tagProg:fastGetSizeDeltaY() if posY < tagHeight / 2 then posY = tagHeight / 2 end end self.tagProg:setAnchoredPositionY(posY) + self.baseObject:getTransform():SetAsLastSibling() else self.tagProg:setVisible(false) end diff --git a/lua/app/userdata/arena/arena_data.lua b/lua/app/userdata/arena/arena_data.lua index 3cfc3b50..3ffda486 100644 --- a/lua/app/userdata/arena/arena_data.lua +++ b/lua/app/userdata/arena/arena_data.lua @@ -568,11 +568,8 @@ function ArenaData:getGradingRewardProgressByScore(id, score) if id == 1 then -- 第一个档位特殊处理 - local minScore = self:getSeasonGradingMinScore() - local prog = (score - minScore) / (point - minScore) - if prog > 0.5 then - prog = 0.5 - end + local prog = 0.5 + if score > point then prog = prog + ((score - point) / (rangeMax - point)) end