From ed65ae452bb87589df8608f73472f72a7abe0f3a Mon Sep 17 00:00:00 2001
From: xiekaidong <kd_xie@juzugame.com>
Date: Wed, 13 Sep 2023 14:55:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E4=BA=9B=E4=BC=98=E5=8C=96=E5=92=8C?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=A8=A1=E5=BC=8F=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../battle/controller/battle_base_controller.lua       |  1 +
 .../battle/controller/battle_controller_boss_rush.lua  |  2 ++
 .../activity/act_boss_rush/cell/rank_reward_cell.lua   |  3 +++
 .../activity/act_boss_rush/act_boss_rush_data.lua      |  3 +++
 lua/app/userdata/activity/hero_fund/hero_fund_data.lua |  3 +++
 lua/app/userdata/battle/battle_base_data.lua           | 10 ++++++++++
 6 files changed, 22 insertions(+)

diff --git a/lua/app/module/battle/controller/battle_base_controller.lua b/lua/app/module/battle/controller/battle_base_controller.lua
index 9a38032f..c0f79e38 100644
--- a/lua/app/module/battle/controller/battle_base_controller.lua
+++ b/lua/app/module/battle/controller/battle_base_controller.lua
@@ -509,6 +509,7 @@ function BattleBaseController:init(params, snapshot)
     self.delayEffectTextList = {}
 	self.delayEffectTextCount = 0
     self.time = 0
+    self.battleData:setTimeScaleBase(nil) -- 还原
     if snapshot then -- 处理战斗快照
         self:dealSnapshotBattleBaseInfo(snapshot)
         self.battleData:init(params, snapshot.battledataShopInfo)
diff --git a/lua/app/module/battle/controller/battle_controller_boss_rush.lua b/lua/app/module/battle/controller/battle_controller_boss_rush.lua
index 22fb47ad..e502c8d7 100644
--- a/lua/app/module/battle/controller/battle_controller_boss_rush.lua
+++ b/lua/app/module/battle/controller/battle_controller_boss_rush.lua
@@ -90,6 +90,8 @@ function BattleControllerBossRush:initOther()
     self.monsterAtkAddition3 = GFunc.getConstIntValue("activity_boss_rush_atk_add_3")
     self.monsterHpAddition3 = GFunc.getConstIntValue("activity_boss_rush_hp_add_3")
     self.battleData:setMaxBattleLv(MAX_LV)
+
+    self.battleData:setTimeScaleBase(1.5, true) -- 设置倍速
 end
 
 -- 怪物攻击力加成
diff --git a/lua/app/ui/activity/act_boss_rush/cell/rank_reward_cell.lua b/lua/app/ui/activity/act_boss_rush/cell/rank_reward_cell.lua
index 27d5a6a8..d1a74a90 100644
--- a/lua/app/ui/activity/act_boss_rush/cell/rank_reward_cell.lua
+++ b/lua/app/ui/activity/act_boss_rush/cell/rank_reward_cell.lua
@@ -9,6 +9,9 @@ function RankRewardcell:refresh(ranking1, ranking2, rewards, totalIndex)
     else
         rankStr = rankStr .. "-"
     end
+    if ranking1 == ranking2 then
+        rankStr = ranking1
+    end
     if self:getIndex() == totalIndex then
         rankStr = ranking1 .. "+"
     end
diff --git a/lua/app/userdata/activity/act_boss_rush/act_boss_rush_data.lua b/lua/app/userdata/activity/act_boss_rush/act_boss_rush_data.lua
index df38e24c..c9f81ce0 100644
--- a/lua/app/userdata/activity/act_boss_rush/act_boss_rush_data.lua
+++ b/lua/app/userdata/activity/act_boss_rush/act_boss_rush_data.lua
@@ -172,6 +172,9 @@ function ActBossRushData:getConditionDay()
 end
 
 function ActBossRushData:getIsOpen()
+    if GFunc.isShenhe() then
+        return false
+    end
     if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.ACTIVITY, true) then
         return false
     end
diff --git a/lua/app/userdata/activity/hero_fund/hero_fund_data.lua b/lua/app/userdata/activity/hero_fund/hero_fund_data.lua
index acda8e9d..2f99f456 100644
--- a/lua/app/userdata/activity/hero_fund/hero_fund_data.lua
+++ b/lua/app/userdata/activity/hero_fund/hero_fund_data.lua
@@ -136,6 +136,9 @@ function HeroFundData:setDirty()
 end
 
 function HeroFundData:getIsOpen()
+    if GFunc.isShenhe() then
+        return false
+    end
     if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.SEVEN_DAY, true) then
         return false
     end
diff --git a/lua/app/userdata/battle/battle_base_data.lua b/lua/app/userdata/battle/battle_base_data.lua
index ae1d0816..e5047187 100644
--- a/lua/app/userdata/battle/battle_base_data.lua
+++ b/lua/app/userdata/battle/battle_base_data.lua
@@ -24,8 +24,18 @@ function BattleBaseData:getRowCount()
 end
 
 function BattleBaseData:getTimeScaleBase()
+    if self.customTimeScaleBase then
+        return self.customTimeScaleBase
+    end
     return 1
 end
+
+function BattleBaseData:setTimeScaleBase(timeScale, needResetTimeScale)
+    self.customTimeScaleBase = timeScale
+    if needResetTimeScale then
+        self.timeScale = BattleConst.TIME_SCALE.LEVEL_1 * self.customTimeScaleBase
+    end
+end
 ---------------------------------end按需重写的方法-------------------------------
 
 function BattleBaseData:init(params, snapInfo)