From 442197f46cc249f2e43d73228bcd4233932b17d9 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 16 Mar 2023 18:44:04 +0800
Subject: [PATCH] 1

---
 server/gameserver/mt/Param.cc | 1 +
 server/gameserver/mt/Param.h  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/server/gameserver/mt/Param.cc b/server/gameserver/mt/Param.cc
index 3f2bbe30..6a9a3af1 100644
--- a/server/gameserver/mt/Param.cc
+++ b/server/gameserver/mt/Param.cc
@@ -45,6 +45,7 @@ namespace mt
             s_.match_lock_time = 3;
 #endif
             {
+                METAMGR_READ(android_auto_combine_team, 1);
                 METAMGR_READ(level0room_shua_robot_min_time, 5);
                 METAMGR_READ(level0room_shua_robot_max_time, 7);
                 METAMGR_READ(level0room_shua_robot_min_num, 1);
diff --git a/server/gameserver/mt/Param.h b/server/gameserver/mt/Param.h
index d365572a..33ec45e5 100644
--- a/server/gameserver/mt/Param.h
+++ b/server/gameserver/mt/Param.h
@@ -11,6 +11,7 @@ namespace mt
                      "param_name")
     public:
     struct S {
+        int android_auto_combine_team = 1;
         int gas_inactive_time = 10;
         float kill_param = 0.0f;
         float rank_param = 0.0f;