From 8c7baf31d468c94d4b68e7ebd193d7ab58457e55 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 18 Oct 2022 18:42:59 +0800 Subject: [PATCH] 1 --- server/gameserver/skill.cc | 9 +++++---- server/gameserver/trigger.cc | 1 + server/gameserver/trigger.h | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/server/gameserver/skill.cc b/server/gameserver/skill.cc index f674976e..a9c3741f 100644 --- a/server/gameserver/skill.cc +++ b/server/gameserver/skill.cc @@ -692,7 +692,7 @@ void Skill::ProcGZJS() (const std::vector& params) mutable { Bullet* bullet = std::any_cast(params.at(0)); - if (!bullet->skill_meta || bullet->skill_meta->GetMagicId() != MAGIC_HJHX) { + if (!bullet->skill_meta || bullet->skill_meta->GetMagicId() != MAGIC_FG) { return; } if (!dmg_ruduce_timer.expired()) { @@ -729,14 +729,15 @@ void Skill::ProcGZJS() } *hold_gun_buff_uniid = owner->TryAddBuffAndSetTime (owner, - meta->number_meta->pb->buff_id(), - meta->number_meta->float_time * 1000, + //meta->number_meta->pb->buff_id(), + 204014, + 10 * 1000, meta); owner->TryAddBuffAndSetTime (owner, kDispelEffectBuffId, - 0, + 100, meta); owner->TryAddBuffAndSetTime diff --git a/server/gameserver/trigger.cc b/server/gameserver/trigger.cc index c6b4e392..74ab2cad 100644 --- a/server/gameserver/trigger.cc +++ b/server/gameserver/trigger.cc @@ -180,6 +180,7 @@ void Trigger::UseSkill(Skill* skill) AddBuffs(buff->meta->int_param1, buff->meta->param4_int_list); } }); + DispatchEvent(kUseSkillEvent, {skill}); } void Trigger::HpChg() diff --git a/server/gameserver/trigger.h b/server/gameserver/trigger.h index 92eb3b8f..593b0b47 100644 --- a/server/gameserver/trigger.h +++ b/server/gameserver/trigger.h @@ -37,6 +37,7 @@ enum EventId_e kFlyHookCreateEvent, kFlyHookDestoryEvent, kSkillBulletPreCreateEvent, + kUseSkillEvent, }; class Weapon;