From c5d37f6d1852a2d90a18abaef75d25c15dcdfd0e Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 28 Feb 2023 18:32:02 +0800 Subject: [PATCH] 1 --- server/gameserver/buff/hold_shield.cc | 10 ++-------- server/gameserver/buff/hold_shield.h | 2 +- server/gameserver/explosion.cc | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/server/gameserver/buff/hold_shield.cc b/server/gameserver/buff/hold_shield.cc index 90778893..d5f57761 100644 --- a/server/gameserver/buff/hold_shield.cc +++ b/server/gameserver/buff/hold_shield.cc @@ -40,6 +40,7 @@ void HoldShieldBuff::Activate() { c->RemoveBuffByEffectId(kBET_HoldShield); c->TryAddBuff(c, meta->_int_buff_param2); + Pound(); } ); } @@ -68,20 +69,13 @@ void HoldShieldBuff::Activate() break; } } - owner->GetTrigger()->AddListener - ( - kShieldDestoryEvent, - [this] (const a8::Args& params) - { - OnShieldDestory(params); - }); } void HoldShieldBuff::Deactivate() { } -void HoldShieldBuff::OnShieldDestory(const a8::Args& params) +void HoldShieldBuff::Pound() { if (!skill_meta || skill_meta->GetMagicId() != MAGIC_21001_NIU) { return; diff --git a/server/gameserver/buff/hold_shield.h b/server/gameserver/buff/hold_shield.h index 7b343222..1485bfb0 100644 --- a/server/gameserver/buff/hold_shield.h +++ b/server/gameserver/buff/hold_shield.h @@ -10,6 +10,6 @@ class HoldShieldBuff : public Buff virtual void Deactivate() override; private: - void OnShieldDestory(const a8::Args& params); + void Pound(); }; diff --git a/server/gameserver/explosion.cc b/server/gameserver/explosion.cc index 17c02f6c..d88a82da 100644 --- a/server/gameserver/explosion.cc +++ b/server/gameserver/explosion.cc @@ -62,7 +62,7 @@ void Explosion::ProcDamage() ( room_, center_.GetX(), - center_.GetY(), + center_.GetZ(), grid_list ); std::set objects;