From 067e9fbdb84d4db137b201e4e56c251009735466 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 10 May 2022 09:54:57 +0800 Subject: [PATCH] 1 --- server/gameserver/human.cc | 1 + server/gameserver/player.cc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index ef2a5288..1d430145 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -173,6 +173,7 @@ Human::Human():Creature() AddInventory(IS_762MM, FIGHTING_MODE_BULLET_NUM); AddInventory(IS_12GAUGE, FIGHTING_MODE_BULLET_NUM); AddInventory(IS_RPG, FIGHTING_MODE_BULLET_NUM); + AddInventory(IS_ICE, FIGHTING_MODE_BULLET_NUM); } } diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc index 8e013417..f25764db 100644 --- a/server/gameserver/player.cc +++ b/server/gameserver/player.cc @@ -637,9 +637,9 @@ void Player::ProcPrepareItems(const ::google::protobuf::RepeatedField< ::google: weapon->weapon_idx = weapon_idx; 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(); + weapon->ammo = weapon->GetClipVolume(); SetCurrWeapon(&weapons[GUN_SLOT1]); } }