diff --git a/server/gameserver/constant.h b/server/gameserver/constant.h index e86c598..65ca4de 100755 --- a/server/gameserver/constant.h +++ b/server/gameserver/constant.h @@ -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 }; diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index 2c5b44f..c8e686c 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -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();