From 55a22a601ed2cc4a842f3ec52548cc839459130f Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 18 Mar 2021 17:43:27 +0800
Subject: [PATCH] 1

---
 server/gameserver/human.cc | 29 ++++-------------------------
 server/gameserver/human.h  |  1 -
 2 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc
index 9bbd439..2b0f5bb 100644
--- a/server/gameserver/human.cc
+++ b/server/gameserver/human.cc
@@ -2913,26 +2913,8 @@ MetaData::Skill* Human::CurrentSkillMeta()
     return skill_meta_;
 }
 
-float Human::GetSkillAtkAdd(int skill_id)
-{
-    if (!skill_meta_) {
-        return 0.0f;
-    }
-    if (skill_meta_->i->skill_id() != skill_id) {
-        return 0.0f;
-    }
-    #if 0
-    if (GetSkillLv() > 0) {
-        return skill_meta_->value_up * GetSkillLv();
-    } else {
-        return 0.0f;
-    }
-    #endif
-}
-
 void Human::TriggerOneObjectBuff(Entity* target, BuffTriggerType_e trigger_type)
 {
-    #if 0
     if (!target->IsEntityType(ET_Player)) {
         return;
     }
@@ -2947,21 +2929,21 @@ void Human::TriggerOneObjectBuff(Entity* target, BuffTriggerType_e trigger_type)
             case kBuffTargetSelf: //自己
                 {
                     if (hum == this) {
-                        hum->AddBuff(this, buff_meta, GetSkillLv(), skill_meta_);
+                        hum->AddBuff(this, buff_meta, 1, skill_meta_);
                     }
                 }
                 break;
             case kBuffTargetFriendly: //友军
                 {
                     if (hum->team_id == team_id) {
-                        hum->AddBuff(this, buff_meta, GetSkillLv(), skill_meta_);
+                        hum->AddBuff(this, buff_meta, 1, skill_meta_);
                     }
                 }
                 break;
             case kBuffTargetEnemy: //敌军
                 {
                     if (hum->team_id != team_id) {
-                        hum->AddBuff(this, buff_meta, GetSkillLv(), skill_meta_);
+                        hum->AddBuff(this, buff_meta, 1, skill_meta_);
                     }
                 }
                 break;
@@ -2970,7 +2952,6 @@ void Human::TriggerOneObjectBuff(Entity* target, BuffTriggerType_e trigger_type)
             }
         }
     }
-    #endif
 }
 
 void Human::AddBuffPostProc(Creature* caster, Buff* buff)
@@ -3128,9 +3109,7 @@ void Human::AddBuffPostProc(Creature* caster, Buff* buff)
                          MetaData::Skill* skill = (MetaData::Skill*)param.param3.GetUserData();
                          MetaData::Buff* buff_meta = MetaMgr::Instance()->GetBuff(buff_id);
                          if (buff_meta && skill == caster->skill_meta_ && caster) {
-                             #if 0
-                             hum->AddBuff(caster, buff_meta, caster->GetSkillLv(), skill);
-                             #endif
+                             hum->AddBuff(caster, buff_meta, 1, skill);
                          }
                      },
                      &buff->xtimer_attacher.timer_list_);
diff --git a/server/gameserver/human.h b/server/gameserver/human.h
index db88782..77a5e2b 100644
--- a/server/gameserver/human.h
+++ b/server/gameserver/human.h
@@ -241,7 +241,6 @@ class Human : public Creature
     void SetSkin(int idx, int skin_id);
     Skin* GetSkinByIdx(int idx);
     MetaData::Skill* CurrentSkillMeta();
-    float GetSkillAtkAdd(int skill_id);
     virtual void TriggerOneObjectBuff(Entity* target, BuffTriggerType_e trigger_type) override;
     int GetLevel() {return level_;};
     int GetExp() {return exp_;};