server/game2005
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2021-03-18 17:43:27 +08:00
parent da996d7ebe
commit 55a22a601e
2 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
server/gameserver/human.cc
View File

@ -2913,26 +2913,8 @@ MetaData::Skill* Human::CurrentSkillMeta()
return skill_meta_; 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) void Human::TriggerOneObjectBuff(Entity* target, BuffTriggerType_e trigger_type)
{ {
#if 0
if (!target->IsEntityType(ET_Player)) { if (!target->IsEntityType(ET_Player)) {
return; return;
} }
@ -2947,21 +2929,21 @@ void Human::TriggerOneObjectBuff(Entity* target, BuffTriggerType_e trigger_type)
case kBuffTargetSelf: //自己 case kBuffTargetSelf: //自己
{ {
if (hum == this) { if (hum == this) {
hum->AddBuff(this, buff_meta, GetSkillLv(), skill_meta_); hum->AddBuff(this, buff_meta, 1, skill_meta_);
} }
} }
break; break;
case kBuffTargetFriendly: //友军 case kBuffTargetFriendly: //友军
{ {
if (hum->team_id == team_id) { if (hum->team_id == team_id) {
hum->AddBuff(this, buff_meta, GetSkillLv(), skill_meta_); hum->AddBuff(this, buff_meta, 1, skill_meta_);
} }
} }
break; break;
case kBuffTargetEnemy: //敌军 case kBuffTargetEnemy: //敌军
{ {
if (hum->team_id != team_id) { if (hum->team_id != team_id) {
hum->AddBuff(this, buff_meta, GetSkillLv(), skill_meta_); hum->AddBuff(this, buff_meta, 1, skill_meta_);
} }
} }
break; break;
@ -2970,7 +2952,6 @@ void Human::TriggerOneObjectBuff(Entity* target, BuffTriggerType_e trigger_type)
} }
} }
} }
#endif
} }
void Human::AddBuffPostProc(Creature* caster, Buff* buff) 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::Skill* skill = (MetaData::Skill*)param.param3.GetUserData();
MetaData::Buff* buff_meta = MetaMgr::Instance()->GetBuff(buff_id); MetaData::Buff* buff_meta = MetaMgr::Instance()->GetBuff(buff_id);
if (buff_meta && skill == caster->skill_meta_ && caster) { if (buff_meta && skill == caster->skill_meta_ && caster) {
#if 0 hum->AddBuff(caster, buff_meta, 1, skill);
hum->AddBuff(caster, buff_meta, caster->GetSkillLv(), skill);
#endif
} }
}, },
&buff->xtimer_attacher.timer_list_); &buff->xtimer_attacher.timer_list_);

1
server/gameserver/human.h
View File

@ -241,7 +241,6 @@ class Human : public Creature
void SetSkin(int idx, int skin_id); void SetSkin(int idx, int skin_id);
Skin* GetSkinByIdx(int idx); Skin* GetSkinByIdx(int idx);
MetaData::Skill* CurrentSkillMeta(); MetaData::Skill* CurrentSkillMeta();
float GetSkillAtkAdd(int skill_id);
virtual void TriggerOneObjectBuff(Entity* target, BuffTriggerType_e trigger_type) override; virtual void TriggerOneObjectBuff(Entity* target, BuffTriggerType_e trigger_type) override;
int GetLevel() {return level_;}; int GetLevel() {return level_;};
int GetExp() {return exp_;}; int GetExp() {return exp_;};