diff --git a/server/gameserver/bag.cc b/server/gameserver/bag.cc index b97a2f5a..809cae58 100644 --- a/server/gameserver/bag.cc +++ b/server/gameserver/bag.cc @@ -20,7 +20,7 @@ int BagItem::GetCdTime(Human* hum) (potion_meta->cooldown() * SERVER_FRAME_RATE - (hum->room->GetFrameNo() - last_use_tick)) * FRAME_RATE_MS); } -void Bag::Parse(const std::list>& items) +void Bag::Parse(const std::list>& items) { for (auto tuple : items) { auto item_id = std::get<0>(tuple); diff --git a/server/gameserver/bag.h b/server/gameserver/bag.h index b4e09402..5020031e 100644 --- a/server/gameserver/bag.h +++ b/server/gameserver/bag.h @@ -26,8 +26,9 @@ class Bag Bag(Human* owner) { owner_ = owner; }; void UseItem(int equip_id); void PushBagInfo(); - void Parse(const std::list>& items); + void Parse(const std::list>& items); std::shared_ptr GetItemById(int equip_id); + void UpdateItemNum(int item_id, int item_num); private: void InternalPushBagInfo(); diff --git a/server/gameserver/netdata.cc b/server/gameserver/netdata.cc index 28d37408..bcccaa32 100644 --- a/server/gameserver/netdata.cc +++ b/server/gameserver/netdata.cc @@ -559,7 +559,7 @@ void BattleDataContext::ParseResult(a8::XObject& obj) int item_id = info->Get("item_id").GetInt(); int item_num = info->Get("item_num").GetInt(); if (item_num > 0) { - items_.push_back(std::make_tuple(item_id, item_num, 0)); + items_.push_back(std::make_tuple(item_id, item_num, 0, 0)); } } } diff --git a/server/gameserver/netdata.h b/server/gameserver/netdata.h index f4d15da9..a0fb46b3 100644 --- a/server/gameserver/netdata.h +++ b/server/gameserver/netdata.h @@ -101,7 +101,7 @@ struct BattleDataContext int GetHonor(); int GetElo() { return elo_; } const std::list& GetAvatars() { return avatars_; } - const std::list>& GetItems() { return items_; } + const std::list>& GetItems() { return items_; } std::shared_ptr GetHeroAbility() { return hero_ability_; } private: @@ -132,7 +132,7 @@ private: int battle_times_ = 0; std::list avatars_; - std::list> items_; + std::list> items_; //item_id item_num use_times already_dec_times int skill1_lv = 1; int skill2_lv = 1; diff --git a/server/gameserver/pbutils.cc b/server/gameserver/pbutils.cc index a0dc79de..fcb53f1b 100644 --- a/server/gameserver/pbutils.cc +++ b/server/gameserver/pbutils.cc @@ -3017,3 +3017,8 @@ void Bag::InternalPushBagInfo() #endif owner_->SendNotifyMsg(notify_msg); } + +void Bag::UpdateItemNum(int item_id, int item_num) +{ + +}