From a965005f7debb33f3301e5f2cd825ae56f5b7504 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 26 Mar 2024 11:22:02 +0800 Subject: [PATCH] 1 --- server/gameserver/custom_battle.cc | 3 ++- server/gameserver/mt/Param.cc | 2 ++ server/gameserver/mt/Param.h | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/server/gameserver/custom_battle.cc b/server/gameserver/custom_battle.cc index ce7cbb6d..8c94db20 100644 --- a/server/gameserver/custom_battle.cc +++ b/server/gameserver/custom_battle.cc @@ -322,7 +322,8 @@ void CustomBattle::OnEnter(std::shared_ptr join_msg, long ip_saddr, } f8::Timer::Instance()->SetTimeoutEx ( - 1000 * 3, + a8::RandEx(mt::Param::s().battle_auto_ready_min_time, + mt::Param::s().battle_auto_ready_max_time) * 1000, [] (int event, const a8::Args* args) { if (a8::TIMER_EXEC_EVENT == event) { diff --git a/server/gameserver/mt/Param.cc b/server/gameserver/mt/Param.cc index 2703cd68..3324895e 100644 --- a/server/gameserver/mt/Param.cc +++ b/server/gameserver/mt/Param.cc @@ -91,6 +91,8 @@ namespace mt s_.nature_recover_hp_interval = a8::XValue(GetStringParam("nature_recover_hp_interval1", "1")); s_.nature_recover_hp_rate = a8::XValue(GetStringParam("nature_recover_hp_rate", "0.1")).GetDouble(); #endif + s_.battle_auto_ready_min_time = GetIntParam("battle_auto_ready_min_time", 5); + s_.battle_auto_ready_max_time = GetIntParam("battle_auto_ready_max_time", 8); #ifdef MYDEBUG s_.match_team_time = 6; s_.match_robot_time = 5; diff --git a/server/gameserver/mt/Param.h b/server/gameserver/mt/Param.h index d7f8cf43..69ed3a19 100644 --- a/server/gameserver/mt/Param.h +++ b/server/gameserver/mt/Param.h @@ -145,6 +145,9 @@ namespace mt float battle_gain_exp_rate_killer = 0; float battle_gain_exp_rate_teammate = 0; + int battle_auto_ready_min_time = 0; + int battle_auto_ready_max_time = 0; + std::vector block_effect_range; std::vector crit_effect_range;