From a7aa915569677232a9158a7db18ccf6b9dfa8cd6 Mon Sep 17 00:00:00 2001
From: Fang <ky_fang@juzugame.com>
Date: Tue, 4 Jul 2023 15:24:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E9=80=94=E9=80=80=E5=87=BA=E4=B8=8D?=
 =?UTF-8?q?=E9=87=8D=E7=BD=AE=E5=AF=B9=E6=89=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lua/app/module/arena/arena_manager.lua |  2 +-
 lua/app/userdata/arena/arena_data.lua  | 20 ++++++++------------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/lua/app/module/arena/arena_manager.lua b/lua/app/module/arena/arena_manager.lua
index 2e4647e1..56933875 100644
--- a/lua/app/module/arena/arena_manager.lua
+++ b/lua/app/module/arena/arena_manager.lua
@@ -115,7 +115,7 @@ function ArenaManager:rspSettlement(result)
 
         -- 异常数据判断处理
         local curScore = DataManager.ArenaData:getScore()
-        local minScore = DataManager.ArenaData:getGradingMinScore()
+        local minScore = DataManager.ArenaData:getGradingMinScore(curScore)
         if curScore + result.settlement.incr_score < minScore then
             result.settlement.incr_score = minScore - curScore
         end
diff --git a/lua/app/userdata/arena/arena_data.lua b/lua/app/userdata/arena/arena_data.lua
index 6ac0abe5..9bda8919 100644
--- a/lua/app/userdata/arena/arena_data.lua
+++ b/lua/app/userdata/arena/arena_data.lua
@@ -448,19 +448,15 @@ end
 
 -- 结算战斗数据
 function ArenaData:onBattleResultReceived(settlement)
-    self.matchInfo = nil
-
-    if settlement then
-        -- 战斗记录改变
-        if self.recentBattle == nil then
-            self.recentBattle = {}
-        end
-        table.remove(self.recentBattle, #self.recentBattle)
-        table.insert(self.recentBattle, 1, settlement)
-        -- 积分改变
-        self.score = self.score + settlement.incr_score
-        self.curGradingId = self:getGradingIdFromScore(self.score)
+    -- 战斗记录改变
+    if self.recentBattle == nil then
+        self.recentBattle = {}
     end
+    table.remove(self.recentBattle, #self.recentBattle)
+    table.insert(self.recentBattle, 1, settlement)
+    -- 积分改变
+    self.score = self.score + settlement.incr_score
+    self.curGradingId = self:getGradingIdFromScore(self.score)
 
     self:setDirty()
 end