From ca9b5476867194befe5b1ba3d3d2da1e58993166 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 28 Dec 2023 14:59:59 +0800
Subject: [PATCH] 1

---
 server/gameserver/mobabattle.h | 25 +++++++++++++++++++++++++
 server/gameserver/pbutils.cc   |  8 ++++----
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/server/gameserver/mobabattle.h b/server/gameserver/mobabattle.h
index 75fb4784..8b410fab 100644
--- a/server/gameserver/mobabattle.h
+++ b/server/gameserver/mobabattle.h
@@ -3,6 +3,31 @@
 class Room;
 class MobaTeam;
 class MobaMember;
+class Player;
+struct BattleDataContext;
+
+class MobaMember
+{
+ public:
+
+    void Join(Player* hum);
+    MobaTeam* GetTeam() { return team_; }
+    bool IsJoined() { return joined_; }
+    int GetJoinTime() { return join_time_; }
+    bool IsView();
+    const std::string& GetAccountId() { return account_id_; }
+    const std::string& GetSessionId() { return session_id_; }
+    std::shared_ptr<BattleDataContext>& GetNetData() { return battle_context_; };
+
+ private:
+    MobaTeam *team_ = nullptr;
+    bool joined_ = false;
+    int join_time_ = 0;
+    std::string account_id_;
+    std::string session_id_;
+    std::shared_ptr<BattleDataContext> battle_context_;
+    friend class MobaBattle;
+};
 
 class MobaTeam
 {
diff --git a/server/gameserver/pbutils.cc b/server/gameserver/pbutils.cc
index 48b757d9..8ea3233f 100644
--- a/server/gameserver/pbutils.cc
+++ b/server/gameserver/pbutils.cc
@@ -2289,9 +2289,9 @@ int Room::InitWithMobaBattle(long ip_saddr, int socket_handle, std::shared_ptr<c
 #if 0
                  hum->hero_uniid = a8::XValue(msg.hero_uniid());
 #endif
-                 //hum->battle_uuid = member->GetNetData()->battle_uuid;
-                 //hum->is_valid_battle = member->GetNetData()->is_valid_battle;
-                 //hum->payload = member->GetNetData()->payload;
+                 hum->battle_uuid = m->GetNetData()->battle_uuid;
+                 hum->is_valid_battle = m->GetNetData()->is_valid_battle;
+                 hum->payload = m->GetNetData()->payload;
                  //msg.set_session_id(member->GetSessionId());
                  //msg.set_team_uuid(team->GetTeamUuid());
                  PlayerMgr::Instance()->
@@ -2304,7 +2304,7 @@ int Room::InitWithMobaBattle(long ip_saddr, int socket_handle, std::shared_ptr<c
                  if (!hum->meta) {
                      hum->meta = mt::Param::s().human_meta;
                  }
-                 //hum->SetBattleContext(member->GetNetData());
+                 hum->SetBattleContext(m->GetNetData());
                  hum->GetBattleContext()->Init(hum);
                  {
                      long long hero_uniid = 0;