merge master

server/gameserver/room.cc

@@ -2950,6 +2950,7 @@ void Room::InitAndroidAI()
             int space = std::get<1>(tuple);
             if (rnd <= space) {
                 hum->SetAiLevel(ai_level);
+                ++ai_num[ai_level];
                 break;
             }
         }
@@ -2958,8 +2959,9 @@ void Room::InitAndroidAI()
     for (auto& pair : accountid_hash_) {
         pair.second->SendDebugMsg
             (
-             a8::Format("ai_num level1:%d level2:%d level3:%d level4:%d level5:%d level6:%d level7:%d level8:%d",
+             a8::Format("room_type:%d ai_num level1:%d level2:%d level3:%d level4:%d level5:%d level6:%d level7:%d level8:%d",
                         {
+                         GetRoomType(),
                          ai_num[0],
                          ai_num[1],
                          ai_num[2],

server/gameserver/roommgr.cc

@@ -64,22 +64,6 @@ static RoomType_e GetHumanRoomType(const cs::CMJoin& msg, int& game_times)
             return RT_NewBrid;
         } else if (game_times == 1) {
             return RT_MidBrid;
-        } else {
-            switch (game_times) {
-            case 2:
-                {
-                    if (msg.team_uuid().empty()) {
-                        return RT_NewBrid;
-                    } else {
-                        return RT_OldBrid1;
-                    }
-                }
-                break;
-            default:
-                {
-                }
-                break;
-            }
         }
     }