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

1

Browse Source
This commit is contained in:
aozhiwei 2022-08-25 14:35:42 +08:00
parent 56d3623171
commit 4ec90b2ed7
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/gameserver/hero.cc
View File

@ -253,12 +253,12 @@ void Hero::DecHP(float dec_hp, int killer_id, const std::string& killer_name, in
float old_health = GetHP(); float old_health = GetHP();
float new_health = std::max(0.0f, GetHP() - dec_hp); float new_health = std::max(0.0f, GetHP() - dec_hp);
SetHP(std::max(0.0f, new_health)); SetHP(std::max(0.0f, new_health));
if (new_health < old_health && room->IsPveRoom()) {
room->pve_data.AddDamageInfo(killer_id, GetUniId(), old_health - new_health);
}
if (GetHP() <= 0.0001f && !IsDead(room)) { if (GetHP() <= 0.0001f && !IsDead(room)) {
BeKill(killer_id, killer_name, weapon_id); BeKill(killer_id, killer_name, weapon_id);
} }
if (new_health > old_health && room->IsPveRoom()) {
room->pve_data.AddDamageInfo(killer_id, GetUniId(), new_health - old_health);
}
room->frame_event.AddHpChg(GetWeakPtrRef()); room->frame_event.AddHpChg(GetWeakPtrRef());
} }

6
server/gameserver/pvedata.cc
View File

@ -13,6 +13,12 @@ void PveData::AddDamageInfo(int sender_id, int receiver_id, float dmg)
damage_hash_[receiver_id] = std::map<int, float>(); damage_hash_[receiver_id] = std::map<int, float>();
} }
itr = damage_hash_.find(receiver_id); itr = damage_hash_.find(receiver_id);
auto itr2 = itr->second.find(sender_id);
if (itr2 != itr->second.end()) {
itr2->second += dmg;
} else {
itr->second[sender_id] = dmg;
}
} }
void PveData::OnBeKill(Hero* hero) void PveData::OnBeKill(Hero* hero)