1

server/gameserver/creature.cc

@@ -1466,3 +1466,10 @@ void Creature::SetCurrWeapon(Weapon* weapon)
     #endif
     curr_weapon_ = weapon;
 }
+
+void Creature::ResetAllSkillCd()
+{
+    for (auto& pair : skill_hash_) {
+        pair.second->ResetSkillCd();
+    }
+}

server/gameserver/creature.h

@@ -139,6 +139,7 @@ class Creature : public MoveableEntity
     Weapon* ChooseNextWeapon(int curr_weapon_slot_id, int begin_slot_id, int end_slot_id);
     Weapon* GetCurrWeapon() { return curr_weapon_; };
     void SetCurrWeapon(Weapon* weapon);
+    void ResetAllSkillCd();
 
 private:
 

server/gameserver/room.cc

@@ -1706,6 +1706,7 @@ void Room::ShuaPlane()
 
     for (auto& pair : human_hash_) {
         pair.second->MustBeAddBuff(pair.second, FLY_BUFFID);
+        pair.second->ResetAllSkillCd();
         pair.second->SetPos(plane.curr_pos);
         pair.second->attack_dir = plane.dir;
         pair.second->SetMoveDir(plane.dir);

server/gameserver/skill.cc

@@ -132,3 +132,11 @@ void Skill::NotifySkillState()
         owner->room->frame_event.AddSkillCurrTimesChg(owner->AllocWeakPtr(), meta->i->skill_id(), GetCurrTimes());
     }
 }
+
+void Skill::ResetSkillCd()
+{
+    curr_times_ = 0;
+    if (inc_times_timer_) {
+        owner->room->xtimer.ModifyTimer(inc_times_timer_, GetCd() / FRAME_RATE_MS);
+    }
+}

server/gameserver/skill.h

@@ -34,6 +34,7 @@ class Skill
     int GetMaxTimes();
     void DecTimes();
     void FillMFSkill(cs::MFSkill* skill_pb);
+    void ResetSkillCd();
 
     void ClearPassiveSkillBuff();
     void AddPassiveSkillBuff();