server/game2006
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2024-10-15 10:48:34 +08:00
parent cfb7a838d3
commit f1938018f9
5 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/gameserver/bag.cc
View File

@ -20,7 +20,7 @@ int BagItem::GetCdTime(Human* hum)
(potion_meta->cooldown() * SERVER_FRAME_RATE - (hum->room->GetFrameNo() - last_use_tick)) * FRAME_RATE_MS); (potion_meta->cooldown() * SERVER_FRAME_RATE - (hum->room->GetFrameNo() - last_use_tick)) * FRAME_RATE_MS);
} }
void Bag::Parse(const std::list<std::tuple<int, int, int>>& items) void Bag::Parse(const std::list<std::tuple<int, int, int, int>>& items)
{ {
for (auto tuple : items) { for (auto tuple : items) {
auto item_id = std::get<0>(tuple); auto item_id = std::get<0>(tuple);

3
server/gameserver/bag.h
View File

@ -26,8 +26,9 @@ class Bag
Bag(Human* owner) { owner_ = owner; }; Bag(Human* owner) { owner_ = owner; };
void UseItem(int equip_id); void UseItem(int equip_id);
void PushBagInfo(); void PushBagInfo();
void Parse(const std::list<std::tuple<int, int, int>>& items); void Parse(const std::list<std::tuple<int, int, int, int>>& items);
std::shared_ptr<BagItem> GetItemById(int equip_id); std::shared_ptr<BagItem> GetItemById(int equip_id);
void UpdateItemNum(int item_id, int item_num);
private: private:
void InternalPushBagInfo(); void InternalPushBagInfo();

2
server/gameserver/netdata.cc
View File

@ -559,7 +559,7 @@ void BattleDataContext::ParseResult(a8::XObject& obj)
int item_id = info->Get("item_id").GetInt(); int item_id = info->Get("item_id").GetInt();
int item_num = info->Get("item_num").GetInt(); int item_num = info->Get("item_num").GetInt();
if (item_num > 0) { 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));
} }
} }
} }

4
server/gameserver/netdata.h
View File

@ -101,7 +101,7 @@ struct BattleDataContext
int GetHonor(); int GetHonor();
int GetElo() { return elo_; } int GetElo() { return elo_; }
const std::list<int>& GetAvatars() { return avatars_; } const std::list<int>& GetAvatars() { return avatars_; }
const std::list<std::tuple<int, int, int>>& GetItems() { return items_; } const std::list<std::tuple<int, int, int, int>>& GetItems() { return items_; }
std::shared_ptr<HeroAbility> GetHeroAbility() { return hero_ability_; } std::shared_ptr<HeroAbility> GetHeroAbility() { return hero_ability_; }
private: private:
@ -132,7 +132,7 @@ private:
int battle_times_ = 0; int battle_times_ = 0;
std::list<int> avatars_; std::list<int> avatars_;
std::list<std::tuple<int, int, int>> items_; std::list<std::tuple<int, int, int, int>> items_; //item_id item_num use_times already_dec_times
int skill1_lv = 1; int skill1_lv = 1;
int skill2_lv = 1; int skill2_lv = 1;

5
server/gameserver/pbutils.cc
View File

@ -3017,3 +3017,8 @@ void Bag::InternalPushBagInfo()
#endif #endif
owner_->SendNotifyMsg(notify_msg); owner_->SendNotifyMsg(notify_msg);
} }
void Bag::UpdateItemNum(int item_id, int item_num)
{
}