Added keyboard controls to menus

LoshkinOleg · Mar 5, 2019 · b6957e0 · b6957e0
1 parent 3292e2c
commit b6957e0
Show file tree

Hide file tree

Showing 6 changed files with 136 additions and 8 deletions.
diff --git a/TheParatroopersUnityProject/Assets/ParatroopersFiles/Scripts/UI/MainMenuGamepadController.cs b/TheParatroopersUnityProject/Assets/ParatroopersFiles/Scripts/UI/MainMenuGamepadController.cs
@@ -21,11 +21,11 @@ private void Update()
         if (!creditsAreOpen && !howToPlayIsOpen) // If we're in main menu.
         {
             // If we're selecting a button.
-            if (InputManager.ActiveDevice.LeftStick.Up.WasPressed || InputManager.ActiveDevice.RightStick.Up.WasPressed || InputManager.ActiveDevice.DPadUp.WasPressed)
+            if (InputManager.ActiveDevice.LeftStick.Up.WasPressed || InputManager.ActiveDevice.RightStick.Up.WasPressed || InputManager.ActiveDevice.DPadUp.WasPressed || Input.GetKeyDown(KeyCode.UpArrow) || Input.GetKeyDown(KeyCode.W))
             {
                 mainMenuSelectedButton = mainMenuSelectedButton - 1 <= 0 ? 0 : mainMenuSelectedButton - 1;
             }
-            else if (InputManager.ActiveDevice.LeftStick.Down.WasPressed || InputManager.ActiveDevice.RightStick.Down.WasPressed || InputManager.ActiveDevice.DPadDown.WasPressed)
+            else if (InputManager.ActiveDevice.LeftStick.Down.WasPressed || InputManager.ActiveDevice.RightStick.Down.WasPressed || InputManager.ActiveDevice.DPadDown.WasPressed || Input.GetKeyDown(KeyCode.DownArrow) || Input.GetKeyDown(KeyCode.S))
             {
                 mainMenuSelectedButton = mainMenuSelectedButton + 1 >= 3 ? 3 : mainMenuSelectedButton + 1;
             }
@@ -41,7 +41,7 @@ private void Update()
         }
 
         // If there was a submit input.
-        if (InputManager.ActiveDevice.Action1.WasPressed || InputManager.ActiveDevice.Action2.WasPressed || InputManager.ActiveDevice.Action3.WasPressed || InputManager.ActiveDevice.Action4.WasPressed)
+        if (InputManager.ActiveDevice.AnyButtonWasPressed || Input.GetKeyDown(KeyCode.Return) || Input.GetKeyDown(KeyCode.Space))
         {
             if (!creditsAreOpen && !howToPlayIsOpen) // If we're in main menu.
             {

diff --git a/TheParatroopersUnityProject/Assets/ParatroopersFiles/Scripts/UI/PauseMenuController.cs b/TheParatroopersUnityProject/Assets/ParatroopersFiles/Scripts/UI/PauseMenuController.cs
@@ -15,17 +15,17 @@ private void Update()
     {
         if (GameManager.Instance.IsPaused)
         {
-            if (InputManager.ActiveDevice.LeftStick.Up.WasPressed || InputManager.ActiveDevice.RightStick.Up.WasPressed || InputManager.ActiveDevice.DPadUp.WasPressed)
+            if (InputManager.ActiveDevice.LeftStick.Up.WasPressed || InputManager.ActiveDevice.RightStick.Up.WasPressed || InputManager.ActiveDevice.DPadUp.WasPressed || Input.GetKeyDown(KeyCode.UpArrow) || Input.GetKeyDown(KeyCode.W))
             {
                 selectedButton = selectedButton - 1 <= 0 ? 0 : selectedButton - 1;
             }
-            else if (InputManager.ActiveDevice.LeftStick.Down.WasPressed || InputManager.ActiveDevice.RightStick.Down.WasPressed || InputManager.ActiveDevice.DPadDown.WasPressed)
+            else if (InputManager.ActiveDevice.LeftStick.Down.WasPressed || InputManager.ActiveDevice.RightStick.Down.WasPressed || InputManager.ActiveDevice.DPadDown.WasPressed || Input.GetKeyDown(KeyCode.DownArrow) || Input.GetKeyDown(KeyCode.S))
             {
                 selectedButton = selectedButton + 1 >= 1 ? 1 : selectedButton + 1;
             }
             level1_eventSystem.SetSelectedGameObject(buttons[selectedButton]);
 
-            if (InputManager.ActiveDevice.Action1.WasPressed || InputManager.ActiveDevice.Action2.WasPressed || InputManager.ActiveDevice.Action3.WasPressed || InputManager.ActiveDevice.Action4.WasPressed)
+            if (InputManager.ActiveDevice.AnyButtonWasPressed || Input.GetKeyDown(KeyCode.Return) || Input.GetKeyDown(KeyCode.Space))
             {
                 level1_eventSystem.currentSelectedGameObject.GetComponent<Button>().onClick.Invoke();
             }

diff --git a/...aratroopersUnityProject/Assets/ParatroopersFiles/Scripts/UI/ScoreMenuGamepadController.cs b/...aratroopersUnityProject/Assets/ParatroopersFiles/Scripts/UI/ScoreMenuGamepadController.cs
@@ -18,7 +18,7 @@ private void Start()
 
     private void Update()
     {
-        if (InputManager.ActiveDevice.AnyButtonWasPressed)
+        if (InputManager.ActiveDevice.AnyButtonWasPressed || Input.GetKeyDown(KeyCode.Return) || Input.GetKeyDown(KeyCode.Space))
         {
             eventSystem.currentSelectedGameObject.GetComponent<Button>().onClick.Invoke();
         }

diff --git a/TheParatroopersUnityProject/Assets/ParatroopersFiles/Sprites/icon.png b/TheParatroopersUnityProject/Assets/ParatroopersFiles/Sprites/icon.png
diff --git a/TheParatroopersUnityProject/Assets/ParatroopersFiles/Sprites/icon.png.meta b/TheParatroopersUnityProject/Assets/ParatroopersFiles/Sprites/icon.png.meta
diff --git a/TheParatroopersUnityProject/ProjectSettings/ProjectSettings.asset b/TheParatroopersUnityProject/ProjectSettings/ProjectSettings.asset
@@ -252,7 +252,14 @@ PlayerSettings:
     banner: {fileID: 0}
   androidGamepadSupportLevel: 0
   resolutionDialogBanner: {fileID: 0}
-  m_BuildTargetIcons: []
+  m_BuildTargetIcons:
+  - m_BuildTarget: 
+    m_Icons:
+    - serializedVersion: 2
+      m_Icon: {fileID: 2800000, guid: 5aec515340a62664290933907f86d50f, type: 3}
+      m_Width: 128
+      m_Height: 128
+      m_Kind: 0
   m_BuildTargetPlatformIcons: []
   m_BuildTargetBatching: []
   m_BuildTargetGraphicsAPIs: []