This commit is contained in:
aozhiwei 2022-09-20 20:28:36 +08:00
parent 7f46f0bc92
commit d3b175bd25
3 changed files with 8 additions and 1 deletions

View File

@ -89,7 +89,7 @@ static void InternalCreateBullet(BulletInfo& bullet_info)
#ifdef DEBUG1 #ifdef DEBUG1
if (bullet_info.c.Get()->IsPlayer()) { if (bullet_info.c.Get()->IsPlayer()) {
bullet_info.c.Get()->SendDebugMsg(a8::Format("CreateBullet id:%d", bullet_info.c.Get()->SendDebugMsg(a8::Format("CreateBullet id:%d",
{bullet_info.bullet_meta->i->id()})); {bullet_info.weapon_meta->i->id()}));
} }
#endif #endif
} }

View File

@ -255,6 +255,7 @@ void PlayerStats::ParseReward(a8::XObject& xobj)
if (!reward_xobj || !reward_xobj->IsObject()) { if (!reward_xobj || !reward_xobj->IsObject()) {
return; return;
} }
over_reward.total_ceg = reward_xobj->At("total_ceg")->AsXValue();
{ {
auto hero_xobj = reward_xobj->At("hero"); auto hero_xobj = reward_xobj->At("hero");
if (hero_xobj && hero_xobj->IsObject()) { if (hero_xobj && hero_xobj->IsObject()) {
@ -984,6 +985,11 @@ void Human::FillSMGameOver(cs::SMGameOver& msg)
} }
TypeConvert::ToPb(stats.over_reward, msg.mutable_reward()); TypeConvert::ToPb(stats.over_reward, msg.mutable_reward());
{ {
if (stats.over_reward.total_ceg > 0) {
auto p = msg.add_spoils_items();
p->add_values(10001);
p->add_values(stats.over_reward.total_ceg);
}
for (auto& tuple : stats.over_reward.items) { for (auto& tuple : stats.over_reward.items) {
auto p = msg.add_spoils_items(); auto p = msg.add_spoils_items();
p->add_values(std::get<0>(tuple)); p->add_values(std::get<0>(tuple));

View File

@ -50,6 +50,7 @@ struct OverReward
OverRewardItem hero; OverRewardItem hero;
OverRewardItem weapon1; OverRewardItem weapon1;
OverRewardItem weapon2; OverRewardItem weapon2;
int total_ceg = 0;
std::vector<std::tuple<int, int>> items; std::vector<std::tuple<int, int>> items;
}; };