From 03e08e46e9b6f5f0adeacbfd0b166a08e60a5701 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Fri, 24 Dec 2021 11:42:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BC=B9=E5=A4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/gameserver/weapon.cc            | 8 ++------
 server/tools/protobuild/cs_proto.proto | 1 +
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/server/gameserver/weapon.cc b/server/gameserver/weapon.cc
index e3618545..fe299dcc 100644
--- a/server/gameserver/weapon.cc
+++ b/server/gameserver/weapon.cc
@@ -19,6 +19,7 @@ void Weapon::ToPB(cs::MFWeapon* pb_obj)
     pb_obj->set_weapon_id(weapon_id);
     pb_obj->set_weapon_lv(weapon_lv);
     pb_obj->set_ammo(ammo);
+    pb_obj->set_volume(GetClipVolume());
 }
 
 void Weapon::Recalc()
@@ -29,12 +30,7 @@ void Weapon::Recalc()
 
 int Weapon::GetClipVolume()
 {
-    if (upgrade_meta) {
-        return meta->i->clip_volume() +
-            upgrade_meta->GetAttrValue(weapon_lv, kHAT_Volume);
-    } else {
-        return meta->i->clip_volume();
-    }
+    return GetAttrValue(kHAT_Volume);
 }
 
 float Weapon::GetAttrValue(HumanAttrType_e attr_type)
diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto
index 8323b601..7233d610 100755
--- a/server/tools/protobuild/cs_proto.proto
+++ b/server/tools/protobuild/cs_proto.proto
@@ -201,6 +201,7 @@ message MFWeapon
     optional int32 weapon_id = 1; //武器id 当weapon_id == 0时表示无装备（装备位置显示空）
     optional int32 weapon_lv = 2; //武器等级
     optional int32 ammo = 4; //弹药数
+    optional int32 volume = 5; //弹夹容量
 }
 
 //皮肤