diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc index 1e9788c..c4082e0 100644 --- a/server/gameserver/room.cc +++ b/server/gameserver/room.cc @@ -917,7 +917,9 @@ void Room::UpdateGas() CreateAndroid(ROOM_MAX_PLAYER_NUM - human_hash_.size()); NotifyUiUpdate(); } + #if 0 CombineTeam(); + #endif ShuaPlane(); NotifyWxVoip(); RoomMgr::Instance()->ActiveRoom(room_uuid);