From 6b3ed6a2f4a19325799095a760b44928c641ecfb Mon Sep 17 00:00:00 2001 From: Oscar Date: Sat, 19 Oct 2024 15:47:54 +0300 Subject: [PATCH] upd --- Assets/Scenes/Menu/Menu.unity | 12 ++++++++++-- Assets/Scripts/Player/CameraController.cs | 2 +- Assets/Scripts/Player/Movement.cs | 19 ++++++++++--------- ProjectSettings/ProjectSettings.asset | 2 +- 4 files changed, 22 insertions(+), 13 deletions(-) diff --git a/Assets/Scenes/Menu/Menu.unity b/Assets/Scenes/Menu/Menu.unity index 12cb495..5a9c7d4 100644 --- a/Assets/Scenes/Menu/Menu.unity +++ b/Assets/Scenes/Menu/Menu.unity @@ -9192,7 +9192,7 @@ MeshCollider: m_LayerOverridePriority: 0 m_IsTrigger: 0 m_ProvidesContacts: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 @@ -9356,6 +9356,14 @@ PrefabInstance: propertyPath: m_Name value: SinglePlayer objectReference: {fileID: 0} + - target: {fileID: 8370227802790125322, guid: 22aace1332feb514b823ccbdd87e8439, type: 3} + propertyPath: runSpeed + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 8370227802790125322, guid: 22aace1332feb514b823ccbdd87e8439, type: 3} + propertyPath: walkSpeed + value: 200 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -10624,7 +10632,7 @@ MeshCollider: m_LayerOverridePriority: 0 m_IsTrigger: 0 m_ProvidesContacts: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 diff --git a/Assets/Scripts/Player/CameraController.cs b/Assets/Scripts/Player/CameraController.cs index f2b5403..70f5b7e 100644 --- a/Assets/Scripts/Player/CameraController.cs +++ b/Assets/Scripts/Player/CameraController.cs @@ -29,7 +29,7 @@ namespace Player if (Cursor.lockState == CursorLockMode.Locked) { transform.Rotate(Vector3.up * mouseX); - _camera.transform.localRotation = Quaternion.Euler(_xRotation, 0f, 0f); + _cameraTransform.localRotation = Quaternion.Euler(_xRotation, 0f, 0f); _cameraTransform.rotation = Quaternion.Euler(_xRotation, transform.eulerAngles.y, 0f); _cameraTransform.position = targetCameraPosition.position; } diff --git a/Assets/Scripts/Player/Movement.cs b/Assets/Scripts/Player/Movement.cs index 72fc9b7..d64b6c5 100644 --- a/Assets/Scripts/Player/Movement.cs +++ b/Assets/Scripts/Player/Movement.cs @@ -1,14 +1,11 @@ -using Mirror; -using Player.States; -using StateMachine; using UnityEngine; namespace Player { public class Movement : MonoBehaviour { - public float walkSpeed = 400f; - public float runSpeed = 1200f; + public float walkSpeed; + public float runSpeed; public float jumpForce = 160f; public float groundCheckRadius = 0.14f; public Transform groundCheck; @@ -24,7 +21,8 @@ namespace Player { playerRigidbody = GetComponent(); } - + + private Vector3 _velocity; void Update() { isGrounded = Physics.CheckSphere(groundCheck.position, groundCheckRadius, groundLayer); @@ -34,14 +32,17 @@ namespace Player playerRigidbody.AddForce(Vector3.up * jumpForce, ForceMode.Impulse); } - Vector3 velocity = moveDirection * (walkSpeed * Time.deltaTime); + _velocity = moveDirection * (walkSpeed * Time.fixedDeltaTime); + } + private void FixedUpdate() + { if (Cursor.lockState == CursorLockMode.Locked) { - playerRigidbody.velocity = new Vector3(velocity.x, playerRigidbody.velocity.y, velocity.z); + playerRigidbody.velocity = new Vector3(_velocity.x, playerRigidbody.velocity.y, _velocity.z); } } - + void OnDrawGizmosSelected() { if (groundCheck != null) diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 7724298..7cb833d 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -103,7 +103,7 @@ PlayerSettings: xboxEnableFitness: 0 visibleInBackground: 1 allowFullscreenSwitch: 1 - fullscreenMode: 0 + fullscreenMode: 1 xboxSpeechDB: 0 xboxEnableHeadOrientation: 0 xboxEnableGuest: 0