server/game2005
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2020-12-09 16:19:40 +08:00
parent 85a76df9e7
commit 9ee9244bba
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/gameserver/room.cc
View File

@ -1042,16 +1042,8 @@ void Room::UpdateGasInactive()
{ {
if (GetFrameNo() - gas_data_.gas_start_frameno >= GetGasInactiveTime() * SERVER_FRAME_RATE) { if (GetFrameNo() - gas_data_.gas_start_frameno >= GetGasInactiveTime() * SERVER_FRAME_RATE) {
gas_data_.gas_mode = GasWaiting; gas_data_.gas_mode = GasWaiting;
if (GetRoomMode() == kZombieMode) { gas_data_.old_area_meta = MetaMgr::Instance()->GetSafeArea(map_meta_->i->safearea());
gas_data_.old_area_meta = MetaMgr::Instance()->GetSafeArea(70001); gas_data_.new_area_meta = MetaMgr::Instance()->GetSafeArea(map_meta_->i->safearea() + 1);
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_.gas_progress = gas_data_.old_area_meta->i->rad(); gas_data_.gas_progress = gas_data_.old_area_meta->i->rad();
gas_data_.gas_start_frameno = GetFrameNo(); gas_data_.gas_start_frameno = GetFrameNo();
gas_data_.pos_old = a8::Vec2(map_meta_->i->map_width() / 2.0f, gas_data_.pos_old = a8::Vec2(map_meta_->i->map_width() / 2.0f,

1
server/tools/protobuild/metatable.proto
View File

@ -31,6 +31,7 @@ message Map
optional int32 player = 8; optional int32 player = 8;
optional string refresh_robot = 9; optional string refresh_robot = 9;
optional int32 map_mode = 10; optional int32 map_mode = 10;
optional int32 safearea = 11;
} }
message MapThing message MapThing