From 961c8cf865fb946c7352d7c24048ef90afa98774 Mon Sep 17 00:00:00 2001 From: OverflowNarhoym Date: Mon, 21 Feb 2022 22:48:53 +0100 Subject: [PATCH 1/5] Modified scene --- Assets/Prefabs/Playable/Player.prefab | 4 +- Assets/Scenes/OverDevScene.unity | 334 +++++++++++++++++- Assets/Scripts/Player/PlayerController.cs | 20 +- .../Layouts/CurrentMaximizeLayout.dwlt | 175 ++++----- 4 files changed, 419 insertions(+), 114 deletions(-) diff --git a/Assets/Prefabs/Playable/Player.prefab b/Assets/Prefabs/Playable/Player.prefab index 91c3f1b..b039671 100644 --- a/Assets/Prefabs/Playable/Player.prefab +++ b/Assets/Prefabs/Playable/Player.prefab @@ -117,10 +117,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 diff --git a/Assets/Scenes/OverDevScene.unity b/Assets/Scenes/OverDevScene.unity index 4eb7de9..5d665be 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: 1.9862347, y: 2.4404585, 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: 10 NearClipPlane: 0.3 FarClipPlane: 1000 Dutch: 0 @@ -199,6 +199,139 @@ Transform: m_CorrespondingSourceObject: {fileID: 7008207192594766311, guid: 2ed6bfce9ad3e19428cb9bef743e0fa3, type: 3} m_PrefabInstance: {fileID: 7008207193554258683} m_PrefabAsset: {fileID: 0} +--- !u!1 &1408086263 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1408086265} + - component: {fileID: 1408086264} + - component: {fileID: 1408086267} + - component: {fileID: 1408086266} + m_Layer: 0 + m_Name: Square + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &1408086264 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1408086263} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 0.7725491, g: 0.76470596, b: 0.22352943, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1408086265 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1408086263} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -13.29, y: 5, z: 0} + m_LocalScale: {x: 1, y: 4, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!50 &1408086266 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1408086263} + m_BodyType: 2 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!61 &1408086267 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1408086263} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 --- !u!1 &1448490236 GameObject: m_ObjectHideFlags: 0 @@ -230,8 +363,65 @@ Transform: - {fileID: 1514474963} - {fileID: 65152410} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1464718380 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3605663502554574831, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} + propertyPath: m_Name + value: Basic Ground Patrolling Enemy Variant + objectReference: {fileID: 0} + - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} + propertyPath: m_LocalPosition.x + value: -10.9370365 + objectReference: {fileID: 0} + - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} + propertyPath: m_LocalPosition.y + value: 0.1003778 + objectReference: {fileID: 0} + - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} --- !u!1 &1483260704 GameObject: m_ObjectHideFlags: 3 @@ -374,7 +564,7 @@ Camera: far clip plane: 1000 field of view: 60 orthographic: 1 - orthographic size: 5 + orthographic size: 10 m_Depth: -1 m_CullingMask: serializedVersion: 2 @@ -398,7 +588,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: 1.9862347, y: 2.4404585, z: -9.967962} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -533,6 +723,124 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1001 &1555312953 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} + propertyPath: m_LocalPosition.x + value: -12.28 + objectReference: {fileID: 0} + - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} + propertyPath: m_LocalPosition.y + value: 4.28 + objectReference: {fileID: 0} + - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} + propertyPath: m_LocalRotation.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 6987122029433902684, guid: 10633caf39c49d94c9f68742db900612, type: 3} + propertyPath: m_Name + value: Basic Wall Patrollling Enemy Variant + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 10633caf39c49d94c9f68742db900612, type: 3} +--- !u!1001 &1584558587 +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: 4 + objectReference: {fileID: 0} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} + propertyPath: m_LocalPosition.x + value: -11.66 + 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 (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} --- !u!1001 &847968261128498245 PrefabInstance: m_ObjectHideFlags: 0 @@ -542,7 +850,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} propertyPath: m_RootOrder - value: 1 + value: 3 objectReference: {fileID: 0} - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} propertyPath: m_LocalScale.x @@ -550,11 +858,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} propertyPath: m_LocalPosition.x - value: -3.79 + value: 2.27 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,12 +913,12 @@ PrefabInstance: propertyPath: m_Name value: Player objectReference: {fileID: 0} - - target: {fileID: 7008207192594766309, guid: 2ed6bfce9ad3e19428cb9bef743e0fa3, type: 3} - propertyPath: m_Interpolate - value: 1 - objectReference: {fileID: 0} - target: {fileID: 7008207192594766311, guid: 2ed6bfce9ad3e19428cb9bef743e0fa3, type: 3} propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 7008207192594766311, guid: 2ed6bfce9ad3e19428cb9bef743e0fa3, type: 3} + propertyPath: m_LocalScale.y value: 2 objectReference: {fileID: 0} - target: {fileID: 7008207192594766311, guid: 2ed6bfce9ad3e19428cb9bef743e0fa3, type: 3} @@ -619,7 +927,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7008207192594766311, guid: 2ed6bfce9ad3e19428cb9bef743e0fa3, type: 3} propertyPath: m_LocalPosition.y - value: 0.41 + value: 0.45 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 f2d3ba6..a2a3651 100644 --- a/Assets/Scripts/Player/PlayerController.cs +++ b/Assets/Scripts/Player/PlayerController.cs @@ -7,10 +7,10 @@ namespace Player { public class PlayerController : MonoBehaviour, IMovement, Input.PlayerInput.IPlayerControlActions { - private const float DefaultJumpForce = 1200.0f; + private const float DefaultJumpForce = 9.81f; private const float DefaultMass = 80.0f; private const float DefaultSpeed = 500.0f; - private const float GravityScale = 3.0f; + private const float GravityScale = 1.0f; private Input.PlayerInput _controls; private Rigidbody2D _playerRigidbody2D; @@ -85,16 +85,12 @@ namespace Player public void Move(float value) { - switch (_xAxisValue) + _playerSpriteRenderer.flipX = _xAxisValue switch { - case < 0: - _playerSpriteRenderer.flipX = true; - break; - case > 0: - _playerSpriteRenderer.flipX = false; - break; - } - + < 0 => true, + > 0 => false, + _ => _playerSpriteRenderer.flipX + }; _playerRigidbody2D.velocity = new Vector2(BaseSpeed * _xAxisValue * Time.fixedDeltaTime, _playerRigidbody2D.velocity.y); } @@ -102,7 +98,7 @@ namespace Player private void Jump() { _playerRigidbody2D.velocity = new Vector2(_playerRigidbody2D.velocity.x, 0); - _playerRigidbody2D.AddForce(Vector2.up.normalized * DefaultJumpForce, ForceMode2D.Impulse); + _playerRigidbody2D.AddForce(Vector2.up.normalized * DefaultJumpForce * DefaultMass, ForceMode2D.Impulse); } private void Climb() diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 9d00d30..2a289fd 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -14,7 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 3} - - {fileID: 8} + - {fileID: 9} - {fileID: 13} m_Position: serializedVersion: 2 @@ -25,7 +25,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 10853 + controlID: 19856 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -46,10 +46,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1 - y: 19 + x: 304 + y: 472.80002 width: 878 - height: 493.40002 + height: 310.59998 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -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 @@ -97,22 +97,22 @@ MonoBehaviour: x: 0 y: 21 width: 878 - height: 472.40002 - m_Scale: {x: 0.5467593, y: 0.5467593} - m_Translation: {x: 439, y: 236.19998} + 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: -802.9127 + x: -1309.7238 y: -431.99994 - width: 1605.8254 + width: 2619.4475 height: 863.99994 m_MinimalGUI: 1 - m_defaultScale: 0.5467593 - m_LastWindowPixelSize: {x: 1097.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 @@ -142,7 +142,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 10791 + controlID: 19826 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -162,8 +162,8 @@ MonoBehaviour: y: 0 width: 304 height: 381.6 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 5} m_Panes: - {fileID: 5} @@ -236,7 +236,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser + m_Name: ConsoleWindow m_EditorClassIdentifier: m_Children: [] m_Position: @@ -245,12 +245,13 @@ MonoBehaviour: y: 381.6 width: 304 height: 349.19998 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 7} + m_MinSize: {x: 101, y: 121} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 8} m_Panes: - {fileID: 7} - m_Selected: 0 + - {fileID: 8} + m_Selected: 1 m_LastSelected: 0 --- !u!114 &7 MonoBehaviour: @@ -273,7 +274,7 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 455.2 + y: 400.6 width: 303 height: 328.19998 m_ViewDataDictionary: {fileID: 0} @@ -292,7 +293,8 @@ MonoBehaviour: m_ShowAllHits: 0 m_SkipHidden: 0 m_SearchArea: 1 - m_Folders: [] + m_Folders: + - Assets/Prefabs m_Globs: [] m_OriginalText: m_ViewMode: 0 @@ -331,8 +333,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 987d0000 + scrollPos: {x: 0, y: 57.80002} + m_SelectedIDs: 90b0ffff m_LastClickedID: 0 m_ExpandedIDs: ffffffff00000000f2620000f4620000f6620000ae6300001464000016640000b27d00002483000050830000 m_RenameOverlay: @@ -350,7 +352,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 6} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -359,8 +361,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 987d0000 - m_LastClickedInstanceID: 32152 + m_SelectedInstanceIDs: 90b0ffff + m_LastClickedInstanceID: -20336 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000d03c0000 m_RenameOverlay: @@ -391,6 +393,34 @@ MonoBehaviour: m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 170 --- !u!114 &8 +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: 1 + m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Console + m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 455.2 + width: 303 + height: 328.19998 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -403,8 +433,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 9} - - {fileID: 11} + - {fileID: 10} + - {fileID: 12} m_Position: serializedVersion: 2 x: 304 @@ -414,8 +444,8 @@ MonoBehaviour: m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 10854 ---- !u!114 &9 + controlID: 19857 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -425,7 +455,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView + m_Name: SceneView m_EditorClassIdentifier: m_Children: [] m_Position: @@ -433,16 +463,15 @@ MonoBehaviour: x: 0 y: 0 width: 880 - height: 514.4 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 2} + height: 399.2 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 11} m_Panes: - - {fileID: 10} - - {fileID: 2} - m_Selected: 1 + - {fileID: 11} + m_Selected: 0 m_LastSelected: 0 ---- !u!114 &10 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -465,7 +494,7 @@ MonoBehaviour: x: 304 y: 73.6 width: 878 - height: 493.40002 + height: 378.2 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -573,7 +602,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 +718,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -7.976013, y: -1.8524797, z: -0.06713244} + m_Target: {x: -4.4614882, y: -1.0482874, z: -0.0713436} speed: 2 - m_Value: {x: -7.976013, y: -1.8524797, z: -0.06713244} + m_Value: {x: -4.4614882, y: -1.0482874, z: -0.0713436} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -742,9 +771,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 7.3032284 + m_Target: 6.4135385 speed: 2 - m_Value: 7.3032284 + m_Value: 6.4135385 m_Ortho: m_Target: 1 speed: 2 @@ -769,7 +798,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &11 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -779,50 +808,22 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow + m_Name: GameView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 514.4 + y: 399.2 width: 880 - height: 216.39996 - m_MinSize: {x: 102, y: 121} + height: 331.59998 + m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 12} + m_ActualView: {fileID: 2} m_Panes: - - {fileID: 12} + - {fileID: 2} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &12 -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: 1 - m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Console - m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 304 - y: 588 - width: 878 - height: 195.39996 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] --- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 @@ -842,8 +843,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 +884,8 @@ MonoBehaviour: m_CachedPref: 160 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: 32152 - m_LastVerticalScrollValue: 160.79999 + m_LastInspectedObjectInstanceID: -23310 + m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: From 696340a434770bdb54743cb51b6dcc0d5a5a79f9 Mon Sep 17 00:00:00 2001 From: OverflowNarhoym Date: Mon, 21 Feb 2022 22:55:52 +0100 Subject: [PATCH 2/5] Corrected Jump bug --- Assets/Prefabs/Playable/Player.prefab | 4 +- Assets/Scenes/OverDevScene.unity | 244 +++++++++--------- .../Layouts/CurrentMaximizeLayout.dwlt | 52 ++-- 3 files changed, 148 insertions(+), 152 deletions(-) diff --git a/Assets/Prefabs/Playable/Player.prefab b/Assets/Prefabs/Playable/Player.prefab index b039671..45a5a9a 100644 --- a/Assets/Prefabs/Playable/Player.prefab +++ b/Assets/Prefabs/Playable/Player.prefab @@ -29,7 +29,7 @@ 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} @@ -172,7 +172,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: [] diff --git a/Assets/Scenes/OverDevScene.unity b/Assets/Scenes/OverDevScene.unity index 5d665be..43202fe 100644 --- a/Assets/Scenes/OverDevScene.unity +++ b/Assets/Scenes/OverDevScene.unity @@ -123,6 +123,63 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &35238242 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalPosition.x + value: -12.204437 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalPosition.y + value: 4.697012 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalRotation.w + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalRotation.z + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 270 + objectReference: {fileID: 0} + - target: {fileID: 7391517555913877016, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_Name + value: Basic Patrolling Enemy + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} --- !u!1 &65152409 GameObject: m_ObjectHideFlags: 0 @@ -148,7 +205,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.4404585, z: -9.967962} + m_LocalPosition: {x: 1.9862347, y: 2.5244584, z: -9.967962} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -194,6 +251,63 @@ MonoBehaviour: m_Calls: [] m_LegacyBlendHint: 0 m_ComponentOwner: {fileID: 1483260705} +--- !u!1001 &361923421 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalPosition.x + value: -11.669386 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalPosition.y + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7391517555913877016, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_Name + value: Basic Patrolling Enemy (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} --- !u!4 &1053905692 stripped Transform: m_CorrespondingSourceObject: {fileID: 7008207192594766311, guid: 2ed6bfce9ad3e19428cb9bef743e0fa3, type: 3} @@ -283,7 +397,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!50 &1408086266 Rigidbody2D: @@ -363,65 +477,8 @@ Transform: - {fileID: 1514474963} - {fileID: 65152410} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1464718380 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3605663502554574831, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} - propertyPath: m_Name - value: Basic Ground Patrolling Enemy Variant - objectReference: {fileID: 0} - - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} - propertyPath: m_LocalPosition.x - value: -10.9370365 - objectReference: {fileID: 0} - - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} - propertyPath: m_LocalPosition.y - value: 0.1003778 - objectReference: {fileID: 0} - - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8681155058961044672, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1bf2cdb83af1d714ab363c6c4d1d140e, type: 3} --- !u!1 &1483260704 GameObject: m_ObjectHideFlags: 3 @@ -588,7 +645,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.4404585, z: -9.967962} + m_LocalPosition: {x: 1.9862347, y: 2.5244584, z: -9.967962} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -723,63 +780,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1001 &1555312953 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} - propertyPath: m_LocalPosition.x - value: -12.28 - objectReference: {fileID: 0} - - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} - propertyPath: m_LocalPosition.y - value: 4.28 - objectReference: {fileID: 0} - - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} - propertyPath: m_LocalRotation.w - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} - propertyPath: m_LocalRotation.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3064546875212868979, guid: 10633caf39c49d94c9f68742db900612, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 180 - objectReference: {fileID: 0} - - target: {fileID: 6987122029433902684, guid: 10633caf39c49d94c9f68742db900612, type: 3} - propertyPath: m_Name - value: Basic Wall Patrollling Enemy Variant - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 10633caf39c49d94c9f68742db900612, type: 3} --- !u!1001 &1584558587 PrefabInstance: m_ObjectHideFlags: 0 @@ -789,7 +789,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} propertyPath: m_RootOrder - value: 7 + value: 5 objectReference: {fileID: 0} - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} propertyPath: m_LocalScale.x @@ -917,17 +917,13 @@ PrefabInstance: propertyPath: m_RootOrder value: 4 objectReference: {fileID: 0} - - target: {fileID: 7008207192594766311, guid: 2ed6bfce9ad3e19428cb9bef743e0fa3, type: 3} - propertyPath: m_LocalScale.y - value: 2 - objectReference: {fileID: 0} - target: {fileID: 7008207192594766311, guid: 2ed6bfce9ad3e19428cb9bef743e0fa3, type: 3} propertyPath: m_LocalPosition.x value: -4.55 objectReference: {fileID: 0} - target: {fileID: 7008207192594766311, guid: 2ed6bfce9ad3e19428cb9bef743e0fa3, type: 3} propertyPath: m_LocalPosition.y - value: 0.45 + value: 0.534 objectReference: {fileID: 0} - target: {fileID: 7008207192594766311, guid: 2ed6bfce9ad3e19428cb9bef743e0fa3, type: 3} propertyPath: m_LocalPosition.z diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 2a289fd..072b8e2 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: 19856 + controlID: 22277 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -142,7 +142,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 19826 + controlID: 22229 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -202,7 +202,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: c0b0ffff8af0ffff0efbffff + m_ExpandedIDs: c0b0ffff40e6ffff8af0ffff0efbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -236,7 +236,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow + m_Name: ProjectBrowser m_EditorClassIdentifier: m_Children: [] m_Position: @@ -245,14 +245,14 @@ MonoBehaviour: y: 381.6 width: 304 height: 349.19998 - m_MinSize: {x: 101, y: 121} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 8} + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} + m_ActualView: {fileID: 7} m_Panes: - {fileID: 7} - {fileID: 8} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -274,7 +274,7 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 400.6 + y: 455.2 width: 303 height: 328.19998 m_ViewDataDictionary: {fileID: 0} @@ -308,7 +308,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: dc3c0000 m_LastClickedID: 15580 - m_ExpandedIDs: ffffffff00000000f2620000f4620000f6620000ae6300001464000016640000b27d00002483000050830000 + m_ExpandedIDs: ffffffff00000000f2620000f4620000f6620000ae6300001464000016640000b27d00002483000050830000dc920000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -333,10 +333,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: - scrollPos: {x: 0, y: 57.80002} - m_SelectedIDs: 90b0ffff + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 40e6ffff m_LastClickedID: 0 - m_ExpandedIDs: ffffffff00000000f2620000f4620000f6620000ae6300001464000016640000b27d00002483000050830000 + m_ExpandedIDs: ffffffff00000000f2620000f4620000f6620000ae6300001464000016640000b27d00002483000050830000dc920000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -361,8 +361,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 90b0ffff - m_LastClickedInstanceID: -20336 + m_SelectedInstanceIDs: 40e6ffff + m_LastClickedInstanceID: -6592 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000d03c0000 m_RenameOverlay: @@ -444,7 +444,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 19857 + controlID: 22278 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -464,8 +464,8 @@ MonoBehaviour: y: 0 width: 880 height: 399.2 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 11} m_Panes: - {fileID: 11} @@ -718,9 +718,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -4.4614882, y: -1.0482874, z: -0.0713436} + m_Target: {x: -4.399658, y: -0.4491718, z: -0.021942846} speed: 2 - m_Value: {x: -4.4614882, y: -1.0482874, z: -0.0713436} + m_Value: {x: -4.399658, y: -0.4491718, z: -0.021942846} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -771,9 +771,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 6.4135385 + m_Target: 0.62474537 speed: 2 - m_Value: 6.4135385 + m_Value: 0.62474537 m_Ortho: m_Target: 1 speed: 2 @@ -843,8 +843,8 @@ MonoBehaviour: y: 0 width: 352 height: 730.8 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} @@ -884,7 +884,7 @@ MonoBehaviour: m_CachedPref: 160 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: -23310 + m_LastInspectedObjectInstanceID: -6592 m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 From 376aedc6fcab1589ad6599e4eba1f3fdb75f030d Mon Sep 17 00:00:00 2001 From: OverflowNarhoym Date: Tue, 22 Feb 2022 09:49:48 +0100 Subject: [PATCH 3/5] Added interact input --- Assets/Input/Player.cs | 41 ++++ Assets/Input/Player.inputactions | 31 +++ Assets/Scripts/Player/PlayerController.cs | 23 +- UserSettings/EditorUserSettings.asset | 4 +- .../Layouts/CurrentMaximizeLayout.dwlt | 38 +-- UserSettings/Layouts/default-2021.dwlt | 223 +++++++++--------- 6 files changed, 221 insertions(+), 139 deletions(-) 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/Scripts/Player/PlayerController.cs b/Assets/Scripts/Player/PlayerController.cs index a2a3651..2d2905b 100644 --- a/Assets/Scripts/Player/PlayerController.cs +++ b/Assets/Scripts/Player/PlayerController.cs @@ -2,10 +2,11 @@ using System; using Movement; using UnityEngine; using UnityEngine.InputSystem; +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 = 9.81f; private const float DefaultMass = 80.0f; @@ -23,18 +24,19 @@ namespace Player private bool _isOnAir; private float _xAxisValue; + private PlayerInput.IPlayerControlActions _playerControlActionsImplementation; private void Awake() { - this._playerRigidbody2D = gameObject.GetComponent(); - this._playerGroundTrigger = GameObject.Find("PlayerGroundTrigger").GetComponent(); - this._playerSpriteRenderer = gameObject.GetComponent(); + _playerRigidbody2D = gameObject.GetComponent(); + _playerGroundTrigger = GameObject.Find("PlayerGroundTrigger").GetComponent(); + _playerSpriteRenderer = gameObject.GetComponent(); } private void Start() { - this._playerRigidbody2D.gravityScale = GravityScale; - this._playerRigidbody2D.mass = DefaultMass; + _playerRigidbody2D.gravityScale = GravityScale; + _playerRigidbody2D.mass = DefaultMass; BaseSpeed = DefaultSpeed; } @@ -42,7 +44,7 @@ namespace Player { if (_controls == null) { - _controls = new Input.PlayerInput(); + _controls = new PlayerInput(); _controls.PlayerControl.SetCallbacks(this); } @@ -72,11 +74,13 @@ namespace Player public void Pause() { IsPaused = true; + _playerRigidbody2D.simulated = IsPaused; } public void Resume() { IsPaused = false; + _playerRigidbody2D.simulated = IsPaused; } // MOVE METHODS @@ -134,5 +138,10 @@ namespace Player break; } } + + public void OnInteract(InputAction.CallbackContext context) + { + throw new NotImplementedException(); + } } } \ No newline at end of file diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 16ee60a..daa06bb 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -9,10 +9,10 @@ EditorUserSettings: value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661 flags: 0 RecentlyUsedSceneGuid-1: - value: 5002060403010b5f0f560e7a47260a444f4f1e2e2f2e27312f7f4536e0b6633d + value: 06550c57540350025c0b0f2747220a44174f4b73297070642b714465b0e6366e 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 072b8e2..eb2cb49 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: 22277 + controlID: 280 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -142,7 +142,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 22229 + controlID: 246 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -202,7 +202,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: c0b0ffff40e6ffff8af0ffff0efbffff + m_ExpandedIDs: 62f9ffff0cfbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -294,7 +294,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Prefabs + - Assets/Scenes m_Globs: [] m_OriginalText: m_ViewMode: 0 @@ -308,7 +308,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: dc3c0000 m_LastClickedID: 15580 - m_ExpandedIDs: ffffffff00000000f2620000f4620000f6620000ae6300001464000016640000b27d00002483000050830000dc920000 + m_ExpandedIDs: ffffffff00000000826300008463000086630000886300008a6300008c6300008e630000906300009263000094630000e0630000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -334,9 +334,9 @@ MonoBehaviour: m_ResourceFile: m_AssetTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 40e6ffff + m_SelectedIDs: 10f9ffff m_LastClickedID: 0 - m_ExpandedIDs: ffffffff00000000f2620000f4620000f6620000ae6300001464000016640000b27d00002483000050830000dc920000 + m_ExpandedIDs: ffffffff00000000826300008463000086630000886300008a6300008c6300008e630000906300009263000094630000e0630000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -361,8 +361,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 40e6ffff - m_LastClickedInstanceID: -6592 + m_SelectedInstanceIDs: 10f9ffff + m_LastClickedInstanceID: -1776 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000d03c0000 m_RenameOverlay: @@ -444,7 +444,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 22278 + controlID: 281 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -718,9 +718,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -4.399658, y: -0.4491718, z: -0.021942846} + m_Target: {x: 3.328073, y: 0.08547431, z: -0.07027102} speed: 2 - m_Value: {x: -4.399658, y: -0.4491718, z: -0.021942846} + m_Value: {x: 3.328073, y: 0.08547431, z: -0.07027102} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -771,9 +771,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 0.62474537 + m_Target: 6.6387906 speed: 2 - m_Value: 0.62474537 + m_Value: 6.6387906 m_Ortho: m_Target: 1 speed: 2 @@ -817,8 +817,8 @@ MonoBehaviour: y: 399.2 width: 880 height: 331.59998 - 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: 2} @@ -843,8 +843,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} @@ -884,7 +884,7 @@ MonoBehaviour: m_CachedPref: 160 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: -6592 + m_LastInspectedObjectInstanceID: -1776 m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 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: From 51f44fc153f84cb205c00a342f8b5906b7806421 Mon Sep 17 00:00:00 2001 From: OverflowNarhoym Date: Tue, 22 Feb 2022 12:17:45 +0100 Subject: [PATCH 4/5] Improved jumping and added TODOs --- Assets/Prefabs/Playable/Player.prefab | 48 +++++++++++++ Assets/Scenes/OverDevScene.unity | 71 +++++++++++++++++-- Assets/Scripts/Player/PlayerController.cs | 45 +++++++++--- ProjectSettings/TagManager.asset | 2 +- UserSettings/EditorUserSettings.asset | 4 +- .../Layouts/CurrentMaximizeLayout.dwlt | 46 ++++++------ 6 files changed, 172 insertions(+), 44 deletions(-) diff --git a/Assets/Prefabs/Playable/Player.prefab b/Assets/Prefabs/Playable/Player.prefab index 45a5a9a..f7f8663 100644 --- a/Assets/Prefabs/Playable/Player.prefab +++ b/Assets/Prefabs/Playable/Player.prefab @@ -33,6 +33,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7008207193600475140} + - {fileID: 3507368432553107122} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -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 43202fe..810d21d 100644 --- a/Assets/Scenes/OverDevScene.unity +++ b/Assets/Scenes/OverDevScene.unity @@ -132,7 +132,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} propertyPath: m_LocalPosition.x @@ -251,6 +251,63 @@ MonoBehaviour: m_Calls: [] m_LegacyBlendHint: 0 m_ComponentOwner: {fileID: 1483260705} +--- !u!1001 &353462435 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2215831379607469555, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2215831379607469555, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} + propertyPath: m_LocalPosition.x + value: 5.7088256 + objectReference: {fileID: 0} + - target: {fileID: 2215831379607469555, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} + propertyPath: m_LocalPosition.y + value: 0.16614294 + objectReference: {fileID: 0} + - target: {fileID: 2215831379607469555, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2215831379607469555, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2215831379607469555, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2215831379607469555, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2215831379607469555, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2215831379607469555, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2215831379607469555, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2215831379607469555, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6102515708334491356, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} + propertyPath: m_Name + value: Basic Shooting Patrolling Enemy Variant + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} --- !u!1001 &361923421 PrefabInstance: m_ObjectHideFlags: 0 @@ -260,7 +317,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} propertyPath: m_LocalPosition.x @@ -397,7 +454,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!50 &1408086266 Rigidbody2D: @@ -477,7 +534,7 @@ Transform: - {fileID: 1514474963} - {fileID: 65152410} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1483260704 GameObject: @@ -789,7 +846,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} propertyPath: m_RootOrder - value: 5 + value: 6 objectReference: {fileID: 0} - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} propertyPath: m_LocalScale.x @@ -850,7 +907,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} propertyPath: m_RootOrder - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} propertyPath: m_LocalScale.x @@ -915,7 +972,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7008207192594766311, guid: 2ed6bfce9ad3e19428cb9bef743e0fa3, type: 3} propertyPath: m_RootOrder - value: 4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 7008207192594766311, guid: 2ed6bfce9ad3e19428cb9bef743e0fa3, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Scripts/Player/PlayerController.cs b/Assets/Scripts/Player/PlayerController.cs index 2d2905b..f33fda1 100644 --- a/Assets/Scripts/Player/PlayerController.cs +++ b/Assets/Scripts/Player/PlayerController.cs @@ -8,15 +8,19 @@ namespace Player { public class PlayerController : MonoBehaviour, IMovement, PlayerInput.IPlayerControlActions { - private const float DefaultJumpForce = 9.81f; - private const float DefaultMass = 80.0f; + private const float DefaultJumpForce = 10.0f; + private const float DefaultMass = 40.0f; private const float DefaultSpeed = 500.0f; - private const float GravityScale = 1.0f; - private Input.PlayerInput _controls; + private const float FallMultiplier = 3f; + private const float LowJumpMultiplier = 3f; + + private PlayerInput _controls; private Rigidbody2D _playerRigidbody2D; private SpriteRenderer _playerSpriteRenderer; + private CollisionChecker _playerGroundTrigger; + private CollisionChecker _playerInteractableTrigger; private bool _moveKeyPressed; private bool _jumpKeyPressed; @@ -24,18 +28,17 @@ namespace Player private bool _isOnAir; private float _xAxisValue; - private PlayerInput.IPlayerControlActions _playerControlActionsImplementation; private void Awake() { - _playerRigidbody2D = gameObject.GetComponent(); + _playerRigidbody2D = GetComponent(); + _playerSpriteRenderer = GetComponent(); _playerGroundTrigger = GameObject.Find("PlayerGroundTrigger").GetComponent(); - _playerSpriteRenderer = gameObject.GetComponent(); + _playerInteractableTrigger = GameObject.Find("PlayerInteractableTrigger").GetComponent(); } private void Start() { - _playerRigidbody2D.gravityScale = GravityScale; _playerRigidbody2D.mass = DefaultMass; BaseSpeed = DefaultSpeed; } @@ -58,15 +61,33 @@ 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 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); + //TODO prevent jumping while keep pressing the button if (_jumpKeyPressed && _playerGroundTrigger.IsCollided) Jump(); } + private void Update() + { + //TODO calculate is on air based on wall and ground triggers + } + // PAUSE METHODS public bool IsPaused { get; private set; } @@ -101,8 +122,9 @@ namespace Player private void Jump() { - _playerRigidbody2D.velocity = new Vector2(_playerRigidbody2D.velocity.x, 0); - _playerRigidbody2D.AddForce(Vector2.up.normalized * DefaultJumpForce * DefaultMass, ForceMode2D.Impulse); + //_playerRigidbody2D.velocity = new Vector2(_playerRigidbody2D.velocity.x, 0); + //_playerRigidbody2D.AddForce(Vector2.up.normalized * DefaultJumpForce * DefaultMass, ForceMode2D.Impulse); + _playerRigidbody2D.velocity = Vector2.up * DefaultJumpForce; } private void Climb() @@ -141,7 +163,8 @@ namespace Player public void OnInteract(InputAction.CallbackContext context) { - throw new NotImplementedException(); + 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 daa06bb..1a9d5ab 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,10 +6,10 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedSceneGuid-0: - value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661 + value: 06550c57540350025c0b0f2747220a44174f4b73297070642b714465b0e6366e flags: 0 RecentlyUsedSceneGuid-1: - value: 06550c57540350025c0b0f2747220a44174f4b73297070642b714465b0e6366e + value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661 flags: 0 RecentlyUsedSceneGuid-2: value: 5002060403010b5f0f560e7a47260a444f4f1e2e2f2e27312f7f4536e0b6633d diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index eb2cb49..cb39504 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: 280 + controlID: 7914 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -142,7 +142,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 246 + controlID: 7877 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -162,8 +162,8 @@ MonoBehaviour: y: 0 width: 304 height: 381.6 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 5} m_Panes: - {fileID: 5} @@ -202,7 +202,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 62f9ffff0cfbffff + m_ExpandedIDs: 4adeffff8cdeffff7ce0ffffc2f2ffff28f3ffff62f9ffff0cfbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -333,8 +333,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 10f9ffff + scrollPos: {x: 0, y: 60} + m_SelectedIDs: e4ddffff m_LastClickedID: 0 m_ExpandedIDs: ffffffff00000000826300008463000086630000886300008a6300008c6300008e630000906300009263000094630000e0630000 m_RenameOverlay: @@ -361,8 +361,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 10f9ffff - m_LastClickedInstanceID: -1776 + m_SelectedInstanceIDs: e4ddffff + m_LastClickedInstanceID: -8732 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000d03c0000 m_RenameOverlay: @@ -444,7 +444,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 281 + controlID: 7915 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -464,8 +464,8 @@ MonoBehaviour: y: 0 width: 880 height: 399.2 - 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: 11} m_Panes: - {fileID: 11} @@ -504,8 +504,8 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: -100, y: -25.600006} + snapOffset: {x: -100, y: -25.600006} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 3 id: Tool Settings index: 0 @@ -515,9 +515,9 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: -141, y: 149} + snapOffset: {x: -141, y: -204.6} snapOffsetDelta: {x: 0, y: 0} - snapCorner: 1 + snapCorner: 3 id: unity-grid-and-snap-toolbar index: 1 layout: 1 @@ -526,7 +526,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 0, y: 0} + snapOffset: {x: 0, y: 24.8} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: unity-scene-view-toolbar @@ -570,7 +570,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 0, y: 0} + snapOffset: {x: 0, y: 24.8} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: unity-transform-toolbar @@ -718,9 +718,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 3.328073, y: 0.08547431, z: -0.07027102} + m_Target: {x: -4.112955, y: -0.28965345, z: 0.056567457} speed: 2 - m_Value: {x: 3.328073, y: 0.08547431, z: -0.07027102} + m_Value: {x: -4.112955, y: -0.28965345, z: 0.056567457} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -771,9 +771,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 6.6387906 + m_Target: 0.7751675 speed: 2 - m_Value: 6.6387906 + m_Value: 0.7751675 m_Ortho: m_Target: 1 speed: 2 @@ -884,7 +884,7 @@ MonoBehaviour: m_CachedPref: 160 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: -1776 + m_LastInspectedObjectInstanceID: -8732 m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 From da4fc01a501e6e93be12080db64dc4b6590d69b6 Mon Sep 17 00:00:00 2001 From: OverflowNarhoym Date: Tue, 22 Feb 2022 17:43:05 +0100 Subject: [PATCH 5/5] Added movement acceleration --- Assets/Scenes/OverDevScene.unity | 473 +++++++----------- Assets/Scripts/Player/PlayerController.cs | 86 +++- .../Layouts/CurrentMaximizeLayout.dwlt | 187 ++++--- 3 files changed, 333 insertions(+), 413 deletions(-) diff --git a/Assets/Scenes/OverDevScene.unity b/Assets/Scenes/OverDevScene.unity index 810d21d..f98c751 100644 --- a/Assets/Scenes/OverDevScene.unity +++ b/Assets/Scenes/OverDevScene.unity @@ -123,63 +123,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1001 &35238242 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - propertyPath: m_LocalPosition.x - value: -12.204437 - objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - propertyPath: m_LocalPosition.y - value: 4.697012 - objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - propertyPath: m_LocalRotation.w - value: -0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - propertyPath: m_LocalRotation.z - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 270 - objectReference: {fileID: 0} - - target: {fileID: 7391517555913877016, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} - propertyPath: m_Name - value: Basic Patrolling Enemy - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} --- !u!1 &65152409 GameObject: m_ObjectHideFlags: 0 @@ -205,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.5244584, 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: @@ -235,7 +178,7 @@ MonoBehaviour: m_Follow: {fileID: 1053905692} m_Lens: FieldOfView: 60 - OrthographicSize: 10 + OrthographicSize: 13 NearClipPlane: 0.3 FarClipPlane: 1000 Dutch: 0 @@ -251,258 +194,255 @@ MonoBehaviour: m_Calls: [] m_LegacyBlendHint: 0 m_ComponentOwner: {fileID: 1483260705} ---- !u!1001 &353462435 +--- !u!1001 &151052495 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 2215831379607469555, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} propertyPath: m_RootOrder - value: 1 + value: 7 objectReference: {fileID: 0} - - target: {fileID: 2215831379607469555, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} + - 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: 5.7088256 + value: 16.55 objectReference: {fileID: 0} - - target: {fileID: 2215831379607469555, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} propertyPath: m_LocalPosition.y - value: 0.16614294 + value: -1 objectReference: {fileID: 0} - - target: {fileID: 2215831379607469555, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2215831379607469555, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 2215831379607469555, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2215831379607469555, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2215831379607469555, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2215831379607469555, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2215831379607469555, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2215831379607469555, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6102515708334491356, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} + - target: {fileID: 847968262667012094, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} propertyPath: m_Name - value: Basic Shooting Patrolling Enemy Variant + value: PlatformTest (4) objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} ---- !u!1001 &361923421 + 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: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + - 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: -11.669386 + value: -4.47 objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} propertyPath: m_LocalPosition.y - value: 0.2 + value: 1.46 objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7391517555913877016, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + - target: {fileID: 847968262667012094, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} propertyPath: m_Name - value: Basic Patrolling Enemy (1) + value: PlatformTest (1) objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + 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!1 &1408086263 -GameObject: +--- !u!1001 &1174240662 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1408086265} - - component: {fileID: 1408086264} - - component: {fileID: 1408086267} - - component: {fileID: 1408086266} - m_Layer: 0 - m_Name: Square - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!212 &1408086264 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1408086263} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} - m_Color: {r: 0.7725491, g: 0.76470596, b: 0.22352943, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &1408086265 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1408086263} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -13.29, y: 5, z: 0} - m_LocalScale: {x: 1, y: 4, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 8 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!50 &1408086266 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1408086263} - m_BodyType: 2 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDrag: 0 - m_AngularDrag: 0.05 - m_GravityScale: 1 - m_Material: {fileID: 0} - m_Interpolate: 0 - m_SleepingMode: 1 - m_CollisionDetection: 0 - m_Constraints: 0 ---- !u!61 &1408086267 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1408086263} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1, y: 1} - newSize: {x: 1, y: 1} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 1, y: 1} - m_EdgeRadius: 0 + 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 @@ -534,7 +474,7 @@ Transform: - {fileID: 1514474963} - {fileID: 65152410} m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1483260704 GameObject: @@ -584,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 @@ -678,7 +618,7 @@ Camera: far clip plane: 1000 field of view: 60 orthographic: 1 - orthographic size: 10 + orthographic size: 13 m_Depth: -1 m_CullingMask: serializedVersion: 2 @@ -702,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.5244584, 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: [] @@ -837,67 +777,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1001 &1584558587 -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: 4 - objectReference: {fileID: 0} - - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} - propertyPath: m_LocalPosition.x - value: -11.66 - 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 (1) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} --- !u!1001 &847968261128498245 PrefabInstance: m_ObjectHideFlags: 0 @@ -911,11 +790,11 @@ PrefabInstance: 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: 2.27 + value: 3.54 objectReference: {fileID: 0} - target: {fileID: 847968262667012088, guid: 9bff55120282d9e45a29d69eea4e6543, type: 3} propertyPath: m_LocalPosition.y @@ -972,15 +851,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7008207192594766311, guid: 2ed6bfce9ad3e19428cb9bef743e0fa3, type: 3} propertyPath: m_RootOrder - value: 5 + value: 1 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.534 + 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 f33fda1..6a29b77 100644 --- a/Assets/Scripts/Player/PlayerController.cs +++ b/Assets/Scripts/Player/PlayerController.cs @@ -2,18 +2,21 @@ using System; using Movement; using UnityEngine; using UnityEngine.InputSystem; +using UnityEngine.SceneManagement; using PlayerInput = Input.PlayerInput; namespace Player { public class PlayerController : MonoBehaviour, IMovement, PlayerInput.IPlayerControlActions { - private const float DefaultJumpForce = 10.0f; - private const float DefaultMass = 40.0f; - private const float DefaultSpeed = 500.0f; + private const float DefaultJumpForce = 25.0f; + private const float DefaultMass = 80.0f; + private const float MaxSpeed = 500.0f; + private const float DefaultAirSpeed = 300.0f; + private const float GravityScale = 5.0f; - private const float FallMultiplier = 3f; - private const float LowJumpMultiplier = 3f; + private const float FallMultiplier = 4.0f; + private const float LowJumpMultiplier = 10.0f; private PlayerInput _controls; private Rigidbody2D _playerRigidbody2D; @@ -25,9 +28,11 @@ namespace Player private bool _moveKeyPressed; private bool _jumpKeyPressed; - private bool _isOnAir; - private float _xAxisValue; + public float speed; + + private bool _isOnAir; + private bool _canJump; private void Awake() { @@ -40,7 +45,9 @@ namespace Player private void Start() { _playerRigidbody2D.mass = DefaultMass; - BaseSpeed = DefaultSpeed; + _playerRigidbody2D.gravityScale = GravityScale; + _canJump = true; + BaseSpeed = 0.0f; } private void OnEnable() @@ -61,31 +68,41 @@ namespace Player private void FixedUpdate() { - switch (_playerRigidbody2D.velocity.y) + /*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); - //TODO prevent jumping while keep pressing the button - if (_jumpKeyPressed && _playerGroundTrigger.IsCollided) + if (_jumpKeyPressed && _canJump && _playerGroundTrigger.IsCollided) Jump(); } private void Update() { - //TODO calculate is on air based on wall and ground triggers + _isOnAir = !_playerGroundTrigger.IsCollided; + RespawnCheck(); + } + + private void RespawnCheck() + { + if (gameObject.transform.position.y < -100) + SceneManager.LoadScene(SceneManager.GetActiveScene().name); } // PAUSE METHODS @@ -106,25 +123,48 @@ namespace Player // 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) { - _playerSpriteRenderer.flipX = _xAxisValue switch + switch (_xAxisValue) { - < 0 => true, - > 0 => false, - _ => _playerSpriteRenderer.flipX - }; + case < 0: + _playerSpriteRenderer.flipX = true; + break; + 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 * DefaultMass, ForceMode2D.Impulse); - _playerRigidbody2D.velocity = Vector2.up * DefaultJumpForce; + BaseSpeed = DefaultAirSpeed; + _playerRigidbody2D.velocity = Vector2.up.normalized * DefaultJumpForce; + _canJump = false; } private void Climb() @@ -140,6 +180,7 @@ namespace Player { case true: _moveKeyPressed = false; + BaseSpeed = 0; break; case false: _moveKeyPressed = true; @@ -154,6 +195,7 @@ namespace Player { case true: _jumpKeyPressed = false; + _canJump = true; break; case false: _jumpKeyPressed = true; diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index cb39504..ba12b2d 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -14,7 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 3} - - {fileID: 9} + - {fileID: 8} - {fileID: 13} m_Position: serializedVersion: 2 @@ -25,7 +25,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 7914 + controlID: 28005 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -46,10 +46,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 304 - y: 472.80002 - width: 878 - height: 310.59998 + x: 302.4 + y: 73.6 + width: 879.6 + height: 493.40002 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -96,23 +96,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 878 - height: 289.59998 - m_Scale: {x: 0.3351852, y: 0.33518517} - m_Translation: {x: 439.00003, y: 144.79997} + width: 879.6 + height: 472.40002 + m_Scale: {x: 0.5467593, y: 0.5467593} + 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: -1309.7238 + x: -804.37585 y: -431.99994 - width: 2619.4475 + width: 1608.7517 height: 863.99994 m_MinimalGUI: 1 - m_defaultScale: 0.33518517 - m_LastWindowPixelSize: {x: 1097.5, y: 388.24997} + m_defaultScale: 0.5467593 + 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: 7877 + 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: 4adeffff8cdeffff7ce0ffffc2f2ffff28f3ffff62f9ffff0cfbffff + m_ExpandedIDs: 0efbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -243,16 +243,15 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 381.6 - width: 304 + width: 302.4 height: 349.19998 m_MinSize: {x: 230, y: 250} m_MaxSize: {x: 10000, y: 10000} m_ActualView: {fileID: 7} m_Panes: - {fileID: 7} - - {fileID: 8} m_Selected: 0 - m_LastSelected: 1 + m_LastSelected: 0 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -275,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: @@ -293,8 +292,7 @@ MonoBehaviour: m_ShowAllHits: 0 m_SkipHidden: 0 m_SearchArea: 1 - m_Folders: - - Assets/Scenes + m_Folders: [] m_Globs: [] m_OriginalText: m_ViewMode: 0 @@ -333,8 +331,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: - scrollPos: {x: 0, y: 60} - m_SelectedIDs: e4ddffff + scrollPos: {x: 0, y: 133.50006} + m_SelectedIDs: m_LastClickedID: 0 m_ExpandedIDs: ffffffff00000000826300008463000086630000886300008a6300008c6300008e630000906300009263000094630000e0630000 m_RenameOverlay: @@ -352,7 +350,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 6} + m_ClientGUIView: {fileID: 0} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -361,8 +359,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: e4ddffff - m_LastClickedInstanceID: -8732 + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000d03c0000 m_RenameOverlay: @@ -393,34 +391,6 @@ MonoBehaviour: m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 170 --- !u!114 &8 -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: 1 - m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Console - m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 0 - y: 455.2 - width: 303 - height: 328.19998 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] ---- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -433,19 +403,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 10} - - {fileID: 12} + - {fileID: 9} + - {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: 7915 ---- !u!114 &10 + controlID: 28006 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -455,23 +425,24 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView + m_Name: GameView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 y: 0 - width: 880 - height: 399.2 + width: 881.6 + height: 514.4 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 11} + m_ActualView: {fileID: 2} m_Panes: - - {fileID: 11} - m_Selected: 0 + - {fileID: 10} + - {fileID: 2} + m_Selected: 1 m_LastSelected: 0 ---- !u!114 &11 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -491,10 +462,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 304 - y: 73.6 - width: 878 - height: 378.2 + x: 706.4 + y: 80.8 + width: 590 + height: 487.8 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -504,8 +475,8 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: -100, y: -25.600006} - snapOffsetDelta: {x: 0, y: 0} + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: -100, y: -25.600006} snapCorner: 3 id: Tool Settings index: 0 @@ -515,9 +486,9 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: -141, y: -204.6} + snapOffset: {x: -141, y: 149} snapOffsetDelta: {x: 0, y: 0} - snapCorner: 3 + snapCorner: 1 id: unity-grid-and-snap-toolbar index: 1 layout: 1 @@ -526,7 +497,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 0, y: 24.8} + snapOffset: {x: 0, y: 0} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: unity-scene-view-toolbar @@ -570,7 +541,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 0, y: 24.8} + snapOffset: {x: 0, y: 0} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: unity-transform-toolbar @@ -718,9 +689,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -4.112955, y: -0.28965345, z: 0.056567457} + m_Target: {x: -13.357433, y: 3.264308, z: -0.07245366} speed: 2 - m_Value: {x: -4.112955, y: -0.28965345, z: 0.056567457} + m_Value: {x: -13.357433, y: 3.264308, z: -0.07245366} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -771,9 +742,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 0.7751675 + m_Target: 13.677304 speed: 2 - m_Value: 0.7751675 + m_Value: 13.677304 m_Ortho: m_Target: 1 speed: 2 @@ -798,7 +769,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &12 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -808,22 +779,50 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView + m_Name: ConsoleWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 399.2 - width: 880 - height: 331.59998 - m_MinSize: {x: 200, y: 200} + y: 514.4 + width: 881.6 + height: 216.39996 + m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 2} + m_ActualView: {fileID: 12} m_Panes: - - {fileID: 2} + - {fileID: 12} m_Selected: 0 m_LastSelected: 0 +--- !u!114 &12 +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: 1 + m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Console + m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 302.4 + y: 588 + width: 879.6 + height: 195.39996 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] --- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 @@ -884,7 +883,7 @@ MonoBehaviour: m_CachedPref: 160 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: -8732 + m_LastInspectedObjectInstanceID: -1 m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0