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

1

Browse Source
This commit is contained in:
aozhiwei 2022-12-28 09:45:29 +08:00
parent b7592f1601
commit 54ee60278b
4 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/gameserver/buff.cc
View File

@ -582,7 +582,7 @@ void Buff::ProcTurnOver()
}));
#endif
Global::Instance()->verify_set_pos = 1;
owner->_UpdateMove(distance);
owner->ForwardMove(distance);
Global::Instance()->verify_set_pos = 0;
owner->SetMoveDir(old_dir);
if (phase->param2.GetInt() == 1) {
@ -732,7 +732,7 @@ void Buff::ProcBeatBack()
if (std::abs(meta->_int_param1) > 0) {
glm::vec3 old_move_dir = owner->GetMoveDir();
owner->SetMoveDir(caster_.Get()->context_dir);
owner->_UpdateMove(meta->_param1);
owner->ForwardMove(meta->_param1);
owner->SetMoveDir(old_move_dir);
}
}
@ -909,7 +909,7 @@ void Buff::ProcReserve()
switch (skill_meta->GetMagicId()) {
case MAGIC_YMCZ:
{
owner->_UpdateMove(SkillHelper::GetYmczReserveDistance(skill_meta));
owner->ForwardMove(SkillHelper::GetYmczReserveDistance(skill_meta));
}
break;
default:
@ -919,7 +919,7 @@ void Buff::ProcReserve()
}
} else {
if (meta->_param1 > 0.001) {
owner->_UpdateMove(meta->_param1);
owner->ForwardMove(meta->_param1);
}
}
}

10
server/gameserver/creature.cc
View File

@ -1089,11 +1089,7 @@ void Creature::ProcSkillPhase(const mt::SkillPhase* phase)
#ifdef DEBUG
a8::XPrintf("old_pos:%f,%f\n", {GetPos().x, GetPos().y});
#endif
#if 1
_UpdateMove(SkillHelper::GetSjydhxForthDistance(CurrentSkill()->meta));
#else
_UpdateMove(phase->param1.GetInt());
#endif
ForwardMove(SkillHelper::GetSjydhxForthDistance(CurrentSkill()->meta));
float recover_hp = SkillHelper::GetSjydhxRecoverHp(this, CurrentSkill()->meta);
AddHp(recover_hp);
glm::vec3 pre_dir = old_dir;
@ -1120,7 +1116,7 @@ void Creature::ProcSkillPhase(const mt::SkillPhase* phase)
GlmHelper::Normalize(new_dir);
SetMoveDir(new_dir);
TryAddBuff(this, buff_id2);
_UpdateMove(distance);
ForwardMove(distance);
}
SetMoveDir(old_dir);
TryAddBuffAndSetTime(this,
@ -3116,7 +3112,7 @@ void Creature::DoRecoilForce(int distance)
glm::vec3 old_move_dir = GetMoveDir();
MustBeAddBuff(this, kRecoilBuffId);
SetMoveDir(GetAttackDir() * -1.0f);
_UpdateMove(distance);
ForwardMove(distance);
SetMoveDir(old_move_dir);
}
}

1
server/gameserver/creature.h
View File

@ -218,6 +218,7 @@ class Creature : public MoveableEntity
void DecInventory(int slot_id, int num);
std::array<Inventory, IS_END>& GetInventoryData() { return inventory_; };
virtual void _UpdateMove(int speed) {};
virtual void ForwardMove(float distance) {};
bool HasSpecMove();
void _UpdateSpecMove();

2
server/gameserver/pbutils.cc
View File

@ -1529,7 +1529,7 @@ void GGListener::SendError(int sockhandle, unsigned int seqid,
}
msg.set_lineno(lineno);
msg.set_error_param(error_param);
f8::Net_SendProxyMsg(tcp_listener_, sockhandle, seqid, error_code, cs::_SMRpcError, msg);
f8::Net_SendProxyMsg(tcp_listener_.get(), sockhandle, seqid, error_code, cs::_SMRpcError, msg);
}
void GGListener::ForceCloseChildSocket(int sockhandle)