From e314b876a2028bae20a6264fb505b63e2b603cea Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 31 May 2023 14:39:09 +0800 Subject: [PATCH] 1 --- server/gameserver/player.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc index 626fddae..4946db7c 100644 --- a/server/gameserver/player.cc +++ b/server/gameserver/player.cc @@ -628,7 +628,7 @@ void Player::Shot() glm::vec3 old_attack_dir = GetAttackDir(); if (std::fabs(shot_client_pos->x - GetPos().GetX()) < 60.0f && std::fabs(shot_client_pos->y - GetPos().GetY()) < 5.0f && - std::fabs(shot_client_pos->y - GetPos().GetZ()) < 60.0f) { + std::fabs(shot_client_pos->z - GetPos().GetZ()) < 60.0f) { glm::vec3 new_attack_dir = *shot_target_pos - GetPos().ToGlmVec3(); GlmHelper::Normalize(new_attack_dir); SetAttackDir(new_attack_dir); @@ -1414,9 +1414,7 @@ void Player::PushJoinRoomMsg() notifymsg.set_server_info(JsonDataMgr::Instance()->server_info); room->FillSMJoinedNotify(this, notifymsg); #ifdef DEBUG - if (App::Instance()->instance_id == 6) { - notifymsg.set_pre_client_shot(mt::Param::s().pre_client_shot); - } + notifymsg.set_pre_client_shot(mt::Param::s().pre_client_shot); #else notifymsg.set_pre_client_shot(mt::Param::s().pre_client_shot); #endif