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

1

Browse Source
This commit is contained in:
aozhiwei 2020-07-28 11:59:48 +08:00
parent 3d31f73e67
commit 062a8412e3
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/gameserver/constant.h
View File

@ -125,9 +125,10 @@ enum BuffEffectType_e
kBET_AdPlaying = 6, //看广告中
kBET_LordMode = 7, //上帝模式
kBET_NewProtect = 8, //新手保护血量低于50%
kBET_Pull = 9, //拉人
kBET_BePull = 9, //拉人(被拉方)
kBET_JumpTo = 10, //跳跃
kBET_OnceChgAttr = 11, //一次性buff
kBET_Pull = 12, //拉人(主动方)
kBET_End
};

10
server/gameserver/human.cc
View File

@ -141,7 +141,7 @@ float Human::GetSpeed()
}
}
{
Buff* buff = GetBuffByEffectId(kBET_Pull);
Buff* buff = GetBuffByEffectId(kBET_BePull);
if (buff) {
return buff->meta->param2;
}
@ -1865,7 +1865,7 @@ int Human::GetSkinConfigLv(int skin_id)
bool Human::HasSpecMove()
{
return GetBuffByEffectId(kBET_JumpTo) ||
GetBuffByEffectId(kBET_Pull);
GetBuffByEffectId(kBET_BePull);
}
void Human::_UpdateSpecMove()
@ -1902,8 +1902,8 @@ void Human::_UpdateSpecMove()
if (GetBuffByEffectId(kBET_JumpTo)) {
RemoveBuffByEffectId(kBET_JumpTo);
}
if (GetBuffByEffectId(kBET_Pull)) {
RemoveBuffByEffectId(kBET_Pull);
if (GetBuffByEffectId(kBET_BePull)) {
RemoveBuffByEffectId(kBET_BePull);
}
}
}
@ -3009,7 +3009,7 @@ void Human::ProcBuffEffect(Human* caster, Buff* buff)
}
}
break;
case kBET_Pull:
case kBET_BePull:
{
if (caster == this) {
abort();