Done menu, cambio scena

Jockbaia · May 7, 2022 · b5d833a · b5d833a
1 parent 5be7f09
commit b5d833a
Show file tree

Hide file tree

Showing 633 changed files with 72,184 additions and 11,264 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,12 +2,12 @@
 #
 # Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore
 #
-/[Ll]ibrary/
-/[Tt]emp/
-/[Oo]bj/
-/[Bb]uild/
-/[Bb]uilds/
-/[Ll]ogs/
+nuts&bolts/[Ll]ibrary/
+nuts&bolts/[Tt]emp/
+nuts&bolts/[Oo]bj/
+nuts&bolts/[Bb]uild/
+nuts&bolts/[Bb]uilds/
+nuts&bolts/[Ll]ogs/
 /[Mm]emoryCaptures/
 
 # Asset meta data should only be ignored when the corresponding asset is also ignored

diff --git a/nuts&bolts/Assets/PlayerControls.inputactions b/nuts&bolts/Assets/PlayerControls.inputactions
@@ -34,6 +34,17 @@
                     "isComposite": false,
                     "isPartOfComposite": false
                 },
+                {
+                    "name": "",
+                    "id": "3fd059ee-36b8-4031-92d8-c79a49119015",
+                    "path": "<Keyboard>/rightShift",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": "KeyboardRight",
+                    "action": "SpecialAction",
+                    "isComposite": false,
+                    "isPartOfComposite": false
+                },
                 {
                     "name": "",
                     "id": "90ab4098-04f3-4f70-be17-bd2581051dc7",
@@ -121,6 +132,61 @@
                     "action": "Movement",
                     "isComposite": false,
                     "isPartOfComposite": false
+                },
+                {
+                    "name": "IJKL",
+                    "id": "180dd46c-f532-4a77-abab-917ade598fe6",
+                    "path": "2DVector",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": "",
+                    "action": "Movement",
+                    "isComposite": true,
+                    "isPartOfComposite": false
+                },
+                {
+                    "name": "up",
+                    "id": "725263cd-14df-4f71-9ead-f9559fe89f6f",
+                    "path": "<Keyboard>/i",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": "KeyboardRight",
+                    "action": "Movement",
+                    "isComposite": false,
+                    "isPartOfComposite": true
+                },
+                {
+                    "name": "down",
+                    "id": "7a542ab5-9792-4fe4-9f50-bd1a810a6321",
+                    "path": "<Keyboard>/k",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": "KeyboardRight",
+                    "action": "Movement",
+                    "isComposite": false,
+                    "isPartOfComposite": true
+                },
+                {
+                    "name": "left",
+                    "id": "eeff7533-3e2b-43b6-99d6-bea4f38fa3e1",
+                    "path": "<Keyboard>/j",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": "KeyboardRight",
+                    "action": "Movement",
+                    "isComposite": false,
+                    "isPartOfComposite": true
+                },
+                {
+                    "name": "right",
+                    "id": "baf7df3b-62a6-40dc-8ee4-a5965c721516",
+                    "path": "<Keyboard>/l",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": "KeyboardRight",
+                    "action": "Movement",
+                    "isComposite": false,
+                    "isPartOfComposite": true
                 }
             ]
         }
@@ -147,6 +213,17 @@
                     "isOR": false
                 }
             ]
+        },
+        {
+            "name": "KeyboardRight",
+            "bindingGroup": "KeyboardRight",
+            "devices": [
+                {
+                    "devicePath": "<Keyboard>",
+                    "isOptional": false,
+                    "isOR": false
+                }
+            ]
         }
     ]
 }
diff --git a/nuts&bolts/Assets/Prefab/Player.prefab b/nuts&bolts/Assets/Prefab/Player.prefab
@@ -100,8 +100,8 @@ GameObject:
   - component: {fileID: 7608206887762183659}
   - component: {fileID: 7608206887762183656}
   - component: {fileID: 7608206887762183657}
-  - component: {fileID: 7608206887762183660}
   - component: {fileID: 7608206887762183661}
+  - component: {fileID: -6510698224084617436}
   m_Layer: 0
   m_Name: Player
   m_TagString: Untagged
@@ -188,7 +188,25 @@ CapsuleCollider:
   m_Height: 2
   m_Direction: 1
   m_Center: {x: 0, y: 0, z: 0}
---- !u!114 &7608206887762183660
+--- !u!114 &7608206887762183661
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7608206887762183670}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0a4932bf20903164b80e53b392f42113, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  moveSpeed: 5
+  movementInput: {x: 0, y: 0}
+  specialAction: 0
+  movePoint: {fileID: 0}
+  draggingBox: 0
+  selectedPower: 0
+--- !u!114 &-6510698224084617436
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -228,7 +246,7 @@ MonoBehaviour:
           m_BoolArgument: 0
         m_CallState: 2
     m_ActionId: 949588f3-dc74-4202-a6c1-d47cc3cd581c
-    m_ActionName: Gameplay/Movement[/Keyboard/w,/Keyboard/s,/Keyboard/a,/Keyboard/d,/XInputControllerWindows/leftStick]
+    m_ActionName: Gameplay/Movement[/Keyboard/w,/Keyboard/s,/Keyboard/a,/Keyboard/d,/XInputControllerWindows/leftStick,/XInputControllerWindows/leftStick,/XInputControllerWindows/dpad,/XInputControllerWindows/dpad,/Keyboard/i,/Keyboard/k,/Keyboard/j,/Keyboard/l]
   - m_PersistentCalls:
       m_Calls:
       - m_Target: {fileID: 7608206887762183661}
@@ -244,24 +262,12 @@ MonoBehaviour:
           m_BoolArgument: 0
         m_CallState: 2
     m_ActionId: 7d47aca9-ea6d-43db-ad10-41f100633ad8
-    m_ActionName: Gameplay/SpecialAction[/Keyboard/leftShift,/XInputControllerWindows/buttonWest]
-  m_NeverAutoSwitchControlSchemes: 1
+    m_ActionName: Gameplay/SpecialAction[/Keyboard/leftShift,/Keyboard/rightShift,/XInputControllerWindows/buttonWest,/XInputControllerWindows/buttonWest]
+  m_NeverAutoSwitchControlSchemes: 0
   m_DefaultControlScheme: 
   m_DefaultActionMap: Gameplay
   m_SplitScreenIndex: -1
   m_Camera: {fileID: 7608206887306186794}
---- !u!114 &7608206887762183661
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7608206887762183670}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0a4932bf20903164b80e53b392f42113, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &7608206888492980901
 GameObject:
   m_ObjectHideFlags: 0