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

1

Browse Source
This commit is contained in:
aozhiwei 2019-07-24 19:04:36 +08:00
parent f7dc28bec2
commit e51c3e70d9
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/gameserver/bullet.cc
View File

@ -86,9 +86,6 @@ void Bullet::OnHit(std::set<Entity*>& objects)
switch (target->entity_type) {
case kET_Player:
{
if (App::Instance()->HasFlag(8)) {
return;
}
Human* hum = (Human*)target;
if (hum->HasBuffEffect(kBET_Invincible)) {
continue;

16
server/gameserver/room.cc
View File

@ -1067,16 +1067,16 @@ void Room::BattleReport()
[] (Human* a, Human* b) -> bool
{
if (a->stats.kills > b->stats.kills) {
return true;
return false;
}
if (a->stats.dead_times < b->stats.dead_times) {
return true;
return false;
}
if (a->stats.damage_amount_out > b->stats.damage_amount_out) {
return true;
return false;
}
if (a->stats.last_kill_timeseq < b->stats.last_kill_timeseq) {
return true;
return false;
}
return false;
});
@ -1084,6 +1084,14 @@ void Room::BattleReport()
int rank = 1;
for (Human* hum : human_list) {
hum->stats.rank = rank++;
a8::XPrintf("rank:%d kills:%d dead_times:%d damage_amount_out:%d last_kill_timeseq:%d\n",
{
hum->stats.rank,
hum->stats.kills,
hum->stats.dead_times,
hum->stats.damage_amount_out,
hum->stats.last_kill_timeseq,
});
hum->SendGameOver();
}
game_over = true;