menus, movement

menus and movement (wall collisions)
theradest1 · Mar 3, 2022 · fe9cdfd · fe9cdfd
1 parent 5782ec6
commit fe9cdfd
Show file tree

Hide file tree

Showing 7 changed files with 2,970 additions and 257 deletions.
diff --git a/Assets/Menu.cs b/Assets/Menu.cs
@@ -0,0 +1,37 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class Menu : MonoBehaviour
+{
+
+    public Canvas menu;
+    public GameObject settings;
+    public GameObject main;
+    public GameObject hidden;
+    public GameObject controls;
+
+    public void quit(){
+        Application.Quit();
+    }
+    public void open(){
+        if(!menu.gameObject.activeSelf){
+            menu.gameObject.SetActive(true);
+            OpenMenu(main);
+        }
+        else{
+            menu.gameObject.SetActive(false);
+        }
+    }
+    public void OpenMenu(GameObject thing){
+        AllOff();
+        thing.SetActive(true);
+    }
+    public void AllOff(){
+        main.SetActive(false);
+        settings.SetActive(false);
+        hidden.SetActive(false);
+        controls.SetActive(false);
+    }
+}
diff --git a/Assets/Menu.cs.meta b/Assets/Menu.cs.meta
diff --git a/Assets/PlayerInput.inputactions b/Assets/PlayerInput.inputactions
@@ -76,6 +76,15 @@
                     "processors": "",
                     "interactions": "",
                     "initialStateCheck": false
+                },
+                {
+                    "name": "Menu",
+                    "type": "Button",
+                    "id": "1177a59b-4871-4e5c-a326-a8003d2a506c",
+                    "expectedControlType": "Button",
+                    "processors": "",
+                    "interactions": "",
+                    "initialStateCheck": true
                 }
             ],
             "bindings": [
@@ -474,6 +483,28 @@
                     "action": "RightBlockSwitch",
                     "isComposite": false,
                     "isPartOfComposite": false
+                },
+                {
+                    "name": "",
+                    "id": "3856aebb-392f-4971-be78-b8213730b49d",
+                    "path": "<Keyboard>/escape",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": "Keyboard",
+                    "action": "Menu",
+                    "isComposite": false,
+                    "isPartOfComposite": false
+                },
+                {
+                    "name": "",
+                    "id": "0f231fc1-db04-4f60-a38b-624f385152c8",
+                    "path": "<Gamepad>/start",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": "Controller",
+                    "action": "Menu",
+                    "isComposite": false,
+                    "isPartOfComposite": false
                 }
             ]
         }