From 99e4dd38eb2ed2f3ead8fac1020dd04db30c1610 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 28 Jul 2020 15:40:28 +0800 Subject: [PATCH] 1 --- server/gameserver/room.cc | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index d055c1b..2acb38d 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -1222,20 +1222,22 @@ void Room::InitAirDrop() { std::list& air_drops = MetaMgr::Instance()->GetAirDrops(); for (auto& air_drop : air_drops) { - xtimer.AddDeadLineTimerAndAttach(SERVER_FRAME_RATE * air_drop.i->time(), - a8::XParams() - .SetSender(this) - .SetParam1(air_drop.i->appear_time()) - .SetParam2(air_drop.i->drop_id()) - .SetParam3(air_drop.i->id()), - [] (const a8::XParams& param) - { - Room* room = (Room*)param.sender.GetUserData(); - if (!room->IsGameOver()) { - room->AirDrop(param.param1, param.param2); - } - }, - &xtimer_attacher_.timer_list_); + if (air_drop.i->id() >= 1 && air_drop.i->id() <= 6) { + xtimer.AddDeadLineTimerAndAttach(SERVER_FRAME_RATE * air_drop.i->time(), + a8::XParams() + .SetSender(this) + .SetParam1(air_drop.i->appear_time()) + .SetParam2(air_drop.i->drop_id()) + .SetParam3(air_drop.i->id()), + [] (const a8::XParams& param) + { + Room* room = (Room*)param.sender.GetUserData(); + if (!room->IsGameOver()) { + room->AirDrop(param.param1, param.param2); + } + }, + &xtimer_attacher_.timer_list_); + } } }