From 9ee9244bbad62ccdd987dad7e44cce11d91f74e1 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 9 Dec 2020 16:19:40 +0800 Subject: [PATCH] 1 --- server/gameserver/room.cc | 12 ++---------- server/tools/protobuild/metatable.proto | 1 + 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index ab45671..261af09 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -1042,16 +1042,8 @@ void Room::UpdateGasInactive() { if (GetFrameNo() - gas_data_.gas_start_frameno >= GetGasInactiveTime() * SERVER_FRAME_RATE) { gas_data_.gas_mode = GasWaiting; - if (GetRoomMode() == kZombieMode) { - gas_data_.old_area_meta = MetaMgr::Instance()->GetSafeArea(70001); - gas_data_.new_area_meta = MetaMgr::Instance()->GetSafeArea(70002); - } else 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_.old_area_meta = MetaMgr::Instance()->GetSafeArea(map_meta_->i->safearea()); + gas_data_.new_area_meta = MetaMgr::Instance()->GetSafeArea(map_meta_->i->safearea() + 1); 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, diff --git a/server/tools/protobuild/metatable.proto b/server/tools/protobuild/metatable.proto index f6e1e8a..c9488bb 100755 --- a/server/tools/protobuild/metatable.proto +++ b/server/tools/protobuild/metatable.proto @@ -31,6 +31,7 @@ message Map optional int32 player = 8; optional string refresh_robot = 9; optional int32 map_mode = 10; + optional int32 safearea = 11; } message MapThing