From 2022d44c72e71b879065fdd700b9b079d3a54e75 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 29 Mar 2023 10:17:01 +0800 Subject: [PATCH] 1 --- server/gameserver/battledatacontext.cc | 4 ++-- server/gameserver/roomobstacle.cc | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/server/gameserver/battledatacontext.cc b/server/gameserver/battledatacontext.cc index 08dcbbcc..9224d5bf 100644 --- a/server/gameserver/battledatacontext.cc +++ b/server/gameserver/battledatacontext.cc @@ -671,8 +671,8 @@ float BattleDataContext::CalcDmg(Obstacle* target, IBullet* bullet) float BattleDataContext::CalcReceiveDmg(Creature* sender, float normal_dmg) { float finaly_dmg = normal_dmg; - finaly_dmg *= (1 + sender.Get()->GetAbility()->GetAttrAddition(kHVAT_Dmg)); //连加 - finaly_dmg *= GetAbility()->GetAttrRuduce(kHVAT_Dmg); //(1-减免) 连乘 + finaly_dmg *= (1 + sender->GetAbility()->GetAttrAddition(kHVAT_Dmg)); //连加 + finaly_dmg *= owner_.Get()->GetAbility()->GetAttrRuduce(kHVAT_Dmg); //(1-减免) 连乘 finaly_dmg = std::max(1.0f, finaly_dmg); return std::round(finaly_dmg); diff --git a/server/gameserver/roomobstacle.cc b/server/gameserver/roomobstacle.cc index 0052ef1e..6fe925fd 100644 --- a/server/gameserver/roomobstacle.cc +++ b/server/gameserver/roomobstacle.cc @@ -854,6 +854,7 @@ void RoomObstacle::ActiveMedicalStation() float damage = SkillHelper::GetYlzDamage(master.Get(), c, skill_meta); + damage = c->GetBattleContext()->CalcReceiveDmg(master.Get(), damage); float dmg_out = 0.0f; c->DecHP(damage, master.Get()->GetUniId(),