取消组队合并功能

This commit is contained in:
aozhiwei 2019-08-31 13:27:41 +08:00
parent f0ee6ebd72
commit 82bbd8bdbb

View File

@ -917,7 +917,9 @@ void Room::UpdateGas()
CreateAndroid(ROOM_MAX_PLAYER_NUM - human_hash_.size()); CreateAndroid(ROOM_MAX_PLAYER_NUM - human_hash_.size());
NotifyUiUpdate(); NotifyUiUpdate();
} }
#if 0
CombineTeam(); CombineTeam();
#endif
ShuaPlane(); ShuaPlane();
NotifyWxVoip(); NotifyWxVoip();
RoomMgr::Instance()->ActiveRoom(room_uuid); RoomMgr::Instance()->ActiveRoom(room_uuid);