Merged Main

Assets/Prefabs/Player.prefab

@@ -15,6 +15,7 @@ GameObject:
   - component: {fileID: 5745475089983227923}
   - component: {fileID: 7763498473808654306}
   - component: {fileID: 3659140714710275197}
+  - component: {fileID: 9133098163257611752}
   m_Layer: 0
   m_Name: Player
   m_TagString: Untagged
@@ -32,7 +33,7 @@ Transform:
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: -1, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.25, y: 0.25, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 5569302833446856119}
@@ -87,12 +88,12 @@ SpriteRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 1
   m_MaskInteraction: 0
-  m_Sprite: {fileID: -3145328045451892686, guid: f4b1656e7a6501e46a62e1f9569815e9, type: 3}
-  m_Color: {r: 0.2, g: 0.4, b: 1, a: 1}
+  m_Sprite: {fileID: 21300000, guid: a0177f7cf2befc04eb7ca47263315dea, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
   m_DrawMode: 0
-  m_Size: {x: 0.18, y: 0.32}
+  m_Size: {x: 2.87, y: 3.58}
   m_AdaptiveModeThreshold: 0.5
   m_SpriteTileMode: 0
   m_WasSpriteAssigned: 1
@@ -124,7 +125,7 @@ Rigidbody2D:
   m_Mass: 1
   m_LinearDamping: 0
   m_AngularDamping: 0.05
-  m_GravityScale: 3
+  m_GravityScale: 2
   m_Material: {fileID: 0}
   m_IncludeLayers:
     serializedVersion: 2
@@ -170,17 +171,17 @@ BoxCollider2D:
   m_UsedByEffector: 0
   m_CompositeOperation: 0
   m_CompositeOrder: 0
-  m_Offset: {x: -0.0029773563, y: -0.000000029802322}
+  m_Offset: {x: -0.16804236, y: -0.16506457}
   m_SpriteTilingProperty:
     border: {x: 0, y: 0, z: 0, w: 0}
     pivot: {x: 0.5, y: 0.5}
-    oldSize: {x: 0.15, y: 0.31}
-    newSize: {x: 0.18, y: 0.32}
+    oldSize: {x: 2.87, y: 3.58}
+    newSize: {x: 2.87, y: 3.58}
     adaptiveTilingThreshold: 0.5
     drawMode: 0
     adaptiveTiling: 0
   m_AutoTiling: 0
-  m_Size: {x: 0.16040364, y: 0.31522292}
+  m_Size: {x: 0.7624042, y: 3.0145144}
   m_EdgeRadius: 0
 --- !u!114 &7763498473808654306
 MonoBehaviour:
@@ -198,8 +199,8 @@ MonoBehaviour:
   actionMapName: Player
   moveActionName: Move
   jumpActionName: Jump
-  controlSchemeName: Keyboard&Mouse
-  gamepadIndex: -1
+  controlSchemeName: Gamepad
+  gamepadIndex: 0
   moveSpeed: 6
   jumpImpulse: 10
   groundMask:
@@ -220,11 +221,26 @@ MonoBehaviour:
   m_EditorClassIdentifier: '::'
   inputActions: {fileID: -944628639613478452, guid: 2bcd2660ca9b64942af0de543d8d7100, type: 3}
   actionMapName: Player
-  interactActionName: Crouch
-  controlSchemeName: Keyboard&Mouse
-  gamepadIndex: -1
+  interactActionName: Interact
+  controlSchemeName: Gamepad
+  gamepadIndex: 0
   holdPoint: {fileID: 5569302833446856119}
   pickupRange: 1
+--- !u!114 &9133098163257611752
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3937090937419967315}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b88e05c37f07ccf48bcc436a9d7def5d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: '::'
+  pickupController: {fileID: 0}
+  currentStress: 0
+  maxStress: 100
 --- !u!1 &6898135930931977916
 GameObject:
   m_ObjectHideFlags: 0