From b9fcee3e998275a63cf0343558e18e73ed67e9be Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 6 May 2022 01:32:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=AD=A6=E5=99=A8=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E5=B8=A6=E5=85=A5=E6=88=98=E6=96=97=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/gameserver/player.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc index ff2fff68..8e013417 100644 --- a/server/gameserver/player.cc +++ b/server/gameserver/player.cc @@ -624,7 +624,7 @@ void Player::ProcPrepareItems(const ::google::protobuf::RepeatedField< ::google: } } for (auto& spec_weapon : spec_weapons) { - MetaData::Equip* item_meta = MetaMgr::Instance()->GetEquip(second_weapon.weapon_id); + MetaData::Equip* item_meta = MetaMgr::Instance()->GetEquip(spec_weapon.weapon_id); if (item_meta) { if (item_meta->i->equip_subtype() != 1) { int weapon_idx = GUN_SLOT1; @@ -635,9 +635,9 @@ void Player::ProcPrepareItems(const ::google::protobuf::RepeatedField< ::google: Weapon* weapon = &weapons[weapon_idx]; weapon->weapon_uniid = spec_weapon.weapon_uniid; weapon->weapon_idx = weapon_idx; - weapon->weapon_id = second_weapon.weapon_id; - weapon->weapon_lv = second_weapon.weapon_lv; - weapon->ammo = second_weapon.ammo; + weapon->weapon_id = spec_weapon.weapon_id; + weapon->weapon_lv = spec_weapon.weapon_lv; + weapon->ammo = spec_weapon.ammo; weapon->meta = item_meta; weapon->Recalc(); SetCurrWeapon(&weapons[GUN_SLOT1]);