From 3a5cd46128928ee25852e6959f5ebe4e5be72e78 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 30 Jan 2024 21:22:48 +0800
Subject: [PATCH] 1

---
 server/gameserver/custom_battle.cc | 5 +++++
 server/gameserver/custom_battle.h  | 1 +
 server/gameserver/pbutils.cc       | 6 ++++++
 server/gameserver/room.h           | 2 ++
 4 files changed, 14 insertions(+)

diff --git a/server/gameserver/custom_battle.cc b/server/gameserver/custom_battle.cc
index 1d9bff76..6ab86cba 100644
--- a/server/gameserver/custom_battle.cc
+++ b/server/gameserver/custom_battle.cc
@@ -128,6 +128,11 @@ int CustomBattle::GetMemberNum()
     return member_id_hash_.size();
 }
 
+int CustomBattle::GetTeamNum()
+{
+    return uuid_hash_.size();
+}
+
 void CustomBattle::TraverseMemberList(std::function<bool (CustomMember*)> func)
 {
     for (auto& pair : member_id_hash_) {
diff --git a/server/gameserver/custom_battle.h b/server/gameserver/custom_battle.h
index 5decda92..1f1d4f1d 100644
--- a/server/gameserver/custom_battle.h
+++ b/server/gameserver/custom_battle.h
@@ -27,6 +27,7 @@ class CustomBattle
     std::shared_ptr<CustomTeam> GetTeamByTeamUuid(const std::string& team_uuid);
     bool AllIsJoined();
     int GetMemberNum();
+    int GetTeamNum();
     void TraverseMemberList(std::function<bool (CustomMember*)> func);
 
  private:
diff --git a/server/gameserver/pbutils.cc b/server/gameserver/pbutils.cc
index 21c32756..3fa24396 100644
--- a/server/gameserver/pbutils.cc
+++ b/server/gameserver/pbutils.cc
@@ -2701,6 +2701,12 @@ int Room::InitWithMobaBattle(long ip_saddr, int socket_handle, std::shared_ptr<c
     return 0;
 }
 
+int Room::InitWithCustomBattle(long ip_saddr, int socket_handle, std::shared_ptr<cs::CMJoin> msg,
+                               std::shared_ptr<CustomBattle> p)
+{
+
+}
+
 void SyncObject::FillSMSyncPosition(cs::SMSyncPosition& sync_msg)
 {
     if (!c.Get()) {
diff --git a/server/gameserver/room.h b/server/gameserver/room.h
index 849095ea..f5987627 100644
--- a/server/gameserver/room.h
+++ b/server/gameserver/room.h
@@ -286,6 +286,8 @@ public:
     int GenShotUniid() { return ++current_shot_uniid_; }
     int InitWithMobaBattle(long ip_saddr, int socket_handle, std::shared_ptr<cs::CMJoin> msg,
                            std::shared_ptr<MobaBattle> p);
+    int InitWithCustomBattle(long ip_saddr, int socket_handle, std::shared_ptr<cs::CMJoin> msg,
+                             std::shared_ptr<CustomBattle> p);
     void CreateAndroid(int android_num, std::shared_ptr<Team> team = nullptr);
     int GetFullLevelIdx() { return ++curr_full_level_idx_;}
     std::shared_ptr<RoomOb> GetRoomOb();