From cdebb91c277276ab1ffb1e74483f0b4849f8e07b Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Tue, 28 Sep 2021 14:39:06 +0800
Subject: [PATCH] 1

---
 server/gameserver/matchteam.cc |  4 +++-
 server/gameserver/matchteam.h  |  7 ++++++-
 server/gameserver/room.cc      | 34 +++++++++++++++++++++++++++++++++-
 3 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/server/gameserver/matchteam.cc b/server/gameserver/matchteam.cc
index 7abe171..dc21132 100644
--- a/server/gameserver/matchteam.cc
+++ b/server/gameserver/matchteam.cc
@@ -28,7 +28,7 @@ void RawTeamMember::InitRobot()
     msg.set_account_id(a8::Format("6000_2005_%d", {++robot_idx}));
     {
         std::set<int> refreshed_robot_set;
-        MetaData::Robot* robot_meta = MetaMgr::Instance()->RandRobot(refreshed_robot_set);
+        robot_meta = MetaMgr::Instance()->RandRobot(refreshed_robot_set);
         if (robot_meta) {
             msg.set_hero_id(robot_meta->i->hero_id());
             msg.set_name(robot_meta->i->name());
@@ -37,6 +37,8 @@ void RawTeamMember::InitRobot()
                 skin->set_skin_id(robot_meta->skin_id[0]);
                 skin->set_skin_lv(1);
             }
+        } else {
+            abort();
         }
     }
 }
diff --git a/server/gameserver/matchteam.h b/server/gameserver/matchteam.h
index d148577..5c8ca2c 100644
--- a/server/gameserver/matchteam.h
+++ b/server/gameserver/matchteam.h
@@ -22,6 +22,11 @@ namespace cs
     class CMReconnect;
 }
 
+namespace MetaData
+{
+    struct Robot;
+}
+
 struct RawTeamMember
 {
     class MatchTeam* team = nullptr;
@@ -31,11 +36,11 @@ struct RawTeamMember
     bool is_robot = false;
     bool is_leader = false;
     int state = kMatchReadying;
+    MetaData::Robot* robot_meta = nullptr;
     void FillMFMatchTeamMember(cs::MFMatchTeamMember* msg);
     void InitRobot();
 };
 
-
 struct timer_list;
 class MatchTeam
 {
diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index a871183..fa68194 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -3880,7 +3880,38 @@ void Room::AddTeam(class MatchTeam* team)
     for (auto& member : team->GetCurrMembers()) {
         cs::CMJoin& msg = member->msg;
         if (member->is_robot) {
-
+            MetaData::Robot* robot_meta = member->robot_meta;
+            Android* hum = EntityFactory::Instance()->MakeAndroid(AllocUniid());
+            hum->name = robot_meta->i->name();
+            hum->meta = MetaMgr::Instance()->GetPlayer(robot_meta->i->hero_id());
+            hum->robot_meta = robot_meta;
+            hum->born_point = AllocBornPoint(hum);
+            if (!hum->born_point) {
+                hum->SetPos(GetDefaultBornPoint());
+            } else {
+                hum->SetPos(hum->born_point->RandPoint());
+            }
+            a8::Vec2 attack_dir = hum->GetPos();
+            attack_dir.Normalize();
+            attack_dir.Rotate(a8::RandAngle());
+            hum->SetAttackDir(attack_dir);
+            hum->SetMoveDir(attack_dir);
+            hum->room = this;
+            hum->Initialize();
+            AddToEntityHash(hum);
+            AddToHumanHash(hum);
+            MatchTeam(hum);
+            ++alive_count_;
+            alive_count_chged_frameno_ = GetFrameNo();
+            ++PerfMonitor::Instance()->alive_count;
+            refreshed_robot_set_.insert(robot_meta->i->id());
+            {
+                AddToAliveHumanHash(hum);
+                AddToMoveableHash(hum);
+                grid_service->AddCreature(hum);
+                hum->FindLocation();
+                hum->RefreshView();
+            }
         } else {
             Player* hum = NewPlayer();
             hum->ProcPreSettlementInfo(member->msg.pre_settlement_info());
@@ -3902,4 +3933,5 @@ void Room::AddTeam(class MatchTeam* team)
             PlayerMgr::Instance()->IncAccountNum(msg.account_id());
         }
     }
+    NotifyUiUpdate();
 }