diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc index 7f6802bd..9fe674fc 100644 --- a/server/gameserver/creature.cc +++ b/server/gameserver/creature.cc @@ -89,7 +89,7 @@ static void InternalCreateBullet(BulletInfo& bullet_info) #ifdef DEBUG1 if (bullet_info.c.Get()->IsPlayer()) { bullet_info.c.Get()->SendDebugMsg(a8::Format("CreateBullet id:%d", - {bullet_info.bullet_meta->i->id()})); + {bullet_info.weapon_meta->i->id()})); } #endif } diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index 05f646e1..5bf9ee87 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -255,6 +255,7 @@ void PlayerStats::ParseReward(a8::XObject& xobj) if (!reward_xobj || !reward_xobj->IsObject()) { return; } + over_reward.total_ceg = reward_xobj->At("total_ceg")->AsXValue(); { auto hero_xobj = reward_xobj->At("hero"); if (hero_xobj && hero_xobj->IsObject()) { @@ -984,6 +985,11 @@ void Human::FillSMGameOver(cs::SMGameOver& msg) } 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) { auto p = msg.add_spoils_items(); p->add_values(std::get<0>(tuple)); diff --git a/server/gameserver/human.h b/server/gameserver/human.h index 01bdfca8..0434d7e4 100644 --- a/server/gameserver/human.h +++ b/server/gameserver/human.h @@ -50,6 +50,7 @@ struct OverReward OverRewardItem hero; OverRewardItem weapon1; OverRewardItem weapon2; + int total_ceg = 0; std::vector> items; };