From 5591cf792f905e91e0e245700190365a6ac3c0f6 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 18 Mar 2021 19:10:10 +0800
Subject: [PATCH] 1

---
 server/gameserver/creature.cc |  3 ---
 server/gameserver/creature.h  |  3 ---
 server/gameserver/human.cc    | 34 +++++++++++-----------------------
 server/gameserver/human.h     |  2 --
 server/gameserver/types.h     |  2 +-
 5 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc
index 4c15d9f..5a60720 100644
--- a/server/gameserver/creature.cc
+++ b/server/gameserver/creature.cc
@@ -376,9 +376,6 @@ void Creature::DoSkillPostProc(bool used, int skill_id, int target_id, const a8:
 
 void Creature::ResetSkill()
 {
-    #if 0
-    use_skill = false;
-    #endif
     curr_skill_phase = 0;
     skill_dir = a8::Vec2();
     skill_target_pos_ = a8::Vec2();
diff --git a/server/gameserver/creature.h b/server/gameserver/creature.h
index 9659b85..8a15d5b 100644
--- a/server/gameserver/creature.h
+++ b/server/gameserver/creature.h
@@ -61,9 +61,6 @@ protected:
     int skill_target_id_ = 0;
     a8::Vec2 skill_target_pos_;
 
-    #if 0
-    long long last_use_skill_frameno_ = 0;
-    #endif
     a8::XTimerAttacher skill_xtimer_attacher_;
     MetaData::Skill* skill_meta_ = nullptr;
 
diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc
index 702b13f..4b7d065 100644
--- a/server/gameserver/human.cc
+++ b/server/gameserver/human.cc
@@ -25,6 +25,7 @@
 #include "roomobstacle.h"
 #include "aicomponent.h"
 #include "jsondatamgr.h"
+#include "skill.h"
 
 #include "framework/cpp/utils.h"
 #include "framework/cpp/httpclientpool.h"
@@ -1547,19 +1548,6 @@ void Human::FillMFActivePlayerData(cs::MFActivePlayerData* player_data)
         player_data->set_max_energy_shield(max_energy_shield);
     }
     #endif
-    #if 0
-    if (skill_meta) {
-        if (last_use_skill_frameno_ == 0) {
-            player_data->set_skill_left_time(0);
-            player_data->set_skill_cd_time(skill_meta->i->cd_time() * 1000);
-        } else {
-            int passed_time = (room->GetFrameNo() - last_use_skill_frameno_) * FRAME_RATE_MS;
-            int skill_left_time = std::max(0, skill_meta->i->cd_time() * 1000 - passed_time);
-            player_data->set_skill_left_time(skill_left_time);
-            player_data->set_skill_cd_time(skill_meta->i->cd_time() * 1000);
-        }
-    }
-    #endif
     FillBodyState(player_data->mutable_states());
     FillItemList(player_data->mutable_items());
 }
@@ -2979,17 +2967,17 @@ void Human::AddBuffPostProc(Creature* caster, Buff* buff)
         break;
     case kBET_TurnOver:
         {
-            MetaData::SkillPhase* phase = GetCurrSkillPhase();
-            #if 0
-            if (phase &&
-                phase->time_offset >= (int)((room->GetFrameNo() - last_use_skill_frameno_) * FRAME_RATE_MS)) {
-                if (HasBuffEffect(kBET_Car)) {
-                    _UpdateMove(phase->param1.GetDouble() * 1.5);
-                } else {
-                    _UpdateMove(phase->param1);
+            Skill* skill = CurrentSkill();
+            if (skill) {
+                MetaData::SkillPhase* phase = GetCurrSkillPhase();
+                if (phase && phase->time_offset >= skill->GetLeftTime()) {
+                    if (HasBuffEffect(kBET_Car)) {
+                        _UpdateMove(phase->param1.GetDouble() * 1.5);
+                    } else {
+                        _UpdateMove(phase->param1);
+                    }
                 }
             }
-            #endif
         }
         break;
     case kBET_Camouflage:
@@ -3948,7 +3936,7 @@ void Human::DoSkillPreProc(int skill_id, int target_id, const a8::Vec2& target_p
 void Human::DoSkillPostProc(bool used, int skill_id, int target_id, const a8::Vec2& target_pos)
 {
     if (used) {
-        ++stats.use_skill_times;
+        ++stats.skill_times;
 #if 0
         room->frame_event.AddSkillCdChg(this);
 #endif
diff --git a/server/gameserver/human.h b/server/gameserver/human.h
index a4b481c..de60d3b 100644
--- a/server/gameserver/human.h
+++ b/server/gameserver/human.h
@@ -378,8 +378,6 @@ private:
     Entity* last_collision_door_ = nullptr;
     long long jump_frameno_ = 0;
 
-    bool use_skill = false;
-
     friend class FrameMaker;
     friend class FrameEvent;
 };
diff --git a/server/gameserver/types.h b/server/gameserver/types.h
index 9754e3f..44e1c2f 100755
--- a/server/gameserver/types.h
+++ b/server/gameserver/types.h
@@ -87,7 +87,7 @@ struct PlayerStats
     int weapon_id = 0;
 
     int rank = 0;
-    int use_skill_times = 0;
+    int skill_times = 0;
 
     int dead_times = 0;
 };