This commit is contained in:
aozhiwei 2019-06-18 16:13:38 +08:00
parent df5f31c8ce
commit 98381f5aad
3 changed files with 3 additions and 2 deletions

View File

@ -718,7 +718,7 @@ void Player::ProcPrepareItems(const ::google::protobuf::RepeatedField< ::google:
curr_weapon = &weapons[GUN_SLOT2]; curr_weapon = &weapons[GUN_SLOT2];
} }
} }
if (!weapon) { if (weapon) {
weapon->weapon_id = equip_id; weapon->weapon_id = equip_id;
weapon->weapon_lv = std::max(1, GetWeaponConfigLv(weapon->weapon_id)); weapon->weapon_lv = std::max(1, GetWeaponConfigLv(weapon->weapon_id));
weapon->ammo = 0; weapon->ammo = 0;

View File

@ -65,7 +65,6 @@ Player* PlayerMgr::CreatePlayerByCMJoin(long ip_saddr, int socket, const cs::CMJ
hum->skin.skin_lv = std::max(1, hum->GetSkinConfigLv(hum->skin.skin_id)); hum->skin.skin_lv = std::max(1, hum->GetSkinConfigLv(hum->skin.skin_id));
} }
#endif #endif
hum->ProcPrepareItems(msg.prepare_items());
socket_hash_[socket] = hum; socket_hash_[socket] = hum;
return hum; return hum;
} }

View File

@ -87,6 +87,7 @@ void RoomMgr::_CMJoin(f8::MsgHdr& hdr, const cs::CMJoin& msg)
Player* hum = PlayerMgr::Instance()->CreatePlayerByCMJoin(hdr.ip_saddr, hdr.socket_handle, msg); Player* hum = PlayerMgr::Instance()->CreatePlayerByCMJoin(hdr.ip_saddr, hdr.socket_handle, msg);
hum->meta = hum_meta; hum->meta = hum_meta;
room->AddPlayer(hum); room->AddPlayer(hum);
hum->ProcPrepareItems(msg.prepare_items());
cs::SMJoinedNotify notifymsg; cs::SMJoinedNotify notifymsg;
notifymsg.set_error_code(0); notifymsg.set_error_code(0);
@ -118,6 +119,7 @@ void RoomMgr::_CMJoin(f8::MsgHdr& hdr, const cs::CMJoin& msg)
Player* hum = PlayerMgr::Instance()->CreatePlayerByCMJoin(hdr.ip_saddr, hdr.socket_handle, msg); Player* hum = PlayerMgr::Instance()->CreatePlayerByCMJoin(hdr.ip_saddr, hdr.socket_handle, msg);
hum->meta = hum_meta; hum->meta = hum_meta;
room->AddPlayer(hum); room->AddPlayer(hum);
hum->ProcPrepareItems(msg.prepare_items());
{ {
cs::SMJoinedNotify notifymsg; cs::SMJoinedNotify notifymsg;