From 3ef48f32068da13a815abba6803a0e0e58f89a3b Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Tue, 9 Jul 2019 11:02:21 +0800
Subject: [PATCH] 1

---
 server/tools/protobuild/cs_proto.proto | 41 ++++++++++++++------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto
index d551899..3fb91d7 100755
--- a/server/tools/protobuild/cs_proto.proto
+++ b/server/tools/protobuild/cs_proto.proto
@@ -459,9 +459,11 @@ message MFBullet
     optional MFVector2D dir = 4; //方向
     optional int32 gun_lv = 5; //枪等级
     optional int32 bulletskin = 6; //子弹皮肤
-    optional bool crit = 7;
-    optional int32 reflect_count = 8;
-    optional int32 reflect_objid = 9;
+
+    //只有追踪类子弹以下两个字段才有意义
+    optional int32 bullet_uniid = 7; //子弹唯一id
+    optional int32 target_id = 8; //目标id
+
     optional int32 gun_id = 10; //枪id
     optional float fly_distance = 11; //只有手雷和烟雾弹时这个字段才有意义
 }
@@ -561,27 +563,28 @@ message CMMove
 {
     optional int32 seq = 1; //序号
 
-    optional MFVector2D move_dir = 24; //移动-方向
-    optional MFVector2D attack_dir = 20; //攻击方向(朝向)
+    optional MFVector2D move_dir = 2; //移动-方向
+    optional MFVector2D attack_dir = 3; //攻击方向(朝向)
 
-    optional bool shot_start = 6; //射击-单发
-    optional bool shot_hold = 7; //射击-连发
-    optional bool reload = 8; //装弹
-    optional float fly_distance = 12; //子弹飞行距离(只有手雷和烟雾弹时这个字段才有意义)
+    optional bool shot_start = 4; //射击-单发
+    optional bool shot_hold = 5; //射击-连发
+    optional bool reload = 6; //装弹
+    optional float fly_distance = 7; //子弹飞行距离(只有手雷和烟雾弹时这个字段才有意义)
 
-    optional int32 select_weapon = 10; //切换武器(没切换是不用发)
-    optional int32 drop_weapon = 11; //丢弃武器
+    optional int32 select_weapon = 8; //切换武器(没切换是不用发)
+    optional int32 drop_weapon = 9; //丢弃武器
 
-    optional bool cancel_action = 26; //取消当前操作(比如取消使用道具装弹等)
-    optional int32 use_item_idx = 22; //使用道具（对应库存索引0-16）
-    optional int32 use_scope = 25; //使用倍镜 0-4
+    optional bool cancel_action = 10; //取消当前操作(比如取消使用道具装弹等)
+    optional int32 use_item_idx = 11; //使用道具（对应库存索引0-16）
+    optional int32 use_scope = 12; //使用倍镜 0-4
 
-    optional bool interaction = 9; //是否有交互
-    repeated int32 interaction_objids = 23; //交互的对象id列表
+    optional bool interaction = 13; //是否有交互
+    repeated int32 interaction_objids = 14; //交互的对象id列表
 
-    optional bool use_skill = 27; //使用技能
-    optional float skill_param1 = 28; //技能参数1
-    optional float skill_param2 = 29; //技能参数2
+    optional bool use_skill = 20; //使用技能
+    optional int32 skill_target_id = 21; //技能目标(单体攻击)
+    optional MFVector2D skill_dir = 22; //技能方向
+    optional float skill_param1 = 23; //辅助参数
 
     optional bool spectate = 30; //自杀