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

1

Browse Source
This commit is contained in:
aozhiwei 2022-08-16 18:58:32 +08:00
parent d3160c1990
commit a25f61ce0d
4 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/gameserver/mapmgr.cc
View File

@ -49,6 +49,9 @@ void MapMgr::UnInit()
void MapMgr::AttachRoom(Room* room, RoomInitInfo& init_info) void MapMgr::AttachRoom(Room* room, RoomInitInfo& init_info)
{ {
#ifdef DEBUG
init_info.init_map_id = 1002;
#endif
MapInstance* map_instance = init_info.init_map_id == 0 ? MapInstance* map_instance = init_info.init_map_id == 0 ?
RandMapInstance(init_info.room_mode) : GetMapInstance(init_info.init_map_id); RandMapInstance(init_info.room_mode) : GetMapInstance(init_info.init_map_id);
if (!map_instance) { if (!map_instance) {

3
server/gameserver/player.cc
View File

@ -1284,6 +1284,9 @@ void Player::PushJoinRoomMsg()
{ {
cs::SMMapInfo notifymsg; cs::SMMapInfo notifymsg;
notifymsg.set_map_id(room->GetMapMeta()->i->map_id()); notifymsg.set_map_id(room->GetMapMeta()->i->map_id());
#ifdef DEBUG
notifymsg.set_map_id(1001);
#endif
notifymsg.set_map_width(room->GetMapMeta()->i->map_width()); notifymsg.set_map_width(room->GetMapMeta()->i->map_width());
notifymsg.set_map_height(room->GetMapMeta()->i->map_height()); notifymsg.set_map_height(room->GetMapMeta()->i->map_height());
//notifymsg.set_room_mode((int)room->GetRoomMode()); //notifymsg.set_room_mode((int)room->GetRoomMode());

16
server/gameserver/room.cc
View File

@ -1221,6 +1221,15 @@ void Room::UpdateGas()
} }
void Room::UpdateGasInactive() void Room::UpdateGasInactive()
{
if (IsPveRoom()) {
UpdateGasInactivePve();
} else {
UpdateGasInactivePvp();
}
}
void Room::UpdateGasInactivePvp()
{ {
if (GetFrameNo() - gas_data_.gas_start_frameno >= GetGasInactiveTime() * SERVER_FRAME_RATE) { if (GetFrameNo() - gas_data_.gas_start_frameno >= GetGasInactiveTime() * SERVER_FRAME_RATE) {
long long begin_tick = a8::XGetTickCount(); long long begin_tick = a8::XGetTickCount();
@ -1281,6 +1290,10 @@ void Room::UpdateGasInactive()
} }
} }
void Room::UpdateGasInactivePve()
{
}
void Room::UpdateGasWaiting() void Room::UpdateGasWaiting()
{ {
if (GetFrameNo() - gas_data_.gas_start_frameno >= if (GetFrameNo() - gas_data_.gas_start_frameno >=
@ -1780,9 +1793,6 @@ void Room::AdjustAirDropPos(MetaData::MapThing* thing_meta, a8::Vec2& box_pos)
void Room::ShuaPlane() void Room::ShuaPlane()
{ {
if (IsPveRoom()) {
return;
}
airline_ = MetaMgr::Instance()->RandAirLine(map_meta_->i->map_id()); airline_ = MetaMgr::Instance()->RandAirLine(map_meta_->i->map_id());
if (!airline_) { if (!airline_) {
A8_ABORT(); A8_ABORT();

2
server/gameserver/room.h
View File

@ -237,6 +237,8 @@ private:
void CreateAndroid(int android_num); void CreateAndroid(int android_num);
void UpdateGas(); void UpdateGas();
void UpdateGasInactive(); void UpdateGasInactive();
void UpdateGasInactivePvp();
void UpdateGasInactivePve();
void UpdateGasWaiting(); void UpdateGasWaiting();
void UpdateGasMoving(); void UpdateGasMoving();
void UpdateGasJump(); void UpdateGasJump();