From a92ceb5650b71ff7593e67e8bf597fb55cc86cc3 Mon Sep 17 00:00:00 2001
From: Fang <ky_fang@juzugame.com>
Date: Fri, 8 Sep 2023 10:01:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=B9=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lua/app/ui/battle/battle_result_ui.lua                    | 8 +++++---
 .../userdata/activity/fourteen_day/fourteen_day_data.lua  | 4 ++--
 lua/app/userdata/arena/arena_data.lua                     | 8 +++++---
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/lua/app/ui/battle/battle_result_ui.lua b/lua/app/ui/battle/battle_result_ui.lua
index 35080232..c5453b93 100644
--- a/lua/app/ui/battle/battle_result_ui.lua
+++ b/lua/app/ui/battle/battle_result_ui.lua
@@ -331,9 +331,11 @@ function BattleResultUI:refreshArenaGradingSpine(gradingId, isUp)
 
     if self.arenaSpine then
         self.arenaSpine:playAnimComplete("vanish", false, false, function()
-            self.arenaSpine:destroy()
-		    self.arenaSpine = nil
-            self:refreshArenaGradingSpine(gradingId, isUp)
+            if self.arenaSpine then
+                self.arenaSpine:destroy()
+                self.arenaSpine = nil
+                self:refreshArenaGradingSpine(gradingId, isUp)
+            end
         end)
     else
         SpineManager:loadUISpineWidgetAsync(DataManager.ArenaData:getGradingIconName(gradingId).."_spine", self.arenaSpineRoot, function(spineObject)
diff --git a/lua/app/userdata/activity/fourteen_day/fourteen_day_data.lua b/lua/app/userdata/activity/fourteen_day/fourteen_day_data.lua
index 654e9b01..bfe290a9 100644
--- a/lua/app/userdata/activity/fourteen_day/fourteen_day_data.lua
+++ b/lua/app/userdata/activity/fourteen_day/fourteen_day_data.lua
@@ -317,13 +317,13 @@ end
 -- 获取阶段子任务id列表
 function FourteenDayData:getStageSubTaskIdsSort(stage)
     local taskMap = self:getTaskMap()
+    local result = {}
     if taskMap[stage] == nil or taskMap[stage].task == nil then
-        return nil
+        return result
     end
 
     local canGet = {}
     local unfinish = {}
-    local result = {}
     for index, id in ipairs(taskMap[stage].task) do
         if self:isTaskFinish(id) then
             -- 已完成
diff --git a/lua/app/userdata/arena/arena_data.lua b/lua/app/userdata/arena/arena_data.lua
index 4acb7ca1..45f5a7cc 100644
--- a/lua/app/userdata/arena/arena_data.lua
+++ b/lua/app/userdata/arena/arena_data.lua
@@ -190,9 +190,11 @@ end
 -- 获取当前赛季最低段位积分
 function ArenaData:getSeasonGradingMinScore()
     local result = 0
-    for id, data in pairs(self.cfgRank) do
-        if result == 0 or result > data.score then
-            result = data.score
+    if self.cfgRank then
+        for id, data in pairs(self.cfgRank) do
+            if result == 0 or result > data.score then
+                result = data.score
+            end
         end
     end
     return result