diff --git a/Assets/Input/Player.cs b/Assets/Input/Player.cs index ccb1e9a..c60e850 100644 --- a/Assets/Input/Player.cs +++ b/Assets/Input/Player.cs @@ -46,6 +46,15 @@ namespace Input ""processors"": """", ""interactions"": """", ""initialStateCheck"": false + }, + { + ""name"": ""Interact"", + ""type"": ""Button"", + ""id"": ""a0a57f7b-062d-458c-a85a-d6030c412835"", + ""expectedControlType"": ""Button"", + ""processors"": """", + ""interactions"": """", + ""initialStateCheck"": false } ], ""bindings"": [ @@ -136,6 +145,28 @@ namespace Input ""action"": ""Jump"", ""isComposite"": false, ""isPartOfComposite"": false + }, + { + ""name"": """", + ""id"": ""4eb9a209-b978-4daf-927a-2f013348d294"", + ""path"": ""/z"", + ""interactions"": """", + ""processors"": """", + ""groups"": ""KeyBoard"", + ""action"": ""Interact"", + ""isComposite"": false, + ""isPartOfComposite"": false + }, + { + ""name"": """", + ""id"": ""c2dc0361-1191-4641-97e6-d105f64ee7ff"", + ""path"": ""/buttonEast"", + ""interactions"": """", + ""processors"": """", + ""groups"": ""Controller"", + ""action"": ""Interact"", + ""isComposite"": false, + ""isPartOfComposite"": false } ] } @@ -169,6 +200,7 @@ namespace Input m_PlayerControl = asset.FindActionMap("PlayerControl", throwIfNotFound: true); m_PlayerControl_Move = m_PlayerControl.FindAction("Move", throwIfNotFound: true); m_PlayerControl_Jump = m_PlayerControl.FindAction("Jump", throwIfNotFound: true); + m_PlayerControl_Interact = m_PlayerControl.FindAction("Interact", throwIfNotFound: true); } public void Dispose() @@ -230,12 +262,14 @@ namespace Input private IPlayerControlActions m_PlayerControlActionsCallbackInterface; private readonly InputAction m_PlayerControl_Move; private readonly InputAction m_PlayerControl_Jump; + private readonly InputAction m_PlayerControl_Interact; public struct PlayerControlActions { private @PlayerInput m_Wrapper; public PlayerControlActions(@PlayerInput wrapper) { m_Wrapper = wrapper; } public InputAction @Move => m_Wrapper.m_PlayerControl_Move; public InputAction @Jump => m_Wrapper.m_PlayerControl_Jump; + public InputAction @Interact => m_Wrapper.m_PlayerControl_Interact; public InputActionMap Get() { return m_Wrapper.m_PlayerControl; } public void Enable() { Get().Enable(); } public void Disable() { Get().Disable(); } @@ -251,6 +285,9 @@ namespace Input @Jump.started -= m_Wrapper.m_PlayerControlActionsCallbackInterface.OnJump; @Jump.performed -= m_Wrapper.m_PlayerControlActionsCallbackInterface.OnJump; @Jump.canceled -= m_Wrapper.m_PlayerControlActionsCallbackInterface.OnJump; + @Interact.started -= m_Wrapper.m_PlayerControlActionsCallbackInterface.OnInteract; + @Interact.performed -= m_Wrapper.m_PlayerControlActionsCallbackInterface.OnInteract; + @Interact.canceled -= m_Wrapper.m_PlayerControlActionsCallbackInterface.OnInteract; } m_Wrapper.m_PlayerControlActionsCallbackInterface = instance; if (instance != null) @@ -261,6 +298,9 @@ namespace Input @Jump.started += instance.OnJump; @Jump.performed += instance.OnJump; @Jump.canceled += instance.OnJump; + @Interact.started += instance.OnInteract; + @Interact.performed += instance.OnInteract; + @Interact.canceled += instance.OnInteract; } } } @@ -287,6 +327,7 @@ namespace Input { void OnMove(InputAction.CallbackContext context); void OnJump(InputAction.CallbackContext context); + void OnInteract(InputAction.CallbackContext context); } } } diff --git a/Assets/Input/Player.inputactions b/Assets/Input/Player.inputactions index f2f2c11..296afb3 100644 --- a/Assets/Input/Player.inputactions +++ b/Assets/Input/Player.inputactions @@ -22,6 +22,15 @@ "processors": "", "interactions": "", "initialStateCheck": false + }, + { + "name": "Interact", + "type": "Button", + "id": "a0a57f7b-062d-458c-a85a-d6030c412835", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false } ], "bindings": [ @@ -112,6 +121,28 @@ "action": "Jump", "isComposite": false, "isPartOfComposite": false + }, + { + "name": "", + "id": "4eb9a209-b978-4daf-927a-2f013348d294", + "path": "/z", + "interactions": "", + "processors": "", + "groups": "KeyBoard", + "action": "Interact", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "c2dc0361-1191-4641-97e6-d105f64ee7ff", + "path": "/buttonEast", + "interactions": "", + "processors": "", + "groups": "Controller", + "action": "Interact", + "isComposite": false, + "isPartOfComposite": false } ] } diff --git a/Assets/Prefabs/Playable/Player.prefab b/Assets/Prefabs/Playable/Player.prefab index 91c3f1b..f7f8663 100644 --- a/Assets/Prefabs/Playable/Player.prefab +++ b/Assets/Prefabs/Playable/Player.prefab @@ -29,10 +29,11 @@ Transform: m_GameObject: {fileID: 7008207192594766305} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -4.55, y: 0.41, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 1, y: 2, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7008207193600475140} + - {fileID: 3507368432553107122} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -117,10 +118,10 @@ Rigidbody2D: m_AngularDrag: 0.05 m_GravityScale: 1 m_Material: {fileID: 0} - m_Interpolate: 0 + m_Interpolate: 1 m_SleepingMode: 1 m_CollisionDetection: 1 - m_Constraints: 0 + m_Constraints: 4 --- !u!61 &7008207192594766308 BoxCollider2D: m_ObjectHideFlags: 0 @@ -172,7 +173,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7008207193600475141} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.005, y: -0.48, z: 0} + m_LocalPosition: {x: -0.005, y: -0.491, z: 0} m_LocalScale: {x: 0.95, y: 0.05, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -194,3 +195,50 @@ MonoBehaviour: layerMask: serializedVersion: 2 m_Bits: 4294967048 +--- !u!1 &7353493454494059090 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3507368432553107122} + - component: {fileID: 5720529389170152932} + m_Layer: 6 + m_Name: PlayerInteractableTrigger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3507368432553107122 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7353493454494059090} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.72, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1.5, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7008207192594766311} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5720529389170152932 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7353493454494059090} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7000c8c0eb91b2d4cb9a0e3ee1b609a7, type: 3} + m_Name: + m_EditorClassIdentifier: + layerMask: + serializedVersion: 2 + m_Bits: 4294967040 diff --git a/Assets/Scenes/OverDevScene.unity b/Assets/Scenes/OverDevScene.unity index 4eb7de9..f98c751 100644 --- a/Assets/Scenes/OverDevScene.unity +++ b/Assets/Scenes/OverDevScene.unity @@ -148,7 +148,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 65152409} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.9862347, y: 2.4004586, z: -9.967962} + m_LocalPosition: {x: -24.753765, y: 2.9204586, z: -9.967962} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -178,7 +178,7 @@ MonoBehaviour: m_Follow: {fileID: 1053905692} m_Lens: FieldOfView: 60 - OrthographicSize: 5 + OrthographicSize: 13 NearClipPlane: 0.3 FarClipPlane: 1000 Dutch: 0 @@ -194,11 +194,255 @@ MonoBehaviour: m_Calls: [] m_LegacyBlendHint: 0 m_ComponentOwner: {fileID: 1483260705} +--- !u!1001 &151052495 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_LocalScale.x + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_LocalPosition.x + value: 16.55 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_LocalPosition.y + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012094, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_Name + value: PlatformTest (4) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} +--- !u!1001 &498167244 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_LocalScale.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_LocalPosition.x + value: -4.47 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_LocalPosition.y + value: 1.46 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012094, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_Name + value: PlatformTest (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} +--- !u!1001 &1032596411 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_LocalScale.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_LocalPosition.x + value: -12.01 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_LocalPosition.y + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012094, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_Name + value: PlatformTest (2) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} --- !u!4 &1053905692 stripped Transform: m_CorrespondingSourceObject: {fileID: 7008207192594766311, guid: 2ed6bfce9ad3e19428cb9bef743e0fa3, type: 3} m_PrefabInstance: {fileID: 7008207193554258683} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1174240662 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_LocalScale.x + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_LocalPosition.x + value: -24.78 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_LocalPosition.y + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012094, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_Name + value: PlatformTest (3) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} --- !u!1 &1448490236 GameObject: m_ObjectHideFlags: 0 @@ -230,7 +474,7 @@ Transform: - {fileID: 1514474963} - {fileID: 65152410} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1483260704 GameObject: @@ -280,10 +524,10 @@ MonoBehaviour: m_TrackedObjectOffset: {x: 0, y: 0, z: 0} m_LookaheadTime: 0 m_LookaheadSmoothing: 0 - m_LookaheadIgnoreY: 0 + m_LookaheadIgnoreY: 1 m_XDamping: 1 m_YDamping: 1 - m_ZDamping: 1 + m_ZDamping: 0 m_TargetMovementOnly: 1 m_ScreenX: 0.5 m_ScreenY: 0.5 @@ -374,7 +618,7 @@ Camera: far clip plane: 1000 field of view: 60 orthographic: 1 - orthographic size: 5 + orthographic size: 13 m_Depth: -1 m_CullingMask: serializedVersion: 2 @@ -398,7 +642,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1514474960} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.9862347, y: 2.4004586, z: -9.967962} + m_LocalPosition: {x: -24.753765, y: 2.9204586, z: -9.967962} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -542,19 +786,19 @@ PrefabInstance: m_Modifications: - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} propertyPath: m_RootOrder - value: 1 + value: 4 objectReference: {fileID: 0} - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} propertyPath: m_LocalScale.x - value: 20 + value: 5 objectReference: {fileID: 0} - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} propertyPath: m_LocalPosition.x - value: -3.79 + value: 3.54 objectReference: {fileID: 0} - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} propertyPath: m_LocalPosition.y - value: -0.89 + value: -1 objectReference: {fileID: 0} - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} propertyPath: m_LocalPosition.z @@ -605,21 +849,17 @@ PrefabInstance: propertyPath: m_Name value: Player objectReference: {fileID: 0} - - target: {fileID: 7008207192594766309, guid: 2ed6bfce9ad3e19428cb9bef743e0fa3, type: 3} - propertyPath: m_Interpolate + - target: {fileID: 7008207192594766311, guid: 2ed6bfce9ad3e19428cb9bef743e0fa3, type: 3} + propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} - - target: {fileID: 7008207192594766311, guid: 2ed6bfce9ad3e19428cb9bef743e0fa3, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - target: {fileID: 7008207192594766311, guid: 2ed6bfce9ad3e19428cb9bef743e0fa3, type: 3} propertyPath: m_LocalPosition.x - value: -4.55 + value: -31.29 objectReference: {fileID: 0} - target: {fileID: 7008207192594766311, guid: 2ed6bfce9ad3e19428cb9bef743e0fa3, type: 3} propertyPath: m_LocalPosition.y - value: 0.41 + value: 0.93 objectReference: {fileID: 0} - target: {fileID: 7008207192594766311, guid: 2ed6bfce9ad3e19428cb9bef743e0fa3, type: 3} propertyPath: m_LocalPosition.z diff --git a/Assets/Scripts/Player/PlayerController.cs b/Assets/Scripts/Player/PlayerController.cs index 060b27e..6a29b77 100644 --- a/Assets/Scripts/Player/PlayerController.cs +++ b/Assets/Scripts/Player/PlayerController.cs @@ -2,47 +2,59 @@ using System; using Movement; using UnityEngine; using UnityEngine.InputSystem; +using UnityEngine.SceneManagement; +using PlayerInput = Input.PlayerInput; namespace Player { - public class PlayerController : MonoBehaviour, IMovement, Input.PlayerInput.IPlayerControlActions + public class PlayerController : MonoBehaviour, IMovement, PlayerInput.IPlayerControlActions { - private const float DefaultJumpForce = 784.0f; + private const float DefaultJumpForce = 25.0f; private const float DefaultMass = 80.0f; - private const float DefaultSpeed = 500.0f; - private const float GravityScale = 1.0f; + private const float MaxSpeed = 500.0f; + private const float DefaultAirSpeed = 300.0f; + private const float GravityScale = 5.0f; - private Input.PlayerInput _controls; + private const float FallMultiplier = 4.0f; + private const float LowJumpMultiplier = 10.0f; + + private PlayerInput _controls; private Rigidbody2D _playerRigidbody2D; private SpriteRenderer _playerSpriteRenderer; + private CollisionChecker _playerGroundTrigger; + private CollisionChecker _playerInteractableTrigger; private bool _moveKeyPressed; private bool _jumpKeyPressed; - private bool _isOnAir; - private float _xAxisValue; + public float speed; + + private bool _isOnAir; + private bool _canJump; private void Awake() { - this._playerRigidbody2D = gameObject.GetComponent(); - this._playerGroundTrigger = GameObject.Find("PlayerGroundTrigger").GetComponent(); - this._playerSpriteRenderer = gameObject.GetComponent(); + _playerRigidbody2D = GetComponent(); + _playerSpriteRenderer = GetComponent(); + _playerGroundTrigger = GameObject.Find("PlayerGroundTrigger").GetComponent(); + _playerInteractableTrigger = GameObject.Find("PlayerInteractableTrigger").GetComponent(); } private void Start() { - this._playerRigidbody2D.gravityScale = GravityScale; - this._playerRigidbody2D.mass = DefaultMass; - BaseSpeed = DefaultSpeed; + _playerRigidbody2D.mass = DefaultMass; + _playerRigidbody2D.gravityScale = GravityScale; + _canJump = true; + BaseSpeed = 0.0f; } private void OnEnable() { if (_controls == null) { - _controls = new Input.PlayerInput(); + _controls = new PlayerInput(); _controls.PlayerControl.SetCallbacks(this); } @@ -56,15 +68,43 @@ namespace Player private void FixedUpdate() { + /*switch (_playerRigidbody2D.velocity.y) + { + case < 0: + _playerRigidbody2D.velocity += + Vector2.up * (Physics2D.gravity.y * (FallMultiplier - 1) * Time.fixedDeltaTime); + break; + /*case > 0 and < 3: + print("We will go down" + i); + ++i; + break; + case > 0 when !_jumpKeyPressed: + _playerRigidbody2D.velocity += + Vector2.up * (Physics2D.gravity.y * (LowJumpMultiplier - 1) * Time.fixedDeltaTime); + break; + }*/ + if (_moveKeyPressed) Move(_xAxisValue); else _playerRigidbody2D.velocity = new Vector2(0.0f, _playerRigidbody2D.velocity.y); - if (_jumpKeyPressed && _playerGroundTrigger.IsCollided) + if (_jumpKeyPressed && _canJump && _playerGroundTrigger.IsCollided) Jump(); } + private void Update() + { + _isOnAir = !_playerGroundTrigger.IsCollided; + RespawnCheck(); + } + + private void RespawnCheck() + { + if (gameObject.transform.position.y < -100) + SceneManager.LoadScene(SceneManager.GetActiveScene().name); + } + // PAUSE METHODS public bool IsPaused { get; private set; } @@ -72,16 +112,27 @@ namespace Player public void Pause() { IsPaused = true; + _playerRigidbody2D.simulated = IsPaused; } public void Resume() { IsPaused = false; + _playerRigidbody2D.simulated = IsPaused; } // MOVE METHODS - public float BaseSpeed { get; set; } + public float BaseSpeed + { + get => speed; + set + { + speed = value; + if (speed > MaxSpeed) + speed = MaxSpeed; + } + } public void Move(float value) { @@ -93,16 +144,27 @@ namespace Player case > 0: _playerSpriteRenderer.flipX = false; break; + default: + _playerSpriteRenderer.flipX = _playerSpriteRenderer.flipX; + break; } + if (!_isOnAir) + BaseSpeed += 40; _playerRigidbody2D.velocity = new Vector2(BaseSpeed * _xAxisValue * Time.fixedDeltaTime, _playerRigidbody2D.velocity.y); } + private void DecelerationAfterMoving() + { + throw new NotImplementedException(); + } + private void Jump() { - _playerRigidbody2D.velocity = new Vector2(_playerRigidbody2D.velocity.x, 0); - _playerRigidbody2D.AddForce(Vector2.up.normalized * DefaultJumpForce, ForceMode2D.Impulse); + BaseSpeed = DefaultAirSpeed; + _playerRigidbody2D.velocity = Vector2.up.normalized * DefaultJumpForce; + _canJump = false; } private void Climb() @@ -118,6 +180,7 @@ namespace Player { case true: _moveKeyPressed = false; + BaseSpeed = 0; break; case false: _moveKeyPressed = true; @@ -132,11 +195,18 @@ namespace Player { case true: _jumpKeyPressed = false; + _canJump = true; break; case false: _jumpKeyPressed = true; break; } } + + public void OnInteract(InputAction.CallbackContext context) + { + if (_playerInteractableTrigger.IsCollided) + throw new NotImplementedException(); + } } -} +} \ No newline at end of file diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 6cdf63a..f71aa5c 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -13,7 +13,7 @@ TagManager: - UI - Player - Enemy - - + - Interactables - - - diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 16ee60a..1a9d5ab 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,13 +6,13 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedSceneGuid-0: - value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661 + value: 06550c57540350025c0b0f2747220a44174f4b73297070642b714465b0e6366e flags: 0 RecentlyUsedSceneGuid-1: - value: 5002060403010b5f0f560e7a47260a444f4f1e2e2f2e27312f7f4536e0b6633d + value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661 flags: 0 RecentlyUsedSceneGuid-2: - value: 06550c57540350025c0b0f2747220a44174f4b73297070642b714465b0e6366e + value: 5002060403010b5f0f560e7a47260a444f4f1e2e2f2e27312f7f4536e0b6633d flags: 0 vcSharedLogLevel: value: 0d5e400f0650 diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 9d00d30..ba12b2d 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -25,7 +25,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 10853 + controlID: 28005 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -46,9 +46,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1 - y: 19 - width: 878 + x: 302.4 + y: 73.6 + width: 879.6 height: 493.40002 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -85,9 +85,9 @@ MonoBehaviour: m_VAllowExceedBaseRangeMax: 1 m_ScaleWithWindow: 0 m_HSlider: 0 - m_VSlider: 0 + m_VSlider: 1 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 0 + m_EnableMouseInput: 1 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -96,23 +96,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 878 + width: 879.6 height: 472.40002 m_Scale: {x: 0.5467593, y: 0.5467593} - m_Translation: {x: 439, y: 236.19998} + m_Translation: {x: 439.8, y: 236.19998} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -802.9127 + x: -804.37585 y: -431.99994 - width: 1605.8254 + width: 1608.7517 height: 863.99994 m_MinimalGUI: 1 m_defaultScale: 0.5467593 - m_LastWindowPixelSize: {x: 1097.5, y: 616.75} + m_LastWindowPixelSize: {x: 1099.5, y: 616.75} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 00000000000100000100 @@ -137,12 +137,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 304 + width: 302.4 height: 730.8 m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 10791 + controlID: 27987 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -160,7 +160,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 304 + width: 302.4 height: 381.6 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} @@ -191,7 +191,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 73.6 - width: 303 + width: 301.4 height: 360.6 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -202,7 +202,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: c0b0ffff8af0ffff0efbffff + m_ExpandedIDs: 0efbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -243,10 +243,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 381.6 - width: 304 + width: 302.4 height: 349.19998 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} m_ActualView: {fileID: 7} m_Panes: - {fileID: 7} @@ -274,7 +274,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 455.2 - width: 303 + width: 301.4 height: 328.19998 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -306,7 +306,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: dc3c0000 m_LastClickedID: 15580 - m_ExpandedIDs: ffffffff00000000f2620000f4620000f6620000ae6300001464000016640000b27d00002483000050830000 + m_ExpandedIDs: ffffffff00000000826300008463000086630000886300008a6300008c6300008e630000906300009263000094630000e0630000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -331,10 +331,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 987d0000 + scrollPos: {x: 0, y: 133.50006} + m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: ffffffff00000000f2620000f4620000f6620000ae6300001464000016640000b27d00002483000050830000 + m_ExpandedIDs: ffffffff00000000826300008463000086630000886300008a6300008c6300008e630000906300009263000094630000e0630000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -359,8 +359,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 987d0000 - m_LastClickedInstanceID: 32152 + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000d03c0000 m_RenameOverlay: @@ -407,14 +407,14 @@ MonoBehaviour: - {fileID: 11} m_Position: serializedVersion: 2 - x: 304 + x: 302.4 y: 0 - width: 880 + width: 881.6 height: 730.8 m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 10854 + controlID: 28006 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -432,10 +432,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 880 + width: 881.6 height: 514.4 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 2} m_Panes: - {fileID: 10} @@ -462,10 +462,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 304 - y: 73.6 - width: 878 - height: 493.40002 + x: 706.4 + y: 80.8 + width: 590 + height: 487.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -573,7 +573,7 @@ MonoBehaviour: containerId: overlay-container--right floating: 0 collapsed: 0 - displayed: 1 + displayed: 0 snapOffset: {x: 0, y: 0} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 @@ -689,9 +689,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -7.976013, y: -1.8524797, z: -0.06713244} + m_Target: {x: -13.357433, y: 3.264308, z: -0.07245366} speed: 2 - m_Value: {x: -7.976013, y: -1.8524797, z: -0.06713244} + m_Value: {x: -13.357433, y: 3.264308, z: -0.07245366} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -742,9 +742,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 7.3032284 + m_Target: 13.677304 speed: 2 - m_Value: 7.3032284 + m_Value: 13.677304 m_Ortho: m_Target: 1 speed: 2 @@ -786,10 +786,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 514.4 - width: 880 + width: 881.6 height: 216.39996 - m_MinSize: {x: 102, y: 121} - m_MaxSize: {x: 4002, y: 4021} + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 12} m_Panes: - {fileID: 12} @@ -815,9 +815,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 304 + x: 302.4 y: 588 - width: 878 + width: 879.6 height: 195.39996 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -842,8 +842,8 @@ MonoBehaviour: y: 0 width: 352 height: 730.8 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} @@ -883,8 +883,8 @@ MonoBehaviour: m_CachedPref: 160 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: 32152 - m_LastVerticalScrollValue: 160.79999 + m_LastInspectedObjectInstanceID: -1 + m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 8696116..593fa08 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -20,62 +20,11 @@ MonoBehaviour: height: 780.8 m_ShowMode: 4 m_Title: Scene - m_RootView: {fileID: 4} - m_MinSize: {x: 875, y: 300} + m_RootView: {fileID: 2} + m_MinSize: {x: 875, y: 371} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 1 --- !u!114 &2 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 514.4 - width: 879.19995 - height: 216.39996 - m_MinSize: {x: 102, y: 121} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 16} - m_Panes: - - {fileID: 16} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &3 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 11} - - {fileID: 2} - m_Position: - serializedVersion: 2 - x: 304 - y: 0 - width: 879.19995 - height: 730.8 - m_MinSize: {x: 100, y: 200} - m_MaxSize: {x: 8096, y: 16192} - vertical: 1 - controlID: 85 ---- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -88,9 +37,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: + - {fileID: 3} - {fileID: 5} - - {fileID: 7} - - {fileID: 6} + - {fileID: 4} m_Position: serializedVersion: 2 x: 0 @@ -103,7 +52,7 @@ MonoBehaviour: m_TopViewHeight: 30 m_UseBottomView: 1 m_BottomViewHeight: 20 ---- !u!114 &5 +--- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -124,8 +73,8 @@ MonoBehaviour: height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} - m_LastLoadedLayoutName: ---- !u!114 &6 + m_LastLoadedLayoutName: Main +--- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -146,7 +95,7 @@ MonoBehaviour: height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &7 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -159,8 +108,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 8} - - {fileID: 3} + - {fileID: 6} + - {fileID: 9} - {fileID: 12} m_Position: serializedVersion: 2 @@ -171,8 +120,8 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 84 ---- !u!114 &8 + controlID: 22822 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -185,8 +134,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 9} - - {fileID: 10} + - {fileID: 7} + - {fileID: 8} m_Position: serializedVersion: 2 x: 0 @@ -196,8 +145,8 @@ MonoBehaviour: m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 57 ---- !u!114 &9 + controlID: 22852 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -223,7 +172,7 @@ MonoBehaviour: - {fileID: 14} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &10 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -247,9 +196,35 @@ MonoBehaviour: m_ActualView: {fileID: 15} m_Panes: - {fileID: 15} + - {fileID: 16} m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &11 + m_LastSelected: 1 +--- !u!114 &9 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 10} + - {fileID: 11} + m_Position: + serializedVersion: 2 + x: 304 + y: 0 + width: 880 + height: 730.8 + m_MinSize: {x: 100, y: 200} + m_MaxSize: {x: 8096, y: 16192} + vertical: 1 + controlID: 22823 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -266,16 +241,41 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 879.19995 - height: 514.4 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} + width: 880 + height: 399.2 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 17} m_Panes: - {fileID: 17} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &11 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: GameView + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 399.2 + width: 880 + height: 331.59998 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 13} + m_Panes: - {fileID: 13} m_Selected: 0 - m_LastSelected: 1 + m_LastSelected: 0 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -291,9 +291,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1183.2 + x: 1184 y: 0 - width: 352.80005 + width: 352 height: 730.8 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} @@ -322,10 +322,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 296.80002 - y: 73.6 - width: 918.8 - height: 493.40002 + x: 304 + y: 472.80002 + width: 878 + height: 310.59998 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -372,23 +372,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 918.8 - height: 472.40002 - m_Scale: {x: 0.5467593, y: 0.5467593} - m_Translation: {x: 459.4, y: 236.19998} + width: 878 + height: 289.59998 + m_Scale: {x: 0.3351852, y: 0.33518517} + m_Translation: {x: 439.00003, y: 144.79997} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -840.22345 + x: -1309.7238 y: -431.99994 - width: 1680.4469 + width: 2619.4475 height: 863.99994 m_MinimalGUI: 1 - m_defaultScale: 0.5467593 - m_LastWindowPixelSize: {x: 1148.5, y: 616.75} + m_defaultScale: 0.33518517 + m_LastWindowPixelSize: {x: 1097.5, y: 388.24997} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 00000000000100000100 @@ -427,23 +427,23 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0cfbffff + m_ExpandedIDs: c0b0ffff40e6ffff8af0ffff0efbffff m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: PlayerGroundTrigger + m_OriginalName: PlayerGroundTrigger m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: -6764 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 9} + m_ClientGUIView: {fileID: 7} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -491,7 +491,8 @@ MonoBehaviour: m_ShowAllHits: 0 m_SkipHidden: 0 m_SearchArea: 1 - m_Folders: [] + m_Folders: + - Assets/Prefabs m_Globs: [] m_OriginalText: m_ViewMode: 0 @@ -505,7 +506,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: dc3c0000 m_LastClickedID: 15580 - m_ExpandedIDs: 00000000f8620000fa620000fc620000 + m_ExpandedIDs: ffffffff00000000f2620000f4620000f6620000ae6300001464000016640000b27d00002483000050830000dc920000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -533,7 +534,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: ffffffff00000000f8620000fa620000fc620000 + m_ExpandedIDs: ffffffff00000000f2620000f4620000f6620000ae6300001464000016640000b27d00002483000050830000dc920000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -549,7 +550,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 10} + m_ClientGUIView: {fileID: 8} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -609,10 +610,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 304 - y: 588 - width: 877.19995 - height: 195.39996 + x: 0 + y: 455.2 + width: 303 + height: 328.19998 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -639,8 +640,8 @@ MonoBehaviour: serializedVersion: 2 x: 304 y: 73.6 - width: 877.19995 - height: 493.40002 + width: 878 + height: 378.2 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -864,9 +865,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -0.15326892, y: 0.05985144, z: -0.113706104} + m_Target: {x: -4.0644355, y: -0.42835724, z: -0.0249797} speed: 2 - m_Value: {x: 0.007334292, y: 0.0774484, z: -0.1166059} + m_Value: {x: -4.1086316, y: -0.43103167, z: -0.024579894} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -917,9 +918,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 6.153973 + m_Target: 0.9284311 speed: 2 - m_Value: 6.443951 + m_Value: 0.8884508 m_Ortho: m_Target: 1 speed: 2 @@ -964,9 +965,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1183.2001 + x: 1184 y: 73.6 - width: 351.80005 + width: 351 height: 709.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: