diff --git a/Assets/MinimapStatrScript.cs b/Assets/MinimapStatrScript.cs index ae4db1c6..640fd077 100644 --- a/Assets/MinimapStatrScript.cs +++ b/Assets/MinimapStatrScript.cs @@ -2,14 +2,14 @@ using UnityEngine; public class MinimapStatrScript : MonoBehaviour { - [SerializeField] private FollowTarget _FollowTarget; - [SerializeField] private FollowYRotation _FollowYRotation; + [SerializeField] private FollowTarget _followTarget; + [SerializeField] private FollowYRotation _followYRotation; [SerializeField] private SelectCarGameScript _SelectCarGameScript; private void Start() { - _FollowTarget.target = _SelectCarGameScript._CurrentCar.transform; - _FollowYRotation.target = _SelectCarGameScript._CurrentCar.transform; + _followTarget.target = _SelectCarGameScript._CurrentCar.transform; + _followYRotation.target = _SelectCarGameScript._CurrentCar.transform; } } diff --git a/Assets/Racing_Game/Scence/Main/Main.unity b/Assets/Racing_Game/Scence/Main/Main.unity index 3a7c1656..b6c3ce91 100644 Binary files a/Assets/Racing_Game/Scence/Main/Main.unity and b/Assets/Racing_Game/Scence/Main/Main.unity differ diff --git a/Assets/Racing_Game/Scence/Maps/2Map/Track216KIT.unity b/Assets/Racing_Game/Scence/Maps/2Map/Track216KIT.unity index 399bb967..4eb7b272 100644 Binary files a/Assets/Racing_Game/Scence/Maps/2Map/Track216KIT.unity and b/Assets/Racing_Game/Scence/Maps/2Map/Track216KIT.unity differ diff --git a/Assets/Racing_Game/Scence/Maps/3Map/Track-KIT.unity b/Assets/Racing_Game/Scence/Maps/3Map/Track-KIT.unity index d6f6b675..3b072efe 100644 Binary files a/Assets/Racing_Game/Scence/Maps/3Map/Track-KIT.unity and b/Assets/Racing_Game/Scence/Maps/3Map/Track-KIT.unity differ diff --git a/Assets/Racing_Game/Scence/Maps/5Map/Track_D_Final.unity b/Assets/Racing_Game/Scence/Maps/5Map/Track_D_Final.unity index 6a3c7160..010e7be0 100644 Binary files a/Assets/Racing_Game/Scence/Maps/5Map/Track_D_Final.unity and b/Assets/Racing_Game/Scence/Maps/5Map/Track_D_Final.unity differ diff --git a/Assets/Racing_Game/Scence/Maps/6Map/Autumn_4_day.unity b/Assets/Racing_Game/Scence/Maps/6Map/Autumn_4_day.unity index 25d23d1c..4d447461 100644 Binary files a/Assets/Racing_Game/Scence/Maps/6Map/Autumn_4_day.unity and b/Assets/Racing_Game/Scence/Maps/6Map/Autumn_4_day.unity differ diff --git a/Assets/Racing_Game/Scence/Maps/8Map/Race Track.unity b/Assets/Racing_Game/Scence/Maps/8Map/Race Track.unity index 3c7862d4..a584c24d 100644 Binary files a/Assets/Racing_Game/Scence/Maps/8Map/Race Track.unity and b/Assets/Racing_Game/Scence/Maps/8Map/Race Track.unity differ diff --git a/Assets/Racing_Game/Scripts/Maps/CheckNumPlayerScript.cs b/Assets/Racing_Game/Scripts/Maps/CheckNumPlayerScript.cs index 69cacd6b..0a96a9cb 100644 --- a/Assets/Racing_Game/Scripts/Maps/CheckNumPlayerScript.cs +++ b/Assets/Racing_Game/Scripts/Maps/CheckNumPlayerScript.cs @@ -8,15 +8,15 @@ public class CheckNumPlayerScript : MonoBehaviour [SerializeField] private SetActiveScript _setActiveFirstPlayer; [SerializeField] private SetActiveScript _setActiveSecondPlayer; - [SerializeField] Camera _CameraFirstPlayer; - [SerializeField] Camera _CameraSecondPlayer; + [SerializeField] Camera _cameraFirstPlayer; + [SerializeField] Camera _cameraSecondPlayer; private void Start() { if (StaticDataMap.NumPlayer == 1) { _setActiveFirstPlayer.SetActiveSelected(); - _CameraFirstPlayer.rect = new Rect(0f, 0f, 1f, 1f); + _cameraFirstPlayer.rect = new Rect(0f, 0f, 1f, 1f); } else diff --git a/Assets/Racing_Game/UI/MainUI/Scripts/TimerOnInactiveScript.cs b/Assets/Racing_Game/UI/MainUI/Scripts/TimerOnInactiveScript.cs index cdf1bafb..3890f629 100644 --- a/Assets/Racing_Game/UI/MainUI/Scripts/TimerOnInactiveScript.cs +++ b/Assets/Racing_Game/UI/MainUI/Scripts/TimerOnInactiveScript.cs @@ -1,31 +1,36 @@ +using System.Collections.Generic; using UnityEngine; +using UnityEngine.EventSystems; using UnityEngine.InputSystem; using UnityEngine.InputSystem.Controls; +using UnityEngine.UI; public class TimerOnInactiveScript : MonoBehaviour { - [SerializeField] float _ValueTargetTime = 30.0f; - [SerializeField] private Animator _Animator; + [SerializeField] float _valueTargetTime = 30.0f; + [SerializeField] private Animator _animator; [SerializeField] GameObject _UIActive; [SerializeField] GameObject _UIInactive; - [SerializeField] private float _TargetTime; + [SerializeField] GameObject _button; - private bool _CanMoveFrom; + [SerializeField] private float _targetTime; + + private bool _canMoveFrom; private void Awake() { - _CanMoveFrom = false; - _TargetTime = _ValueTargetTime; + _canMoveFrom = false; + _targetTime = _valueTargetTime; } private void Update() { - _TargetTime -= Time.deltaTime; - if (_TargetTime <= 0.0f) + _targetTime -= Time.deltaTime; + if (_targetTime <= 0.0f) { //Debug.Log("Таймер Закончился"); - _CanMoveFrom = true; + _canMoveFrom = true; MoveCameraToRound(); } @@ -66,17 +71,32 @@ public class TimerOnInactiveScript : MonoBehaviour { _UIActive.SetActive(false); //Debug.Log("Переместился к"); - _Animator.Play("MoveCameraToRound"); + _animator.Play("MoveCameraToRound"); } void MoveCameraFromRound() { - if (_CanMoveFrom) + if (_canMoveFrom) { _UIInactive.SetActive(false); - _Animator.Play("MoveCameraFromRound"); + _animator.Play("MoveCameraFromRound"); //Debug.Log("Переместился от"); ResetTimer(); + + //_button.GetComponent