From e8a2d36a3f04caf795e211b023df11af6a98218d Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 24 Jun 2021 12:07:31 +0000 Subject: [PATCH] 1 --- server/gameserver/creature.cc | 3 +++ server/gameserver/trigger.cc | 2 +- server/gameserver/trigger.h | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc index b807924..6d604b8 100644 --- a/server/gameserver/creature.cc +++ b/server/gameserver/creature.cc @@ -79,6 +79,7 @@ void InternalShot(Creature* c, is_tank_skin); } } + c->GetTrigger()->Shot(weapon_meta); if (weapon_meta->i->recoil_force() > 0.000001) { a8::Vec2 old_move_dir = c->GetMoveDir(); c->MustBeAddBuff(c, kRecoilBuffId); @@ -100,6 +101,7 @@ void InternalShot(Creature* c, Creature::Creature():MoveableEntity() { trigger_ = new Trigger(this); + trigger_->Init(); weapons.reserve(MAX_WEAPON_NUM); for (size_t i = 0; i < MAX_WEAPON_NUM; ++i) { auto& weapon = a8::FastAppend(weapons); @@ -126,6 +128,7 @@ Creature::~Creature() } skill_hash_.clear(); ClearPassiveSkill(); + trigger_->UnInit(); A8_SAFE_DELETE(trigger_); } diff --git a/server/gameserver/trigger.cc b/server/gameserver/trigger.cc index 67eb97b..36297fa 100644 --- a/server/gameserver/trigger.cc +++ b/server/gameserver/trigger.cc @@ -16,7 +16,7 @@ void Trigger::TakeonWeapon(Weapon* old_weapon, Weapon* new_weapon) { } -void Trigger::Shot(Weapon* weapon) +void Trigger::Shot(MetaData::Equip* weapon_meta) { } diff --git a/server/gameserver/trigger.h b/server/gameserver/trigger.h index 2d499c9..77b9002 100644 --- a/server/gameserver/trigger.h +++ b/server/gameserver/trigger.h @@ -12,7 +12,7 @@ public: void UnInit(); Creature* GetOwner() { return owner_; }; void TakeonWeapon(Weapon* old_weapon, Weapon* new_weapon); - void Shot(Weapon* weapon); + void Shot(MetaData::Equip* weapon_meta); void Kill(Creature* target); void UseItemAction(); void UseSkill(Skill* skill);