diff --git a/Assets/Racing_Game/Scence/Main/Main.unity b/Assets/Racing_Game/Scence/Main/Main.unity index f93c4fe5..7b437ac0 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/UI/MainUI/Animations/Camera.meta b/Assets/Racing_Game/UI/MainUI/Animations/Camera.meta new file mode 100644 index 00000000..b8205fd9 --- /dev/null +++ b/Assets/Racing_Game/UI/MainUI/Animations/Camera.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 02e42aa68a49ffe40b9d552c186984a1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Racing_Game/UI/MainUI/Animations/Camera/MoveCameraFromRound.anim b/Assets/Racing_Game/UI/MainUI/Animations/Camera/MoveCameraFromRound.anim new file mode 100644 index 00000000..d0e916cb Binary files /dev/null and b/Assets/Racing_Game/UI/MainUI/Animations/Camera/MoveCameraFromRound.anim differ diff --git a/Assets/Racing_Game/UI/MainUI/Animations/Camera/MoveCameraFromRound.anim.meta b/Assets/Racing_Game/UI/MainUI/Animations/Camera/MoveCameraFromRound.anim.meta new file mode 100644 index 00000000..509ea322 --- /dev/null +++ b/Assets/Racing_Game/UI/MainUI/Animations/Camera/MoveCameraFromRound.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0e475b941203345428a8c460bc5f93a3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Racing_Game/UI/MainUI/Animations/Camera/MoveCameraToRound.anim b/Assets/Racing_Game/UI/MainUI/Animations/Camera/MoveCameraToRound.anim new file mode 100644 index 00000000..e9fe472b Binary files /dev/null and b/Assets/Racing_Game/UI/MainUI/Animations/Camera/MoveCameraToRound.anim differ diff --git a/Assets/Racing_Game/UI/MainUI/Animations/Camera/MoveCameraToRound.anim.meta b/Assets/Racing_Game/UI/MainUI/Animations/Camera/MoveCameraToRound.anim.meta new file mode 100644 index 00000000..2471f84a --- /dev/null +++ b/Assets/Racing_Game/UI/MainUI/Animations/Camera/MoveCameraToRound.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5b3cf7e41a22e904c930fca6e6585282 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Racing_Game/UI/MainUI/Animations/Camera/MoverCamer.controller b/Assets/Racing_Game/UI/MainUI/Animations/Camera/MoverCamer.controller new file mode 100644 index 00000000..940dcf38 Binary files /dev/null and b/Assets/Racing_Game/UI/MainUI/Animations/Camera/MoverCamer.controller differ diff --git a/Assets/Racing_Game/UI/MainUI/Animations/Camera/MoverCamer.controller.meta b/Assets/Racing_Game/UI/MainUI/Animations/Camera/MoverCamer.controller.meta new file mode 100644 index 00000000..36e94571 --- /dev/null +++ b/Assets/Racing_Game/UI/MainUI/Animations/Camera/MoverCamer.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 64f540471671d3e4bbc9c15ed87ef659 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TimerOnInactiveScript.cs b/Assets/TimerOnInactiveScript.cs new file mode 100644 index 00000000..c55d5a7c --- /dev/null +++ b/Assets/TimerOnInactiveScript.cs @@ -0,0 +1,76 @@ +using UnityEngine; +using UnityEngine.InputSystem; + +public class TimerOnInactiveScript : MonoBehaviour +{ + [SerializeField] float _ValueTargetTime = 30.0f; + [SerializeField] private Animator _Animator; + [SerializeField] GameObject _UIActive; + [SerializeField] GameObject _UIInactive; + + private float _TargetTime; + + private bool _CanMoveFrom; + + private void Awake() + { + _CanMoveFrom = false; + _TargetTime = _ValueTargetTime; + } + + private void Update() + { + _TargetTime -= Time.deltaTime; + if (_TargetTime <= 0.0f) + { + //Debug.Log("Таймер Закончился"); + _CanMoveFrom = true; + MoveCameraToRound(); + } + + if (Gamepad.current.wasUpdatedThisFrame) + { + //Debug.Log("кнопка нажата"); + ResetTimer(); + MoveCameraFromRound(); + } + } + + void MoveCameraToRound() + { + _UIActive.SetActive(false); + //Debug.Log("Переместился к"); + _Animator.Play("MoveCameraToRound"); + + } + + void MoveCameraFromRound() + { + if (_CanMoveFrom) + { + _UIInactive.SetActive(false); + _Animator.Play("MoveCameraFromRound"); + //Debug.Log("Переместился от"); + ResetTimer(); + + } + + } + + public void SetActiveInactive() + { + + _UIInactive.SetActive(true); + } + + public void SetActiveActive() + { + + _UIActive.SetActive(true); + } + + void ResetTimer() + { + _TargetTime = _ValueTargetTime; + } +} diff --git a/Assets/TimerOnInactiveScript.cs.meta b/Assets/TimerOnInactiveScript.cs.meta new file mode 100644 index 00000000..de157f43 --- /dev/null +++ b/Assets/TimerOnInactiveScript.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 078165a11ead93242a8bd350c42fb2db +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: