From 7cd4411ac22758fe902fe4cec0483620bf0bc457 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Wed, 14 Apr 2021 13:17:34 +0800
Subject: [PATCH] 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();
+        }
     }
 }