From 85f3dcec6cdc817d5b64827821ff40159bb823a8 Mon Sep 17 00:00:00 2001
From: sk <123456@qq.com>
Date: Fri, 1 Nov 2024 02:24:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=9B=E5=8B=9F=E5=8A=9F=E8=83=BD=E5=8D=8F?=
 =?UTF-8?q?=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 protocol/gamehall/game.proto | 34 +++++++++++++++++++++++++++++++++-
 protocol/player/player.proto | 10 ++++++++--
 2 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/protocol/gamehall/game.proto b/protocol/gamehall/game.proto
index 2b06bfc..d3b2e37 100644
--- a/protocol/gamehall/game.proto
+++ b/protocol/gamehall/game.proto
@@ -109,6 +109,12 @@ enum GameHallPacketID {
   // 竞技馆房间信息
   PACKET_CSRoomConfig = 2300;
   PACKET_SCRoomConfig = 2301;
+  // 启动招募
+  PACKET_CSRoomRecruit = 2302;
+  PACKET_SCRoomRecruit = 2303;
+  // 邀请加入房间
+  PACKET_CSInviteJoinRoom = 2304;
+  PACKET_SCInviteJoinRoom = 2305;
 
   // client -> gamesrv 协议
   // 消息id 8000~8099
@@ -158,7 +164,7 @@ message SCCreateRoom{
 //玩家请求进入游戏
 message CSEnterRoom{
   int32 RoomId = 1;    //房间编号
-  int32 GameId = 2;    //游戏编号
+  int32 GameId = 2;    //游戏编号, 不需要了
   string Password = 3;  //房间密码
 }
 //PACKET_SC_ENTERROOM
@@ -545,4 +551,30 @@ message CSRoomConfig{}
 // PACKET_SCRoomConfig 竞技馆房间配置
 message SCRoomConfig{
   repeated RoomTypeInfo List = 1;
+}
+
+// 房间招募功能
+// PACKET_CSRoomRecruit
+message CSRoomRecruit{
+  int32 RoomId = 1; // 房间id
+  int32 On = 2; // 开关 1开启 2关闭
+}
+// PACKET_SCRoomRecruit
+message SCRoomRecruit{
+  int32 RoomId = 1; // 房间id
+  int32 On = 2; // 开关 1开启 2关闭
+}
+
+// 邀请加入房间
+// PACKET_CSInviteJoinRoom
+message CSInviteJoinRoom{
+}
+// PACKET_SCInviteJoinRoom
+message SCInviteJoinRoom{
+  int32 RoomId = 1; // 房间id
+  bool IsSystem = 2; // 是否为系统房间
+  int32 SnId = 3; // 邀请者id
+  string Name = 4; // 邀请者昵称
+  int32 UseRoleId = 5; // 邀请者人物模型id
+  string RoomName = 6; // 房间名称
 }
\ No newline at end of file
diff --git a/protocol/player/player.proto b/protocol/player/player.proto
index 8ba613a..3a07969 100644
--- a/protocol/player/player.proto
+++ b/protocol/player/player.proto
@@ -351,6 +351,10 @@ message PlayerData {
   int32 UseSkinId = 50; // 皮肤id
   string ChannelID = 51; // 渠道ID
   int32 GuideStep = 52; // 引导步骤; 最小为0，-1表示跳过引导了
+  // 引导步骤完成情况
+  // 下标：0表示竞技馆引导
+  // 值：最小为0，-1表示跳过引导了
+  repeated int32 Guide = 53;
 }
 
 //周卡数据
@@ -1341,8 +1345,10 @@ message WindowsInfo{
 
 //PACKET_CSUpdateAttribute
 message CSUpdateAttribute{
-  int32 Tp = 1; // 1.更新新手引导阶段 2.跳过新手引导 3.更新新手引导状态(测试用) 4.竞技馆引导结束
-  repeated int64 Param = 2;
+  int32 Tp = 1; // 1.更新引导阶段 2.跳过引导 3.更新引导状态(测试用) 4.标记竞技馆引导页面已经显示过
+  repeated int64 Param = 2; // 引导步骤; 以后不用了
+  int32 GuideType = 3; //引导类型 0 新手引导 1 竞技馆引导
+  int32 Step = 4; //引导步骤
 }
 //PACKET_SCUpdateAttribute
 message SCUpdateAttribute{