From c6c7b700e555a171419a2ddcbcfbe7f3b20637f5 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 23 May 2024 18:00:33 +0800 Subject: [PATCH] 1 --- server/gameserver/netdata.cc | 3 +++ server/gameserver/trigger.cc | 10 ++++++++++ server/gameserver/trigger.h | 4 ++++ 3 files changed, 17 insertions(+) diff --git a/server/gameserver/netdata.cc b/server/gameserver/netdata.cc index a9c65731..8c614224 100644 --- a/server/gameserver/netdata.cc +++ b/server/gameserver/netdata.cc @@ -16,6 +16,7 @@ #include "stats.h" #include "android.h" #include "skill.h" +#include "trigger.h" #include "buff/distance_dmg_addition.h" @@ -811,6 +812,7 @@ float BattleDataContext::CalcDmg(Creature* target, IBullet* bullet) } #endif + owner_.Get()->GetTrigger()->BulletDmgStart(target); float vEbc = 1.0f; float vEd = 1 - target->GetNetData()->GetDef(); float X = (1 + hero_ability_->GetCrit()) * (1 - target->GetNetData()->GetBlock()) - 1; @@ -881,6 +883,7 @@ float BattleDataContext::CalcDmg(Creature* target, IBullet* bullet) } } #endif + owner_.Get()->GetTrigger()->BulletDmgEnd(target); return std::max(1.0f, std::round(finaly_dmg)); } diff --git a/server/gameserver/trigger.cc b/server/gameserver/trigger.cc index 56a7f145..3fa7833d 100644 --- a/server/gameserver/trigger.cc +++ b/server/gameserver/trigger.cc @@ -723,3 +723,13 @@ void Trigger::BeAttack(int attacker_id) } }); } + +void Trigger::BulletDmgStart(Creature* target) +{ + +} + +void Trigger::BulletDmgEnd(Creature* target) +{ + +} diff --git a/server/gameserver/trigger.h b/server/gameserver/trigger.h index a179c2a0..82e54f07 100644 --- a/server/gameserver/trigger.h +++ b/server/gameserver/trigger.h @@ -36,6 +36,8 @@ enum EventId_e kDownedEvent, kUpdateEnergyShieldEvent, kDestoryEnergyShieldEvent, + kBulletDmgStartEvent, + kBulletDmgEndEvent, kCrazeModeEvent, }; @@ -90,6 +92,8 @@ public: void EnterBattleMode(); void LeaveBattleMode(); void BeAttack(int attacker_id); + void BulletDmgStart(Creature* target); + void BulletDmgEnd(Creature* target); std::weak_ptr AddListener(int event_id, a8::CommonCbProc cb); void RemoveEventHandler(std::weak_ptr handler_ptr);