This commit is contained in:
aozhiwei 2021-03-19 15:25:08 +08:00
parent 5f39720626
commit 3d78d8d1d5
3 changed files with 2 additions and 2 deletions

View File

@ -811,7 +811,6 @@ void Creature::ProcBuffEffect(Creature* caster, Buff* buff)
void Creature::Initialize() void Creature::Initialize()
{ {
MoveableEntity::Initialize(); MoveableEntity::Initialize();
skill_xtimer_attacher_.xtimer = &room->xtimer;
} }
void Creature::AddSkill(int skill_id) void Creature::AddSkill(int skill_id)
@ -821,6 +820,7 @@ void Creature::AddSkill(int skill_id)
Skill* skill = new Skill; Skill* skill = new Skill;
skill->owner = this; skill->owner = this;
skill->meta = skill_meta; skill->meta = skill_meta;
skill->xtimer_attacher.xtimer = &room->xtimer;
skill_hash_[skill_id] = skill; skill_hash_[skill_id] = skill;
} }
} }

View File

@ -93,6 +93,5 @@ private:
int skill_target_id_ = 0; int skill_target_id_ = 0;
a8::Vec2 skill_target_pos_; a8::Vec2 skill_target_pos_;
std::map<int, Skill*> skill_hash_; std::map<int, Skill*> skill_hash_;
a8::XTimerAttacher skill_xtimer_attacher_;
std::map<MetaData::Skill*, xtimer_list*> passive_skill_metas_; std::map<MetaData::Skill*, xtimer_list*> passive_skill_metas_;
}; };

View File

@ -12,6 +12,7 @@ class Skill
Creature* owner = nullptr; Creature* owner = nullptr;
MetaData::Skill* meta = nullptr; MetaData::Skill* meta = nullptr;
long long last_use_frameno = 0; long long last_use_frameno = 0;
a8::XTimerAttacher xtimer_attacher;
int GetCd(); int GetCd();
int GetLeftTime(); int GetLeftTime();