From ff825e13dbc974556c4b29fca042091b89e799f4 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Tue, 21 May 2019 15:28:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=AD=A6=E5=99=A8=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/gameserver/constant.h           | 10 ++++++++++
 server/tools/protobuild/cs_proto.proto |  1 +
 2 files changed, 11 insertions(+)

diff --git a/server/gameserver/constant.h b/server/gameserver/constant.h
index 670f5d6..48805a8 100755
--- a/server/gameserver/constant.h
+++ b/server/gameserver/constant.h
@@ -122,6 +122,16 @@ enum VirtualPlayer_e
     VP_Mine = 9000003,
 };
 
+enum EquipAttr
+{
+    EA_HP = 1,
+    EA_Dmg = 2,
+    EA_ShotRange = 3,
+    EA_ShotSpeed = 4,
+    EA_Def = 5,
+    EA_End
+};
+
 const char* const PROJ_NAME_FMT = "game%d_gameserver";
 const char* const PROJ_ROOT_FMT = "/data/logs/%s";
 
diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto
index 8e35362..7c15bb5 100755
--- a/server/tools/protobuild/cs_proto.proto
+++ b/server/tools/protobuild/cs_proto.proto
@@ -589,6 +589,7 @@ message CMJoin
     optional int32 basemelee = 14; //xx
     optional int32 elo_score = 15;
     repeated MFPlug plugs = 16;
+    repeated MFWeapon weapons = 17; //武器列表
 
     optional string gmode = 21;
 }