From fae243676af086484473154881a9152b96f3abf6 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 23 Jul 2019 17:05:08 +0800 Subject: [PATCH] 1 --- server/gameserver/room.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index 06f6205..bc3dcd7 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -855,7 +855,11 @@ void Room::UpdateGas() NotifyWxVoip(); RoomMgr::Instance()->ActiveRoom(room_uuid); battle_start_frameno_ = frameno; - battle_report_timer_ = xtimer.AddDeadLineTimerAndAttach(kSERVER_FRAME_RATE * 15, + int game_duration = MetaMgr::Instance()->game_duration; + if (App::Instance()->HasFlag(8)) { + game_duration = 15; + } + battle_report_timer_ = xtimer.AddDeadLineTimerAndAttach(kSERVER_FRAME_RATE * game_duration, a8::XParams() .SetSender(this), [] (const a8::XParams& param)