From 737e6fd80f4e29d20f4c4b19f0a9e957fc62e038 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 14 Apr 2021 13:04:49 +0800 Subject: [PATCH 1/2] 1 --- third_party/a8engine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/a8engine b/third_party/a8engine index 1bcc249..2b5f0d3 160000 --- a/third_party/a8engine +++ b/third_party/a8engine @@ -1 +1 @@ -Subproject commit 1bcc24955410e67342d5e44c2e35addff5111fca +Subproject commit 2b5f0d3b41e764d61181089b95c4fa568b1e1942 From 7cd4411ac22758fe902fe4cec0483620bf0bc457 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 14 Apr 2021 13:17:34 +0800 Subject: [PATCH 2/2] 1 --- server/gameserver/skill.cc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/server/gameserver/skill.cc b/server/gameserver/skill.cc index 4a59ad8..36a5f2e 100644 --- a/server/gameserver/skill.cc +++ b/server/gameserver/skill.cc @@ -7,6 +7,7 @@ void Skill::Initialzie() { + curr_times_ = GetMaxTimes(); switch (meta->i->skill_type()) { case kActiveSkill: { @@ -135,8 +136,11 @@ void Skill::NotifySkillState() void Skill::ResetSkillCd() { - curr_times_ = 0; - if (inc_times_timer_) { - owner->room->xtimer.ModifyTimer(inc_times_timer_, GetCd() / FRAME_RATE_MS); + if (meta->i->skill_id() != TURN_OVER_SKILL_ID) { + curr_times_ = 0; + if (inc_times_timer_) { + owner->room->xtimer.ModifyTimer(inc_times_timer_, GetCd() / FRAME_RATE_MS); + NotifySkillState(); + } } }