diff --git a/server/gameserver/constant.h b/server/gameserver/constant.h index 186305e..999ee06 100755 --- a/server/gameserver/constant.h +++ b/server/gameserver/constant.h @@ -119,6 +119,7 @@ enum BuffEffectType_e kBET_Jump = 2, //翻滚 kBET_Car = 3, //骑乘 kBET_Invincible = 4, //无敌 + kBET_Camouflage = 5, //伪装 kBET_OnceChgAttr = 11, //一次性buff kBET_End }; diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto index 1d38386..a8519ae 100755 --- a/server/tools/protobuild/cs_proto.proto +++ b/server/tools/protobuild/cs_proto.proto @@ -106,6 +106,9 @@ message MFVec2 property_type: 7 载具油量 property_subtype: 0(当前油量)1(总油量)) 在同步当前油量前必然同步过总油量! property_type: 8 当前武器的子弹剩余数量 + property_type: 9 当前道具(目前只有伪装) + property_subtype: 道具id + valule: 当前数量(数量<=0时除) */ message MFPropertyChg { @@ -424,6 +427,8 @@ message MFActivePlayerData optional int32 action_item_id = 6; optional int32 action_target_id = 7; + repeated MFPair items = 8; //存放玩家身上携带的装备信息(目前只存伪装) key:道具id value:数量 + repeated MFSkin skin = 30; //皮肤id optional int32 backpack = 31; //背包 optional int32 helmet = 32; //头盔 @@ -666,6 +671,7 @@ message CMJoin repeated MFWeapon weapons = 17; //武器列表 repeated MFSkin skins = 18; //皮肤列表 key: 皮肤id value:皮肤等级 repeated int32 prepare_items = 19; //战斗前准备道具 战前准备护盾存到energy_shield + repeated MFPair prepare_items2 = 29; //战斗前准备道具 key:道具id value:数量 optional string session_id = 20; //session_id optional string from_appid = 21; //from_appid optional float atk_add = 22; //攻击加成 @@ -695,6 +701,7 @@ message CMMove optional bool cancel_action = 26; //取消当前操作(比如取消使用道具装弹等) optional int32 use_item_idx = 22; //使用道具(对应库存索引0-16) + optional int32 use_item_id = 4; //使用道具 (道具id目前只有伪装) optional int32 use_scope = 25; //使用倍镜 0-4 optional bool interaction = 9; //是否有交互