This commit is contained in:
aozhiwei 2022-12-20 10:55:00 +08:00
parent a99793fac2
commit 5af52aa19a

View File

@ -767,6 +767,11 @@ void Player::_CMMove(f8::MsgHdr& hdr, const cs::CMMove& msg)
glm::vec3 old_move_dir; glm::vec3 old_move_dir;
glm::vec3 new_move_dir; glm::vec3 new_move_dir;
TypeConvert::FromPb(new_move_dir, &msg.move_dir()); TypeConvert::FromPb(new_move_dir, &msg.move_dir());
// 666
#if 1
new_move_dir.z = new_move_dir.y;
new_move_dir.y = 0.0f;
#endif
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) {
@ -789,7 +794,8 @@ void Player::_CMMove(f8::MsgHdr& hdr, const cs::CMMove& msg)
std::isfinite(msg.attack_dir().y()) && std::isfinite(msg.attack_dir().y()) &&
( (
std::abs(msg.attack_dir().x()) > 0.00001f || std::abs(msg.attack_dir().x()) > 0.00001f ||
std::abs(msg.attack_dir().y()) > 0.00001f std::abs(msg.attack_dir().y()) > 0.00001f ||
std::abs(msg.attack_dir().z()) > 0.00001f
) )
){ ){
bool can_set = true; bool can_set = true;
@ -812,7 +818,12 @@ void Player::_CMMove(f8::MsgHdr& hdr, const cs::CMMove& msg)
if (can_set) { if (can_set) {
if (GetDisableMoveDirTimes() <= 0 && if (GetDisableMoveDirTimes() <= 0 &&
GetDisableAttackDirTimes() <= 0) { GetDisableAttackDirTimes() <= 0) {
// 666
#if 1
glm::vec3 attack_dir(msg.attack_dir().x(), msg.attack_dir().z(), msg.attack_dir().y());
#else
glm::vec3 attack_dir(msg.attack_dir().x(), msg.attack_dir().y(), msg.attack_dir().z()); glm::vec3 attack_dir(msg.attack_dir().x(), msg.attack_dir().y(), msg.attack_dir().z());
#endif
GlmHelper::Normalize(attack_dir); GlmHelper::Normalize(attack_dir);
SetAttackDir(attack_dir); SetAttackDir(attack_dir);
if (GetCar() && GetCar()->IsDriver(this)) { if (GetCar() && GetCar()->IsDriver(this)) {