diff --git a/lua/app/module/battle/controller/battle_base_controller.lua b/lua/app/module/battle/controller/battle_base_controller.lua index 420454fa..a4535af4 100644 --- a/lua/app/module/battle/controller/battle_base_controller.lua +++ b/lua/app/module/battle/controller/battle_base_controller.lua @@ -521,6 +521,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 0b21cfc7..c1a8a8d7 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,11 +172,18 @@ 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 - if DataManager:getRegisterTs() <= self:getConditionDay() then -- 前14天的号,看不到 - return false + if Time:getServerTime() <= DataManager:getRegisterTs() + self:getConditionDay() then -- 前14天的号,看不到 + if self.fightCount > 0 or self.proBounght or self.utralBounght then + -- 兼容已参与的玩家 + else + return false + end end local time = Time:getServerTime() return self.endTime > time and time > self.startTime 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 ccb29cb2..b9d0219a 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)