From 7912b93911885db5807ea95363669ed89a5794dc Mon Sep 17 00:00:00 2001
From: Fang <ky_fang@juzugame.com>
Date: Sat, 7 Oct 2023 17:41:58 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=A6=E6=A0=87=E8=B5=9B=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lua/app/ui/activity/tourn_arena/tourn_arena_rank_comp.lua | 3 ++-
 lua/app/ui/activity/tourn_arena/tourn_arena_ui.lua        | 1 +
 lua/app/ui/activity/tourn_wave/tourn_wave_rank_comp.lua   | 3 ++-
 lua/app/ui/activity/tourn_wave/tourn_wave_ui.lua          | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lua/app/ui/activity/tourn_arena/tourn_arena_rank_comp.lua b/lua/app/ui/activity/tourn_arena/tourn_arena_rank_comp.lua
index 2f58403c..1bfe146a 100644
--- a/lua/app/ui/activity/tourn_arena/tourn_arena_rank_comp.lua
+++ b/lua/app/ui/activity/tourn_arena/tourn_arena_rank_comp.lua
@@ -46,7 +46,6 @@ function TournArenaRankComp:init()
     self.txCur:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_TOURN_WAVE_BTN_1))
     self.txLast:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_TOURN_WAVE_BTN_2))
     self.txReward:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_TOURN_WAVE_BTN_3))
-    self:refreshCountdown()
 
 	self.listRankComp:addInitCallback(function()
 		return "app/ui/activity/tourn_arena/cell/tourn_arena_rank_cell"
@@ -108,6 +107,7 @@ function TournArenaRankComp:refresh(showType)
         self:showRankReward()
         self:showSelfRank(curStep)
     end
+    self:refreshCountdown()
 end
 
 -- 展示自己排名
@@ -192,6 +192,7 @@ function TournArenaRankComp:refreshCountdown()
         if time >= 0 then
             self.txCountdown:setText(str .. Time:formatNumTimeStr(time))
         else
+            self.baseObject:unscheduleGlobal(self.countdownSid)
             if self.showType == SHOW_TYPE.CUR_RANK then
                 ModuleManager.TournArenaManager:reqRankList(DataManager.TournArenaData:getCurRankStep())
             elseif self.showType == SHOW_TYPE.LAST_RANK then
diff --git a/lua/app/ui/activity/tourn_arena/tourn_arena_ui.lua b/lua/app/ui/activity/tourn_arena/tourn_arena_ui.lua
index af674803..9e15640f 100644
--- a/lua/app/ui/activity/tourn_arena/tourn_arena_ui.lua
+++ b/lua/app/ui/activity/tourn_arena/tourn_arena_ui.lua
@@ -100,6 +100,7 @@ function TournArenaUI:onLoadRootComplete()
     self:bind(DataManager.TournArenaData, "isDirty", function()
         -- 检查更新数据
         if DataManager.TournArenaData:getIsInReset() and self.panelType == GConst.TournArenaConst.PANEL_TYPE.RANK then
+            ModuleManager.TournArenaManager:reqActData()
             self:onRefresh()
         else
             self:refreshRedPoint()
diff --git a/lua/app/ui/activity/tourn_wave/tourn_wave_rank_comp.lua b/lua/app/ui/activity/tourn_wave/tourn_wave_rank_comp.lua
index 8a03e04b..5d1b2e05 100644
--- a/lua/app/ui/activity/tourn_wave/tourn_wave_rank_comp.lua
+++ b/lua/app/ui/activity/tourn_wave/tourn_wave_rank_comp.lua
@@ -46,7 +46,6 @@ function TournWaveRankComp:init()
     self.txCur:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_TOURN_WAVE_BTN_1))
     self.txLast:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_TOURN_WAVE_BTN_2))
     self.txReward:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_TOURN_WAVE_BTN_3))
-    self:refreshCountdown()
 
 	self.listRankComp:addInitCallback(function()
 		return "app/ui/activity/tourn_wave/cell/tourn_wave_rank_cell"
@@ -108,6 +107,7 @@ function TournWaveRankComp:refresh(showType)
         self:showRankReward()
         self:showSelfRank(curStep)
     end
+    self:refreshCountdown()
 end
 
 -- 展示自己排名
@@ -192,6 +192,7 @@ function TournWaveRankComp:refreshCountdown()
         if time >= 0 then
             self.txCountdown:setText(str .. Time:formatNumTimeStr(time))
         else
+            self.baseObject:unscheduleGlobal(self.countdownSid)
             if self.showType == SHOW_TYPE.CUR_RANK then
                 ModuleManager.TournWaveManager:reqRankList(DataManager.TournWaveData:getCurRankStep())
             elseif self.showType == SHOW_TYPE.LAST_RANK then
diff --git a/lua/app/ui/activity/tourn_wave/tourn_wave_ui.lua b/lua/app/ui/activity/tourn_wave/tourn_wave_ui.lua
index 2b4b39c2..90381114 100644
--- a/lua/app/ui/activity/tourn_wave/tourn_wave_ui.lua
+++ b/lua/app/ui/activity/tourn_wave/tourn_wave_ui.lua
@@ -91,6 +91,7 @@ function TournWaveUI:onLoadRootComplete()
     self:bind(DataManager.TournWaveData, "isDirty", function()
         -- 检查更新数据
         if DataManager.TournWaveData:getIsInReset() and self.panelType == GConst.TournWaveConst.PANEL_TYPE.RANK then
+            ModuleManager.TournWaveManager:reqActData()
             self:onRefresh()
         else
             self:refreshRedPoint()