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-20 10:49:54 +08:00
parent 7a27294f38
commit a99793fac2
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/gameserver/player.cc
View File

@ -764,16 +764,16 @@ void Player::_CMMove(f8::MsgHdr& hdr, const cs::CMMove& msg)
if (std::abs(msg.move_dir().x()) > FLT_EPSILON || if (std::abs(msg.move_dir().x()) > FLT_EPSILON ||
std::abs(msg.move_dir().y()) > FLT_EPSILON std::abs(msg.move_dir().y()) > FLT_EPSILON
) { ) {
#if 0 glm::vec3 old_move_dir;
a8::Vec2 old_move_dir; glm::vec3 new_move_dir;
a8::Vec2 new_move_dir;
TypeConvert::FromPb(new_move_dir, &msg.move_dir()); TypeConvert::FromPb(new_move_dir, &msg.move_dir());
if (!HasBuffEffect(kBET_Vertigo)) { if (!HasBuffEffect(kBET_Vertigo)) {
if (!(HasBuffEffect(kBET_Jump) && follow_target.Get())) { if (!(HasBuffEffect(kBET_Jump) && follow_target.Get())) {
if (GetDisableMoveDirTimes() <= 0) { if (GetDisableMoveDirTimes() <= 0) {
new_move_dir.Normalize(); GlmHelper::Normalize(new_move_dir);
if (std::fabs(new_move_dir.x - GetMoveDir().x) > 0.00001f || if (std::fabs(new_move_dir.x - GetMoveDir().x) > 0.00001f ||
std::fabs(new_move_dir.y - GetMoveDir().y) > 0.00001f) { std::fabs(new_move_dir.y - GetMoveDir().y) > 0.00001f ||
std::fabs(new_move_dir.z - GetMoveDir().z) > 0.00001f) {
SetMoveDir(new_move_dir); SetMoveDir(new_move_dir);
GetMoveHelper()->CalcTargetPos(500); GetMoveHelper()->CalcTargetPos(500);
} }
@ -781,7 +781,6 @@ void Player::_CMMove(f8::MsgHdr& hdr, const cs::CMMove& msg)
} }
} }
} }
#endif
} }
} }
assert(!isnan(GetMoveDir().x) && !isnan(GetMoveDir().y)); assert(!isnan(GetMoveDir().x) && !isnan(GetMoveDir().y));

7
server/gameserver/typeconvert.cc
View File

@ -82,6 +82,13 @@ namespace TypeConvert
v.z = pb_obj->z(); v.z = pb_obj->z();
} }
void FromPb(glm::vec3& v, const cs::MFVec3* pb_obj)
{
v.x = pb_obj->x();
v.y = pb_obj->y();
v.z = pb_obj->z();
}
void ToPb(const OverReward& v, cs::MFOverReward* pb_obj) void ToPb(const OverReward& v, cs::MFOverReward* pb_obj)
{ {
pb_obj->mutable_hero()->set_id(v.hero.id); pb_obj->mutable_hero()->set_id(v.hero.id);

1
server/gameserver/typeconvert.h
View File

@ -18,6 +18,7 @@ namespace TypeConvert
void ToPb(const glm::vec3& v, cs::MFVec3* pb_obj); void ToPb(const glm::vec3& v, cs::MFVec3* pb_obj);
void FromPb(a8::Vec2& v, const cs::MFVec2* pb_obj); void FromPb(a8::Vec2& v, const cs::MFVec2* pb_obj);
void FromPb(a8::Vec2& v, const cs::MFVec3* pb_obj); void FromPb(a8::Vec2& v, const cs::MFVec3* pb_obj);
void FromPb(glm::vec3& v, const cs::MFVec3* pb_obj);
void ToPb(const a8::Vec3& v, cs::MFVec3* pb_obj); void ToPb(const a8::Vec3& v, cs::MFVec3* pb_obj);
void FromPb(a8::Vec3& v, const cs::MFVec3* pb_obj); void FromPb(a8::Vec3& v, const cs::MFVec3* pb_obj);