From 0719cb89c79d750649f390c3dee61f7ccae701b3 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 29 Dec 2023 10:42:18 +0800
Subject: [PATCH] 1

---
 server/gameserver/pbutils.cc | 21 +++++++++++++++++++++
 server/gameserver/room.cc    |  3 +++
 2 files changed, 24 insertions(+)

diff --git a/server/gameserver/pbutils.cc b/server/gameserver/pbutils.cc
index 3e33147c..0a6f770f 100644
--- a/server/gameserver/pbutils.cc
+++ b/server/gameserver/pbutils.cc
@@ -2346,6 +2346,8 @@ int Room::InitWithMobaBattle(long ip_saddr, int socket_handle, std::shared_ptr<c
              [ip_saddr, socket_handle, join_msg, p, new_team] (std::shared_ptr<MobaMember> m) mutable -> bool
              {
                  Player* hum = p->GetRoom()->NewPlayer();
+                 //hum->ip_saddr = ip_saddr;
+                 //hum->socket_handle = socket_handle;
                  hum->room = p->GetRoom();
                  hum->proto_version = join_msg.proto_version();
 #if 0
@@ -2389,6 +2391,14 @@ int Room::InitWithMobaBattle(long ip_saddr, int socket_handle, std::shared_ptr<c
                  PlayerMgr::Instance()->IncAccountNum(join_msg.account_id());
                  RoomMgr::Instance()->OnJoinRoomOk(join_msg, hum);
                  new_team->AddMember(hum);
+#ifdef MYDEBUG
+                 a8::XPrintf("moba init1 uniid:%d team_id:%d side:%d\n",
+                             {
+                              hum->GetUniId(),
+                              hum->GetTeam()->GetTeamId(),
+                              hum->side
+                             });
+#endif
                  return true;
              });
     };
@@ -2405,6 +2415,15 @@ int Room::InitWithMobaBattle(long ip_saddr, int socket_handle, std::shared_ptr<c
                  hum->side = side;
                  hum->born_point->wo_meta = std::get<0>(GetMapMeta()->moba_born_points.at(side - 1));
                  hum->InitMobaRoad();
+#ifdef MYDEBUG
+                 a8::XPrintf("moba init uniid:%d team_id:%d side:%d\n",
+                             {
+                              hum->GetUniId(),
+                              hum->GetTeam()->GetTeamId(),
+                              hum->side
+                             });
+#endif
+                 return true;
              });
         if (side == 1) {
             side = 2;
@@ -2412,12 +2431,14 @@ int Room::InitWithMobaBattle(long ip_saddr, int socket_handle, std::shared_ptr<c
             side = 1;
         }
     }
+    #if 1
     {
         auto hum = GetPlayerByAccountId(msg->account_id());
         if (hum) {
             hum->ReJoin(ip_saddr, socket_handle, msg, p);
         }
     }
+    #endif
 #ifdef MYDEBUG
     a8::XPrintf("InitWithMobaBattle\n", {});
 #endif
diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 277b2b3f..d56ae4a1 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -419,6 +419,9 @@ void Room::ShuaAndroid()
     if (GetGasData().GetGasMode() != GasInactive) {
         return;
     }
+    if (IsMobaModeRoom()) {
+        return;
+    }
     int robot_num = a8::RandEx(map_meta_->refresh_robot_min_num,
                                map_meta_->refresh_robot_max_num);
     int refresh_time = a8::RandEx(map_meta_->refresh_robot_min_time,