From 9e75ea15c3f59d7896ac4c5b25debaa00c24b847 Mon Sep 17 00:00:00 2001
From: xiekaidong <kd_xie@juzugame.com>
Date: Tue, 5 Sep 2023 15:24:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=8D=93=E8=BF=94=E5=9B=9E=E9=94=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../act_boss_rush/act_boss_rush_fund_ui.lua        |  4 ++++
 .../act_boss_rush/act_boss_rush_pop_ui.lua         |  4 ++++
 .../act_boss_rush/act_boss_rush_rank_ui.lua        | 14 +++++++++++++-
 .../act_boss_rush/act_boss_rush_shop_ui.lua        |  4 ++++
 .../ui/activity/act_boss_rush/act_boss_rush_ui.lua |  4 ++++
 lua/app/ui/activity/hero_fund/hero_fund_ui.lua     |  4 ++++
 lua/app/ui/common/common_exchange_ui.lua           |  4 ++++
 7 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/lua/app/ui/activity/act_boss_rush/act_boss_rush_fund_ui.lua b/lua/app/ui/activity/act_boss_rush/act_boss_rush_fund_ui.lua
index 16cbf83b..36c818a9 100644
--- a/lua/app/ui/activity/act_boss_rush/act_boss_rush_fund_ui.lua
+++ b/lua/app/ui/activity/act_boss_rush/act_boss_rush_fund_ui.lua
@@ -3,6 +3,10 @@ local ActBossRushFundUI = class("ActBossRushFundUI", BaseUI)
 local FUND_CELL = "app/ui/activity/act_boss_rush/cell/fund_cell"
 local BTN_ICON = {"common_btn_green_3", "act_bossrush_board_1"}
 
+function ActBossRushFundUI:onPressBackspace()
+	self:closeUI()
+end
+
 function ActBossRushFundUI:isFullScreen()
     return false
 end
diff --git a/lua/app/ui/activity/act_boss_rush/act_boss_rush_pop_ui.lua b/lua/app/ui/activity/act_boss_rush/act_boss_rush_pop_ui.lua
index c6280e3e..f82c5ec9 100644
--- a/lua/app/ui/activity/act_boss_rush/act_boss_rush_pop_ui.lua
+++ b/lua/app/ui/activity/act_boss_rush/act_boss_rush_pop_ui.lua
@@ -1,5 +1,9 @@
 local ActBossRushPopUI = class("ActBossRushPopUI", BaseUI)
 
+function ActBossRushPopUI:onPressBackspace()
+	self:closeUI()
+end
+
 function ActBossRushPopUI:isFullScreen()
     return false
 end
diff --git a/lua/app/ui/activity/act_boss_rush/act_boss_rush_rank_ui.lua b/lua/app/ui/activity/act_boss_rush/act_boss_rush_rank_ui.lua
index 8f5b4aa2..9ad40d6b 100644
--- a/lua/app/ui/activity/act_boss_rush/act_boss_rush_rank_ui.lua
+++ b/lua/app/ui/activity/act_boss_rush/act_boss_rush_rank_ui.lua
@@ -18,6 +18,10 @@ local PAGE_TX = {
     [PAGE_TYPE.REWARD] = I18N.GlobalConst.ACT_BOSS_RUSH_DESC_22,
 }
 
+function ActBossRushRankUI:onPressBackspace()
+	self:closeUI()
+end
+
 function ActBossRushRankUI:isFullScreen()
     return false
 end
@@ -226,7 +230,10 @@ function ActBossRushRankUI:refreshMyRankInfo()
     local info = DataManager.ActBossRushData:getLastSelfInfo()
     local canGot = DataManager.ActBossRushData:canGetRankReward()
 
