From ba648a02938dc0a8d0e01f03114e4393700f5fdd Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 12 Oct 2022 14:05:23 +0800 Subject: [PATCH] 1 --- server/gameserver/battledatacontext.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/server/gameserver/battledatacontext.cc b/server/gameserver/battledatacontext.cc index 267b645f..42c220c4 100644 --- a/server/gameserver/battledatacontext.cc +++ b/server/gameserver/battledatacontext.cc @@ -497,6 +497,8 @@ float BattleDataContext::CalcDmg(Creature* target, Bullet* bullet) float crit = IsCrit(bullet) ? GetCritRate(bullet) : 0; float dodge = IsDodge(bullet) ? GetDodgeRuduce(bullet) : 0; float finaly_dmg = normal_dmg * (1.0f + crit + dodge); + finaly_dmg *= (1 + target->GetAbility()->GetDmgAddition()); + finaly_dmg *= (1 - target->GetAbility()->GetDmgRuduce()); #if 1 finaly_dmg *= (1 + bullet->strengthen_wall); #endif @@ -515,6 +517,7 @@ float BattleDataContext::CalcDmg(Creature* target, Bullet* bullet) owner_.Get()->SendDebugMsg(data); } #endif + finaly_dmg = std::max(1.0f, finaly_dmg); return finaly_dmg; }