From bc2d8dc12bd3c7f399c18b9e09eeba820fef8bac Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Mon, 11 Mar 2019 20:11:45 +0800
Subject: [PATCH] 1

---
 server/tools/protobuild/cs_proto.proto | 73 ++++++++++++++++++--------
 third_party/tools                      |  2 +-
 2 files changed, 52 insertions(+), 23 deletions(-)

diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto
index 2462a37..774f6e1 100755
--- a/server/tools/protobuild/cs_proto.proto
+++ b/server/tools/protobuild/cs_proto.proto
@@ -168,16 +168,18 @@ message CMJoin
     optional int32 player_count = 4; //玩家数
     optional int32 auto_fill = 5; //是否自动填充玩家
     optional int32 bot = 6; //是否机器人
-    optional string name = 7; //zzzz
+    optional string name = 7; //角色名
     optional int32 use_touch = 8; //zzz
-    optional string uuid = 9; //zzz
+    optional string uuid = 9; //账号id account_id
     repeated int32 emotes = 10; //表情列表
-    optional string icon = 11; //zzz
-    optional int32 energy_shield = 12; //zz
-    //baseskin
-    //basemelee
-    optional  int32 elo_score = 13;
+    optional string icon = 11; //头像
+    optional int32 energy_shield = 12; //能量护盾
+    optional int32 baseskin = 13; //皮肤id
+    optional int32 basemelee = 14; //xx
+    optional  int32 elo_score = 15;
     //plugs
+    optional string channel = 20; //渠道编号
+    optional string gmode = 21;
 }
 
 //断线通知
@@ -224,24 +226,24 @@ message CMEditMsg
     optional float zoom = 2; //zz
 }
 
-//xx
+//丢弃道具
 message CMDropItem
 {
-    //item
-    optional int32 weapon_idx = 1;
+    optional int32 item_id = 1;
+    optional int32 weapon_idx = 2;
 }
 
-//xxx
-message CMEmoteMsg
+//发送表情
+message CMSendEmote
 {
     optional int32 type = 1;
     optional MFVector2D pos = 2;
-    optional bool use_loadout = 3;
+    //optional bool use_loadout = 3;
     optional bool team_only = 4;
-    optional bool is_ping = 5;
+    //optional bool is_ping = 5;
 }
 
-//xxx
+//加入成功
 message SMJoinedNotify
 {
     optional int32 team_mode = 1;
@@ -252,6 +254,12 @@ message SMJoinedNotify
     optional bool elo_start = 6;
 }
 
+//玩家信息
+message SMPlayerInfo
+{
+    optional MFPlayerInfo info = 1; //玩家信息
+}
+
 //帧事件
 message SMUpdate
 {
@@ -271,7 +279,13 @@ message SMKillMsg
     optional int32 killed =7;
 }
 
-//xx
+//个人信息统计
+message SMPlayerStats
+{
+    optional MFPlayerStats player_stats = 1;
+}
+
+//游戏结束
 message SMGameOver
 {
     optional int32 team_id = 1;
@@ -283,17 +297,32 @@ message SMGameOver
     repeated MFPlayerStats player_stats = 6;
 }
 
-//xx
-message CMPickup
+//拾取
+message SMPickup
 {
     optional int32 type = 1;
-    //item
+    optional int32 item_id = 2;
     optional int32 count = 3;
 }
 
-//xx
-message SMSpectate
+//自杀
+message CMSpectate
 {
     optional int32 spec_next = 1;
     optional int32 spec_prev = 2;
-}
\ No newline at end of file
+}
+
+//语音
+message CMSendVoice
+{
+    optional int32 mode = 1; //模式
+    optional string uuid = 2; //唯一id
+    optional string msg = 3; //语音内容
+}
+
+message CMVoiceNotify
+{
+    optional int32 mode = 1; //模式
+    optional string uuid = 2; //唯一id
+    optional string msg = 3; //语音内容
+}
diff --git a/third_party/tools b/third_party/tools
index 80f1497..9d23cf8 160000
--- a/third_party/tools
+++ b/third_party/tools
@@ -1 +1 @@
-Subproject commit 80f14970e1be8aa575ad9271bdf3a813c848354a
+Subproject commit 9d23cf84bbd8db847fc180ab34f426d949f161b1