-    if self.curPage == PAGE_TYPE.TODAY or not canGot then
+    if self.curPage == PAGE_TYPE.TODAY then
+        info = DataManager.ActBossRushData:getCurRankSelfInfo()
+    end
+    if self.curPage == PAGE_TYPE.REWARD and not canGot then
         info = DataManager.ActBossRushData:getCurRankSelfInfo()
     end
     local rank = info and info.rank or 0
@@ -275,6 +282,11 @@ function ActBossRushRankUI:refreshMyRankInfo()
         for index, cell in ipairs(self.selfRewardCells) do
             cell:getBaseObject():setActive(false)
         end
+        if self.curPage == PAGE_TYPE.LAST_DAY then
+            descObj:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_20))
+        else
+            descObj:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_BOSS_RUSH_DESC_21))
+        end
     else
         imgWave:setVisible(false)
         imgRound:setVisible(false)
diff --git a/lua/app/ui/activity/act_boss_rush/act_boss_rush_shop_ui.lua b/lua/app/ui/activity/act_boss_rush/act_boss_rush_shop_ui.lua
index 3c78fe2a..90ebff49 100644
--- a/lua/app/ui/activity/act_boss_rush/act_boss_rush_shop_ui.lua
+++ b/lua/app/ui/activity/act_boss_rush/act_boss_rush_shop_ui.lua
@@ -2,6 +2,10 @@ local ActBossRushShopUI = class("ActBossRushShopUI", BaseUI)
 
 local SHOP_CELL = "app/ui/activity/act_boss_rush/cell/shop_cell"
 
+function ActBossRushShopUI:onPressBackspace()
+	self:closeUI()
+end
+
 function ActBossRushShopUI:getPrefabPath()
     return "assets/prefabs/ui/activity/act_boss_rush/act_boss_rush_shop_ui.prefab"
 end
diff --git a/lua/app/ui/activity/act_boss_rush/act_boss_rush_ui.lua b/lua/app/ui/activity/act_boss_rush/act_boss_rush_ui.lua
index 8704cc5a..9b9890e1 100644
--- a/lua/app/ui/activity/act_boss_rush/act_boss_rush_ui.lua
+++ b/lua/app/ui/activity/act_boss_rush/act_boss_rush_ui.lua
@@ -6,6 +6,10 @@ function ActBossRushUI:getPrefabPath()
     return "assets/prefabs/ui/activity/act_boss_rush/act_boss_rush_ui.prefab"
 end
 
+function ActBossRushUI:onPressBackspace()
+	self:closeUI()
+end
+
 function ActBossRushUI:getCurrencyParams()
     if self.currencyParams == nil then
         self.currencyParams = {
diff --git a/lua/app/ui/activity/hero_fund/hero_fund_ui.lua b/lua/app/ui/activity/hero_fund/hero_fund_ui.lua
index 741b2b75..5ed398f2 100644
--- a/lua/app/ui/activity/hero_fund/hero_fund_ui.lua
+++ b/lua/app/ui/activity/hero_fund/hero_fund_ui.lua
@@ -3,6 +3,10 @@ local HeroFundUI = class("HeroFundUI", BaseUI)
 local FUND_CELL = "app/ui/activity/hero_fund/cell/fund_cell"
 local BTN_ICON = {"common_btn_green_3", "act_herofund_board_2"}
 
+function HeroFundUI:onPressBackspace()
+	self:closeUI()
+end
+
 function HeroFundUI:isFullScreen()
     return false
 end
diff --git a/lua/app/ui/common/common_exchange_ui.lua b/lua/app/ui/common/common_exchange_ui.lua
index c43628c6..2db735ce 100644
--- a/lua/app/ui/common/common_exchange_ui.lua
+++ b/lua/app/ui/common/common_exchange_ui.lua
@@ -1,5 +1,9 @@
 local CommonExchangeUI = class("CommonExchangeUI", BaseUI)
 
+function CommonExchangeUI:onPressBackspace()
+	self:closeUI()
+end
+
 function CommonExchangeUI:isFullScreen()
     return false
 end