From e2ec2e8a83cba3b4c6824f1d8e63b2848815f778 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 18 Mar 2021 13:46:14 +0800
Subject: [PATCH] 1

---
 server/gameserver/creature.h | 11 +++++++++++
 server/gameserver/human.h    |  5 -----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/server/gameserver/creature.h b/server/gameserver/creature.h
index 1db4840..49d040a 100644
--- a/server/gameserver/creature.h
+++ b/server/gameserver/creature.h
@@ -5,6 +5,12 @@
 
 #include "cs_proto.pb.h"
 
+namespace MetaData
+{
+    class Skill;
+}
+
+struct xtimer_list;
 class Creature : public MoveableEntity
 {
  public:
@@ -38,6 +44,11 @@ protected:
     int skill_target_id_ = 0;
     a8::Vec2 skill_target_pos_;
 
+    long long last_use_skill_frameno_ = 0;
+    a8::XTimerAttacher skill_xtimer_attacher_;
+    MetaData::Skill* skill_meta_ = nullptr;
+    std::map<MetaData::Skill*, xtimer_list*> passive_skill_metas_;
+
 private:
 
     virtual void AddBuffPostProc(Creature* caster, Buff* buff);
diff --git a/server/gameserver/human.h b/server/gameserver/human.h
index 0e59191..14d3130 100644
--- a/server/gameserver/human.h
+++ b/server/gameserver/human.h
@@ -332,7 +332,6 @@ private:
 protected:
     int level_ = 0;
     int exp_ = 0;
-    long long last_use_skill_frameno_ = 0;
     long long hide_frameno_ = 0;
     long long accelerate_frameno_ = 0;
     long long damageadd_frameno_ = 0;
@@ -341,7 +340,6 @@ protected:
     long long reflect_damage_frameno_ = 0;
     long long summon_hero_frameno_ = 0;
     long long last_sync_teamdata_frameno_ = 0;
-    a8::XTimerAttacher skill_xtimer_attacher_;
     bool leave_ = false;
     long long leave_frameno_ = 0;
 
@@ -374,9 +372,6 @@ protected:
     Car* car_ = nullptr;
     int seat_ = 0;
 
-    MetaData::Skill* skill_meta_ = nullptr;
-    std::map<MetaData::Skill*, xtimer_list*> passive_skill_metas_;
-
 private:
     RaceType_e race_ = kHumanRace;
     CircleCollider* self_collider_ = nullptr;