From 30c965ddc4c825bbc956630a26182f1b43e2c709 Mon Sep 17 00:00:00 2001 From: Giovani Date: Sat, 1 Feb 2020 22:45:05 -0500 Subject: [PATCH 1/4] Continued working on event controls --- Assets/Model/EventControlTile.cs | 4 +- Assets/Scenes/LevelOne.unity | 2610 +++++++---------- Assets/Scripts/BugMovement.cs | 3 +- Assets/Scripts/EventControls.cs | 57 +- Assets/Scripts/Player.cs | 9 +- Assets/Sprites/Enemy/GioBug/GioBug.png.meta | 20 +- .../Enemy/GioBug/GioBugAnim.controller | 2 +- 7 files changed, 1162 insertions(+), 1543 deletions(-) diff --git a/Assets/Model/EventControlTile.cs b/Assets/Model/EventControlTile.cs index ddbc868..6b87ac1 100644 --- a/Assets/Model/EventControlTile.cs +++ b/Assets/Model/EventControlTile.cs @@ -13,15 +13,17 @@ namespace Assets.Model public KeyCode keyCode; public Tile tile; public Tile successTile; + public Tile failTile; public Vector3Int position; public bool isPlusTile; public bool isPerformed; - public EventControlTile(KeyCode keyCode, Tile tile, Tile successTile, Vector3Int position, bool isPlusTile = false) + public EventControlTile(KeyCode keyCode, Tile tile, Tile successTile, Tile failTile, Vector3Int position, bool isPlusTile = false) { this.keyCode = keyCode; this.tile = tile; this.successTile = successTile; + this.failTile = failTile; this.position = position; this.isPlusTile = isPlusTile; } diff --git a/Assets/Scenes/LevelOne.unity b/Assets/Scenes/LevelOne.unity index 8582a6a..4f15a28 100644 --- a/Assets/Scenes/LevelOne.unity +++ b/Assets/Scenes/LevelOne.unity @@ -181,6 +181,13 @@ MonoBehaviour: - {fileID: 11400000, guid: 31952a6eac335264bbb33d2823f28683, type: 2} - {fileID: 11400000, guid: fe934cd7480abb34d85c270a61159910, type: 2} - {fileID: 11400000, guid: 5eea178b37799c04484c1d11a68c148c, type: 2} + failTiles: + - {fileID: 11400000, guid: 2144cee47e8929f4cb0ce23b78f8f4ad, type: 2} + - {fileID: 11400000, guid: cb7c540b9df3b994fb4320684eb0ff65, type: 2} + - {fileID: 11400000, guid: e3c7dcade26bec746bd38fb794264216, type: 2} + - {fileID: 11400000, guid: 873a5cecdfc9ebf4583428797abdf980, type: 2} + - {fileID: 11400000, guid: aa0847f2d07a5de409fea20d9eef8f98, type: 2} + - {fileID: 11400000, guid: 4a575a19b6cd8a140959a1461963418f, type: 2} plusTile: {fileID: 11400000, guid: ee14e10b7ac07bd449e0f1d5ea99eb42, type: 2} framesPerControlTile: 15 nextControlYOffset: 2 @@ -642,7 +649,7 @@ PrefabInstance: - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_RootOrder - value: 7 + value: 6 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -716,7 +723,7 @@ PrefabInstance: - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_RootOrder - value: 11 + value: 10 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -1595,7 +1602,7 @@ PrefabInstance: - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_RootOrder - value: 4 + value: 3 objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} @@ -1669,7 +1676,7 @@ PrefabInstance: - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_RootOrder - value: 10 + value: 9 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -1826,7 +1833,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 13 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1008122161 GameObject: @@ -1874,7 +1881,7 @@ Transform: - {fileID: 1491654} - {fileID: 193535121} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1028911173 PrefabInstance: @@ -1951,7 +1958,7 @@ PrefabInstance: - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_RootOrder - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -2123,7 +2130,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1247097598 stripped Transform: @@ -2186,7 +2193,7 @@ PrefabInstance: - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_RootOrder - value: 9 + value: 8 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -2295,6 +2302,31 @@ Camera: type: 3} m_PrefabInstance: {fileID: 1337282921} m_PrefabAsset: {fileID: 0} +--- !u!1 &1369239206 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3827363133515929333, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + m_PrefabInstance: {fileID: 3827363132279464972} + m_PrefabAsset: {fileID: 0} +--- !u!95 &1369239211 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1369239206} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: b76bb1b393cc12742a8731288b81b071, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &1671840916 GameObject: m_ObjectHideFlags: 0 @@ -2450,6 +2482,7 @@ MonoBehaviour: startStamina: 100 coffeValuePercent: 10 bugStaminaDamagePercent: 15 + hurtVelocity: 20 healthBar: {fileID: 367096170} staminaBar: {fileID: 2086987805} --- !u!95 &1671840923 @@ -2526,7 +2559,7 @@ PrefabInstance: - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_RootOrder - value: 6 + value: 5 objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} @@ -2685,179 +2718,6 @@ Tilemap: e31: 0 e32: 0 e33: 1 ---- !u!1 &1759518263 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1759518264} - - component: {fileID: 1759518267} - - component: {fileID: 1759518266} - - component: {fileID: 1759518265} - m_Layer: 0 - m_Name: Event Controls - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1759518264 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1759518263} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1759518265 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1759518263} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 555a3f8aa89a0e84fb6c43249a117f93, type: 3} - m_Name: - m_EditorClassIdentifier: - player: {fileID: 0} - camera: {fileID: 0} - tiles: [] - successTiles: [] - plusTile: {fileID: 0} - framesPerControlTile: 15 - nextControlYOffset: 0 - tileMapClearDelayInSeconds: 0.5 - maxNumberOfControlTiles: 2 ---- !u!483693784 &1759518266 -TilemapRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1759518263} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 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_ChunkSize: {x: 32, y: 32, z: 32} - m_ChunkCullingBounds: {x: 0, y: 0, z: 0} - m_MaxChunkCount: 16 - m_MaxFrameAge: 16 - m_SortOrder: 0 - m_Mode: 0 - m_DetectChunkCullingBounds: 0 - m_MaskInteraction: 0 ---- !u!1839735485 &1759518267 -Tilemap: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1759518263} - m_Enabled: 1 - m_Tiles: {} - m_AnimatedTiles: {} - m_TileAssetArray: - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - m_TileSpriteArray: - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - m_TileMatrixArray: - - m_RefCount: 0 - m_Data: - e00: NaN - e01: NaN - e02: -0.0000000555834 - e03: 0 - e10: NaN - e11: NaN - e12: 1.18e-43 - e13: 0 - e20: 0 - e21: -0.000000055583342 - e22: 0 - e23: 0 - e30: 0 - e31: 1.18e-43 - e32: 0 - e33: 0 - m_TileColorArray: - - m_RefCount: 0 - m_Data: {r: 6.129018e-32, g: 6.129018e-32, b: 6.129018e-32, a: 6.129018e-32} - m_AnimationFrameRate: 1 - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Origin: {x: 0, y: 0, z: 0} - m_Size: {x: 68, y: 6, z: 1} - m_TileAnchor: {x: 0.5, y: 0.5, z: 0} - m_TileOrientation: 0 - m_TileOrientationMatrix: - e00: 1 - e01: 0 - e02: 0 - e03: 0 - e10: 0 - e11: 1 - e12: 0 - e13: 0 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 --- !u!1 &1882958979 GameObject: m_ObjectHideFlags: 0 @@ -3255,18 +3115,6 @@ CompositeCollider2D: Y: -40000000 - X: -150000000 Y: -40000000 - - X: -150000000 - Y: 329999900 - - X: -150000041 - Y: 329999900 - - X: -150000100 - Y: 329999959 - - X: -150000100 - Y: 370000041 - - X: -150000041 - Y: 370000100 - - X: -150000000 - Y: 370000100 - X: -150000000 Y: 410000000 - X: 2320000000 @@ -3357,302 +3205,26 @@ CompositeCollider2D: Y: -150000000 - X: -80000000 Y: -230000000 - - - X: 960000100 - Y: 339999959 - - X: 960000100 - Y: 349999900 - - X: 970000041 - Y: 349999900 - - X: 970000100 - Y: 349999959 - - X: 970000100 - Y: 359999900 - - X: 980000041 - Y: 359999900 - - X: 980000100 - Y: 359999959 - - X: 980000100 - Y: 379999900 - - X: 990000041 - Y: 379999900 - - X: 990000100 - Y: 379999959 - - X: 990000100 - Y: 400000041 - - X: 990000041 - Y: 400000100 - - X: 949999959 - Y: 400000100 - - X: 949999900 - Y: 400000041 - - X: 949999900 - Y: 339999959 - - X: 949999959 - Y: 339999900 - - X: 960000041 - Y: 339999900 - - - X: 930000100 - Y: 319999959 - - X: 930000100 - Y: 370000041 - - X: 930000041 - Y: 370000100 - - X: 910000100 - Y: 370000100 - - X: 910000100 - Y: 380000041 - - X: 910000041 - Y: 380000100 - - X: 899999959 - Y: 380000100 - - X: 899999900 - Y: 380000041 - - X: 899999900 - Y: 339999959 - - X: 899999959 - Y: 339999900 - - X: 909999900 - Y: 339999900 - - X: 909999900 - Y: 329999959 - - X: 909999959 - Y: 329999900 - - X: 919999900 - Y: 329999900 - - X: 919999900 - Y: 319999959 - - X: 919999959 - Y: 319999900 - - X: 930000041 - Y: 319999900 - - - X: -39999900 - Y: 169999959 - - X: -39999900 - Y: 199999900 - - X: -29999959 - Y: 199999900 - - X: -29999900 - Y: 199999959 - - X: -29999900 - Y: 209999900 - - X: -20000100 - Y: 209999900 - - X: -20000100 - Y: 179999959 - - X: -20000041 - Y: 179999900 - - X: -10000100 - Y: 179999900 - - X: -10000100 - Y: 169999959 - - X: -10000041 - Y: 169999900 - - X: 41 - Y: 169999900 - - X: 100 - Y: 169999959 - - X: 100 - Y: 209999900 - - X: 9999900 - Y: 209999900 - - X: 9999900 - Y: 199999959 - - X: 9999959 - Y: 199999900 - - X: 29999900 - Y: 199999900 - - X: 29999900 - Y: 179999959 - - X: 29999959 - Y: 179999900 - - X: 50000041 - Y: 179999900 - - X: 50000100 - Y: 179999959 - - X: 50000100 - Y: 190000041 - - X: 50000041 - Y: 190000100 - - X: 40000100 - Y: 190000100 - - X: 40000100 - Y: 210000041 - - X: 40000041 - Y: 210000100 - - X: 30000100 - Y: 210000100 - - X: 30000100 - Y: 220000041 - - X: 30000041 - Y: 220000100 - - X: 20000100 - Y: 220000100 - - X: 20000100 - Y: 229999900 - - X: 30000041 - Y: 229999900 - - X: 30000100 - Y: 229999959 - - X: 30000100 - Y: 239999900 - - X: 40000041 - Y: 239999900 - - X: 40000100 - Y: 239999959 - - X: 40000100 - Y: 339999900 - - X: 60000041 - Y: 339999900 - - X: 60000100 - Y: 339999959 - - X: 60000100 - Y: 360000041 - - X: 60000041 - Y: 360000100 - - X: 50000100 - Y: 360000100 - - X: 50000100 - Y: 380000041 - - X: 50000041 - Y: 380000100 - - X: -19999900 - Y: 380000100 - - X: -19999900 - Y: 379999959 - - X: -19999959 - Y: 379999900 - - X: -29999900 - Y: 379999900 - - X: -29999900 - Y: 380000041 - - X: -29999959 - Y: 380000100 - - X: -39999900 - Y: 380000100 - - X: -39999900 - Y: 380000041 - - X: -39999959 - Y: 380000100 - - X: -110000041 - Y: 380000100 - - X: -110000100 - Y: 380000041 - - X: -110000100 - Y: 379999900 - - X: -119999900 - Y: 379999900 - - X: -119999900 - Y: 370000041 - - X: -119999959 - Y: 370000100 - - X: -130000041 - Y: 370000100 - - X: -130000100 - Y: 370000041 - - X: -130000100 - Y: 359999959 - - X: -130000041 - Y: 359999900 - - X: -140000041 - Y: 359999900 - - X: -140000100 - Y: 359999959 - - X: -140000100 - Y: 339999959 - - X: -140000041 - Y: 339999900 - - X: -120000100 - Y: 339999900 - - X: -120000100 - Y: 309999959 - - X: -120000041 - Y: 309999900 - - X: -109999959 - Y: 309999900 - - X: -109999900 - Y: 309999959 - - X: -109999900 - Y: 319999900 - - X: -100000100 - Y: 319999900 - - X: -100000100 - Y: 310000100 - - X: -99999959 - Y: 310000100 - - X: -99999900 - Y: 310000041 - - X: -99999900 - Y: 300000100 - - X: -100000041 - Y: 300000100 - - X: -100000100 - Y: 300000041 - - X: -100000100 - Y: 279999959 - - X: -100000041 - Y: 279999900 - - X: -100000100 - Y: 279999900 - - X: -100000100 - Y: 229999959 - - X: -100000041 - Y: 229999900 - - X: -90000100 - Y: 229999900 - - X: -90000100 - Y: 219999959 - - X: -90000041 - Y: 219999900 - - X: -80000100 - Y: 219999900 - - X: -80000100 - Y: 210000100 - - X: -100000041 - Y: 210000100 - - X: -100000100 - Y: 210000041 - - X: -100000100 - Y: 200000100 - - X: -110000041 - Y: 200000100 - - X: -110000100 - Y: 200000041 - - X: -110000100 - Y: 179999959 - - X: -110000041 - Y: 179999900 - - X: -99999959 - Y: 179999900 - - X: -99999900 - Y: 179999959 - - X: -99999900 - Y: 189999900 - - X: -89999959 - Y: 189999900 - - X: -89999900 - Y: 189999959 - - X: -89999900 - Y: 199999900 - - X: -69999959 - Y: 199999900 - - X: -69999900 - Y: 199999959 - - X: -69999900 - Y: 209999900 - - X: -50000100 - Y: 209999900 - - X: -50000100 - Y: 180000100 - - X: -60000041 - Y: 180000100 - - X: -60000100 - Y: 180000041 - - X: -60000100 - Y: 169999959 - - X: -60000041 - Y: 169999900 - - X: -39999959 - Y: 169999900 + - - X: 960000000 + Y: 350000000 + - X: 970000000 + Y: 350000000 + - X: 970000000 + Y: 360000000 + - X: 980000000 + Y: 360000000 + - X: 980000000 + Y: 380000000 + - X: 990000000 + Y: 380000000 + - X: 990000000 + Y: 400000000 + - X: 950000000 + Y: 400000000 + - X: 950000000 + Y: 340000000 + - X: 960000000 + Y: 340000000 - - X: 1620000000 Y: 300000000 - X: 1660000000 @@ -3685,64 +3257,170 @@ CompositeCollider2D: Y: -70000000 - X: 1620000000 Y: -70000000 - - - X: -109999900 - Y: 330000100 - - X: -109999900 - Y: 349999900 - - X: -99999959 - Y: 349999900 - - X: -99999900 - Y: 349999959 - - X: -99999900 - Y: 360000041 - - X: -99999959 - Y: 360000100 - - X: -119999900 - Y: 360000100 - - X: -119999900 - Y: 369999900 - - X: -29999959 - Y: 369999900 - - X: -29999900 - Y: 369999959 - - X: -29999900 - Y: 369999900 - - X: 19999900 - Y: 369999900 - - X: 19999900 - Y: 370000041 - - X: 19999959 - Y: 370000100 - - X: 29999900 - Y: 370000100 - - X: 29999900 - Y: 369999959 - - X: 29999959 - Y: 369999900 - - X: 39999900 - Y: 369999900 - - X: 39999900 - Y: 349999959 - - X: 39999959 - Y: 349999900 - - X: 29999959 - Y: 349999900 - - X: 29999900 - Y: 349999959 - - X: 29999900 - Y: 350000100 - - X: -80000041 - Y: 350000100 - - X: -80000100 - Y: 350000041 - - X: -80000100 - Y: 340000100 - - X: -100000041 - Y: 340000100 - - X: -100000100 - Y: 340000041 - - X: -100000100 - Y: 330000100 + - - X: 930000000 + Y: 370000000 + - X: 910000000 + Y: 370000000 + - X: 910000000 + Y: 380000000 + - X: 900000000 + Y: 380000000 + - X: 900000000 + Y: 340000000 + - X: 910000000 + Y: 340000000 + - X: 910000000 + Y: 330000000 + - X: 920000000 + Y: 330000000 + - X: 920000000 + Y: 320000000 + - X: 930000000 + Y: 320000000 + - - X: -40000000 + Y: 200000000 + - X: -30000000 + Y: 200000000 + - X: -30000000 + Y: 210000000 + - X: -20000000 + Y: 210000000 + - X: -20000000 + Y: 180000000 + - X: -10000000 + Y: 180000000 + - X: -10000000 + Y: 170000000 + - X: 0 + Y: 170000000 + - X: 0 + Y: 210000000 + - X: 10000000 + Y: 210000000 + - X: 10000000 + Y: 200000000 + - X: 30000000 + Y: 200000000 + - X: 30000000 + Y: 180000000 + - X: 50000000 + Y: 180000000 + - X: 50000000 + Y: 190000000 + - X: 40000000 + Y: 190000000 + - X: 40000000 + Y: 210000000 + - X: 30000000 + Y: 210000000 + - X: 30000000 + Y: 220000000 + - X: 20000000 + Y: 220000000 + - X: 20000000 + Y: 230000000 + - X: 30000000 + Y: 230000000 + - X: 30000000 + Y: 240000000 + - X: 40000000 + Y: 240000000 + - X: 40000000 + Y: 340000000 + - X: 60000000 + Y: 340000000 + - X: 60000000 + Y: 360000000 + - X: 50000000 + Y: 360000000 + - X: 50000000 + Y: 380000000 + - X: -120000000 + Y: 380000000 + - X: -120000000 + Y: 370000000 + - X: 40000000 + Y: 370000000 + - X: 40000000 + Y: 350000000 + - X: -80000000 + Y: 350000000 + - X: -80000000 + Y: 340000000 + - X: -100000000 + Y: 340000000 + - X: -100000000 + Y: 330000000 + - X: -110000000 + Y: 330000000 + - X: -110000000 + Y: 350000000 + - X: -100000000 + Y: 350000000 + - X: -100000000 + Y: 360000000 + - X: -120000000 + Y: 360000000 + - X: -120000000 + Y: 370000000 + - X: -130000000 + Y: 370000000 + - X: -130000000 + Y: 360000000 + - X: -140000000 + Y: 360000000 + - X: -140000000 + Y: 340000000 + - X: -120000000 + Y: 340000000 + - X: -120000000 + Y: 310000000 + - X: -110000000 + Y: 310000000 + - X: -110000000 + Y: 320000000 + - X: -100000000 + Y: 320000000 + - X: -100000000 + Y: 230000000 + - X: -90000000 + Y: 230000000 + - X: -90000000 + Y: 220000000 + - X: -80000000 + Y: 220000000 + - X: -80000000 + Y: 210000000 + - X: -100000000 + Y: 210000000 + - X: -100000000 + Y: 200000000 + - X: -110000000 + Y: 200000000 + - X: -110000000 + Y: 180000000 + - X: -100000000 + Y: 180000000 + - X: -100000000 + Y: 190000000 + - X: -90000000 + Y: 190000000 + - X: -90000000 + Y: 200000000 + - X: -70000000 + Y: 200000000 + - X: -70000000 + Y: 210000000 + - X: -50000000 + Y: 210000000 + - X: -50000000 + Y: 180000000 + - X: -60000000 + Y: 180000000 + - X: -60000000 + Y: 170000000 + - X: -40000000 + Y: 170000000 - - X: 1360000000 Y: 370000000 - X: 1290000000 @@ -3751,168 +3429,82 @@ CompositeCollider2D: Y: 350000000 - X: 1360000000 Y: 350000000 - - - X: 980000100 - Y: 309999959 - - X: 980000100 - Y: 319999900 - - X: 1010000041 - Y: 319999900 - - X: 1010000100 - Y: 319999959 - - X: 1010000100 - Y: 350000041 - - X: 1010000041 - Y: 350000100 - - X: 999999959 - Y: 350000100 - - X: 999999900 - Y: 350000041 - - X: 999999900 - Y: 340000100 - - X: 969999959 - Y: 340000100 - - X: 969999900 - Y: 340000041 - - X: 969999900 - Y: 320000100 - - X: 959999959 - Y: 320000100 - - X: 959999900 - Y: 320000041 - - X: 959999900 - Y: 309999959 - - X: 959999959 - Y: 309999900 - - X: 980000041 - Y: 309999900 - - - X: -69999900 - Y: 220000100 - - X: -69999900 - Y: 230000041 - - X: -69999959 - Y: 230000100 - - X: -79999900 - Y: 230000100 - - X: -79999900 - Y: 240000041 - - X: -79999959 - Y: 240000100 - - X: -89999900 - Y: 240000100 - - X: -89999900 - Y: 329999900 - - X: -69999959 - Y: 329999900 - - X: -69999900 - Y: 329999959 - - X: -69999900 - Y: 339999900 - - X: -59999959 - Y: 339999900 - - X: -59999900 - Y: 339999959 - - X: -59999900 - Y: 339999900 - - X: 29999900 - Y: 339999900 - - X: 29999900 - Y: 250000100 - - X: 19999959 - Y: 250000100 - - X: 19999900 - Y: 250000041 - - X: 19999900 - Y: 240000100 - - X: 9999959 - Y: 240000100 - - X: 9999900 - Y: 240000041 - - X: 9999900 - Y: 230000100 - - X: -40000041 - Y: 230000100 - - X: -40000100 - Y: 230000041 - - X: -40000100 - Y: 220000100 - - - X: 20000100 - Y: 299999959 - - X: 20000100 - Y: 320000041 - - X: 20000041 - Y: 320000100 - - X: -19999959 - Y: 320000100 - - X: -19999900 - Y: 320000041 - - X: -19999900 - Y: 309999959 - - X: -19999959 - Y: 309999900 - - X: -20000100 - Y: 309999900 - - X: -20000100 - Y: 299999959 - - X: -20000041 - Y: 299999900 - - X: 20000041 - Y: 299999900 - - - X: -39999900 - Y: 299999959 - - X: -39999900 - Y: 320000041 - - X: -39999959 - Y: 320000100 - - X: -80000041 - Y: 320000100 - - X: -80000100 - Y: 320000041 - - X: -80000100 - Y: 299999959 - - X: -80000041 - Y: 299999900 - - X: -39999959 - Y: 299999900 - - - X: 2169999872 + - - X: 980000000 Y: 320000000 - - X: 2160000000 + - X: 1010000000 Y: 320000000 - - X: 2160000000 - Y: 300000000 - - X: 2169999872 - Y: 300000000 - - - X: 2050000000 + - X: 1010000000 + Y: 350000000 + - X: 1000000000 + Y: 350000000 + - X: 1000000000 + Y: 340000000 + - X: 970000000 + Y: 340000000 + - X: 970000000 Y: 320000000 - - X: 2040000000 + - X: 960000000 Y: 320000000 - - X: 2040000000 - Y: 300000000 - - X: 2050000000 - Y: 300000000 - - - X: 1380000000 - Y: 320000000 - - X: 1270000000 - Y: 320000000 - - X: 1270000000 - Y: 300000000 - - X: 1380000000 - Y: 300000000 - - - X: 1990000000 - Y: 320000000 - - X: 1980000000 - Y: 320000000 - - X: 1980000000 + - X: 960000000 Y: 310000000 - - X: 1990000000 + - X: 980000000 Y: 310000000 - - - X: 1830000000 + - - X: -70000000 + Y: 220000000 + - X: -70000000 + Y: 230000000 + - X: -80000000 + Y: 230000000 + - X: -80000000 + Y: 240000000 + - X: -90000000 + Y: 240000000 + - X: -90000000 + Y: 330000000 + - X: -70000000 + Y: 330000000 + - X: -70000000 + Y: 340000000 + - X: 30000000 + Y: 340000000 + - X: 30000000 + Y: 250000000 + - X: 20000000 + Y: 250000000 + - X: 20000000 + Y: 240000000 + - X: 10000000 + Y: 240000000 + - X: 10000000 + Y: 230000000 + - X: -40000000 + Y: 230000000 + - X: -40000000 + Y: 220000000 + - - X: 2289999872 Y: 320000000 - - X: 1820000000 + - X: 2280000000 Y: 320000000 - - X: 1820000000 + - X: 2280000000 + Y: 300000000 + - X: 2289999872 + Y: 300000000 + - - X: 2240000000 + Y: 320000000 + - X: 2220000000 + Y: 320000000 + - X: 2220000000 Y: 310000000 - - X: 1830000000 + - X: 2240000000 Y: 310000000 + - - X: 2209999872 + Y: 320000000 + - X: 2200000000 + Y: 320000000 + - X: 2200000000 + Y: 300000000 + - X: 2209999872 + Y: 300000000 - - X: 2190000128 Y: 320000000 - X: 2180000000 @@ -3921,21 +3513,21 @@ CompositeCollider2D: Y: 310000000 - X: 2190000128 Y: 310000000 - - - X: 1850000000 + - - X: 2169999872 Y: 320000000 - - X: 1840000000 + - X: 2160000000 Y: 320000000 - - X: 1840000000 + - X: 2160000000 Y: 300000000 - - X: 1850000000 + - X: 2169999872 Y: 300000000 - - - X: 1790000000 + - - X: 2150000128 Y: 320000000 - - X: 1780000000 + - X: 2140000000 Y: 320000000 - - X: 1780000000 + - X: 2140000000 Y: 310000000 - - X: 1790000000 + - X: 2150000128 Y: 310000000 - - X: 2130000000 Y: 320000000 @@ -3945,21 +3537,13 @@ CompositeCollider2D: Y: 310000000 - X: 2130000000 Y: 310000000 - - - X: 1810000000 + - - X: 2110000000 Y: 320000000 - - X: 1800000000 + - X: 2100000000 Y: 320000000 - - X: 1800000000 - Y: 300000000 - - X: 1810000000 - Y: 300000000 - - - X: 1950000000 - Y: 320000000 - - X: 1940000000 - Y: 320000000 - - X: 1940000000 + - X: 2100000000 Y: 310000000 - - X: 1950000000 + - X: 2110000000 Y: 310000000 - - X: 2090000000 Y: 320000000 @@ -3969,21 +3553,29 @@ CompositeCollider2D: Y: 300000000 - X: 2090000000 Y: 300000000 - - - X: 2289999872 + - - X: 2070000000 Y: 320000000 - - X: 2280000000 + - X: 2060000000 Y: 320000000 - - X: 2280000000 - Y: 300000000 - - X: 2289999872 - Y: 300000000 - - - X: 2110000000 - Y: 320000000 - - X: 2100000000 - Y: 320000000 - - X: 2100000000 + - X: 2060000000 Y: 310000000 - - X: 2110000000 + - X: 2070000000 + Y: 310000000 + - - X: 2050000000 + Y: 320000000 + - X: 2040000000 + Y: 320000000 + - X: 2040000000 + Y: 300000000 + - X: 2050000000 + Y: 300000000 + - - X: 2030000000 + Y: 320000000 + - X: 2020000000 + Y: 320000000 + - X: 2020000000 + Y: 310000000 + - X: 2030000000 Y: 310000000 - - X: 2010000000 Y: 320000000 @@ -3993,6 +3585,14 @@ CompositeCollider2D: Y: 310000000 - X: 2010000000 Y: 310000000 + - - X: 1990000000 + Y: 320000000 + - X: 1980000000 + Y: 320000000 + - X: 1980000000 + Y: 310000000 + - X: 1990000000 + Y: 310000000 - - X: 1970000000 Y: 320000000 - X: 1960000000 @@ -4001,21 +3601,21 @@ CompositeCollider2D: Y: 300000000 - X: 1970000000 Y: 300000000 - - - X: 1750000000 + - - X: 1950000000 Y: 320000000 - - X: 1740000000 + - X: 1940000000 Y: 320000000 - - X: 1740000000 + - X: 1940000000 Y: 310000000 - - X: 1750000000 + - X: 1950000000 Y: 310000000 - - - X: 1770000000 + - - X: 1930000000 Y: 320000000 - - X: 1760000000 + - X: 1920000000 Y: 320000000 - - X: 1760000000 + - X: 1920000000 Y: 300000000 - - X: 1770000000 + - X: 1930000000 Y: 300000000 - - X: 1910000000 Y: 320000000 @@ -4025,13 +3625,37 @@ CompositeCollider2D: Y: 310000000 - X: 1910000000 Y: 310000000 - - - X: 2150000128 + - - X: 1890000000 Y: 320000000 - - X: 2140000000 + - X: 1880000000 Y: 320000000 - - X: 2140000000 + - X: 1880000000 Y: 310000000 - - X: 2150000128 + - X: 1890000000 + Y: 310000000 + - - X: 1870000000 + Y: 320000000 + - X: 1860000000 + Y: 320000000 + - X: 1860000000 + Y: 310000000 + - X: 1870000000 + Y: 310000000 + - - X: 1850000000 + Y: 320000000 + - X: 1840000000 + Y: 320000000 + - X: 1840000000 + Y: 300000000 + - X: 1850000000 + Y: 300000000 + - - X: 1830000000 + Y: 320000000 + - X: 1820000000 + Y: 320000000 + - X: 1820000000 + Y: 310000000 + - X: 1830000000 Y: 310000000 - - X: 1710000000 Y: 310000000 @@ -4045,62 +3669,70 @@ CompositeCollider2D: Y: 300000000 - X: 1710000000 Y: 300000000 - - - X: 1930000000 + - - X: 1790000000 Y: 320000000 - - X: 1920000000 + - X: 1780000000 Y: 320000000 - - X: 1920000000 + - X: 1780000000 + Y: 310000000 + - X: 1790000000 + Y: 310000000 + - - X: 1770000000 + Y: 320000000 + - X: 1760000000 + Y: 320000000 + - X: 1760000000 Y: 300000000 - - X: 1930000000 + - X: 1770000000 Y: 300000000 - - - X: 2209999872 + - - X: 1750000000 Y: 320000000 - - X: 2200000000 + - X: 1740000000 Y: 320000000 - - X: 2200000000 + - X: 1740000000 + Y: 310000000 + - X: 1750000000 + Y: 310000000 + - - X: 1380000000 + Y: 320000000 + - X: 1270000000 + Y: 320000000 + - X: 1270000000 Y: 300000000 - - X: 2209999872 + - X: 1380000000 Y: 300000000 - - - X: 2070000000 + - - X: 1810000000 Y: 320000000 - - X: 2060000000 + - X: 1800000000 Y: 320000000 - - X: 2060000000 - Y: 310000000 - - X: 2070000000 - Y: 310000000 - - - X: 2240000000 + - X: 1800000000 + Y: 300000000 + - X: 1810000000 + Y: 300000000 + - - X: 20000000 Y: 320000000 - - X: 2220000000 + - X: -20000000 Y: 320000000 - - X: 2220000000 - Y: 310000000 - - X: 2240000000 - Y: 310000000 - - - X: 2030000000 + - X: -20000000 + Y: 300000000 + - X: 20000000 + Y: 300000000 + - - X: -40000000 Y: 320000000 - - X: 2020000000 + - X: -80000000 Y: 320000000 - - X: 2020000000 - Y: 310000000 - - X: 2030000000 - Y: 310000000 - - - X: 1870000000 - Y: 320000000 - - X: 1860000000 - Y: 320000000 - - X: 1860000000 - Y: 310000000 - - X: 1870000000 - Y: 310000000 - - - X: 1890000000 - Y: 320000000 - - X: 1880000000 - Y: 320000000 - - X: 1880000000 - Y: 310000000 - - X: 1890000000 - Y: 310000000 + - X: -80000000 + Y: 300000000 + - X: -40000000 + Y: 300000000 + - - X: 410000000 + Y: 300000000 + - X: 270000000 + Y: 300000000 + - X: 270000000 + Y: 280000000 + - X: 410000000 + Y: 280000000 - - X: 1010000000 Y: 90000000 - X: 1020000000 @@ -4167,29 +3799,21 @@ CompositeCollider2D: Y: 240000000 - X: 1070000000 Y: 250000000 - - X: 970000100 + - X: 970000000 Y: 250000000 - - X: 970000100 - Y: 260000041 - - X: 970000041 - Y: 260000100 - - X: 950000100 - Y: 260000100 - - X: 950000100 - Y: 270000041 - - X: 950000041 - Y: 270000100 - - X: 909999959 - Y: 270000100 - - X: 909999900 - Y: 270000041 - - X: 909999900 - Y: 260000100 - - X: 889999959 - Y: 260000100 - - X: 889999900 - Y: 260000041 - - X: 889999900 + - X: 970000000 + Y: 260000000 + - X: 950000000 + Y: 260000000 + - X: 950000000 + Y: 270000000 + - X: 910000000 + Y: 270000000 + - X: 910000000 + Y: 260000000 + - X: 890000000 + Y: 260000000 + - X: 890000000 Y: 250000000 - X: 790000000 Y: 250000000 @@ -4202,134 +3826,86 @@ CompositeCollider2D: - X: 770000000 Y: 280000000 - X: 770000000 - Y: 230000100 - - X: 749999959 - Y: 230000100 - - X: 749999900 - Y: 230000041 - - X: 749999900 - Y: 220000100 - - X: 739999959 - Y: 220000100 - - X: 739999900 - Y: 220000041 - - X: 739999900 - Y: 210000100 - - X: 729999959 - Y: 210000100 - - X: 729999900 - Y: 210000041 - - X: 729999900 - Y: 199999959 - - X: 729999959 - Y: 199999900 - - X: 739999900 - Y: 199999900 - - X: 739999900 - Y: 189999959 - - X: 739999959 - Y: 189999900 - - X: 749999900 - Y: 189999900 - - X: 749999900 - Y: 179999959 - - X: 749999959 - Y: 179999900 - - X: 759999900 - Y: 179999900 - - X: 759999900 - Y: 169999959 - - X: 759999959 - Y: 169999900 - - X: 779999900 - Y: 169999900 - - X: 779999900 - Y: 159999959 - - X: 779999959 - Y: 159999900 - - X: 789999900 - Y: 159999900 - - X: 789999900 - Y: 149999959 - - X: 789999959 - Y: 149999900 - - X: 799999900 - Y: 149999900 - - X: 799999900 - Y: 140000041 - - X: 799999959 - Y: 140000100 - - X: 810000041 - Y: 140000100 - - X: 810000100 - Y: 140000041 - - X: 810000100 - Y: 129999959 - - X: 810000041 - Y: 129999900 - - X: 819999900 - Y: 129999900 - - X: 819999900 - Y: 119999959 - - X: 819999959 - Y: 119999900 - - X: 829999900 - Y: 119999900 - - X: 829999900 - Y: 109999959 - - X: 829999959 - Y: 109999900 - - X: 839999900 - Y: 109999900 - - X: 839999900 - Y: 120000041 - - X: 839999959 - Y: 120000100 - - X: 840000100 - Y: 120000100 - - X: 840000100 - Y: 130000041 - - X: 840000041 - Y: 130000100 - - X: 830000100 - Y: 130000100 - - X: 830000100 - Y: 140000041 - - X: 830000041 - Y: 140000100 - - X: 820000100 - Y: 140000100 - - X: 820000100 - Y: 150000041 - - X: 820000041 - Y: 150000100 - - X: 810000100 - Y: 150000100 - - X: 810000100 - Y: 170000041 - - X: 810000041 - Y: 170000100 - - X: 800000100 - Y: 170000100 - - X: 800000100 - Y: 180000041 - - X: 800000041 - Y: 180000100 - - X: 790000100 - Y: 180000100 - - X: 790000100 - Y: 209999900 - - X: 810000041 - Y: 209999900 - - X: 810000100 - Y: 209999959 - - X: 810000100 - Y: 219999900 - - X: 820000041 - Y: 219999900 - - X: 820000100 - Y: 219999959 - - X: 820000100 + Y: 230000000 + - X: 750000000 + Y: 230000000 + - X: 750000000 + Y: 220000000 + - X: 740000000 + Y: 220000000 + - X: 740000000 + Y: 210000000 + - X: 730000000 + Y: 210000000 + - X: 730000000 + Y: 200000000 + - X: 740000000 + Y: 200000000 + - X: 740000000 + Y: 190000000 + - X: 750000000 + Y: 190000000 + - X: 750000000 + Y: 180000000 + - X: 760000000 + Y: 180000000 + - X: 760000000 + Y: 170000000 + - X: 780000000 + Y: 170000000 + - X: 780000000 + Y: 160000000 + - X: 790000000 + Y: 160000000 + - X: 790000000 + Y: 150000000 + - X: 800000000 + Y: 150000000 + - X: 800000000 + Y: 140000000 + - X: 810000000 + Y: 140000000 + - X: 810000000 + Y: 130000000 + - X: 820000000 + Y: 130000000 + - X: 820000000 + Y: 120000000 + - X: 830000000 + Y: 120000000 + - X: 830000000 + Y: 110000000 + - X: 840000000 + Y: 110000000 + - X: 840000000 + Y: 130000000 + - X: 830000000 + Y: 130000000 + - X: 830000000 + Y: 140000000 + - X: 820000000 + Y: 140000000 + - X: 820000000 + Y: 150000000 + - X: 810000000 + Y: 150000000 + - X: 810000000 + Y: 170000000 + - X: 800000000 + Y: 170000000 + - X: 800000000 + Y: 180000000 + - X: 790000000 + Y: 180000000 + - X: 790000000 + Y: 210000000 + - X: 810000000 + Y: 210000000 + - X: 810000000 + Y: 220000000 + - X: 820000000 + Y: 220000000 + - X: 820000000 Y: 230000000 - X: 1060000000 Y: 230000000 @@ -4379,58 +3955,28 @@ CompositeCollider2D: Y: 100000000 - X: 990000000 Y: 90000000 - - X: 880000100 - Y: 90000000 - - X: 880000100 - Y: 89999959 - - X: 880000041 - Y: 89999900 - X: 860000000 - Y: 89999900 + Y: 90000000 - X: 860000000 Y: 70000000 - X: 1010000000 Y: 70000000 - - - X: 410000000 - Y: 300000000 - - X: 270000000 - Y: 300000000 - - X: 270000000 + - - X: -50000000 + Y: 290000000 + - X: -60000000 + Y: 290000000 + - X: -60000000 Y: 280000000 - - X: 410000000 + - X: -50000000 + Y: 280000000 + - - X: 0 + Y: 290000000 + - X: -10000000 + Y: 290000000 + - X: -10000000 + Y: 280000000 + - X: 0 Y: 280000000 - - - X: -49999900 - Y: 279999959 - - X: -49999900 - Y: 290000041 - - X: -49999959 - Y: 290000100 - - X: -60000041 - Y: 290000100 - - X: -60000100 - Y: 290000041 - - X: -60000100 - Y: 279999959 - - X: -60000041 - Y: 279999900 - - X: -49999959 - Y: 279999900 - - - X: 100 - Y: 279999959 - - X: 100 - Y: 290000041 - - X: 41 - Y: 290000100 - - X: -10000041 - Y: 290000100 - - X: -10000100 - Y: 290000041 - - X: -10000100 - Y: 279999959 - - X: -10000041 - Y: 279999900 - - X: 41 - Y: 279999900 - - X: 1400000000 Y: 270000000 - X: 1250000000 @@ -4439,34 +3985,14 @@ CompositeCollider2D: Y: 250000000 - X: 1400000000 Y: 250000000 - - - X: -9999900 - Y: 249999959 - - X: -9999900 - Y: 260000041 - - X: -9999959 - Y: 260000100 - - X: -20000041 - Y: 260000100 - - X: -20000100 - Y: 260000041 - - X: -20000100 - Y: 259999900 - - X: -39999900 - Y: 259999900 - - X: -39999900 - Y: 260000041 - - X: -39999959 - Y: 260000100 - - X: -50000041 - Y: 260000100 - - X: -50000100 - Y: 260000041 - - X: -50000100 - Y: 249999959 - - X: -50000041 - Y: 249999900 - - X: -9999959 - Y: 249999900 + - - X: -10000000 + Y: 260000000 + - X: -50000000 + Y: 260000000 + - X: -50000000 + Y: 250000000 + - X: -10000000 + Y: 250000000 - - X: 2240000000 Y: 260000000 - X: 2169999872 @@ -4475,6 +4001,14 @@ CompositeCollider2D: Y: 240000000 - X: 2240000000 Y: 240000000 + - - X: 1430000000 + Y: 220000000 + - X: 1220000000 + Y: 220000000 + - X: 1220000000 + Y: 200000000 + - X: 1430000000 + Y: 200000000 - - X: 430000000 Y: 220000000 - X: 410000000 @@ -4483,25 +4017,15 @@ CompositeCollider2D: Y: 200000000 - X: 430000000 Y: 200000000 - - - X: 2040000000 - Y: 210000000 - - X: 2030000000 - Y: 210000000 - - X: 2030000000 - Y: 200000000 - - X: 2020000000 - Y: 200000000 - - X: 2020000000 + - - X: 2050000000 Y: 220000000 - - X: 2010000000 + - X: 2040000000 Y: 220000000 - - X: 2010000000 - Y: 200000000 - - X: 2000000000 - Y: 200000000 - - X: 2000000000 + - X: 2040000000 Y: 210000000 - - X: 1990000000 + - X: 2050000000 + Y: 210000000 + - - X: 1990000000 Y: 210000000 - X: 1990000000 Y: 200000000 @@ -4511,21 +4035,41 @@ CompositeCollider2D: Y: 160000000 - X: 2040000000 Y: 160000000 - - - X: 1900000000 + - X: 2040000000 + Y: 210000000 + - X: 2030000000 + Y: 210000000 + - X: 2030000000 Y: 200000000 - - X: 1890000000 + - X: 2020000000 Y: 200000000 - - X: 1890000000 + - X: 2020000000 Y: 220000000 - - X: 1880000000 + - X: 2010000000 Y: 220000000 - - X: 1880000000 + - X: 2010000000 Y: 200000000 - - X: 1860000000 + - X: 2000000000 Y: 200000000 - - X: 1860000000 + - X: 2000000000 + Y: 210000000 + - - X: 1990000000 Y: 220000000 - - X: 1850000000 + - X: 1980000000 + Y: 220000000 + - X: 1980000000 + Y: 210000000 + - X: 1990000000 + Y: 210000000 + - - X: 1920000000 + Y: 220000000 + - X: 1910000000 + Y: 220000000 + - X: 1910000000 + Y: 210000000 + - X: 1920000000 + Y: 210000000 + - - X: 1850000000 Y: 220000000 - X: 1850000000 Y: 200000000 @@ -4535,38 +4079,20 @@ CompositeCollider2D: Y: 160000000 - X: 1900000000 Y: 160000000 - - - X: 1990000000 - Y: 220000000 - - X: 1980000000 - Y: 220000000 - - X: 1980000000 - Y: 210000000 - - X: 1990000000 - Y: 210000000 - - - X: 2050000000 - Y: 220000000 - - X: 2040000000 - Y: 220000000 - - X: 2040000000 - Y: 210000000 - - X: 2050000000 - Y: 210000000 - - - X: 1430000000 - Y: 220000000 - - X: 1220000000 - Y: 220000000 - - X: 1220000000 + - X: 1900000000 Y: 200000000 - - X: 1430000000 + - X: 1890000000 Y: 200000000 - - - X: 1920000000 + - X: 1890000000 Y: 220000000 - - X: 1910000000 + - X: 1880000000 + Y: 220000000 + - X: 1880000000 + Y: 200000000 + - X: 1860000000 + Y: 200000000 + - X: 1860000000 Y: 220000000 - - X: 1910000000 - Y: 210000000 - - X: 1920000000 - Y: 210000000 - - X: 1910000000 Y: 210000000 - X: 1900000000 @@ -4695,22 +4221,6 @@ CompositeCollider2D: Y: 130000000 - X: 730000000 Y: 130000000 - - - X: 520000000 - Y: 140000000 - - X: 480000000 - Y: 140000000 - - X: 480000000 - Y: 120000000 - - X: 520000000 - Y: 120000000 - - - X: 1510000000 - Y: 140000000 - - X: 1490000000 - Y: 140000000 - - X: 1490000000 - Y: 120000000 - - X: 1510000000 - Y: 120000000 - - X: 1800000000 Y: 130000000 - X: 1810000000 @@ -4735,6 +4245,22 @@ CompositeCollider2D: Y: 120000000 - X: 2110000000 Y: 120000000 + - - X: 520000000 + Y: 140000000 + - X: 480000000 + Y: 140000000 + - X: 480000000 + Y: 120000000 + - X: 520000000 + Y: 120000000 + - - X: 1510000000 + Y: 140000000 + - X: 1490000000 + Y: 140000000 + - X: 1490000000 + Y: 120000000 + - X: 1510000000 + Y: 120000000 - - X: 450000000 Y: 120000000 - X: 370000000 @@ -4743,14 +4269,6 @@ CompositeCollider2D: Y: 100000000 - X: 450000000 Y: 100000000 - - - X: 1550000000 - Y: 100000000 - - X: 1530000000 - Y: 100000000 - - X: 1530000000 - Y: 80000000 - - X: 1550000000 - Y: 80000000 - - X: 1280000000 Y: 20000000 - X: 1300000000 @@ -4855,6 +4373,14 @@ CompositeCollider2D: Y: 10000000 - X: 1280000000 Y: 10000000 + - - X: 1550000000 + Y: 100000000 + - X: 1530000000 + Y: 100000000 + - X: 1530000000 + Y: 80000000 + - X: 1550000000 + Y: 80000000 - - X: 760000000 Y: 100000000 - X: 700000000 @@ -4903,14 +4429,6 @@ CompositeCollider2D: Y: 40000000 - X: 2040000000 Y: 40000000 - - - X: 290000000 - Y: 80000000 - - X: 240000000 - Y: 80000000 - - X: 240000000 - Y: 60000000 - - X: 290000000 - Y: 60000000 - - X: 2220000000 Y: 80000000 - X: 2169999872 @@ -4919,6 +4437,14 @@ CompositeCollider2D: Y: 50000000 - X: 2220000000 Y: 50000000 + - - X: 290000000 + Y: 80000000 + - X: 240000000 + Y: 80000000 + - X: 240000000 + Y: 60000000 + - X: 290000000 + Y: 60000000 - - X: 380000000 Y: 70000000 - X: 330000000 @@ -4935,6 +4461,14 @@ CompositeCollider2D: Y: 70000000 - X: 2020000000 Y: 50000000 + - - X: 1800000000 + Y: 60000000 + - X: 1770000000 + Y: 60000000 + - X: 1770000000 + Y: 40000000 + - X: 1800000000 + Y: 40000000 - - X: 910000000 Y: -110000000 - X: 1030000000 @@ -5015,14 +4549,6 @@ CompositeCollider2D: Y: -200000000 - X: 910000000 Y: -200000000 - - - X: 1800000000 - Y: 60000000 - - X: 1770000000 - Y: 60000000 - - X: 1770000000 - Y: 40000000 - - X: 1800000000 - Y: 40000000 - - X: 840000000 Y: 50000000 - X: 760000000 @@ -5063,14 +4589,6 @@ CompositeCollider2D: Y: 10000000 - X: 2270000128 Y: 10000000 - - - X: 1750000000 - Y: 10000000 - - X: 1670000000 - Y: 10000000 - - X: 1670000000 - Y: -20000000 - - X: 1750000000 - Y: -20000000 - - X: 2160000000 Y: -40000000 - X: 2150000128 @@ -5131,6 +4649,14 @@ CompositeCollider2D: Y: -60000000 - X: 2160000000 Y: -60000000 + - - X: 1750000000 + Y: 10000000 + - X: 1670000000 + Y: 10000000 + - X: 1670000000 + Y: -20000000 + - X: 1750000000 + Y: -20000000 - - X: 1660000000 Y: -40000000 - X: 1640000000 @@ -5139,14 +4665,6 @@ CompositeCollider2D: Y: -140000000 - X: 1660000000 Y: -140000000 - - - X: 1430000000 - Y: -50000000 - - X: 1410000000 - Y: -50000000 - - X: 1410000000 - Y: -70000000 - - X: 1430000000 - Y: -70000000 - - X: 2270000128 Y: -50000000 - X: 2260000000 @@ -5155,6 +4673,14 @@ CompositeCollider2D: Y: -60000000 - X: 2270000128 Y: -60000000 + - - X: 1430000000 + Y: -50000000 + - X: 1410000000 + Y: -50000000 + - X: 1410000000 + Y: -70000000 + - X: 1430000000 + Y: -70000000 - - X: 1160000000 Y: -80000000 - X: 1130000000 @@ -5163,13 +4689,13 @@ CompositeCollider2D: Y: -110000000 - X: 1160000000 Y: -110000000 - - - X: 1550000000 + - - X: 1240000000 Y: -90000000 - - X: 1530000000 + - X: 1180000000 Y: -90000000 - - X: 1530000000 + - X: 1180000000 Y: -110000000 - - X: 1550000000 + - X: 1240000000 Y: -110000000 - - X: 1470000000 Y: -90000000 @@ -5179,6 +4705,14 @@ CompositeCollider2D: Y: -110000000 - X: 1470000000 Y: -110000000 + - - X: 1550000000 + Y: -90000000 + - X: 1530000000 + Y: -90000000 + - X: 1530000000 + Y: -110000000 + - X: 1550000000 + Y: -110000000 - - X: 2140000000 Y: -110000000 - X: 2230000128 @@ -5199,14 +4733,6 @@ CompositeCollider2D: Y: -170000000 - X: 2140000000 Y: -170000000 - - - X: 1240000000 - Y: -90000000 - - X: 1180000000 - Y: -90000000 - - X: 1180000000 - Y: -110000000 - - X: 1240000000 - Y: -110000000 - - X: 1780000000 Y: -120000000 - X: 1730000000 @@ -5215,6 +4741,14 @@ CompositeCollider2D: Y: -140000000 - X: 1780000000 Y: -140000000 + - - X: 1140000000 + Y: -130000000 + - X: 1050000000 + Y: -130000000 + - X: 1050000000 + Y: -150000000 + - X: 1140000000 + Y: -150000000 - - X: 1510000000 Y: -130000000 - X: 1490000000 @@ -5231,14 +4765,6 @@ CompositeCollider2D: Y: -150000000 - X: 1320000000 Y: -150000000 - - - X: 1140000000 - Y: -130000000 - - X: 1050000000 - Y: -130000000 - - X: 1050000000 - Y: -150000000 - - X: 1140000000 - Y: -150000000 - - X: 2270000128 Y: -140000000 - X: 2260000000 @@ -5303,29 +4829,13 @@ CompositeCollider2D: Y: -190000000 - X: 1550000000 Y: -190000000 - - - X: 690000000 + - - X: 640000000 Y: -180000000 - - X: 670000000 + - X: 620000000 Y: -180000000 - - X: 670000000 + - X: 620000000 Y: -200000000 - - X: 690000000 - Y: -200000000 - - - X: 840000000 - Y: -180000000 - - X: 820000000 - Y: -180000000 - - X: 820000000 - Y: -200000000 - - X: 840000000 - Y: -200000000 - - - X: 990000000 - Y: -180000000 - - X: 930000000 - Y: -180000000 - - X: 930000000 - Y: -200000000 - - X: 990000000 + - X: 640000000 Y: -200000000 - - X: 590000000 Y: -180000000 @@ -5351,13 +4861,21 @@ CompositeCollider2D: Y: -200000000 - X: 740000000 Y: -200000000 - - - X: 640000000 + - - X: 1110000000 Y: -180000000 - - X: 620000000 + - X: 1020000000 Y: -180000000 - - X: 620000000 + - X: 1020000000 Y: -200000000 - - X: 640000000 + - X: 1110000000 + Y: -200000000 + - - X: 840000000 + Y: -180000000 + - X: 820000000 + Y: -180000000 + - X: 820000000 + Y: -200000000 + - X: 840000000 Y: -200000000 - - X: 790000000 Y: -180000000 @@ -5367,13 +4885,21 @@ CompositeCollider2D: Y: -200000000 - X: 790000000 Y: -200000000 - - - X: 1110000000 + - - X: 690000000 Y: -180000000 - - X: 1020000000 + - X: 670000000 Y: -180000000 - - X: 1020000000 + - X: 670000000 Y: -200000000 - - X: 1110000000 + - X: 690000000 + Y: -200000000 + - - X: 990000000 + Y: -180000000 + - X: 930000000 + Y: -180000000 + - X: 930000000 + Y: -200000000 + - X: 990000000 Y: -200000000 m_CompositePaths: m_Paths: @@ -5473,98 +4999,16 @@ CompositeCollider2D: - {x: 135, y: -16.000029} - {x: 135.00003, y: -18} - {x: 136, y: -18.000029} - - - {x: 95.99998, y: 33.999992} - - {x: 96.00004, y: 34.999992} - - {x: 97.000015, y: 35.000027} - - {x: 97.00004, y: 35.999992} - - {x: 98.000015, y: 36.000027} - - {x: 98.00004, y: 37.999992} - - {x: 99.000015, y: 38.000027} - - {x: 98.99998, y: 40.00001} - - {x: 94.999985, y: 39.999973} - - {x: 95.00003, y: 33.999992} - - - {x: -4.0000253, y: 16.99999} - - {x: -3.999961, y: 19.99999} - - {x: -2.99999, y: 20.000027} - - {x: -2.9999607, y: 20.99999} - - {x: -2.00001, y: 20.99996} - - {x: -1.9999748, y: 17.99999} - - {x: -1.00001, y: 17.99996} - - {x: -0.9999748, y: 16.99999} - - {x: 0.00001, y: 17.000027} - - {x: 0.0000394, y: 20.99999} - - {x: 0.99999, y: 20.99996} - - {x: 1.0000252, y: 19.99999} - - {x: 2.99999, y: 19.99996} - - {x: 3.0000253, y: 17.99999} - - {x: 5.00001, y: 18.000027} - - {x: 4.9999747, y: 19.00001} - - {x: 4.00001, y: 19.00004} - - {x: 3.9999747, y: 21.00001} - - {x: 3.00001, y: 21.00004} - - {x: 2.9999747, y: 22.00001} - - {x: 2.00001, y: 22.00004} - - {x: 2.0000393, y: 22.99999} - - {x: 3.00001, y: 23.000027} - - {x: 3.0000393, y: 23.99999} - - {x: 4.00001, y: 24.000027} - - {x: 4.000039, y: 33.999992} - - {x: 6.00001, y: 34.000027} - - {x: 5.9999747, y: 36.00001} - - {x: 5.00001, y: 36.00004} - - {x: 4.9999747, y: 38.00001} - - {x: -11.99999, y: 37.99996} - - {x: -11.999967, y: 36.999992} - - {x: 3.99999, y: 36.99996} - - {x: 3.9999664, y: 34.999992} - - {x: -8.00001, y: 34.999973} - - {x: -8.000039, y: 34.00001} - - {x: -10.00001, y: 33.999973} - - {x: -10.000039, y: 33.00001} - - {x: -10.99999, y: 33.00004} - - {x: -10.999961, y: 34.999992} - - {x: -9.99999, y: 35.000027} - - {x: -10.000026, y: 36.00001} - - {x: -11.99999, y: 36.00004} - - {x: -12.000019, y: 37.00001} - - {x: -13.00001, y: 36.999973} - - {x: -13.000033, y: 35.999992} - - {x: -14.00001, y: 35.99997} - - {x: -13.999974, y: 33.999992} - - {x: -12.00001, y: 33.99996} - - {x: -11.999974, y: 30.99999} - - {x: -10.99999, y: 31.000027} - - {x: -10.999961, y: 31.99999} - - {x: -10.00001, y: 31.999962} - - {x: -9.999974, y: 22.99999} - - {x: -9.00001, y: 22.99996} - - {x: -8.999974, y: 21.99999} - - {x: -8.00001, y: 21.99996} - - {x: -8.000039, y: 21.00001} - - {x: -10.00001, y: 20.999975} - - {x: -10.000039, y: 20.00001} - - {x: -11.00001, y: 19.999975} - - {x: -10.999974, y: 17.99999} - - {x: -9.99999, y: 18.000027} - - {x: -9.999961, y: 18.99999} - - {x: -8.99999, y: 19.000027} - - {x: -8.999961, y: 19.99999} - - {x: -6.9999905, y: 20.000027} - - {x: -6.999961, y: 20.99999} - - {x: -5.00001, y: 20.99996} - - {x: -5.000039, y: 18.00001} - - {x: -6.00001, y: 17.999975} - - {x: -5.9999747, y: 16.99999} - - - {x: 92.99998, y: 31.99999} - - {x: 92.99998, y: 37.00001} - - {x: 91.000015, y: 37.00004} - - {x: 90.99998, y: 38.00001} - - {x: 89.999985, y: 37.999973} - - {x: 90.00002, y: 33.999992} - - {x: 90.999985, y: 33.99996} - - {x: 91.00002, y: 32.999992} - - {x: 91.999985, y: 32.99996} - - {x: 92.00002, y: 31.99999} + - - {x: 95.99997, y: 34} + - {x: 96.00003, y: 35} + - {x: 97, y: 35.00003} + - {x: 97.00003, y: 36} + - {x: 98, y: 36.00003} + - {x: 98.00003, y: 38} + - {x: 99, y: 38.00003} + - {x: 98.99997, y: 40} + - {x: 95, y: 39.999973} + - {x: 95.00003, y: 34} - - {x: 161.99997, y: -7} - {x: 162.00003, y: 30} - {x: 166, y: 30.000029} @@ -5581,158 +5025,240 @@ CompositeCollider2D: - {x: 157.00003, y: 4} - {x: 159, y: 3.9999704} - {x: 159.00003, y: -7} + - - {x: 92.99997, y: 32} + - {x: 92.99997, y: 37} + - {x: 91, y: 37.00003} + - {x: 90.99997, y: 38} + - {x: 90, y: 37.999973} + - {x: 90.00003, y: 34} + - {x: 91, y: 33.999973} + - {x: 91.00003, y: 33} + - {x: 92, y: 32.999973} + - {x: 92.00003, y: 32} + - - {x: -4.000029, y: 17} + - {x: -3.9999704, y: 20} + - {x: -3, y: 20.000029} + - {x: -2.9999707, y: 21} + - {x: -2, y: 20.999971} + - {x: -1.9999708, y: 18} + - {x: -1, y: 17.999971} + - {x: -0.99997073, y: 17} + - {x: 0, y: 17.000029} + - {x: 0.0000294, y: 21} + - {x: 1, y: 20.999971} + - {x: 1.0000293, y: 20} + - {x: 3, y: 19.999971} + - {x: 3.0000293, y: 18} + - {x: 5, y: 18.000029} + - {x: 4.999971, y: 19} + - {x: 4, y: 19.000029} + - {x: 3.999971, y: 21} + - {x: 3, y: 21.000029} + - {x: 2.999971, y: 22} + - {x: 2, y: 22.000029} + - {x: 2.0000293, y: 23} + - {x: 3, y: 23.000029} + - {x: 3.0000293, y: 24} + - {x: 4, y: 24.000029} + - {x: 4.0000296, y: 34} + - {x: 6, y: 34.00003} + - {x: 5.999971, y: 36} + - {x: 5, y: 36.00003} + - {x: 4.999971, y: 38} + - {x: -12, y: 37.999973} + - {x: -11.99997, y: 37} + - {x: 4, y: 36.999973} + - {x: 3.9999704, y: 35} + - {x: -8, y: 34.999973} + - {x: -8.00003, y: 34} + - {x: -10, y: 33.999973} + - {x: -10.00003, y: 33} + - {x: -11, y: 33.00003} + - {x: -10.99997, y: 35} + - {x: -10, y: 35.00003} + - {x: -10.00003, y: 36} + - {x: -12, y: 36.00003} + - {x: -12.00003, y: 37} + - {x: -13, y: 36.999973} + - {x: -13.00003, y: 36} + - {x: -14, y: 35.999973} + - {x: -13.999971, y: 34} + - {x: -12, y: 33.999973} + - {x: -11.99997, y: 31} + - {x: -11, y: 31.000029} + - {x: -10.99997, y: 32} + - {x: -10, y: 31.999971} + - {x: -9.99997, y: 23} + - {x: -9, y: 22.999971} + - {x: -8.99997, y: 22} + - {x: -8, y: 21.999971} + - {x: -8.00003, y: 21} + - {x: -10, y: 20.999971} + - {x: -10.00003, y: 20} + - {x: -11, y: 19.999971} + - {x: -10.99997, y: 18} + - {x: -10, y: 18.000029} + - {x: -9.99997, y: 19} + - {x: -9, y: 19.000029} + - {x: -8.99997, y: 20} + - {x: -7, y: 20.000029} + - {x: -6.9999704, y: 21} + - {x: -5, y: 20.999971} + - {x: -5.0000296, y: 18} + - {x: -6, y: 17.999971} + - {x: -5.999971, y: 17} - - {x: 135.99997, y: 35} - {x: 135.99997, y: 37} - {x: 129, y: 36.999973} - {x: 129.00003, y: 35} - - - {x: 97.99998, y: 30.99999} - - {x: 98.00004, y: 31.99999} - - {x: 101.000015, y: 32.000027} - - {x: 100.99998, y: 35.00001} - - {x: 99.999985, y: 34.999973} - - {x: 99.99996, y: 34.00001} - - {x: 96.999985, y: 33.999973} - - {x: 96.99996, y: 32.00001} - - {x: 95.999985, y: 31.999975} - - {x: 96.00003, y: 30.99999} - - - {x: -4.00001, y: 22.00004} - - {x: -6.9999905, y: 22.00004} - - {x: -7.0000257, y: 23.00001} - - {x: -7.9999905, y: 23.00004} - - {x: -8.000026, y: 24.00001} - - {x: -8.99999, y: 24.00004} - - {x: -8.999961, y: 32.999992} - - {x: -6.9999905, y: 33.000027} - - {x: -6.999961, y: 33.999992} - - {x: 2.99999, y: 33.99996} - - {x: 2.9999607, y: 25.00001} - - {x: 1.99999, y: 24.999975} - - {x: 1.9999607, y: 24.00001} - - {x: 0.99999, y: 23.999975} - - {x: 0.9999606, y: 23.00001} - - {x: -4.00001, y: 22.999975} - - - {x: -4.0000253, y: 29.99999} - - {x: -4.0000253, y: 32.00001} - - {x: -8.00001, y: 31.999975} - - {x: -7.9999747, y: 29.99999} - - - {x: 1.9999748, y: 29.99999} - - {x: 1.9999748, y: 32.00001} - - {x: -1.99999, y: 31.999975} - - {x: -1.9999748, y: 29.99999} - - - {x: 186.99997, y: 31} - - {x: 186.99997, y: 32} - - {x: 186, y: 31.999971} - - {x: 186.00003, y: 31} - - - {x: 184.99997, y: 30} - - {x: 184.99997, y: 32} - - {x: 184, y: 31.999971} - - {x: 184.00003, y: 30} - - - {x: 182.99997, y: 31} - - {x: 182.99997, y: 32} - - {x: 182, y: 31.999971} - - {x: 182.00003, y: 31} - - - {x: 180.99997, y: 30} - - {x: 180.99997, y: 32} - - {x: 180, y: 31.999971} - - {x: 180.00003, y: 30} - - - {x: 178.99997, y: 31} - - {x: 178.99997, y: 32} - - {x: 178, y: 31.999971} - - {x: 178.00003, y: 31} - - - {x: 176.99997, y: 30} - - {x: 176.99997, y: 32} - - {x: 176, y: 31.999971} - - {x: 176.00003, y: 30} - - - {x: 174.99997, y: 31} - - {x: 174.99997, y: 32} - - {x: 174, y: 31.999971} - - {x: 174.00003, y: 31} + - - {x: 97.99997, y: 31} + - {x: 98.00003, y: 32} + - {x: 101, y: 32.00003} + - {x: 100.99997, y: 35} + - {x: 100, y: 34.999973} + - {x: 99.99997, y: 34} + - {x: 97, y: 33.999973} + - {x: 96.99997, y: 32} + - {x: 96, y: 31.999971} + - {x: 96.00003, y: 31} + - - {x: -4, y: 22.000029} + - {x: -7, y: 22.000029} + - {x: -7.0000296, y: 23} + - {x: -8, y: 23.000029} + - {x: -8.00003, y: 24} + - {x: -9, y: 24.000029} + - {x: -8.99997, y: 33} + - {x: -7, y: 33.00003} + - {x: -6.9999704, y: 34} + - {x: 3, y: 33.999973} + - {x: 2.9999707, y: 25} + - {x: 2, y: 24.999971} + - {x: 1.9999707, y: 24} + - {x: 1, y: 23.999971} + - {x: 0.9999706, y: 23} + - {x: -4, y: 22.999971} + - - {x: 206.99997, y: 31} + - {x: 206.99997, y: 32} + - {x: 206, y: 31.999971} + - {x: 206.00003, y: 31} - - {x: 170.99997, y: 30} - {x: 171.00003, y: 31} - {x: 173, y: 31.000029} - {x: 172.99997, y: 32} - {x: 170, y: 31.999971} - {x: 170.00003, y: 30} - - - {x: 137.99997, y: 30} - - {x: 137.99997, y: 32} - - {x: 127, y: 31.999971} - - {x: 127.00003, y: 30} - - - {x: 210.99997, y: 31} - - {x: 210.99997, y: 32} - - {x: 210, y: 31.999971} - - {x: 210.00003, y: 31} - - - {x: 206.99997, y: 31} - - {x: 206.99997, y: 32} - - {x: 206, y: 31.999971} - - {x: 206.00003, y: 31} - - - {x: 216.99997, y: 30} - - {x: 216.99997, y: 32} - - {x: 216, y: 31.999971} - - {x: 216.00003, y: 30} - - - {x: 218.99998, y: 31} - - {x: 218.99998, y: 32} - - {x: 218, y: 31.999971} - - {x: 218.00003, y: 31} - - - {x: 220.99997, y: 30} - - {x: 220.99997, y: 32} - - {x: 220, y: 31.999971} - - {x: 220.00003, y: 30} - - - {x: 223.99997, y: 31} - - {x: 223.99997, y: 32} - - {x: 222, y: 31.999971} - - {x: 222.00003, y: 31} - - - {x: 228.99997, y: 30} - - {x: 228.99997, y: 32} - - {x: 228, y: 31.999971} - - {x: 228.00003, y: 30} - - - {x: 194.99997, y: 31} - - {x: 194.99997, y: 32} - - {x: 194, y: 31.999971} - - {x: 194.00003, y: 31} - - - {x: 198.99997, y: 31} - - {x: 198.99997, y: 32} - - {x: 198, y: 31.999971} - - {x: 198.00003, y: 31} - - - {x: 200.99997, y: 31} - - {x: 200.99997, y: 32} - - {x: 200, y: 31.999971} - - {x: 200.00003, y: 31} - - - {x: 196.99997, y: 30} - - {x: 196.99997, y: 32} - - {x: 196, y: 31.999971} - - {x: 196.00003, y: 30} + - - {x: 174.99997, y: 31} + - {x: 174.99997, y: 32} + - {x: 174, y: 31.999971} + - {x: 174.00003, y: 31} + - - {x: 176.99997, y: 30} + - {x: 176.99997, y: 32} + - {x: 176, y: 31.999971} + - {x: 176.00003, y: 30} + - - {x: 178.99997, y: 31} + - {x: 178.99997, y: 32} + - {x: 178, y: 31.999971} + - {x: 178.00003, y: 31} - - {x: 202.99997, y: 31} - {x: 202.99997, y: 32} - {x: 202, y: 31.999971} - {x: 202.00003, y: 31} - - - {x: 204.99997, y: 30} - - {x: 204.99997, y: 32} - - {x: 204, y: 31.999971} - - {x: 204.00003, y: 30} - - - {x: 208.99997, y: 30} - - {x: 208.99997, y: 32} - - {x: 208, y: 31.999971} - - {x: 208.00003, y: 30} - - - {x: 214.99998, y: 31} - - {x: 214.99998, y: 32} - - {x: 214, y: 31.999971} - - {x: 214.00003, y: 31} - - - {x: 192.99997, y: 30} - - {x: 192.99997, y: 32} - - {x: 192, y: 31.999971} - - {x: 192.00003, y: 30} - - - {x: 190.99997, y: 31} - - {x: 190.99997, y: 32} - - {x: 190, y: 31.999971} - - {x: 190.00003, y: 31} + - - {x: 198.99997, y: 31} + - {x: 198.99997, y: 32} + - {x: 198, y: 31.999971} + - {x: 198.00003, y: 31} + - - {x: 180.99997, y: 30} + - {x: 180.99997, y: 32} + - {x: 180, y: 31.999971} + - {x: 180.00003, y: 30} + - - {x: 200.99997, y: 31} + - {x: 200.99997, y: 32} + - {x: 200, y: 31.999971} + - {x: 200.00003, y: 31} + - - {x: -4.000029, y: 30} + - {x: -4.000029, y: 32} + - {x: -8, y: 31.999971} + - {x: -7.9999704, y: 30} + - - {x: 182.99997, y: 31} + - {x: 182.99997, y: 32} + - {x: 182, y: 31.999971} + - {x: 182.00003, y: 31} + - - {x: 184.99997, y: 30} + - {x: 184.99997, y: 32} + - {x: 184, y: 31.999971} + - {x: 184.00003, y: 30} + - - {x: 186.99997, y: 31} + - {x: 186.99997, y: 32} + - {x: 186, y: 31.999971} + - {x: 186.00003, y: 31} + - - {x: 196.99997, y: 30} + - {x: 196.99997, y: 32} + - {x: 196, y: 31.999971} + - {x: 196.00003, y: 30} - - {x: 188.99997, y: 31} - {x: 188.99997, y: 32} - {x: 188, y: 31.999971} - {x: 188.00003, y: 31} + - - {x: 190.99997, y: 31} + - {x: 190.99997, y: 32} + - {x: 190, y: 31.999971} + - {x: 190.00003, y: 31} + - - {x: 192.99997, y: 30} + - {x: 192.99997, y: 32} + - {x: 192, y: 31.999971} + - {x: 192.00003, y: 30} + - - {x: 228.99997, y: 30} + - {x: 228.99997, y: 32} + - {x: 228, y: 31.999971} + - {x: 228.00003, y: 30} + - - {x: 223.99997, y: 31} + - {x: 223.99997, y: 32} + - {x: 222, y: 31.999971} + - {x: 222.00003, y: 31} + - - {x: 220.99997, y: 30} + - {x: 220.99997, y: 32} + - {x: 220, y: 31.999971} + - {x: 220.00003, y: 30} + - - {x: 218.99998, y: 31} + - {x: 218.99998, y: 32} + - {x: 218, y: 31.999971} + - {x: 218.00003, y: 31} + - - {x: 216.99997, y: 30} + - {x: 216.99997, y: 32} + - {x: 216, y: 31.999971} + - {x: 216.00003, y: 30} + - - {x: 214.99998, y: 31} + - {x: 214.99998, y: 32} + - {x: 214, y: 31.999971} + - {x: 214.00003, y: 31} - - {x: 212.99997, y: 31} - {x: 212.99997, y: 32} - {x: 212, y: 31.999971} - {x: 212.00003, y: 31} + - - {x: 210.99997, y: 31} + - {x: 210.99997, y: 32} + - {x: 210, y: 31.999971} + - {x: 210.00003, y: 31} + - - {x: 208.99997, y: 30} + - {x: 208.99997, y: 32} + - {x: 208, y: 31.999971} + - {x: 208.00003, y: 30} + - - {x: 194.99997, y: 31} + - {x: 194.99997, y: 32} + - {x: 194, y: 31.999971} + - {x: 194.00003, y: 31} + - - {x: 204.99997, y: 30} + - {x: 204.99997, y: 32} + - {x: 204, y: 31.999971} + - {x: 204.00003, y: 30} + - - {x: 137.99997, y: 30} + - {x: 137.99997, y: 32} + - {x: 127, y: 31.999971} + - {x: 127.00003, y: 30} + - - {x: 1.9999708, y: 30} + - {x: 1.9999708, y: 32} + - {x: -2, y: 31.999971} + - {x: -1.9999708, y: 30} - - {x: 40.999973, y: 28} - {x: 40.999973, y: 30} - {x: 27, y: 29.999971} @@ -5771,60 +5297,60 @@ CompositeCollider2D: - {x: 107.99998, y: 24} - {x: 107, y: 24.000029} - {x: 106.99997, y: 25} - - {x: 97.000015, y: 25.000029} - - {x: 96.99998, y: 26.00001} - - {x: 95.000015, y: 26.00004} - - {x: 94.99998, y: 27.00001} - - {x: 90.999985, y: 26.999975} - - {x: 90.99996, y: 26.00001} - - {x: 88.999985, y: 25.999975} - - {x: 88.99996, y: 25} + - {x: 97, y: 25.000029} + - {x: 96.99997, y: 26} + - {x: 95, y: 26.000029} + - {x: 94.99997, y: 27} + - {x: 91, y: 26.999971} + - {x: 90.99997, y: 26} + - {x: 89, y: 25.999971} + - {x: 88.99997, y: 25} - {x: 79, y: 25.000029} - {x: 78.99997, y: 30} - {x: 43, y: 29.999971} - {x: 43.00003, y: 28} - {x: 77, y: 27.999971} - - {x: 76.99997, y: 23.00001} - - {x: 74.999985, y: 22.999975} - - {x: 74.99996, y: 22.00001} - - {x: 73.999985, y: 21.999975} - - {x: 73.99996, y: 21.00001} - - {x: 72.999985, y: 20.999975} - - {x: 73.00002, y: 19.99999} - - {x: 73.999985, y: 19.99996} - - {x: 74.00002, y: 18.99999} - - {x: 74.999985, y: 18.99996} - - {x: 75.00002, y: 17.99999} - - {x: 75.999985, y: 17.99996} - - {x: 76.00002, y: 16.99999} - - {x: 77.999985, y: 16.99996} - - {x: 78.00002, y: 15.99999} - - {x: 78.999985, y: 15.99996} - - {x: 79.00002, y: 14.99999} - - {x: 79.999985, y: 14.99996} - - {x: 80.00002, y: 14.00001} - - {x: 81.000015, y: 13.999974} - - {x: 81.00003, y: 12.99999} - - {x: 81.999985, y: 12.999961} - - {x: 82.00002, y: 11.99999} - - {x: 82.999985, y: 11.999961} - - {x: 83.00002, y: 10.99999} - - {x: 83.999985, y: 11.000019} - - {x: 83.99998, y: 13.00001} - - {x: 83.000015, y: 13.000039} - - {x: 82.99998, y: 14.00001} - - {x: 82.000015, y: 14.00004} - - {x: 81.99998, y: 15.00001} - - {x: 81.000015, y: 15.00004} - - {x: 80.99998, y: 17.00001} - - {x: 80.000015, y: 17.00004} - - {x: 79.99998, y: 18.00001} - - {x: 79.000015, y: 18.00004} - - {x: 79.00004, y: 20.99999} - - {x: 81.000015, y: 21.000027} - - {x: 81.00004, y: 21.99999} - - {x: 82.000015, y: 22.000027} - - {x: 82.00004, y: 23} + - {x: 76.99997, y: 23} + - {x: 75, y: 22.999971} + - {x: 74.99997, y: 22} + - {x: 74, y: 21.999971} + - {x: 73.99997, y: 21} + - {x: 73, y: 20.999971} + - {x: 73.00003, y: 20} + - {x: 74, y: 19.999971} + - {x: 74.00003, y: 19} + - {x: 75, y: 18.999971} + - {x: 75.00003, y: 18} + - {x: 76, y: 17.999971} + - {x: 76.00003, y: 17} + - {x: 78, y: 16.999971} + - {x: 78.00003, y: 16} + - {x: 79, y: 15.999971} + - {x: 79.00003, y: 15} + - {x: 80, y: 14.999971} + - {x: 80.00003, y: 14} + - {x: 81, y: 13.999971} + - {x: 81.00003, y: 13} + - {x: 82, y: 12.99997} + - {x: 82.00003, y: 12} + - {x: 83, y: 11.99997} + - {x: 83.00003, y: 11} + - {x: 84, y: 11.00003} + - {x: 83.99997, y: 13} + - {x: 83, y: 13.00003} + - {x: 82.99997, y: 14} + - {x: 82, y: 14.000029} + - {x: 81.99997, y: 15} + - {x: 81, y: 15.000029} + - {x: 80.99997, y: 17} + - {x: 80, y: 17.000029} + - {x: 79.99997, y: 18} + - {x: 79, y: 18.000029} + - {x: 79.00003, y: 21} + - {x: 81, y: 21.000029} + - {x: 81.00003, y: 22} + - {x: 82, y: 22.000029} + - {x: 82.00003, y: 23} - {x: 106, y: 22.999971} - {x: 106.00003, y: 22} - {x: 107, y: 21.999971} @@ -5849,46 +5375,28 @@ CompositeCollider2D: - {x: 100.99997, y: 10} - {x: 99, y: 9.99997} - {x: 98.99997, y: 9} - - {x: 86, y: 8.999961} + - {x: 86, y: 8.99997} - {x: 86.00003, y: 7} - - - {x: -0.0000252, y: 27.99999} - - {x: -0.0000252, y: 29.00001} - - {x: -1.00001, y: 28.999975} - - {x: -0.9999748, y: 27.99999} - - - {x: -5.0000253, y: 27.99999} - - {x: -5.0000253, y: 29.00001} - - {x: -6.00001, y: 28.999975} - - {x: -5.9999747, y: 27.99999} + - - {x: -0.000029300001, y: 28} + - {x: -0.000029300001, y: 29} + - {x: -1, y: 28.999971} + - {x: -0.99997073, y: 28} + - - {x: -5.000029, y: 28} + - {x: -5.000029, y: 29} + - {x: -6, y: 28.999971} + - {x: -5.999971, y: 28} - - {x: 139.99997, y: 25} - {x: 139.99997, y: 27} - {x: 125, y: 26.999971} - {x: 125.00003, y: 25} - - - {x: -1.0000252, y: 24.99999} - - {x: -1.0000252, y: 26.00001} - - {x: -5.00001, y: 25.999975} - - {x: -4.9999747, y: 24.99999} + - - {x: -1.0000293, y: 25} + - {x: -1.0000293, y: 26} + - {x: -5, y: 25.999971} + - {x: -4.999971, y: 25} - - {x: 223.99997, y: 24} - {x: 223.99997, y: 26} - {x: 216.99998, y: 25.999971} - {x: 217.00002, y: 24} - - - {x: 204.99997, y: 21} - - {x: 204.99997, y: 22} - - {x: 204, y: 21.999971} - - {x: 204.00003, y: 21} - - - {x: 203.99997, y: 16} - - {x: 203.99997, y: 21} - - {x: 203, y: 20.999971} - - {x: 202.99997, y: 20} - - {x: 202, y: 20.000029} - - {x: 201.99997, y: 22} - - {x: 201, y: 21.999971} - - {x: 200.99997, y: 20} - - {x: 200, y: 19.999971} - - {x: 200.00003, y: 16} - - - {x: 198.99997, y: 21} - - {x: 198.99997, y: 22} - - {x: 198, y: 21.999971} - - {x: 198.00003, y: 21} - - {x: 191.99997, y: 21} - {x: 191.99997, y: 22} - {x: 191, y: 21.999971} @@ -5901,10 +5409,6 @@ CompositeCollider2D: - {x: 187.99997, y: 20} - {x: 186, y: 19.999971} - {x: 186.00003, y: 16} - - - {x: 185.99997, y: 20} - - {x: 185.99997, y: 22} - - {x: 185, y: 21.999971} - - {x: 185.00003, y: 20} - - {x: 142.99997, y: 20} - {x: 142.99997, y: 22} - {x: 122, y: 21.999971} @@ -5913,6 +5417,42 @@ CompositeCollider2D: - {x: 42.999973, y: 22} - {x: 41, y: 21.999971} - {x: 41.00003, y: 20} + - - {x: 198.99997, y: 21} + - {x: 198.99997, y: 22} + - {x: 198, y: 21.999971} + - {x: 198.00003, y: 21} + - - {x: 203.99997, y: 16} + - {x: 203.99997, y: 21} + - {x: 203, y: 20.999971} + - {x: 202.99997, y: 20} + - {x: 202, y: 20.000029} + - {x: 201.99997, y: 22} + - {x: 201, y: 21.999971} + - {x: 200.99997, y: 20} + - {x: 200, y: 19.999971} + - {x: 200.00003, y: 16} + - - {x: 204.99997, y: 21} + - {x: 204.99997, y: 22} + - {x: 204, y: 21.999971} + - {x: 204.00003, y: 21} + - - {x: 185.99997, y: 20} + - {x: 185.99997, y: 22} + - {x: 185, y: 21.999971} + - {x: 185.00003, y: 20} + - - {x: 176.99997, y: 14} + - {x: 177.00003, y: 16} + - {x: 178, y: 16.000029} + - {x: 178.00003, y: 18} + - {x: 179, y: 18.000029} + - {x: 178.99997, y: 19} + - {x: 178, y: 19.000029} + - {x: 177.99997, y: 20} + - {x: 177, y: 20.000029} + - {x: 176.99997, y: 21} + - {x: 173, y: 20.999971} + - {x: 173.00003, y: 15} + - {x: 174, y: 14.999971} + - {x: 174.00003, y: 14} - - {x: 190.99997, y: 20} - {x: 190.99997, y: 21} - {x: 190, y: 20.999971} @@ -5933,20 +5473,6 @@ CompositeCollider2D: - {x: 199.99997, y: 21} - {x: 199, y: 20.999971} - {x: 199.00003, y: 20} - - - {x: 176.99997, y: 14} - - {x: 177.00003, y: 16} - - {x: 178, y: 16.000029} - - {x: 178.00003, y: 18} - - {x: 179, y: 18.000029} - - {x: 178.99997, y: 19} - - {x: 178, y: 19.000029} - - {x: 177.99997, y: 20} - - {x: 177, y: 20.000029} - - {x: 176.99997, y: 21} - - {x: 173, y: 20.999971} - - {x: 173.00003, y: 15} - - {x: 174, y: 14.999971} - - {x: 174.00003, y: 14} - - {x: 215.00002, y: 17.000029} - {x: 214, y: 17.000029} - {x: 213.99997, y: 18} @@ -5981,26 +5507,26 @@ CompositeCollider2D: - {x: 72.99997, y: 15} - {x: 71, y: 14.999971} - {x: 71.00003, y: 13} - - - {x: 210.99997, y: 12} - - {x: 210.99997, y: 14} - - {x: 209, y: 13.999971} - - {x: 208.99997, y: 13} - - {x: 208, y: 12.99997} - - {x: 208.00003, y: 12} + - - {x: 51.999973, y: 12} + - {x: 51.999973, y: 14} + - {x: 48, y: 13.999971} + - {x: 48.00003, y: 12} + - - {x: 150.99997, y: 12} + - {x: 150.99997, y: 14} + - {x: 149, y: 13.999971} + - {x: 149.00003, y: 12} - - {x: 179.99997, y: 12} - {x: 180.00003, y: 13} - {x: 181, y: 13.00003} - {x: 180.99997, y: 14} - {x: 179, y: 13.999971} - {x: 179.00003, y: 12} - - - {x: 150.99997, y: 12} - - {x: 150.99997, y: 14} - - {x: 149, y: 13.999971} - - {x: 149.00003, y: 12} - - - {x: 51.999973, y: 12} - - {x: 51.999973, y: 14} - - {x: 48, y: 13.999971} - - {x: 48.00003, y: 12} + - - {x: 210.99997, y: 12} + - {x: 210.99997, y: 14} + - {x: 209, y: 13.999971} + - {x: 208.99997, y: 13} + - {x: 208, y: 12.99997} + - {x: 208.00003, y: 12} - - {x: 44.999973, y: 10} - {x: 44.999973, y: 12} - {x: 37, y: 11.99997} @@ -6057,14 +5583,14 @@ CompositeCollider2D: - {x: 125.00003, y: 2} - {x: 127, y: 1.9999707} - {x: 127.00003, y: 1} - - - {x: 154.99997, y: 8} - - {x: 154.99997, y: 10} - - {x: 153, y: 9.99997} - - {x: 153.00003, y: 8} - - {x: 75.99997, y: 8} - {x: 75.99997, y: 10} - {x: 70, y: 9.99997} - {x: 70.00003, y: 8} + - - {x: 154.99997, y: 8} + - {x: 154.99997, y: 10} + - {x: 153, y: 9.99997} + - {x: 153.00003, y: 8} - - {x: 203.99997, y: 4} - {x: 204.00003, y: 5} - {x: 205, y: 5.000029} @@ -6101,10 +5627,6 @@ CompositeCollider2D: - {x: 37.999973, y: 7} - {x: 33, y: 6.9999704} - {x: 33.00003, y: 5} - - - {x: 179.99997, y: 4} - - {x: 179.99997, y: 6} - - {x: 177, y: 5.999971} - - {x: 177.00003, y: 4} - - {x: 90.99997, y: -20} - {x: 91.00003, y: -11} - {x: 103, y: -10.99997} @@ -6145,6 +5667,10 @@ CompositeCollider2D: - {x: 47.00003, y: -5} - {x: 88, y: -5.0000296} - {x: 88.00003, y: -20} + - - {x: 179.99997, y: 4} + - {x: 179.99997, y: 6} + - {x: 177, y: 5.999971} + - {x: 177.00003, y: 4} - - {x: 83.99997, y: 3} - {x: 83.99997, y: 5} - {x: 76, y: 4.999971} @@ -47873,7 +47399,7 @@ PrefabInstance: - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_RootOrder - value: 3 + value: 2 objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} @@ -47904,15 +47430,66 @@ PrefabInstance: propertyPath: m_IsTrigger value: 0 objectReference: {fileID: 0} + - target: {fileID: 3827363133515929328, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_Offset.x + value: 0.03701496 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929328, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_SpriteTilingProperty.oldSize.x + value: 3.1875 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929328, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_SpriteTilingProperty.oldSize.y + value: 2.6875 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929328, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_Size.x + value: 2.51762 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929328, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_Offset.y + value: -0.01850748 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929328, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_Size.y + value: 2.6286669 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929329, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 7874731793569252650, guid: 843576248a0c2dc4eb92d627ffe951a6, + type: 3} + - target: {fileID: 3827363133515929329, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929329, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929329, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, type: 3} propertyPath: m_LocalPosition.x - value: 2.5 + value: 2.73 objectReference: {fileID: 0} - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, type: 3} propertyPath: m_LocalPosition.y - value: -3.5 + value: -2.65 objectReference: {fileID: 0} - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, type: 3} @@ -47962,7 +47539,7 @@ PrefabInstance: - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, type: 3} propertyPath: m_LocalScale.x - value: 1 + value: -1 objectReference: {fileID: 0} - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, type: 3} @@ -48008,7 +47585,12 @@ PrefabInstance: type: 3} propertyPath: eventControls value: - objectReference: {fileID: 1759518265} + objectReference: {fileID: 1491655} + - target: {fileID: 3827363133515929335, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: player + value: + objectReference: {fileID: 1671840921} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, type: 3} --- !u!1001 &7653345758327600075 @@ -48086,7 +47668,7 @@ PrefabInstance: - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_RootOrder - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} diff --git a/Assets/Scripts/BugMovement.cs b/Assets/Scripts/BugMovement.cs index 40daa80..c8b82ac 100644 --- a/Assets/Scripts/BugMovement.cs +++ b/Assets/Scripts/BugMovement.cs @@ -9,6 +9,7 @@ public class BugMovement : MonoBehaviour [SerializeField] private float movementSpeed = 10; [SerializeField] BoxCollider2D playerCollider; [SerializeField] EventControls eventControls; + [SerializeField] Player player; private int leftAccumalator = 0; private int rightAccumalator = 0; @@ -25,7 +26,7 @@ public class BugMovement : MonoBehaviour private void Update() { if (HasEncounteredPlayer()) - eventControls.TriggerEvent(playerCollider, GetComponent()); + eventControls.TriggerEvent(playerCollider, GetComponent(), player); var totalFramesGoingLeft = framesPerSecond * secondsGoingLeft; var totalFramesGoingRight = framesPerSecond * secondsGoingRight; diff --git a/Assets/Scripts/EventControls.cs b/Assets/Scripts/EventControls.cs index 1ca811d..35feac7 100644 --- a/Assets/Scripts/EventControls.cs +++ b/Assets/Scripts/EventControls.cs @@ -7,10 +7,11 @@ using UnityEngine.Tilemaps; public class EventControls : MonoBehaviour { - [SerializeField] private Player player; + [SerializeField] private Player player; [SerializeField] private Camera camera; [SerializeField] private List tiles; [SerializeField] private List successTiles; + [SerializeField] private List failTiles; [SerializeField] private Tile plusTile; [SerializeField] private float framesPerControlTile = 15; [SerializeField] private int nextControlYOffset = 0; @@ -31,6 +32,7 @@ public class EventControls : MonoBehaviour private int eventCycleAccumalator = 0; private int tileMapClearDelayAccumalator = 0; private EventControlTile currentEventControl; + private bool isInBattle = false; private Collider2D currentPlayerCollider; private Collider2D currentEnemyCollider; @@ -42,7 +44,7 @@ public class EventControls : MonoBehaviour private int framesPerSecond => 60; private Vector3Int nextControlOffSetAsVector => new Vector3Int(nextControlXOffset, nextControlYOffset, 0); - public void TriggerEvent(Collider2D playerCollider, Collider2D enemyCollider) + public void TriggerEvent(Collider2D playerCollider, Collider2D enemyCollider, Player player) { currentPlayerCollider = playerCollider; currentEnemyCollider = enemyCollider; @@ -51,6 +53,7 @@ public class EventControls : MonoBehaviour Physics2D.IgnoreCollision(playerCollider, enemyCollider, true); eventTriggered = true; + isInBattle = true; } public bool IsEventTriggered() @@ -59,7 +62,7 @@ public class EventControls : MonoBehaviour } private void Start() - { + { tilemap = GetComponent(); eventControlTilesInCycle = new List(); } @@ -76,7 +79,7 @@ public class EventControls : MonoBehaviour { PerformControlEvent(); } - + if (eventDrawn && !eventTriggered) { Reset(); @@ -124,24 +127,24 @@ public class EventControls : MonoBehaviour private Vector3Int GetCameraPosition() { - return new Vector3Int((int)camera.transform.position.x, - (int)camera.transform.position.y, + return new Vector3Int((int)camera.transform.position.x, + (int)camera.transform.position.y, (int)camera.transform.position.z); } private Vector3Int GetNextTilePosition() { - return (initialCameraPosition + new Vector3Int(numberOfControlTilesSet*2, 0, 0)) + return (initialCameraPosition + new Vector3Int(numberOfControlTilesSet * 2, 0, 0)) .GetValueOrDefault(); } private Vector3Int GetNextPlusTilePosition() { - return (initialCameraPosition + new Vector3Int(numberOfControlTilesSet*2-1, 0, 0)) + return (initialCameraPosition + new Vector3Int(numberOfControlTilesSet * 2 - 1, 0, 0)) .GetValueOrDefault(); } - private bool PerformControlEvent() + private void PerformControlEvent() { nextControlAccumalator = 0; @@ -158,21 +161,35 @@ public class EventControls : MonoBehaviour { eventTriggered = false; eventCycleAccumalator = 0; + // Destroy(currentEnemyCollider.gameObject); + // currentEnemyCollider = null; } + + return; } else if (eventCycleAccumalator >= eventCycleInSeconds * framesPerSecond) { eventTriggered = false; + isInBattle = false; eventCycleAccumalator = 0; - Destroy(currentEnemyCollider.gameObject); - currentEnemyCollider = null; + currentEventControl = null; + + player.ThrowUserInTheAirHurt(); + return; } - else + else if (FailedToClickCorrect(currentEventControl.keyCode)) { - eventCycleAccumalator++; + tilemap.SetTile(currentEventControl.position, currentEventControl.failTile); + eventTriggered = false; + isInBattle = false; + eventCycleAccumalator = 0; + currentEventControl = null; + + player.ThrowUserInTheAirHurt(); + return; } - return false; + eventCycleAccumalator++; } private void Reset() @@ -187,7 +204,8 @@ public class EventControls : MonoBehaviour if (currentEnemyCollider != null) Physics2D.IgnoreCollision(currentPlayerCollider, currentEnemyCollider, false); - player.EnablePlayerMovement(); + if (!isInBattle) + player.EnablePlayerMovement(); currentPlayerCollider = null; currentEnemyCollider = null; @@ -211,6 +229,7 @@ public class EventControls : MonoBehaviour return new EventControlTile(TileToKeyMappings.TileToKey[randomNumber], tiles[randomNumber], successTiles[randomNumber], + failTiles[randomNumber], position); } @@ -219,7 +238,15 @@ public class EventControls : MonoBehaviour return new EventControlTile(KeyCode.Escape, plusTile, null, + null, position, true); } + + private bool FailedToClickCorrect(KeyCode correctKey) + { + var allKeysButCorrect = TileToKeyMappings.TileToKey.Where(x => x != correctKey); + + return allKeysButCorrect.Any(x => Input.GetKeyDown(x)); + } } diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index d258d3a..a49d82c 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -13,10 +13,12 @@ public class Player : MonoBehaviour [SerializeField] private float wallLineCaseDistance = 0.5f; [SerializeField] private float runErrorThreshold = 0.05f; [SerializeField] private int startHealth = 3; - private int currentHealth; [SerializeField] private int startStamina = 100; [SerializeField] private int coffeValuePercent = 10; [SerializeField] private int bugStaminaDamagePercent = 15; + [SerializeField] private float hurtVelocity = 15f; + + private int currentHealth; private int currentStamina; [SerializeField] private SpriteRenderer healthBar; @@ -222,4 +224,9 @@ public class Player : MonoBehaviour { isMovementEnabled = true; } + + public void ThrowUserInTheAirHurt() + { + GetComponent().velocity += new Vector2(Mathf.Sign(transform.localScale.x) * -1 * hurtVelocity, hurtVelocity); + } } diff --git a/Assets/Sprites/Enemy/GioBug/GioBug.png.meta b/Assets/Sprites/Enemy/GioBug/GioBug.png.meta index eb3a924..2f71105 100644 --- a/Assets/Sprites/Enemy/GioBug/GioBug.png.meta +++ b/Assets/Sprites/Enemy/GioBug/GioBug.png.meta @@ -143,12 +143,12 @@ TextureImporter: name: GioBug0 rect: serializedVersion: 2 - x: 0 + x: 8 y: 0 - width: 64 - height: 64 - alignment: 7 - pivot: {x: 0.5, y: 0} + width: 51 + height: 43 + alignment: 0 + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -164,12 +164,12 @@ TextureImporter: name: GioBug1 rect: serializedVersion: 2 - x: 64 + x: 71 y: 0 - width: 64 - height: 64 - alignment: 7 - pivot: {x: 0.5, y: 0} + width: 51 + height: 44 + alignment: 0 + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] diff --git a/Assets/Sprites/Enemy/GioBug/GioBugAnim.controller b/Assets/Sprites/Enemy/GioBug/GioBugAnim.controller index e68b27c..3a1ca6e 100644 --- a/Assets/Sprites/Enemy/GioBug/GioBugAnim.controller +++ b/Assets/Sprites/Enemy/GioBug/GioBugAnim.controller @@ -59,7 +59,7 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -2351193573875906098} - m_Position: {x: 200, y: 0, z: 0} + m_Position: {x: 270, y: 50, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] From 0e16dc5f9f42ee4c80ee1f9d4f25444c5b058058 Mon Sep 17 00:00:00 2001 From: Giovani Date: Sat, 1 Feb 2020 23:10:39 -0500 Subject: [PATCH 2/4] finally fixed player getting stuck --- Assets/Scenes/LevelOne.unity | 20 +++++--------------- Assets/Scripts/BugMovement.cs | 4 ++-- Assets/Scripts/Player.cs | 10 +++++----- Assets/Sprites/Controls.meta | 8 ++++++++ Assets/Sprites/Hud/Controls.meta | 2 +- 5 files changed, 21 insertions(+), 23 deletions(-) create mode 100644 Assets/Sprites/Controls.meta diff --git a/Assets/Scenes/LevelOne.unity b/Assets/Scenes/LevelOne.unity index c147343..cd52986 100644 --- a/Assets/Scenes/LevelOne.unity +++ b/Assets/Scenes/LevelOne.unity @@ -48168,8 +48168,8 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 1 m_Constraints: 4 ---- !u!61 &1671840919 -BoxCollider2D: +--- !u!70 &1671840919 +CapsuleCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -48181,19 +48181,9 @@ BoxCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: -0.01, y: -0.62} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 4, y: 4} - newSize: {x: 1, y: 1} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 1 - serializedVersion: 2 - m_Size: {x: 0.9, y: 2.79} - m_EdgeRadius: 0 + m_Offset: {x: 0, y: -0.64} + m_Size: {x: 0.9, y: 2.75} + m_Direction: 0 --- !u!212 &1671840920 SpriteRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/BugMovement.cs b/Assets/Scripts/BugMovement.cs index c8b82ac..f9f26ef 100644 --- a/Assets/Scripts/BugMovement.cs +++ b/Assets/Scripts/BugMovement.cs @@ -7,7 +7,7 @@ public class BugMovement : MonoBehaviour [SerializeField] private float secondsGoingLeft = 1; [SerializeField] private float secondsGoingRight = 1; [SerializeField] private float movementSpeed = 10; - [SerializeField] BoxCollider2D playerCollider; + [SerializeField] Collider2D playerCollider; [SerializeField] EventControls eventControls; [SerializeField] Player player; @@ -26,7 +26,7 @@ public class BugMovement : MonoBehaviour private void Update() { if (HasEncounteredPlayer()) - eventControls.TriggerEvent(playerCollider, GetComponent(), player); + eventControls.TriggerEvent(playerCollider, GetComponent(), player); var totalFramesGoingLeft = framesPerSecond * secondsGoingLeft; var totalFramesGoingRight = framesPerSecond * secondsGoingRight; diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index a49d82c..538a178 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -27,14 +27,14 @@ public class Player : MonoBehaviour private Rigidbody2D rigidBody; - new private BoxCollider2D collider; + new private Collider2D collider; private Animator animator; private bool isMovementEnabled = true; private void Start() { rigidBody = GetComponent(); - collider = GetComponent(); + collider = GetComponent(); animator = GetComponent(); currentHealth = startHealth; currentStamina = startStamina; @@ -173,10 +173,10 @@ public class Player : MonoBehaviour private bool IsPlayerOnWall(bool ignoreGround = false) { - return IsPointOnWall(transform.position + new Vector3(0, collider.bounds.extents.y * 0.6f, 0), ignoreGround) || - IsPointOnWall(transform.position - new Vector3(0, collider.bounds.extents.y * 0.25f, 0), ignoreGround) || + return IsPointOnWall(transform.position + new Vector3(0, collider.bounds.extents.y * 0.52f, 0), ignoreGround) || + IsPointOnWall(transform.position - new Vector3(0, collider.bounds.extents.y * 0.24f, 0), ignoreGround) || IsPointOnWall(transform.position - new Vector3(0, collider.bounds.extents.y * 0.8f, 0), ignoreGround) || - IsPointOnWall(transform.position - new Vector3(0, collider.bounds.extents.y * 1.5f, 0), ignoreGround); + IsPointOnWall(transform.position - new Vector3(0, collider.bounds.extents.y * 1.45f, 0), ignoreGround); } private bool IsPointOnWall(Vector2 position, bool ignoreGround = false) diff --git a/Assets/Sprites/Controls.meta b/Assets/Sprites/Controls.meta new file mode 100644 index 0000000..ca48b25 --- /dev/null +++ b/Assets/Sprites/Controls.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bf9fc495ca38d7d4d804ad1d2df0f4c5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Hud/Controls.meta b/Assets/Sprites/Hud/Controls.meta index ca48b25..4179f8a 100644 --- a/Assets/Sprites/Hud/Controls.meta +++ b/Assets/Sprites/Hud/Controls.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bf9fc495ca38d7d4d804ad1d2df0f4c5 +guid: 93ff3d1c20b08c048a2ae60a4b35e73f folderAsset: yes DefaultImporter: externalObjects: {} From 457d3c6a5019485bdd6695930eff4385e07c9ffb Mon Sep 17 00:00:00 2001 From: Sweet Tini Date: Sat, 1 Feb 2020 23:47:43 -0500 Subject: [PATCH 3/4] Add Hurt animation to player --- Assets/Sprites/Player/JrDev.png | Bin 2345 -> 2692 bytes Assets/Sprites/Player/JrDev.png.meta | 44 +++++-- Assets/Sprites/Player/JrDevHurt.anim | 69 ++++++++++ Assets/Sprites/Player/JrDevHurt.anim.meta | 8 ++ Assets/Sprites/Player/Player.controller | 94 +++++++++++++- Assets/Sprites/Tilemaps/Matrix.png | Bin 0 -> 3789 bytes Assets/Sprites/Tilemaps/Matrix.png.meta | 151 ++++++++++++++++++++++ 7 files changed, 354 insertions(+), 12 deletions(-) create mode 100644 Assets/Sprites/Player/JrDevHurt.anim create mode 100644 Assets/Sprites/Player/JrDevHurt.anim.meta create mode 100644 Assets/Sprites/Tilemaps/Matrix.png create mode 100644 Assets/Sprites/Tilemaps/Matrix.png.meta diff --git a/Assets/Sprites/Player/JrDev.png b/Assets/Sprites/Player/JrDev.png index 5d5b2bcb07253997bf022cf02995586e69f9351f..731f24e62864d89a7ed1d6e1910986797f117b3a 100644 GIT binary patch delta 2569 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 literal 0 HcmV?d00001 diff --git a/Assets/Sprites/Tilemaps/Matrix.png.meta b/Assets/Sprites/Tilemaps/Matrix.png.meta new file mode 100644 index 0000000..632faa2 --- /dev/null +++ b/Assets/Sprites/Tilemaps/Matrix.png.meta @@ -0,0 +1,151 @@ +fileFormatVersion: 2 +guid: e33008ddf5593464c90eced40f3f28e8 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 1 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 16 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: From 79812da2c5ee521e594350f95166003cb80378db Mon Sep 17 00:00:00 2001 From: Giovani Date: Sat, 1 Feb 2020 23:51:06 -0500 Subject: [PATCH 4/4] Added fighting animation --- Assets/Scenes/LevelOne.unity | 4 +- Assets/Scripts/EventControls.cs | 4 +- Assets/Scripts/Player.cs | 10 ++- .../Enemy/GioBug/GioBugAnim.controller | 10 ++- Assets/Sprites/Player/Player.controller | 89 ++++++++++++++++++- 5 files changed, 106 insertions(+), 11 deletions(-) diff --git a/Assets/Scenes/LevelOne.unity b/Assets/Scenes/LevelOne.unity index cd52986..98b1a1a 100644 --- a/Assets/Scenes/LevelOne.unity +++ b/Assets/Scenes/LevelOne.unity @@ -189,7 +189,7 @@ MonoBehaviour: - {fileID: 11400000, guid: aa0847f2d07a5de409fea20d9eef8f98, type: 2} - {fileID: 11400000, guid: 4a575a19b6cd8a140959a1461963418f, type: 2} plusTile: {fileID: 11400000, guid: ee14e10b7ac07bd449e0f1d5ea99eb42, type: 2} - framesPerControlTile: 15 + framesPerControlTile: 8 nextControlYOffset: 2 tileMapClearDelayInSeconds: 0.5 maxNumberOfControlTiles: 2 @@ -93340,7 +93340,7 @@ PrefabInstance: - target: {fileID: 3827363133515929335, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, type: 3} propertyPath: movementSpeed - value: 2 + value: 2.2 objectReference: {fileID: 0} - target: {fileID: 3827363133515929335, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, type: 3} diff --git a/Assets/Scripts/EventControls.cs b/Assets/Scripts/EventControls.cs index 35feac7..296afe0 100644 --- a/Assets/Scripts/EventControls.cs +++ b/Assets/Scripts/EventControls.cs @@ -49,7 +49,7 @@ public class EventControls : MonoBehaviour currentPlayerCollider = playerCollider; currentEnemyCollider = enemyCollider; - player.DisablePlayerMovement(); + player.StartEncounter(); Physics2D.IgnoreCollision(playerCollider, enemyCollider, true); eventTriggered = true; @@ -205,7 +205,7 @@ public class EventControls : MonoBehaviour if (currentEnemyCollider != null) Physics2D.IgnoreCollision(currentPlayerCollider, currentEnemyCollider, false); if (!isInBattle) - player.EnablePlayerMovement(); + player.EndEncounter(); currentPlayerCollider = null; currentEnemyCollider = null; diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index 538a178..4e23889 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -24,12 +24,11 @@ public class Player : MonoBehaviour [SerializeField] private SpriteRenderer healthBar; [SerializeField] private SpriteRenderer staminaBar; - - private Rigidbody2D rigidBody; new private Collider2D collider; private Animator animator; private bool isMovementEnabled = true; + private bool isFighting = false; private void Start() { @@ -213,15 +212,18 @@ public class Player : MonoBehaviour animator.SetBool("IsRunning", Mathf.Abs(rigidBody.velocity.x) > runErrorThreshold); animator.SetBool("IsGround", IsPlayerOnGround()); animator.SetFloat("YVelocity", rigidBody.velocity.y); + animator.SetBool("IsFighting", isFighting); } - public void DisablePlayerMovement() + public void StartEncounter() { + isFighting = true; isMovementEnabled = false; } - public void EnablePlayerMovement() + public void EndEncounter() { + isFighting = false; isMovementEnabled = true; } diff --git a/Assets/Sprites/Enemy/GioBug/GioBugAnim.controller b/Assets/Sprites/Enemy/GioBug/GioBugAnim.controller index 3a1ca6e..61f1576 100644 --- a/Assets/Sprites/Enemy/GioBug/GioBugAnim.controller +++ b/Assets/Sprites/Enemy/GioBug/GioBugAnim.controller @@ -34,7 +34,13 @@ AnimatorController: m_PrefabAsset: {fileID: 0} m_Name: GioBugAnim serializedVersion: 5 - m_AnimatorParameters: [] + m_AnimatorParameters: + - m_Name: IsFighting + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -59,7 +65,7 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -2351193573875906098} - m_Position: {x: 270, y: 50, z: 0} + m_Position: {x: 290, y: 190, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/Assets/Sprites/Player/Player.controller b/Assets/Sprites/Player/Player.controller index 062d010..02a256f 100644 --- a/Assets/Sprites/Player/Player.controller +++ b/Assets/Sprites/Player/Player.controller @@ -21,6 +21,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: 6251363122210737033} m_Position: {x: 160, y: 270, z: 0} + - serializedVersion: 1 + m_State: {fileID: 5819910786424590319} + m_Position: {x: -390, y: 170, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: - {fileID: 3708718943660755162} @@ -32,6 +35,31 @@ AnimatorStateMachine: m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: -2991084837782200938} +--- !u!1101 &-5610768259902955866 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: IsFighting + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -2991084837782200938} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &-4427708455344951909 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -91,6 +119,7 @@ AnimatorState: m_CycleOffset: 0 m_Transitions: - {fileID: -4109286016316069763} + - {fileID: -880235167412170940} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -106,6 +135,31 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-880235167412170940 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: IsFighting + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 5819910786424590319} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -119,7 +173,7 @@ AnimatorController: m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 - m_DefaultBool: 1 + m_DefaultBool: 0 m_Controller: {fileID: 0} - m_Name: IsGround m_Type: 4 @@ -133,6 +187,12 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 0} + - m_Name: IsFighting + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -327,6 +387,33 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1102 &5819910786424590319 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: BugFight + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -5610768259902955866} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 784d0899d352c39428548fc7aa7de282, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &6251363122210737033 AnimatorState: serializedVersion: 5