From 176ba5314f98e93a8c7aab71e95783903bdd07f7 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Wed, 11 Sep 2019 19:19:34 +0800
Subject: [PATCH] 1

---
 server/gameserver/room.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 030e78f..15e7a40 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -930,7 +930,7 @@ void Room::UpdateGas()
                     CreateAndroid(ROOM_MAX_PLAYER_NUM - human_hash_.size());
                     NotifyUiUpdate();
                 }
-                #if 0
+                #if 1
                 CombineTeam();
                 #endif
                 ShuaPlane();