1
This commit is contained in:
parent
32cb4e1bf1
commit
e314b876a2
@ -628,7 +628,7 @@ void Player::Shot()
|
|||||||
glm::vec3 old_attack_dir = GetAttackDir();
|
glm::vec3 old_attack_dir = GetAttackDir();
|
||||||
if (std::fabs(shot_client_pos->x - GetPos().GetX()) < 60.0f &&
|
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().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();
|
glm::vec3 new_attack_dir = *shot_target_pos - GetPos().ToGlmVec3();
|
||||||
GlmHelper::Normalize(new_attack_dir);
|
GlmHelper::Normalize(new_attack_dir);
|
||||||
SetAttackDir(new_attack_dir);
|
SetAttackDir(new_attack_dir);
|
||||||
@ -1414,9 +1414,7 @@ void Player::PushJoinRoomMsg()
|
|||||||
notifymsg.set_server_info(JsonDataMgr::Instance()->server_info);
|
notifymsg.set_server_info(JsonDataMgr::Instance()->server_info);
|
||||||
room->FillSMJoinedNotify(this, notifymsg);
|
room->FillSMJoinedNotify(this, notifymsg);
|
||||||
#ifdef DEBUG
|
#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
|
#else
|
||||||
notifymsg.set_pre_client_shot(mt::Param::s().pre_client_shot);
|
notifymsg.set_pre_client_shot(mt::Param::s().pre_client_shot);
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user