修复死亡结算问题

This commit is contained in:
aozhiwei 2020-03-31 13:14:56 +08:00
parent 92d8dcbd95
commit a2104aaf2f

View File

@ -2006,11 +2006,21 @@ void Human::GenBattleReportData(a8::MutableXObject* params)
std::sort(human_list.begin(), human_list.end(), std::sort(human_list.begin(), human_list.end(),
[] (Human* a, Human* b ) [] (Human* a, Human* b )
{ {
if (a->dead_frameno == b->dead_frameno) { if (a->real_dead && b->real_dead) {
return a->entity_uniid < b->entity_uniid; if (a->dead_frameno == b->dead_frameno) {
return a->entity_uniid < b->entity_uniid;
} else {
return a->dead_frameno == 0 ||
(b->dead_frameno != 0 && a->dead_frameno > b->dead_frameno);
}
} else { } else {
return a->dead_frameno == 0 || if (a->real_dead) {
(b->dead_frameno != 0 && a->dead_frameno > b->dead_frameno); return false;
}
if (b->real_dead) {
return true;
}
return a->entity_uniid < b->entity_uniid;
} }
}); });
rank = human_list.size(); rank = human_list.size();