From 2ce7ddc3dd509bb991c3df3039397cd103cf72cb Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 9 Jul 2020 10:19:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BD=8D=EF=BD=89=EF=BD=8E?= =?UTF-8?q?=EF=BD=89=E6=88=BF=E9=97=B4=E6=AF=92=E5=9C=88=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/gameserver/room.cc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index 27abbcd..0a5245d 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -882,8 +882,14 @@ void Room::UpdateGasInactive() { if (GetFrameNo() - gas_data_.gas_start_frameno >= GetGasInactiveTime() * SERVER_FRAME_RATE) { gas_data_.gas_mode = GasWaiting; - gas_data_.old_area_meta = MetaMgr::Instance()->GetSafeArea(30001); - gas_data_.new_area_meta = MetaMgr::Instance()->GetSafeArea(30002); + if (IsMiniRoom()) { + gas_data_.old_area_meta = MetaMgr::Instance()->GetSafeArea(60001); + gas_data_.new_area_meta = MetaMgr::Instance()->GetSafeArea(60002); + } else { + gas_data_.old_area_meta = MetaMgr::Instance()->GetSafeArea(30001); + gas_data_.new_area_meta = MetaMgr::Instance()->GetSafeArea(30002); + } + gas_data_.gas_progress = gas_data_.old_area_meta->i->rad(); gas_data_.gas_start_frameno = GetFrameNo(); gas_data_.pos_old = a8::Vec2(map_meta_->i->map_width() / 2.0f,