From 14fd195ef8fcc0a427c9d44e45abc3c95a31761d Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 25 Mar 2024 15:42:23 +0800
Subject: [PATCH] 1

---
 server/tools/protobuild/cs_msgid.proto |  2 ++
 server/tools/protobuild/cs_proto.proto | 43 ++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)

diff --git a/server/tools/protobuild/cs_msgid.proto b/server/tools/protobuild/cs_msgid.proto
index 3e1262cd..f3525aa1 100644
--- a/server/tools/protobuild/cs_msgid.proto
+++ b/server/tools/protobuild/cs_msgid.proto
@@ -35,6 +35,7 @@ enum CMMessageId_e
     _CMWatchTarget = 241;
     _CMTeamCommand = 242;
     _CMMobaBattleData = 243;
+    _CMBattlePreSetReady = 245;
 }
 
 enum SMMessageId_e
@@ -82,4 +83,5 @@ enum SMMessageId_e
     _SMTeamCommandNotify = 1031;
     _SMTeamFullNotify = 1032;
     _SMTeamPartNotify = 1033;
+    _SMBattlePreInfoUpdate = 1034;
 }
diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto
index c901c86e..94098d01 100755
--- a/server/tools/protobuild/cs_proto.proto
+++ b/server/tools/protobuild/cs_proto.proto
@@ -1501,6 +1501,38 @@ message MFMobaBattleDataTeam
     repeated MFMobaBattleDataMember members = 2; //成员列表
 }
 
+//战前英雄
+message MFBattlePreHero
+{
+    optional int32 hero_id = 1; //英雄id
+    optional int32 quality = 2; //英雄品阶
+}
+
+//战前队伍成员
+message MFBattlePreMember
+{
+    optional string account_id = 1; //账号id
+    optional string name = 2; //昵称
+    optional int32 is_leader = 3; //是否队长
+    optional int32 spec_skill = 4; //召唤师技能id
+    optional MFBattlePreHero hero = 5; //英雄信息
+    optional int32 is_ready = 6; //是否已准备
+}
+
+//战前队伍
+message MFBattlePreTeam
+{
+    repeated MFBattlePreMember members = 1; //成员
+}
+
+//战前准备信息(后面可能会加入排队逻辑)
+message MFBattlePreInfo
+{
+    repeated MFBattlePreTeam team_list = 1; //成员列表(通过判断account_id获取自己所在队伍,如果是观战则找不到)
+    optional int32 state = 2; //0:准备阶段 1:可以开始 这时服务器会通知后续的SMJoinedNotify和SMMapInfo信息
+    optional int32 map_id = 3; //地图id
+}
+
 //end mfmsg
 
 //加入
@@ -1530,6 +1562,11 @@ message CMJoin
     optional string payload_data = 75; //透传数据
 }
 
+//战前阶段设置为已准备
+message CMBattlePreSetReady
+{
+}
+
 //断线重连
 message CMReconnect
 {
@@ -2131,3 +2168,9 @@ message SMTeamPartNotify
 {
     repeated MFTeamPart members = 1; //待更新成员列表
 }
+
+//战前准备状态更新
+message SMBattlePreInfoUpdate
+{
+    optional MFBattlePreInfo info = 1; //战前准备信息
+}
\ No newline at end of file