From 1a51c6df3f16feb50dccb7a50c7e82c2829fe177 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 6 Oct 2022 09:15:41 +0800 Subject: [PATCH] 1 --- server/gameserver/skill.cc | 5 +++++ server/gameserver/trigger.cc | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/server/gameserver/skill.cc b/server/gameserver/skill.cc index be5c4cec..68679e54 100644 --- a/server/gameserver/skill.cc +++ b/server/gameserver/skill.cc @@ -27,6 +27,11 @@ void Skill::Initialzie() &xtimer_attacher.timer_list_); } break; + case kPassiveSkill: + { + + } + break; default: { } diff --git a/server/gameserver/trigger.cc b/server/gameserver/trigger.cc index bfe5e2f9..552a9719 100644 --- a/server/gameserver/trigger.cc +++ b/server/gameserver/trigger.cc @@ -9,6 +9,7 @@ #include "room.h" #include "human.h" #include "car.h" +#include "bullet.h" void Trigger::Init() { @@ -424,7 +425,7 @@ void Trigger::DispatchEvent(int event_id, const std::vector& param) void Trigger::BulletHit(Bullet* bullet) { if (bullet->sender.Get()) { - bullet->sender.Get()->DispatchEvent(kBulletHit, {bullet}); + bullet->sender.Get()->GetTrigger()->DispatchEvent(kBulletHit, {bullet}); } }