diff --git a/Assets/Racing_Game/InputActionAsset/MainScence/MainInputMain.inputactions b/Assets/Racing_Game/InputActionAsset/MainScence/MainInputMain.inputactions index 30f6e12c..59783ab0 100644 --- a/Assets/Racing_Game/InputActionAsset/MainScence/MainInputMain.inputactions +++ b/Assets/Racing_Game/InputActionAsset/MainScence/MainInputMain.inputactions @@ -207,6 +207,61 @@ "isComposite": false, "isPartOfComposite": false }, + { + "name": "2D Vector", + "id": "fc8df150-cf95-48c7-8f83-52e1d99dcc73", + "path": "2DVector", + "interactions": "", + "processors": "", + "groups": "", + "action": "Move", + "isComposite": true, + "isPartOfComposite": false + }, + { + "name": "up", + "id": "467edd3b-7270-4cbb-aa7f-42da64798aaf", + "path": "/w", + "interactions": "", + "processors": "", + "groups": "", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "down", + "id": "894c888f-08b0-409e-8fad-e6d1a4639052", + "path": "/s", + "interactions": "", + "processors": "", + "groups": "", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "left", + "id": "ca3a6e6d-2921-4807-a507-fffcba159ca0", + "path": "/a", + "interactions": "", + "processors": "", + "groups": "", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, + { + "name": "right", + "id": "bce8a4c3-41ee-4d46-bcfa-806c9646e5d0", + "path": "/d", + "interactions": "", + "processors": "", + "groups": "", + "action": "Move", + "isComposite": false, + "isPartOfComposite": true + }, { "name": "", "id": "83039f45-6901-4dc9-8336-e0cfce58be6d", @@ -218,6 +273,17 @@ "isComposite": false, "isPartOfComposite": false }, + { + "name": "", + "id": "915669cd-7677-4f5b-96d8-df6b1cb307bd", + "path": "/space", + "interactions": "", + "processors": "", + "groups": "", + "action": "Submit", + "isComposite": false, + "isPartOfComposite": false + }, { "name": "", "id": "34b17771-9abc-4619-baac-eba36fda801d", diff --git a/Assets/TimerOnInactiveScript.cs b/Assets/TimerOnInactiveScript.cs index c55d5a7c..24595783 100644 --- a/Assets/TimerOnInactiveScript.cs +++ b/Assets/TimerOnInactiveScript.cs @@ -28,7 +28,9 @@ public class TimerOnInactiveScript : MonoBehaviour MoveCameraToRound(); } - if (Gamepad.current.wasUpdatedThisFrame) + //ResetTimer(); + //MoveCameraFromRound(); + if (Gamepad.current.wasUpdatedThisFrame || Keyboard.current.wasUpdatedThisFrame) { //Debug.Log("кнопка нажата"); ResetTimer(); @@ -41,7 +43,6 @@ public class TimerOnInactiveScript : MonoBehaviour _UIActive.SetActive(false); //Debug.Log("Переместился к"); _Animator.Play("MoveCameraToRound"); - } void MoveCameraFromRound() @@ -52,20 +53,16 @@ public class TimerOnInactiveScript : MonoBehaviour _Animator.Play("MoveCameraFromRound"); //Debug.Log("Переместился от"); ResetTimer(); - } - } public void SetActiveInactive() { - _UIInactive.SetActive(true); } public void SetActiveActive() { - _UIActive.SetActive(true); }