1

server/gameserver/creature.h

@@ -29,6 +29,15 @@ class Creature : public MoveableEntity
     float GetBuffAttrRate(int attr_id);
     void FillBuffList(::google::protobuf::RepeatedPtrField<::cs::MFBuff>* pb_buff_list);
 
+protected:
+    bool use_skill = false;
+    size_t curr_skill_phase = 0;
+    a8::Vec2 skill_dir;
+    float skill_param1 = 0;
+    bool playing_skill = false;
+    int skill_target_id_ = 0;
+    a8::Vec2 skill_target_pos_;
+
 private:
 
     virtual void AddBuffPostProc(Creature* caster, Buff* buff);
@@ -40,4 +49,5 @@ private:
     std::array<float, kHAT_End> buff_attr_rate_ = {};
     std::array<Buff*, kBET_End> buff_effect_ = {};
     std::list<Buff> buff_list_;
+
 };

server/gameserver/human.cc

@@ -1337,8 +1337,10 @@ void Human::DoJump()
     }
 }
 
-void Human::DoSkill()
+void Human::DoSkill(int target_id, const a8::Vec2& target_pos)
 {
+    skill_target_id_ = target_id;
+    skill_target_pos_ = target_pos;
     if (action_type == AT_Reload ||
         action_type == AT_UseItem
         ) {
@@ -1350,13 +1352,13 @@ void Human::DoSkill()
         last_use_skill_frameno_ = room->GetFrameNo();
         if (skill_meta_->i->skill_target() == kST_Self
             ) {
-            skill_target_id = GetEntityUniId();
+            skill_target_id_ = GetEntityUniId();
         }
-        Entity* entity = room->GetEntityByUniId(skill_target_id);
+        Entity* entity = room->GetEntityByUniId(skill_target_id_);
         if (entity && entity->IsEntityType(ET_Player)) {
             Human* hum = (Human*)entity;
             std::set<Entity*> target_list;
-            skill_target_pos = hum->GetPos();
+            skill_target_pos_ = hum->GetPos();
             SelectSkillTargets(hum->GetPos(), target_list);
             TriggerBuff(target_list, kBTT_UseSkill);
             if (!skill_meta_->phases.empty() && skill_meta_->phases[0].time_offset <= 0) {
@@ -3143,25 +3145,25 @@ void Human::AddBuffPostProc(Creature* caster, Buff* buff)
         break;
     case kBET_JumpTo:
         {
-            Entity* entity = room->GetEntityByUniId(skill_target_id);
+            Entity* entity = room->GetEntityByUniId(skill_target_id_);
             if (entity) {
                 float target_distance = entity->GetPos().Distance(GetPos());
                 if (target_distance <= 0.000001f) {
                     SetPos(entity->GetPos());
-                    skill_target_pos = entity->GetPos();
+                    skill_target_pos_ = entity->GetPos();
                 } else {
                     if (target_distance <= buff->meta->param3) {
                         SetPos(entity->GetPos());
-                        skill_target_pos = entity->GetPos();
+                        skill_target_pos_ = entity->GetPos();
                     } else {
                         move_dir = entity->GetPos() - GetPos();
                         move_dir.Normalize();
                         skill_dir = move_dir;
-                        skill_target_pos  = GetPos() + move_dir * (target_distance - buff->meta->param3);
+                        skill_target_pos_  = GetPos() + move_dir * (target_distance - buff->meta->param3);
                     }
                 }
             }
-            target_pos = skill_target_pos;
+            target_pos = skill_target_pos_;
         }
         break;
     case kBET_Pull:
@@ -3463,7 +3465,7 @@ void Human::SelectSkillTargets(const a8::Vec2& target_pos, std::set<Entity*>& ta
         break;
     case kST_EnemySingle:
         {
-            Entity* entity = room->GetEntityByUniId(skill_target_id);
+            Entity* entity = room->GetEntityByUniId(skill_target_id_);
             if (entity && entity->IsEntityType(ET_Player)) {
                 Human* hum = (Human*)entity;
                 if (IsEnemy(hum)) {
@@ -3513,7 +3515,7 @@ void Human::SelectSkillTargets(const a8::Vec2& target_pos, std::set<Entity*>& ta
         break;
     case kST_SingleEnemyAndSelf:
         {
-            Entity* entity = room->GetEntityByUniId(skill_target_id);
+            Entity* entity = room->GetEntityByUniId(skill_target_id_);
             if (entity && entity->IsEntityType(ET_Player)) {
                 Human* hum = (Human*)entity;
                 if (IsEnemy(hum)) {
@@ -3542,7 +3544,7 @@ void Human::ProcSkillPhase(MetaData::SkillPhase* phase)
         break;
     case kSkill_Shot:
         {
-            Entity* entity = room->GetEntityByUniId(skill_target_id);
+            Entity* entity = room->GetEntityByUniId(skill_target_id_);
             MetaData::Equip* weapon_meta = MetaMgr::Instance()->GetEquip(phase->param1.GetInt());
             if (weapon_meta && entity) {
                 float target_distance = entity->GetPos().Distance(GetPos());
@@ -3864,7 +3866,7 @@ void Human::ResetSkill()
     use_skill = false;
     curr_skill_phase = 0;
     skill_dir = a8::Vec2();
-    skill_target_pos = a8::Vec2();
+    skill_target_pos_ = a8::Vec2();
     skill_param1 = 0.0f;
     playing_skill = false;
 }
@@ -3940,20 +3942,20 @@ void Human::AddPassiveSkillBuff(MetaData::Skill* skill_meta)
         return;
     }
     MetaData::Skill* old_curr_skill = skill_meta_;
-    int old_skill_target_id = skill_target_id;
+    int old_skill_target_id_ = skill_target_id_;
-    a8::Vec2 old_skill_target_pos = skill_target_pos;
+    a8::Vec2 old_skill_target_pos_ = skill_target_pos_;
 
     skill_meta_ = skill_meta;
-    skill_target_id = GetEntityUniId();
+    skill_target_id_ = GetEntityUniId();
-    skill_target_pos = GetPos();
+    skill_target_pos_ = GetPos();
 
     std::set<Entity*> target_list;
     SelectSkillTargets(GetPos(), target_list);
     TriggerBuff(target_list, kBTT_UseSkill);
 
     skill_meta_= old_curr_skill;
-    skill_target_id = old_skill_target_id;
+    skill_target_id_ = old_skill_target_id_;
-    skill_target_pos = old_skill_target_pos;
+    skill_target_pos_ = old_skill_target_pos_;
 }
 
 void Human::OnMetaChange()

server/gameserver/human.h

@@ -138,13 +138,6 @@ class Human : public Creature
     std::map<int, int> skin_configs;
     std::map<int, int> spoils_items;
 
-    bool use_skill = false;
-    size_t curr_skill_phase = 0;
-    int skill_target_id = 0;
-    a8::Vec2 skill_dir;
-    a8::Vec2 skill_target_pos;
-    float skill_param1 = 0;
-    bool playing_skill = false;
     xtimer_list* ad_timer_ = nullptr;
     Human* last_human_target = nullptr;
 
@@ -202,7 +195,7 @@ class Human : public Creature
     bool HasNoDownedTeammate();
     bool CanUseSkill();
     void DoJump();
-    void DoSkill();
+    void DoSkill(int target_id, const a8::Vec2& target_pos);
     void DoGetOn(int obj_uniid);
     void DoGetDown();
     void FindLocation();

server/gameserver/player.cc

@@ -393,7 +393,7 @@ void Player::UpdateUseSkill()
     if (HasBuffEffect(kBET_Vertigo)) {
         return;
     }
-    DoSkill();
+    DoSkill(skill_target_id, a8::Vec2());
 }
 
 void Player::Shot()
@@ -1111,7 +1111,7 @@ void Player::_CMMove(f8::MsgHdr& hdr, const cs::CMMove& msg)
     }
     if (msg.has_use_skill()) {
         use_skill = msg.use_skill();
-        skill_target_id = msg.skill_target_id();
+        skill_target_id = msg.skill_target_id_();
     } else {
         use_skill = false;
     }

server/gameserver/player.h

@@ -58,6 +58,7 @@ class Player : public Human
     bool jump = false;
 
     bool use_skill = false;
+    int skill_target_id = 0;
 
     bool get_down = false;
     int get_on = 0;

server/gameserver/zombiemode.ai.cc

@@ -477,9 +477,7 @@ void ZombieModeAI::DoShot()
 void ZombieModeAI::DoSkill()
 {
     Human* myself = (Human*)owner;
-    myself->skill_target_id = node_->target->GetEntityUniId();
+    myself->DoSkill(node_->target->GetEntityUniId(), node_->target->GetPos());
-    myself->skill_target_pos = node_->target->GetPos();
-    myself->DoSkill();
 }
 
 int ZombieModeAI::GetAttackTimes()