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-09-06 16:56:16 +08:00
parent 194e9f6257
commit da19616e66
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/gameserver/car.cc
View File

@ -309,7 +309,10 @@ float Car::GetSpeed()
void Car::OnBulletHit(Bullet* bullet) void Car::OnBulletHit(Bullet* bullet)
{ {
if (!IsDead(room)) { if (!IsDead(room)) {
#ifdef NEWGS //超能电磁枪已删除
#ifdef ATTR
float finaly_dmg = bullet->sender.Get()->GetBattleContext()->CalcDmg(this, bullet);
#else
float finaly_dmg = 0; float finaly_dmg = 0;
float atk_rate = 0; float atk_rate = 0;
float def_rate = 0; float def_rate = 0;
@ -317,12 +320,6 @@ void Car::OnBulletHit(Bullet* bullet)
#if 1 #if 1
finaly_dmg += bullet->gun_meta->i->atk_mech(); finaly_dmg += bullet->gun_meta->i->atk_mech();
#endif #endif
#else
float dmg = bullet->GetAtk() + bullet->gun_meta->i->atk_mech();
float def = GetDef() * (1 + GetAbility()->GetAttrRate(kHAT_Def)) +
GetAbility()->GetAttrAbs(kHAT_Def);
float finaly_dmg = dmg * (1 - def/MetaMgr::Instance()->K);
finaly_dmg = std::max(finaly_dmg, 0.0f);
#endif #endif
if (bullet->meta->buff_meta) { if (bullet->meta->buff_meta) {
MustBeAddBuff(bullet->sender.Get(), bullet->meta->i->buffid()); MustBeAddBuff(bullet->sender.Get(), bullet->meta->i->buffid());

4
server/gameserver/hero.cc
View File

@ -143,10 +143,14 @@ void Hero::OnBulletHit(Bullet* bullet)
RemoveBuffByEffectId(kBET_PeaceMode); RemoveBuffByEffectId(kBET_PeaceMode);
if (!IsDead(room) && (bullet->IsBomb() || bullet->sender.Get()->team_id != team_id)) { if (!IsDead(room) && (bullet->IsBomb() || bullet->sender.Get()->team_id != team_id)) {
#ifdef ATTR
float finaly_dmg = bullet->sender.Get()->GetBattleContext()->CalcDmg(this, bullet);
#else
float finaly_dmg = 0; float finaly_dmg = 0;
float atk_rate = 0; float atk_rate = 0;
float def_rate = 0; float def_rate = 0;
bullet->CalcDmg(this, finaly_dmg, atk_rate, def_rate); bullet->CalcDmg(this, finaly_dmg, atk_rate, def_rate);
#endif
if (bullet->sender.Get()->IsHuman()) { if (bullet->sender.Get()->IsHuman()) {
bullet->sender.Get()->AsHuman()->stats.damage_amount_out += finaly_dmg; bullet->sender.Get()->AsHuman()->stats.damage_amount_out += finaly_dmg;
} }