diff --git a/Assets/Racing_Game/Data/Scripts/Camera/CameraController.cs b/Assets/Racing_Game/Data/Scripts/Camera/CameraController.cs index 1e902e61..d37095af 100644 --- a/Assets/Racing_Game/Data/Scripts/Camera/CameraController.cs +++ b/Assets/Racing_Game/Data/Scripts/Camera/CameraController.cs @@ -1,10 +1,8 @@ using UnityEngine; -using System.Collections; -using UnityEngine.InputSystem; namespace RootMotion { - + public class CameraController : MonoBehaviour { @@ -31,7 +29,7 @@ namespace RootMotion public float yMinLimit = -20; // Min vertical angle public float yMaxLimit = 80; // Max vertical angle public bool rotateAlways = true; // Always rotate to mouse? - + [Header("Distance")] public float distance = 10.0f; // The current distance to target public float minDistance = 4; // The minimum distance to target @@ -59,7 +57,7 @@ namespace RootMotion private Vector3 lastUp; //Rotation - + public void SetAngles(Quaternion rotation) { Vector3 euler = rotation.eulerAngles; @@ -85,10 +83,10 @@ namespace RootMotion cam = GetComponent(); - + } - + protected virtual void Update() { @@ -131,7 +129,7 @@ namespace RootMotion // delta rotation if (rotate) { - // var _pass = _rotate.Player.CameraRotation.ReadValue(); + // var _pass = _rotate.Player.CameraRotation.ReadValue(); //x += _pass.normalized.x; //y = ClampAngle(y +_pass.normalized.y * rotationSensitivity, yMinLimit, yMaxLimit); } @@ -152,15 +150,15 @@ namespace RootMotion // Rotation //rotation = Quaternion.AngleAxis(x, Vector3.up) * Quaternion.AngleAxis(y, Vector3.right); - + if (target != null) { // Distance distance += (distanceTarget - distance) * zoomSpeed * deltaTime; - - + + } //transform.rotation = rotation; diff --git a/Assets/Racing_Game/Data/Scripts/Start/Starter.cs b/Assets/Racing_Game/Data/Scripts/Start/Starter.cs index 658730ef..c10cec89 100644 --- a/Assets/Racing_Game/Data/Scripts/Start/Starter.cs +++ b/Assets/Racing_Game/Data/Scripts/Start/Starter.cs @@ -18,8 +18,8 @@ public class Starter : MonoBehaviour { _timer.text = _starter.ToString(); - _dontMovePlayer1.enabled = false; - _dontMovePlayer2.enabled = false; + _dontMovePlayer1.DeactivateInput(); + _dontMovePlayer2.DeactivateInput(); _borders.enabled = true; @@ -38,8 +38,8 @@ public class Starter : MonoBehaviour if (_timer != null) { Destroy(_timer.gameObject); - _dontMovePlayer1.enabled = true; - _dontMovePlayer2.enabled = true; + _dontMovePlayer1.ActivateInput(); + _dontMovePlayer2.ActivateInput(); _borders.enabled = false; } } diff --git a/Assets/Racing_Game/Scence/Maps/1Map/FirstMap.unity b/Assets/Racing_Game/Scence/Maps/1Map/FirstMap.unity index 6e1bae8e..c9a1bdcc 100644 Binary files a/Assets/Racing_Game/Scence/Maps/1Map/FirstMap.unity and b/Assets/Racing_Game/Scence/Maps/1Map/FirstMap.unity differ