diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc index b8b192e..e961b36 100644 --- a/server/gameserver/player.cc +++ b/server/gameserver/player.cc @@ -684,6 +684,11 @@ void Player::HumanInteraction(Human* hum) ); } +void Player::ProcPrepareItems(const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >& prepare_items) +{ + +} + void Player::_CMMove(f8::MsgHdr& hdr, const cs::CMMove& msg) { bool has_move_dir = msg.has_move_dir(); diff --git a/server/gameserver/player.h b/server/gameserver/player.h index 9a1ac2f..32ed027 100644 --- a/server/gameserver/player.h +++ b/server/gameserver/player.h @@ -79,6 +79,7 @@ class Player : public Human void ObstacleInteraction(Obstacle* entity); void LootInteraction(Loot* entity); void HumanInteraction(Human* hum); + void ProcPrepareItems(const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >& prepare_items); void _CMMove(f8::MsgHdr& hdr, const cs::CMMove& msg); void _CMEmote(f8::MsgHdr& hdr, const cs::CMEmote& msg); diff --git a/server/gameserver/playermgr.cc b/server/gameserver/playermgr.cc index bd87ce6..caaee89 100644 --- a/server/gameserver/playermgr.cc +++ b/server/gameserver/playermgr.cc @@ -65,6 +65,7 @@ Player* PlayerMgr::CreatePlayerByCMJoin(long ip_saddr, int socket, const cs::CMJ hum->skin.skin_lv = std::max(1, hum->GetSkinConfigLv(hum->skin.skin_id)); } #endif + hum->ProcPrepareItems(msg.prepare_items()); socket_hash_[socket] = hum; return hum; } diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto index d089995..a237d1e 100755 --- a/server/tools/protobuild/cs_proto.proto +++ b/server/tools/protobuild/cs_proto.proto @@ -596,7 +596,7 @@ message CMJoin optional int32 basemelee = 14; //xx repeated MFWeapon weapons = 17; //武器列表 repeated MFSkin skins = 18; //皮肤列表 key: 皮肤id value:皮肤等级 - repeated int32 perpare_items = 19; //战斗前准备道具 战前准备护盾存到energy_shield + repeated int32 prepare_items = 19; //战斗前准备道具 战前准备护盾存到energy_shield } //移动