取消组队合并功能

2019-08-31 13:27:41 +08:00 · 2019-08-31 13:27:41 +08:00 · 82bbd8bdbb
commit 82bbd8bdbb
parent f0ee6ebd72
1 changed files with 2 additions and 0 deletions
--- 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);