diff --git a/server/gameserver/team.cc b/server/gameserver/team.cc index 43c41b43..bf8be7aa 100644 --- a/server/gameserver/team.cc +++ b/server/gameserver/team.cc @@ -479,6 +479,20 @@ void Team::GenBattleReportData(a8::MutableXObject* params) member_pb->SetVal("pvp_rescue", hum->stats->rescue_member); member_pb->SetVal("pvp_personal_rank", hum->stats->rank); } + { + auto battle_items_pb = a8::MutableXObject::CreateArray(); + for (auto tuple : hum->GetNetData()->GetItems()) { + int item_id = std::get<0>(tuple); + int item_num = std::get<1>(tuple); + if (item_num > 0) { + auto item_pb = a8::MutableXObject::CreateObject(); + item_pb->SetVal("item_id", item_id); + item_pb->SetVal("item_num", item_num); + battle_items_pb->Push(*item_pb); + } + } + member_pb->SetVal("battle_items", *battle_items_pb); + } members_pb->Push(*member_pb); }; params->SetVal("members", *members_pb);