From 02685a76bc7d73a7573e9eb526ae7c324b11a3bf Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Mon, 8 Apr 2019 15:52:02 +0800
Subject: [PATCH] 1

---
 server/gameserver/human.cc             | 2 +-
 server/gameserver/player.cc            | 9 +++------
 server/gameserver/types.cc             | 1 -
 server/gameserver/types.h              | 1 -
 server/tools/protobuild/cs_proto.proto | 1 -
 5 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc
index d7b0f81..f27256f 100644
--- a/server/gameserver/human.cc
+++ b/server/gameserver/human.cc
@@ -23,7 +23,7 @@ Human::Human()
         weapon.weapon_idx = i;
         weapon.weapon_id = 0;
         weapon.weapon_lv = 0;
-        weapon.num = 0;
+        weapon.ammo = 0;
     }
     weapons[0] = default_weapon;
     curr_weapon = &weapons[0];
diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc
index 835c801..322857d 100644
--- a/server/gameserver/player.cc
+++ b/server/gameserver/player.cc
@@ -422,8 +422,7 @@ void Player::LootInteraction(Loot* entity)
                     weapons[0].weapon_idx = 0;
                     weapons[0].weapon_id = entity->item_id;
                     weapons[0].weapon_lv = 1;
-                    weapons[0].num = 0;
-                    weapons[0].ammo = 0;
+                    weapons[0].ammo = entity->count;
                     need_sync_active_player = true;
                 }
                 need_sync_active_player = true;
@@ -453,8 +452,7 @@ void Player::LootInteraction(Loot* entity)
                 }
                 weapon->weapon_id = entity->item_id;
                 weapon->weapon_lv = 1;
-                weapon->num = 0;
-                weapon->ammo = 0;
+                weapon->ammo = entity->count;
                 weapon->meta = item_meta;
                 AutoLoadingBullet();
                 need_sync_active_player = true;
@@ -475,8 +473,7 @@ void Player::LootInteraction(Loot* entity)
                     if (weapon->weapon_id == 0) {
                         weapon->weapon_id = entity->item_id;
                         weapon->weapon_lv = 1;
-                        weapon->num = 0;
-                        weapon->ammo = 1 ;
+                        weapon->ammo = entity->count;
                         weapon->meta = item_meta;
                         inventory[item_meta->i->_inventory_slot()] -= entity->count;
                     }
diff --git a/server/gameserver/types.cc b/server/gameserver/types.cc
index 028db28..763b26c 100644
--- a/server/gameserver/types.cc
+++ b/server/gameserver/types.cc
@@ -123,6 +123,5 @@ void Weapon::ToPB(cs::MFWeapon* pb_obj)
 {
     pb_obj->set_weapon_id(weapon_id);
     pb_obj->set_weapon_lv(weapon_lv);
-    pb_obj->set_num(num);
     pb_obj->set_ammo(ammo);
 }
diff --git a/server/gameserver/types.h b/server/gameserver/types.h
index 32f8496..375592f 100755
--- a/server/gameserver/types.h
+++ b/server/gameserver/types.h
@@ -69,7 +69,6 @@ struct Weapon
     int weapon_idx = 0;
     int weapon_id = 0;
     int weapon_lv = 0;
-    int num = 0;
     int ammo = 0;
     MetaData::Equip* meta = nullptr;
 
diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto
index 28ac8c1..0d15a34 100755
--- a/server/tools/protobuild/cs_proto.proto
+++ b/server/tools/protobuild/cs_proto.proto
@@ -124,7 +124,6 @@ message MFWeapon
 {
     optional int32 weapon_id = 1; //武器id 当weapon_id == 0时表示无装备（装备位置显示空）
     optional int32 weapon_lv = 2; //武器等级
-    optional int32 num = 3; //数量 手雷和烟雾弹时该字段有意义
     optional int32 ammo = 4; //弹药数
 }