From 5cced8868a89730ed169a264fa64859f2ac2142f Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 16 Mar 2023 16:55:27 +0800
Subject: [PATCH] 1

---
 server/gameserver/battledatacontext.cc | 2 +-
 server/gameserver/room.cc              | 8 ++++++++
 server/gameserver/room.h               | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/server/gameserver/battledatacontext.cc b/server/gameserver/battledatacontext.cc
index cea2f730..bba5f83a 100644
--- a/server/gameserver/battledatacontext.cc
+++ b/server/gameserver/battledatacontext.cc
@@ -370,11 +370,11 @@ void BattleDataContext::ParseResult(a8::XObject& obj)
         match_mode_ = obj.Get("match_mode");
     }
     level_ = obj.HasKey("level") ? obj.Get("level").GetInt() : 1;
+    skin_id_ = obj.HasKey("skin_id") ? obj.Get("skin_id").GetInt() : 0;
     if (obj.HasKey("hero_dto") && obj.At("hero_dto")->IsObject()) {
         hero_dto = obj.At("hero_dto");
         hero_ability_->hero_uniid_ = hero_dto->Get("hero_uniid", "");
         hero_ability_->hero_dto = hero_dto;
-        skin_id_ = hero_dto->HasKey("skin_id") ? hero_dto->Get("skin_id").GetInt() : 0;
         const mt::Hero* meta = mt::Hero::GetById(hero_dto->Get("hero_id", ""));
         if (meta) {
             hero_ability_->hero_meta = meta;
diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 9065a9d5..b916934d 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -1640,6 +1640,14 @@ void Room::CombineTeam()
             }
         }
     } while (++try_count < 20);
+    FillTeam();
+}
+
+void Room::FillTeam()
+{
+    for (auto& pair : accountid_hash_) {
+
+    }
 }
 
 void Room::InitAirDrop()
diff --git a/server/gameserver/room.h b/server/gameserver/room.h
index 5212a271..41e631d3 100644
--- a/server/gameserver/room.h
+++ b/server/gameserver/room.h
@@ -228,6 +228,7 @@ private:
     bool GenSmallCircle();
     void MatchTeam(Human* hum);
     void CombineTeam();
+    void FillTeam();
     void AirDrop(int appear_time, int box_id, int airdrop_id);
     void AdjustAirDropPos(const mt::MapThing* thing_meta, glm::vec3& box_pos);
     void AirRaid(int airraid_id);