From 0d82056bc2fed0a8debba95c492b7ff7109d574e Mon Sep 17 00:00:00 2001
From: wangzhenxing <wangzhenxing@jmfy.com>
Date: Thu, 9 Sep 2021 15:44:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../~Lua/Modules/WorldArena/WorldArenaMainPanel.lua        | 7 ++++---
 .../~Lua/Modules/WorldArena/WorldArenaManager.lua          | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMainPanel.lua
index b1e9eca501..4a8caedd92 100644
--- a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMainPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMainPanel.lua
@@ -157,7 +157,7 @@ end
 --移除事件监听（用于子类重写）
 function WorldArenaMainPanel:RemoveListener()
 end
-local rankData
+local grid, rankData
 --界面打开时调用（用于子类重写） 
 
 function WorldArenaMainPanel:OnOpen(...)
@@ -165,13 +165,14 @@ function WorldArenaMainPanel:OnOpen(...)
     local args = {...}
      NetManager.CrossYuXuLunDaoGetInfoRequest(function(msg)
         local currRankId=msg.newLevelId
-        rankData=ConfigManager.GetConfigData(ConfigName.MServerRankConfig,currRankId)
+        grid, rankData=WorldArenaManager.GetRankImgByScore(msg.newMyscore)
+        --rankData=ConfigManager.GetConfigData(ConfigName.MServerRankConfig,currRankId)
         battleTimes=msg.changedTimes
         rewardState=msg.dailyRewardState
         leftTimes=msg.freeTimes
         WorldArenaManager.SetFreeTime(leftTimes)
         this.Integral.text="积分:"..msg.newMyscore
-        this.SetStarShow(rankData.RankGrade+1,self.sortingOrder)
+        this.SetStarShow(rankData.RankLevel,grid,self.sortingOrder)
         this.endTime.text="周日23:30赛季结束"
         LogError("len==="..#msg.arenaEnemys)
         this:RefreshEnemyData(msg.arenaEnemys)
diff --git a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaManager.lua b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaManager.lua
index 7a13b3193b..7aaa9afc23 100644
--- a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaManager.lua
@@ -25,7 +25,7 @@ function this.GetArenaChallengeTimes()
     local privilege = ArenaSetting[2].BattleFree
     local allTimes = PrivilegeManager.GetPrivilegeNumber(privilege)
     local leftTimes = PrivilegeManager.GetPrivilegeRemainValue(privilege)
-    return leftTimes, allTimes
+    return freeTimes, allTimes
 end
 
 -- 获取竞技场挑战消耗
@@ -39,7 +39,7 @@ end
 function this.GetRankImgByScore(num)
     for k, v in ConfigPairs(rankConfig) do
         if v.ScoreLow<num and v.ScoreUp>=num then
-           return v.RankGrade+1
+           return v.RankGrade+1,v
         end
     end
     return 1