Skip to content
Snippets Groups Projects
Commit 2243134e authored by Noel Simbolon's avatar Noel Simbolon
Browse files

Merge branch 'main' of https://gitlab.informatika.org/fachrgab/if3210-2024-unity-bdm

parents f39b74b0 19d3f83e
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Assets/Action/PlayerInput.cs
+ 132
− 0
View file @ 2243134e
......@@ -156,6 +156,61 @@ public partial class @PlayerInput: IInputActionCollection2, IDisposable
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""Controller"",
""id"": ""6d5b2fa1-1eac-4c1e-a54e-78d64a695a13"",
""path"": ""2DVector"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""Move"",
""isComposite"": true,
""isPartOfComposite"": false
},
{
""name"": ""up"",
""id"": ""16691111-e049-4a34-b6dd-c3273b40f120"",
""path"": ""<XInputController>/leftStick/up"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""Move"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""down"",
""id"": ""8e6954e8-7bad-4ae1-8c94-7179cec4aa43"",
""path"": ""<XInputController>/leftStick/down"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""Move"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""left"",
""id"": ""558a8864-bcab-4eb9-a876-1fa989835b9f"",
""path"": ""<XInputController>/leftStick/left"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""Move"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": ""right"",
""id"": ""0a4f987f-6a3a-4937-bba2-5f8cc852584e"",
""path"": ""<XInputController>/leftStick/right"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""Move"",
""isComposite"": false,
""isPartOfComposite"": true
},
{
""name"": """",
""id"": ""b33bf0e1-367d-4049-a986-ec3d1ae32ead"",
......@@ -167,6 +222,17 @@ public partial class @PlayerInput: IInputActionCollection2, IDisposable
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""ce060ecb-de31-4307-9240-8f241cf2491b"",
""path"": ""<Gamepad>/buttonSouth"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""Jump"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""3f474a4e-e351-42e3-ac2b-4a6fa64960f8"",
......@@ -178,6 +244,17 @@ public partial class @PlayerInput: IInputActionCollection2, IDisposable
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""031edcd3-97ca-4e70-9aec-88e6c6587695"",
""path"": ""<Gamepad>/rightStick"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""MoveDirection"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""988245e9-5c12-424b-b725-b47ddeeb293f"",
......@@ -189,6 +266,17 @@ public partial class @PlayerInput: IInputActionCollection2, IDisposable
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""021c340d-1473-4136-a89d-147793b2f672"",
""path"": ""<Gamepad>/buttonSouth"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""Interact"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""0917a77f-a550-4878-af94-790d0e95c240"",
......@@ -200,6 +288,17 @@ public partial class @PlayerInput: IInputActionCollection2, IDisposable
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""9f110a03-2a71-4d9f-b908-861cb22f089a"",
""path"": ""<Gamepad>/buttonWest"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""OpenShop"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""d1e54374-26d3-40af-ade2-76427c127d43"",
......@@ -211,6 +310,17 @@ public partial class @PlayerInput: IInputActionCollection2, IDisposable
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""88c55a1c-4e92-461e-b555-ad8df50fc6ae"",
""path"": ""<Gamepad>/rightTrigger"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""Attack"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""1fbd979b-95de-4068-8a75-897a1236c0ff"",
......@@ -222,6 +332,17 @@ public partial class @PlayerInput: IInputActionCollection2, IDisposable
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""4f37c44e-9cad-4306-88ae-e03a7da7e9d5"",
""path"": ""<Gamepad>/buttonEast"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""Inspect"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""3a5ec151-af16-41f2-97a8-7c68d46739c9"",
......@@ -232,6 +353,17 @@ public partial class @PlayerInput: IInputActionCollection2, IDisposable
""action"": ""Skip"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""5d8b0adb-dce8-4759-ad8a-ff4c1720f288"",
""path"": ""<Gamepad>/buttonNorth"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""Skip"",
""isComposite"": false,
""isPartOfComposite"": false
}
]
}
......
Assets/Action/PlayerInput.inputactions
+ 132
− 0
View file @ 2243134e
......@@ -134,6 +134,61 @@
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "Controller",
"id": "6d5b2fa1-1eac-4c1e-a54e-78d64a695a13",
"path": "2DVector",
"interactions": "",
"processors": "",
"groups": "",
"action": "Move",
"isComposite": true,
"isPartOfComposite": false
},
{
"name": "up",
"id": "16691111-e049-4a34-b6dd-c3273b40f120",
"path": "<XInputController>/leftStick/up",
"interactions": "",
"processors": "",
"groups": "",
"action": "Move",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "down",
"id": "8e6954e8-7bad-4ae1-8c94-7179cec4aa43",
"path": "<XInputController>/leftStick/down",
"interactions": "",
"processors": "",
"groups": "",
"action": "Move",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "left",
"id": "558a8864-bcab-4eb9-a876-1fa989835b9f",
"path": "<XInputController>/leftStick/left",
"interactions": "",
"processors": "",
"groups": "",
"action": "Move",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "right",
"id": "0a4f987f-6a3a-4937-bba2-5f8cc852584e",
"path": "<XInputController>/leftStick/right",
"interactions": "",
"processors": "",
"groups": "",
"action": "Move",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "",
"id": "b33bf0e1-367d-4049-a986-ec3d1ae32ead",
......@@ -145,6 +200,17 @@
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "ce060ecb-de31-4307-9240-8f241cf2491b",
"path": "<Gamepad>/buttonSouth",
"interactions": "",
"processors": "",
"groups": "",
"action": "Jump",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "3f474a4e-e351-42e3-ac2b-4a6fa64960f8",
......@@ -156,6 +222,17 @@
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "031edcd3-97ca-4e70-9aec-88e6c6587695",
"path": "<Gamepad>/rightStick",
"interactions": "",
"processors": "",
"groups": "",
"action": "MoveDirection",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "988245e9-5c12-424b-b725-b47ddeeb293f",
......@@ -167,6 +244,17 @@
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "021c340d-1473-4136-a89d-147793b2f672",
"path": "<Gamepad>/buttonSouth",
"interactions": "",
"processors": "",
"groups": "",
"action": "Interact",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "0917a77f-a550-4878-af94-790d0e95c240",
......@@ -178,6 +266,17 @@
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "9f110a03-2a71-4d9f-b908-861cb22f089a",
"path": "<Gamepad>/buttonWest",
"interactions": "",
"processors": "",
"groups": "",
"action": "OpenShop",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "d1e54374-26d3-40af-ade2-76427c127d43",
......@@ -189,6 +288,17 @@
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "88c55a1c-4e92-461e-b555-ad8df50fc6ae",
"path": "<Gamepad>/rightTrigger",
"interactions": "",
"processors": "",
"groups": "",
"action": "Attack",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "1fbd979b-95de-4068-8a75-897a1236c0ff",
......@@ -200,6 +310,17 @@
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "4f37c44e-9cad-4306-88ae-e03a7da7e9d5",
"path": "<Gamepad>/buttonEast",
"interactions": "",
"processors": "",
"groups": "",
"action": "Inspect",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "3a5ec151-af16-41f2-97a8-7c68d46739c9",
......@@ -210,6 +331,17 @@
"action": "Skip",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "5d8b0adb-dce8-4759-ad8a-ff4c1720f288",
"path": "<Gamepad>/buttonNorth",
"interactions": "",
"processors": "",
"groups": "",
"action": "Skip",
"isComposite": false,
"isPartOfComposite": false
}
]
}
......
Assets/Scripts/Menu/PauseMenu.cs
+ 6
− 0
View file @ 2243134e
......@@ -28,12 +28,18 @@ public class PauseMenu : MonoBehaviour
pauseMenuUI.SetActive(true);
Time.timeScale = 0f;
GameIsPaused = true;
Cursor.lockState = CursorLockMode.None;
Cursor.visible = true;
}
public void Resume()
{
pauseMenuUI.SetActive(false);
Time.timeScale = 1f;
GameIsPaused = false;
Cursor.lockState = CursorLockMode.Locked;
Cursor.visible = false;
}
public void GoMainMenuAndSave()
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment