From d4cca79ab31454d1f651382fded1674b1d226725 Mon Sep 17 00:00:00 2001 From: Giovani Date: Sun, 2 Feb 2020 12:12:11 -0500 Subject: [PATCH] made more bugs --- Assets/Prefabs/GioBug.prefab | 12 +- Assets/Prefabs/KatBug.prefab | 137 ++ Assets/Prefabs/KatBug.prefab.meta | 7 + Assets/Scenes/LevelOne.unity | 2032 ++++++++--------- Assets/Scripts/EventControls.cs | 4 +- Assets/Scripts/Player.cs | 21 +- .../Bug Physics Material.physicsMaterial2D | 11 + ...ug Physics Material.physicsMaterial2D.meta | 8 + Assets/Sprites/Hud/Controls/Buttons.png.meta | 84 +- Assets/Sprites/Player/Player.controller | 48 +- ProjectSettings/TagManager.asset | 4 + 11 files changed, 1265 insertions(+), 1103 deletions(-) create mode 100644 Assets/Prefabs/KatBug.prefab create mode 100644 Assets/Prefabs/KatBug.prefab.meta create mode 100644 Assets/Sprites/Enemy/Bug Physics Material.physicsMaterial2D create mode 100644 Assets/Sprites/Enemy/Bug Physics Material.physicsMaterial2D.meta diff --git a/Assets/Prefabs/GioBug.prefab b/Assets/Prefabs/GioBug.prefab index 1dc2ff9..5c6ae07 100644 --- a/Assets/Prefabs/GioBug.prefab +++ b/Assets/Prefabs/GioBug.prefab @@ -16,7 +16,7 @@ GameObject: - component: {fileID: -6605527394410161759} m_Layer: 9 m_Name: GioBug - m_TagString: Untagged + m_TagString: Kat Bug m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -98,7 +98,7 @@ BoxCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0.03701496, y: -0.01850748} + m_Offset: {x: -0.2753334, y: 1.7770281} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} @@ -109,7 +109,7 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 2.51762, y: 2.6286669} + m_Size: {x: 2.815094, y: 3.5491123} m_EdgeRadius: 0 --- !u!114 &3827363133515929335 MonoBehaviour: @@ -125,9 +125,9 @@ MonoBehaviour: m_EditorClassIdentifier: secondsGoingLeft: 0.8 secondsGoingRight: 0.8 - movementSpeed: 2.2 - eventTriggerCount: 1 - controlTriggerCounterEvent: 1 + movementSpeed: 2.6 + eventTriggerCount: 2 + controlTriggerCounterEvent: 2 playerCollider: {fileID: 0} eventControls: {fileID: 0} player: {fileID: 0} diff --git a/Assets/Prefabs/KatBug.prefab b/Assets/Prefabs/KatBug.prefab new file mode 100644 index 0000000..0a9b020 --- /dev/null +++ b/Assets/Prefabs/KatBug.prefab @@ -0,0 +1,137 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &8633131507466429591 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -6605527394410161759, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_Controller + value: + objectReference: {fileID: 9100000, guid: 8b1593eba53dfd848ba134d626f63f6c, type: 2} + - target: {fileID: 3827363133515929328, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_SpriteTilingProperty.pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929328, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_SpriteTilingProperty.oldSize.x + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929328, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_SpriteTilingProperty.oldSize.y + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929329, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 5875687446670976453, guid: b0ab9d2a48d01f64892a3fddb3ab1622, + type: 3} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalPosition.x + value: 56 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalPosition.y + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalScale.x + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929333, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_Name + value: KatBug + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929335, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: playerCollider + value: + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929335, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: player + value: + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929335, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: eventControls + value: + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929335, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: controlTriggerCounterEvent + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929335, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: eventTriggerCount + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, type: 3} diff --git a/Assets/Prefabs/KatBug.prefab.meta b/Assets/Prefabs/KatBug.prefab.meta new file mode 100644 index 0000000..14d513e --- /dev/null +++ b/Assets/Prefabs/KatBug.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c98830a6bebcdc24b91c550a26c9b621 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/LevelOne.unity b/Assets/Scenes/LevelOne.unity index 29b21b6..b1e41e0 100644 --- a/Assets/Scenes/LevelOne.unity +++ b/Assets/Scenes/LevelOne.unity @@ -151,7 +151,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1008122163} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1491655 MonoBehaviour: @@ -227,8 +227,8 @@ TilemapRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 + m_SortingLayerID: -1653763861 + m_SortingLayer: 2 m_SortingOrder: 0 m_ChunkSize: {x: 32, y: 32, z: 32} m_ChunkCullingBounds: {x: 0, y: 0, z: 0} @@ -348,6 +348,12 @@ Tilemap: e31: 0 e32: 0 e33: 1 +--- !u!4 &8021909 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + m_PrefabInstance: {fileID: 553298993} + m_PrefabAsset: {fileID: 0} --- !u!1001 &55524261 PrefabInstance: m_ObjectHideFlags: 0 @@ -438,7 +444,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} @@ -527,7 +533,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} @@ -576,7 +582,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1008122163} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!483693784 &193535122 TilemapRenderer: @@ -1248,7 +1254,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} @@ -1267,6 +1273,130 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} +--- !u!1001 &553298993 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1008122163} + m_Modifications: + - target: {fileID: 3827363133515929328, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_Offset.y + value: -0.02550745 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929328, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_Size.y + value: 2.6413336 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929328, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_Offset.x + value: 0.009020925 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929328, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_Size.x + value: 3.193085 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalPosition.x + value: -7.5 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalPosition.y + value: -20.5 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalScale.x + value: -1.75 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalScale.y + value: 1.75 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalScale.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929333, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_Name + value: GioBugBoss + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929335, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: controlTriggerCounterEvent + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929335, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: playerCollider + value: + objectReference: {fileID: 1671840919} + - target: {fileID: 3827363133515929335, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: eventControls + value: + 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 &567733218 PrefabInstance: m_ObjectHideFlags: 0 @@ -1337,7 +1467,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} @@ -1494,8 +1624,103 @@ 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!1001 &951888604 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1008122163} + m_Modifications: + - target: {fileID: 4815066122311201376, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: playerCollider + value: + objectReference: {fileID: 1671840919} + - target: {fileID: 4815066122311201376, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: eventControls + value: + objectReference: {fileID: 1491655} + - target: {fileID: 4815066122311201376, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: player + value: + objectReference: {fileID: 1671840921} + - target: {fileID: 4815066122311201377, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 6200000, guid: 8bbf95d8d23ff94449785e66e0ae11ec, type: 2} + - target: {fileID: 4815066122311201378, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: m_Name + value: KatBug + objectReference: {fileID: 0} + - target: {fileID: 4815066122311201381, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: m_LocalPosition.x + value: 56.5 + objectReference: {fileID: 0} + - target: {fileID: 4815066122311201381, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: m_LocalPosition.y + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4815066122311201381, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4815066122311201381, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4815066122311201381, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4815066122311201381, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4815066122311201381, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4815066122311201381, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 4815066122311201381, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4815066122311201381, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4815066122311201381, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c98830a6bebcdc24b91c550a26c9b621, type: 3} +--- !u!4 &951888605 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4815066122311201381, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + m_PrefabInstance: {fileID: 951888604} + m_PrefabAsset: {fileID: 0} --- !u!1 &1008122161 GameObject: m_ObjectHideFlags: 0 @@ -1538,11 +1763,14 @@ Transform: m_Children: - {fileID: 1713017494} - {fileID: 1671840917} - - {fileID: 1247097598} - {fileID: 1491654} - {fileID: 193535121} + - {fileID: 1247097598} + - {fileID: 1842108763} + - {fileID: 8021909} + - {fileID: 951888605} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1028911173 PrefabInstance: @@ -1634,7 +1862,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} @@ -1960,6 +2188,26 @@ CompositeCollider2D: Y: 340000000 - X: 960000000 Y: 340000000 + - - 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: 1620000000 Y: 300000000 - X: 1660000000 @@ -2158,18 +2406,6 @@ CompositeCollider2D: Y: 370000000 - X: 40000000 Y: 350000000 - - X: 30000100 - Y: 350000000 - - X: 30000100 - Y: 350000041 - - X: 30000041 - Y: 350000100 - - X: -70000041 - Y: 350000100 - - X: -70000100 - Y: 350000041 - - X: -70000100 - Y: 350000000 - X: -80000000 Y: 350000000 - X: -80000000 @@ -2244,26 +2480,6 @@ CompositeCollider2D: Y: 170000000 - X: -40000000 Y: 170000000 - - - 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: 1360000000 Y: 370000000 - X: 1290000000 @@ -2315,9 +2531,9 @@ CompositeCollider2D: - X: -70000000 Y: 330000000 - X: -70000000 - Y: 339999900 + Y: 340000000 - X: 30000000 - Y: 339999900 + Y: 340000000 - X: 30000000 Y: 250000000 - X: 20000000 @@ -2328,38 +2544,6 @@ CompositeCollider2D: Y: 240000000 - X: 10000000 Y: 220000000 - - - X: 2289999872 - Y: 320000000 - - X: 2280000000 - Y: 320000000 - - X: 2280000000 - Y: 300000000 - - X: 2289999872 - Y: 300000000 - - - X: 1940000000 - Y: 320000000 - - X: 1920000000 - Y: 320000000 - - X: 1920000000 - Y: 310000000 - - X: 1940000000 - Y: 310000000 - - - X: 2060000000 - Y: 320000000 - - X: 2040000000 - Y: 320000000 - - X: 2040000000 - Y: 310000000 - - X: 2060000000 - Y: 310000000 - - - X: 1880000000 - Y: 320000000 - - X: 1860000000 - Y: 320000000 - - X: 1860000000 - Y: 310000000 - - X: 1880000000 - Y: 310000000 - - X: -40000000 Y: 320000000 - X: -80000000 @@ -2368,21 +2552,21 @@ CompositeCollider2D: Y: 300000000 - X: -40000000 Y: 300000000 - - - X: 1380000000 + - - X: 1880000000 Y: 320000000 - - X: 1270000000 + - X: 1860000000 Y: 320000000 - - X: 1270000000 - Y: 300000000 - - X: 1380000000 - Y: 300000000 - - - X: 2180000000 - Y: 320000000 - - X: 2160000000 - Y: 320000000 - - X: 2160000000 + - X: 1860000000 Y: 310000000 - - X: 2180000000 + - X: 1880000000 + Y: 310000000 + - - X: 1940000000 + Y: 320000000 + - X: 1920000000 + Y: 320000000 + - X: 1920000000 + Y: 310000000 + - X: 1940000000 Y: 310000000 - - X: 2000000000 Y: 320000000 @@ -2392,6 +2576,46 @@ CompositeCollider2D: Y: 310000000 - X: 2000000000 Y: 310000000 + - - X: 2060000000 + Y: 320000000 + - X: 2040000000 + Y: 320000000 + - X: 2040000000 + Y: 310000000 + - X: 2060000000 + Y: 310000000 + - - X: 2120000000 + Y: 320000000 + - X: 2100000000 + Y: 320000000 + - X: 2100000000 + Y: 310000000 + - X: 2120000000 + Y: 310000000 + - - X: 2180000000 + Y: 320000000 + - X: 2160000000 + Y: 320000000 + - X: 2160000000 + Y: 310000000 + - X: 2180000000 + Y: 310000000 + - - X: 2240000000 + Y: 320000000 + - X: 2220000000 + Y: 320000000 + - X: 2220000000 + Y: 310000000 + - X: 2240000000 + Y: 310000000 + - - X: 2289999872 + Y: 320000000 + - X: 2280000000 + Y: 320000000 + - X: 2280000000 + Y: 300000000 + - X: 2289999872 + Y: 300000000 - - X: 1710000000 Y: 310000000 - X: 1740000000 @@ -2404,22 +2628,14 @@ CompositeCollider2D: Y: 300000000 - X: 1710000000 Y: 300000000 - - - X: 2120000000 + - - X: 1380000000 Y: 320000000 - - X: 2100000000 + - X: 1270000000 Y: 320000000 - - X: 2100000000 - Y: 310000000 - - X: 2120000000 - Y: 310000000 - - - X: 2240000000 - Y: 320000000 - - X: 2220000000 - Y: 320000000 - - X: 2220000000 - Y: 310000000 - - X: 2240000000 - Y: 310000000 + - X: 1270000000 + Y: 300000000 + - X: 1380000000 + Y: 300000000 - - X: 1820000000 Y: 320000000 - X: 1780000000 @@ -2436,13 +2652,7 @@ CompositeCollider2D: Y: 300000000 - X: 20000000 Y: 300000000 - - - X: 960000100 - Y: 69999959 - - X: 960000100 - Y: 70000000 - - X: 1010000000 - Y: 70000000 - - X: 1010000000 + - - X: 1010000000 Y: 90000000 - X: 1020000000 Y: 90000000 @@ -2532,30 +2742,6 @@ CompositeCollider2D: Y: 300000000 - X: 430000000 Y: 280000000 - - X: 469999900 - Y: 280000000 - - X: 469999900 - Y: 279999959 - - X: 469999959 - Y: 279999900 - - X: 480000041 - Y: 279999900 - - X: 480000100 - Y: 279999959 - - X: 480000100 - Y: 280000000 - - X: 659999900 - Y: 280000000 - - X: 659999900 - Y: 280000041 - - X: 659999959 - Y: 280000100 - - X: 670000041 - Y: 280000100 - - X: 670000100 - Y: 280000041 - - X: 670000100 - Y: 280000000 - X: 770000000 Y: 280000000 - X: 770000000 @@ -2640,30 +2826,6 @@ CompositeCollider2D: Y: 220000000 - X: 820000000 Y: 230000000 - - X: 839999900 - Y: 230000000 - - X: 839999900 - Y: 229999959 - - X: 839999959 - Y: 229999900 - - X: 850000041 - Y: 229999900 - - X: 850000100 - Y: 229999959 - - X: 850000100 - Y: 230000000 - - X: 979999900 - Y: 230000000 - - X: 979999900 - Y: 229999959 - - X: 979999959 - Y: 229999900 - - X: 990000041 - Y: 229999900 - - X: 990000100 - Y: 229999959 - - X: 990000100 - Y: 230000000 - X: 1060000000 Y: 230000000 - X: 1060000000 @@ -2716,42 +2878,16 @@ CompositeCollider2D: Y: 90000000 - X: 860000000 Y: 70000000 - - X: 949999900 + - X: 1010000000 Y: 70000000 - - X: 949999900 - Y: 69999959 - - X: 949999959 - Y: 69999900 - - X: 960000041 - Y: 69999900 - - - X: 340000100 - Y: 279999959 - - X: 340000100 - Y: 280000000 - - X: 410000000 - Y: 280000000 - - X: 410000000 + - - X: 410000000 Y: 300000000 - X: 270000000 Y: 300000000 - X: 270000000 Y: 280000000 - - X: 329999900 + - X: 410000000 Y: 280000000 - - X: 329999900 - Y: 279999959 - - X: 329999959 - Y: 279999900 - - X: 340000041 - Y: 279999900 - - - X: -40000000 - Y: 290000000 - - X: -60000000 - Y: 290000000 - - X: -60000000 - Y: 270000000 - - X: -40000000 - Y: 270000000 - - X: 10000000 Y: 290000000 - X: -10000000 @@ -2760,6 +2896,14 @@ CompositeCollider2D: Y: 270000000 - X: 10000000 Y: 270000000 + - - X: -40000000 + Y: 290000000 + - X: -60000000 + Y: 290000000 + - X: -60000000 + Y: 270000000 + - X: -40000000 + Y: 270000000 - - X: 1400000000 Y: 270000000 - X: 1250000000 @@ -2768,42 +2912,22 @@ CompositeCollider2D: Y: 250000000 - X: 1400000000 Y: 250000000 - - - X: -9999900 - Y: 249999959 - - X: -9999900 - Y: 260000041 - - X: -9999959 - Y: 260000100 - - X: -50000041 - Y: 260000100 - - X: -50000100 - Y: 260000041 - - X: -50000100 - Y: 249999959 - - X: -50000041 - Y: 249999900 - - X: -9999959 - Y: 249999900 - - - X: 2220000100 - Y: 239999959 - - X: 2220000100 - Y: 240000000 - - X: 2240000000 - Y: 240000000 - - X: 2240000000 + - - X: -10000000 + Y: 260000000 + - X: -50000000 + Y: 260000000 + - X: -50000000 + Y: 250000000 + - X: -10000000 + Y: 250000000 + - - X: 2240000000 Y: 260000000 - X: 2169999872 Y: 260000000 - X: 2169999872 Y: 240000000 - - X: 2209999772 + - X: 2240000000 Y: 240000000 - - X: 2209999772 - Y: 239999959 - - X: 2209999831 - Y: 239999900 - - X: 2220000041 - Y: 239999900 - - X: 430000000 Y: 220000000 - X: 410000000 @@ -2812,21 +2936,21 @@ CompositeCollider2D: Y: 200000000 - X: 430000000 Y: 200000000 - - - X: 1990000000 + - - X: 1430000000 Y: 220000000 - - X: 1980000000 + - X: 1220000000 Y: 220000000 - - X: 1980000000 + - X: 1220000000 + Y: 200000000 + - X: 1430000000 + Y: 200000000 + - - X: 1860000000 + Y: 220000000 + - X: 1850000000 + Y: 220000000 + - X: 1850000000 Y: 210000000 - - X: 1990000000 - Y: 210000000 - - - X: 2050000000 - Y: 220000000 - - X: 2040000000 - Y: 220000000 - - X: 2040000000 - Y: 210000000 - - X: 2050000000 + - X: 1860000000 Y: 210000000 - - X: 1920000000 Y: 220000000 @@ -2836,13 +2960,41 @@ CompositeCollider2D: Y: 210000000 - X: 1920000000 Y: 210000000 - - - X: 1860000000 - Y: 220000000 - - X: 1850000000 - Y: 220000000 - - X: 1850000000 + - - X: 1990000000 Y: 210000000 - - X: 1860000000 + - X: 1990000000 + Y: 200000000 + - X: 2000000000 + Y: 200000000 + - X: 2000000000 + Y: 160000000 + - X: 2040000000 + Y: 160000000 + - X: 2040000000 + Y: 210000000 + - X: 2030000000 + Y: 210000000 + - X: 2030000000 + Y: 200000000 + - X: 2020000000 + Y: 200000000 + - X: 2020000000 + Y: 220000000 + - X: 2010000000 + Y: 220000000 + - X: 2010000000 + Y: 200000000 + - X: 2000000000 + Y: 200000000 + - X: 2000000000 + Y: 210000000 + - - X: 2050000000 + Y: 220000000 + - X: 2040000000 + Y: 220000000 + - X: 2040000000 + Y: 210000000 + - X: 2050000000 Y: 210000000 - - X: 1900000000 Y: 200000000 @@ -2864,66 +3016,22 @@ CompositeCollider2D: Y: 160000000 - X: 1900000000 Y: 160000000 - - - X: 2040000000 - Y: 210000000 - - X: 2030000000 - Y: 210000000 - - X: 2030000000 - Y: 200000000 - - X: 2020000000 - Y: 200000000 - - X: 2020000000 + - - X: 1990000000 Y: 220000000 - - X: 2010000000 + - X: 1980000000 Y: 220000000 - - X: 2010000000 - Y: 200000000 - - X: 2000000000 - Y: 200000000 - - X: 2000000000 + - X: 1980000000 Y: 210000000 - X: 1990000000 Y: 210000000 - - X: 1990000000 - Y: 200000000 - - X: 2000000000 - Y: 200000000 - - X: 2000000000 - Y: 160000000 - - X: 2040000000 - Y: 160000000 - - - X: 1430000000 - Y: 220000000 - - X: 1220000000 - Y: 220000000 - - X: 1220000000 - Y: 200000000 - - X: 1430000000 - Y: 200000000 - - - X: 2160000000 + - - X: 1910000000 Y: 210000000 - - X: 2130000000 + - X: 1900000000 Y: 210000000 - - X: 2130000000 + - X: 1900000000 Y: 200000000 - - X: 2120000000 + - X: 1910000000 Y: 200000000 - - X: 2120000000 - Y: 190000000 - - X: 2110000000 - Y: 190000000 - - X: 2110000000 - Y: 180000000 - - X: 2120000000 - Y: 180000000 - - X: 2120000000 - Y: 160000000 - - X: 2130000000 - Y: 160000000 - - X: 2130000000 - Y: 150000000 - - X: 2160000000 - Y: 150000000 - - X: 1770000000 Y: 160000000 - X: 1780000000 @@ -2952,14 +3060,54 @@ CompositeCollider2D: Y: 140000000 - X: 1770000000 Y: 140000000 - - - X: 1910000000 + - - X: 2160000000 Y: 210000000 - - X: 1900000000 + - X: 2130000000 Y: 210000000 - - X: 1900000000 + - X: 2130000000 Y: 200000000 - - X: 1910000000 + - X: 2120000000 Y: 200000000 + - X: 2120000000 + Y: 190000000 + - X: 2110000000 + Y: 190000000 + - X: 2110000000 + Y: 180000000 + - X: 2120000000 + Y: 180000000 + - X: 2120000000 + Y: 160000000 + - X: 2130000000 + Y: 160000000 + - X: 2130000000 + Y: 150000000 + - X: 2160000000 + Y: 150000000 + - - X: 2140000000 + Y: 160000000 + - X: 2140000000 + Y: 170000000 + - X: 2130000000 + Y: 170000000 + - X: 2130000000 + Y: 190000000 + - X: 2140000000 + Y: 190000000 + - X: 2140000000 + Y: 200000000 + - X: 2150000128 + Y: 200000000 + - X: 2150000128 + Y: 160000000 + - - X: 1160000000 + Y: 200000000 + - X: 1150000000 + Y: 200000000 + - X: 1150000000 + Y: 190000000 + - X: 1160000000 + Y: 190000000 - - X: 1750000000 Y: 160000000 - X: 1750000000 @@ -2988,30 +3136,6 @@ CompositeCollider2D: Y: 180000000 - X: 710000000 Y: 180000000 - - - X: 1160000000 - Y: 200000000 - - X: 1150000000 - Y: 200000000 - - X: 1150000000 - Y: 190000000 - - X: 1160000000 - Y: 190000000 - - - X: 2140000000 - Y: 160000000 - - X: 2140000000 - Y: 170000000 - - X: 2130000000 - Y: 170000000 - - X: 2130000000 - Y: 190000000 - - X: 2140000000 - Y: 190000000 - - X: 2140000000 - Y: 200000000 - - X: 2150000128 - Y: 200000000 - - X: 2150000128 - Y: 160000000 - - X: 1960000000 Y: 190000000 - X: 1940000000 @@ -3044,22 +3168,6 @@ CompositeCollider2D: Y: 130000000 - X: 730000000 Y: 130000000 - - - X: 1510000000 - Y: 140000000 - - X: 1490000000 - Y: 140000000 - - X: 1490000000 - Y: 120000000 - - X: 1510000000 - Y: 120000000 - - - X: 520000000 - Y: 140000000 - - X: 480000000 - Y: 140000000 - - X: 480000000 - Y: 120000000 - - X: 520000000 - Y: 120000000 - - X: 2110000000 Y: 140000000 - X: 2090000000 @@ -3084,6 +3192,22 @@ CompositeCollider2D: Y: 120000000 - X: 1800000000 Y: 120000000 + - - X: 1510000000 + Y: 140000000 + - X: 1490000000 + Y: 140000000 + - X: 1490000000 + Y: 120000000 + - X: 1510000000 + Y: 120000000 + - - X: 520000000 + Y: 140000000 + - X: 480000000 + Y: 140000000 + - X: 480000000 + Y: 120000000 + - X: 520000000 + Y: 120000000 - - X: 450000000 Y: 120000000 - X: 370000000 @@ -3092,14 +3216,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: 760000000 Y: 100000000 - X: 700000000 @@ -3108,6 +3224,14 @@ CompositeCollider2D: Y: 80000000 - X: 760000000 Y: 80000000 + - - X: 1550000000 + Y: 100000000 + - X: 1530000000 + Y: 100000000 + - X: 1530000000 + Y: 80000000 + - X: 1550000000 + Y: 80000000 - - X: 1280000000 Y: 20000000 - X: 1300000000 @@ -3212,25 +3336,7 @@ CompositeCollider2D: Y: 10000000 - X: 1280000000 Y: 10000000 - - - X: 1950000100 - Y: 39999959 - - X: 1950000100 - Y: 40000000 - - X: 1989999900 - Y: 40000000 - - X: 1989999900 - Y: 39999959 - - X: 1989999959 - Y: 39999900 - - X: 2000000041 - Y: 39999900 - - X: 2000000100 - Y: 39999959 - - X: 2000000100 - Y: 40000000 - - X: 2040000000 - Y: 40000000 - - X: 2040000000 + - - X: 2040000000 Y: 50000000 - X: 2050000000 Y: 50000000 @@ -3268,34 +3374,16 @@ CompositeCollider2D: Y: 50000000 - X: 1860000000 Y: 40000000 - - X: 1939999900 + - X: 2040000000 Y: 40000000 - - X: 1939999900 - Y: 39999959 - - X: 1939999959 - Y: 39999900 - - X: 1950000041 - Y: 39999900 - - - X: 2200000100 - Y: 49999959 - - X: 2200000100 - Y: 50000000 - - X: 2220000000 - Y: 50000000 - - X: 2220000000 + - - X: 2220000000 Y: 80000000 - X: 2169999872 Y: 80000000 - X: 2169999872 Y: 50000000 - - X: 2190000028 + - X: 2220000000 Y: 50000000 - - X: 2190000028 - Y: 49999959 - - X: 2190000087 - Y: 49999900 - - X: 2200000041 - Y: 49999900 - - X: 290000000 Y: 80000000 - X: 240000000 @@ -3312,30 +3400,6 @@ CompositeCollider2D: Y: 70000000 - X: 2020000000 Y: 50000000 - - X: 2000000100 - Y: 50000000 - - X: 2000000100 - Y: 50000041 - - X: 2000000041 - Y: 50000100 - - X: 1989999959 - Y: 50000100 - - X: 1989999900 - Y: 50000041 - - X: 1989999900 - Y: 50000000 - - X: 1950000100 - Y: 50000000 - - X: 1950000100 - Y: 50000041 - - X: 1950000041 - Y: 50000100 - - X: 1939999959 - Y: 50000100 - - X: 1939999900 - Y: 50000041 - - X: 1939999900 - Y: 50000000 - - X: 380000000 Y: 70000000 - X: 330000000 @@ -3344,134 +3408,6 @@ CompositeCollider2D: Y: 50000000 - X: 380000000 Y: 50000000 - - - X: 910000000 - Y: -110000000 - - X: 939999900 - Y: -110000000 - - X: 939999900 - Y: -110000041 - - X: 939999959 - Y: -110000100 - - X: 950000041 - Y: -110000100 - - X: 950000100 - Y: -110000041 - - X: 950000100 - Y: -110000000 - - X: 979999900 - Y: -110000000 - - X: 979999900 - Y: -110000041 - - X: 979999959 - Y: -110000100 - - X: 990000041 - Y: -110000100 - - X: 990000100 - Y: -110000041 - - X: 990000100 - Y: -110000000 - - X: 1030000000 - Y: -110000000 - - X: 1030000000 - Y: -80000000 - - X: 1059999900 - Y: -80000000 - - X: 1059999900 - Y: -80000041 - - X: 1059999959 - Y: -80000100 - - X: 1070000041 - Y: -80000100 - - X: 1070000100 - Y: -80000041 - - X: 1070000100 - Y: -80000000 - - X: 1110000000 - Y: -80000000 - - X: 1110000000 - Y: -40000000 - - X: 1180000000 - Y: -40000000 - - X: 1180000000 - Y: -50000000 - - X: 1220000000 - Y: -50000000 - - X: 1220000000 - Y: -60000000 - - X: 1269999900 - Y: -60000000 - - X: 1269999900 - Y: -60000041 - - X: 1269999959 - Y: -60000100 - - X: 1280000041 - Y: -60000100 - - X: 1280000100 - Y: -60000041 - - X: 1280000100 - Y: -60000000 - - X: 1360000000 - Y: -60000000 - - X: 1360000000 - Y: -130000000 - - X: 1390000000 - Y: -130000000 - - X: 1390000000 - Y: -30000000 - - X: 1160000000 - Y: -30000000 - - X: 1160000000 - Y: -10000000 - - X: 1080000000 - Y: -10000000 - - X: 1080000000 - Y: -50000000 - - X: 1000000000 - Y: -50000000 - - X: 1000000000 - Y: -80000000 - - X: 910000000 - Y: -80000000 - - X: 910000000 - Y: -20000000 - - X: 730000000 - Y: -20000000 - - X: 730000000 - Y: 10000000 - - X: 720000000 - Y: 10000000 - - X: 720000000 - Y: 20000000 - - X: 680000000 - Y: 20000000 - - X: 680000000 - Y: 60000000 - - X: 660000000 - Y: 60000000 - - X: 660000000 - Y: 40000000 - - X: 640000000 - Y: 40000000 - - X: 640000000 - Y: 20000000 - - X: 620000000 - Y: 20000000 - - X: 620000000 - Y: 10000000 - - X: 610000000 - Y: 10000000 - - X: 610000000 - Y: -20000000 - - X: 470000000 - Y: -20000000 - - X: 470000000 - Y: -50000000 - - X: 880000000 - Y: -50000000 - - X: 880000000 - Y: -200000000 - - X: 910000000 - Y: -200000000 - - X: 1800000000 Y: 60000000 - X: 1770000000 @@ -3480,6 +3416,86 @@ CompositeCollider2D: Y: 40000000 - X: 1800000000 Y: 40000000 + - - X: 910000000 + Y: -110000000 + - X: 1030000000 + Y: -110000000 + - X: 1030000000 + Y: -80000000 + - X: 1110000000 + Y: -80000000 + - X: 1110000000 + Y: -40000000 + - X: 1180000000 + Y: -40000000 + - X: 1180000000 + Y: -50000000 + - X: 1220000000 + Y: -50000000 + - X: 1220000000 + Y: -60000000 + - X: 1360000000 + Y: -60000000 + - X: 1360000000 + Y: -130000000 + - X: 1390000000 + Y: -130000000 + - X: 1390000000 + Y: -30000000 + - X: 1160000000 + Y: -30000000 + - X: 1160000000 + Y: -10000000 + - X: 1080000000 + Y: -10000000 + - X: 1080000000 + Y: -50000000 + - X: 1000000000 + Y: -50000000 + - X: 1000000000 + Y: -80000000 + - X: 910000000 + Y: -80000000 + - X: 910000000 + Y: -20000000 + - X: 730000000 + Y: -20000000 + - X: 730000000 + Y: 10000000 + - X: 720000000 + Y: 10000000 + - X: 720000000 + Y: 20000000 + - X: 680000000 + Y: 20000000 + - X: 680000000 + Y: 60000000 + - X: 660000000 + Y: 60000000 + - X: 660000000 + Y: 40000000 + - X: 640000000 + Y: 40000000 + - X: 640000000 + Y: 20000000 + - X: 620000000 + Y: 20000000 + - X: 620000000 + Y: 10000000 + - X: 610000000 + Y: 10000000 + - X: 610000000 + Y: -20000000 + - X: 470000000 + Y: -20000000 + - X: 470000000 + Y: -50000000 + - X: 880000000 + Y: -50000000 + - X: 880000000 + Y: -200000000 + - X: 910000000 + Y: -200000000 - - X: 840000000 Y: 50000000 - X: 760000000 @@ -3488,22 +3504,14 @@ CompositeCollider2D: Y: 30000000 - X: 840000000 Y: 30000000 - - - X: 1050000100 - Y: 9999959 - - X: 1050000100 - Y: 30000041 - - X: 1050000041 - Y: 30000100 - - X: 1029999959 - Y: 30000100 - - X: 1029999900 - Y: 30000041 - - X: 1029999900 - Y: 9999959 - - X: 1029999959 - Y: 9999900 - - X: 1050000041 - Y: 9999900 + - - X: 1050000000 + Y: 30000000 + - X: 1030000000 + Y: 30000000 + - X: 1030000000 + Y: 10000000 + - X: 1050000000 + Y: 10000000 - - X: 590000000 Y: 30000000 - X: 520000000 @@ -3528,22 +3536,66 @@ CompositeCollider2D: Y: 10000000 - X: 2270000128 Y: 10000000 - - - X: 1000000100 - Y: -10000041 - - X: 1000000100 - Y: 10000041 - - X: 1000000041 - Y: 10000100 - - X: 939999959 - Y: 10000100 - - X: 939999900 - Y: 10000041 - - X: 939999900 - Y: -10000041 - - X: 939999959 - Y: -10000100 - - X: 1000000041 - Y: -10000100 + - - X: 2160000000 + Y: -40000000 + - X: 2150000128 + Y: -40000000 + - X: 2150000128 + Y: -30000000 + - X: 2080000000 + Y: -30000000 + - X: 2080000000 + Y: 10000000 + - X: 2050000000 + Y: 10000000 + - X: 2050000000 + Y: -30000000 + - X: 2030000000 + Y: -30000000 + - X: 2030000000 + Y: 10000000 + - X: 2010000000 + Y: 10000000 + - X: 2010000000 + Y: -30000000 + - X: 1990000000 + Y: -30000000 + - X: 1990000000 + Y: 10000000 + - X: 1980000000 + Y: 10000000 + - X: 1980000000 + Y: -30000000 + - X: 1960000000 + Y: -30000000 + - X: 1960000000 + Y: 10000000 + - X: 1950000000 + Y: 10000000 + - X: 1950000000 + Y: -30000000 + - X: 1930000000 + Y: -30000000 + - X: 1930000000 + Y: 10000000 + - X: 1910000000 + Y: 10000000 + - X: 1910000000 + Y: -30000000 + - X: 1890000000 + Y: -30000000 + - X: 1890000000 + Y: 10000000 + - X: 1860000000 + Y: 10000000 + - X: 1860000000 + Y: -30000000 + - X: 1770000000 + Y: -30000000 + - X: 1770000000 + Y: -60000000 + - X: 2160000000 + Y: -60000000 - - X: 1750000000 Y: 10000000 - X: 1670000000 @@ -3552,78 +3604,14 @@ CompositeCollider2D: Y: -20000000 - X: 1750000000 Y: -20000000 - - - X: 2030000100 - Y: -60000041 - - X: 2030000100 - Y: -60000000 - - X: 2160000000 - Y: -60000000 - - X: 2160000000 - Y: -40000000 - - X: 2150000128 - Y: -40000000 - - X: 2150000128 - Y: -30000000 - - X: 2080000000 - Y: -30000000 - - X: 2080000000 + - - X: 1000000000 Y: 10000000 - - X: 2050000000 + - X: 940000000 Y: 10000000 - - X: 2050000000 - Y: -30000000 - - X: 2030000000 - Y: -30000000 - - X: 2030000000 - Y: 10000000 - - X: 2010000000 - Y: 10000000 - - X: 2010000000 - Y: -30000000 - - X: 1990000000 - Y: -30000000 - - X: 1990000000 - Y: 10000000 - - X: 1980000000 - Y: 10000000 - - X: 1980000000 - Y: -30000000 - - X: 1960000000 - Y: -30000000 - - X: 1960000000 - Y: 10000000 - - X: 1950000000 - Y: 10000000 - - X: 1950000000 - Y: -30000000 - - X: 1930000000 - Y: -30000000 - - X: 1930000000 - Y: 10000000 - - X: 1910000000 - Y: 10000000 - - X: 1910000000 - Y: -30000000 - - X: 1890000000 - Y: -30000000 - - X: 1890000000 - Y: 10000000 - - X: 1860000000 - Y: 10000000 - - X: 1860000000 - Y: -30000000 - - X: 1770000000 - Y: -30000000 - - X: 1770000000 - Y: -60000000 - - X: 2019999900 - Y: -60000000 - - X: 2019999900 - Y: -60000041 - - X: 2019999959 - Y: -60000100 - - X: 2030000041 - Y: -60000100 + - X: 940000000 + Y: -10000000 + - X: 1000000000 + Y: -10000000 - - X: 1660000000 Y: -40000000 - X: 1640000000 @@ -3656,14 +3644,26 @@ CompositeCollider2D: Y: -110000000 - X: 1160000000 Y: -110000000 - - - X: 1240000000 - Y: -90000000 - - X: 1180000000 - Y: -90000000 - - X: 1180000000 + - - X: 2140000000 Y: -110000000 - - X: 1240000000 + - X: 2230000128 Y: -110000000 + - X: 2230000128 + Y: -90000000 + - X: 2130000000 + Y: -90000000 + - X: 2130000000 + Y: -100000000 + - X: 2120000000 + Y: -100000000 + - X: 2120000000 + Y: -150000000 + - X: 2090000000 + Y: -150000000 + - X: 2090000000 + Y: -170000000 + - X: 2140000000 + Y: -170000000 - - X: 1550000000 Y: -90000000 - X: 1530000000 @@ -3684,38 +3684,14 @@ CompositeCollider2D: Y: -110000000 - X: 1470000000 Y: -110000000 - - - X: 2140000000 - Y: -110000000 - - X: 2159999900 - Y: -110000000 - - X: 2159999900 - Y: -110000041 - - X: 2159999959 - Y: -110000100 - - X: 2169999913 - Y: -110000100 - - X: 2169999972 - Y: -110000041 - - X: 2169999972 - Y: -110000000 - - X: 2230000128 - Y: -110000000 - - X: 2230000128 + - - X: 1240000000 Y: -90000000 - - X: 2130000000 + - X: 1180000000 Y: -90000000 - - X: 2130000000 - Y: -100000000 - - X: 2120000000 - Y: -100000000 - - X: 2120000000 - Y: -150000000 - - X: 2090000000 - Y: -150000000 - - X: 2090000000 - Y: -170000000 - - X: 2140000000 - Y: -170000000 + - X: 1180000000 + Y: -110000000 + - X: 1240000000 + Y: -110000000 - - X: 1780000000 Y: -120000000 - X: 1730000000 @@ -3724,6 +3700,14 @@ CompositeCollider2D: Y: -140000000 - X: 1780000000 Y: -140000000 + - - X: 1510000000 + Y: -130000000 + - X: 1490000000 + Y: -130000000 + - X: 1490000000 + Y: -150000000 + - X: 1510000000 + Y: -150000000 - - X: 1320000000 Y: -130000000 - X: 1240000000 @@ -3740,14 +3724,6 @@ CompositeCollider2D: Y: -150000000 - X: 1140000000 Y: -150000000 - - - X: 1510000000 - Y: -130000000 - - X: 1490000000 - Y: -130000000 - - X: 1490000000 - Y: -150000000 - - X: 1510000000 - Y: -150000000 - - X: -90000000 Y: -150000000 - X: -50000000 @@ -3780,14 +3756,6 @@ CompositeCollider2D: Y: -150000000 - X: 2270000128 Y: -150000000 - - - X: 2050000000 - Y: -150000000 - - X: 2010000000 - Y: -150000000 - - X: 2010000000 - Y: -170000000 - - X: 2050000000 - Y: -170000000 - - X: 1970000000 Y: -150000000 - X: 1930000000 @@ -3802,18 +3770,6 @@ CompositeCollider2D: Y: -190000000 - X: 1810000000 Y: -170000000 - - X: 1819999900 - Y: -170000000 - - X: 1819999900 - Y: -170000041 - - X: 1819999959 - Y: -170000100 - - X: 1830000041 - Y: -170000100 - - X: 1830000100 - Y: -170000041 - - X: 1830000100 - Y: -170000000 - X: 1890000000 Y: -170000000 - X: 1890000000 @@ -3832,6 +3788,22 @@ CompositeCollider2D: Y: -200000000 - X: 1790000000 Y: -200000000 + - - X: 2050000000 + Y: -150000000 + - X: 2010000000 + Y: -150000000 + - X: 2010000000 + Y: -170000000 + - X: 2050000000 + Y: -170000000 + - - X: 1720000000 + Y: -170000000 + - X: 1640000000 + Y: -170000000 + - X: 1640000000 + Y: -200000000 + - X: 1720000000 + Y: -200000000 - - X: 1550000000 Y: -170000000 - X: 1530000000 @@ -3840,26 +3812,6 @@ CompositeCollider2D: Y: -190000000 - X: 1550000000 Y: -190000000 - - - X: 1660000100 - Y: -200000041 - - X: 1660000100 - Y: -200000000 - - X: 1720000000 - Y: -200000000 - - X: 1720000000 - Y: -170000000 - - X: 1640000000 - Y: -170000000 - - X: 1640000000 - Y: -200000000 - - X: 1649999900 - Y: -200000000 - - X: 1649999900 - Y: -200000041 - - X: 1649999959 - Y: -200000100 - - X: 1660000041 - Y: -200000100 - - X: 840000000 Y: -180000000 - X: 820000000 @@ -3868,77 +3820,13 @@ CompositeCollider2D: Y: -200000000 - X: 840000000 Y: -200000000 - - - X: 640000000 + - - X: 790000000 Y: -180000000 - - X: 620000000 + - X: 770000000 Y: -180000000 - - X: 620000000 + - X: 770000000 Y: -200000000 - - X: 640000000 - Y: -200000000 - - - X: 690000000 - Y: -180000000 - - X: 670000000 - Y: -180000000 - - X: 670000000 - Y: -200000000 - - X: 690000000 - Y: -200000000 - - - X: 970000100 - Y: -200000041 - - X: 970000100 - Y: -200000000 - - X: 990000000 - Y: -200000000 - - X: 990000000 - Y: -180000000 - - X: 930000000 - Y: -180000000 - - X: 930000000 - Y: -200000000 - - X: 959999900 - Y: -200000000 - - X: 959999900 - Y: -200000041 - - X: 959999959 - Y: -200000100 - - X: 970000041 - Y: -200000100 - - - X: 540000000 - Y: -180000000 - - X: 520000000 - Y: -180000000 - - X: 520000000 - Y: -200000000 - - X: 540000000 - Y: -200000000 - - - X: 1080000100 - Y: -200000041 - - X: 1080000100 - Y: -200000000 - - X: 1110000000 - Y: -200000000 - - X: 1110000000 - Y: -180000000 - - X: 1020000000 - Y: -180000000 - - X: 1020000000 - Y: -200000000 - - X: 1069999900 - Y: -200000000 - - X: 1069999900 - Y: -200000041 - - X: 1069999959 - Y: -200000100 - - X: 1080000041 - Y: -200000100 - - - X: 590000000 - Y: -180000000 - - X: 570000000 - Y: -180000000 - - X: 570000000 - Y: -200000000 - - X: 590000000 + - X: 790000000 Y: -200000000 - - X: 740000000 Y: -180000000 @@ -3948,13 +3836,53 @@ CompositeCollider2D: Y: -200000000 - X: 740000000 Y: -200000000 - - - X: 790000000 + - - X: 690000000 Y: -180000000 - - X: 770000000 + - X: 670000000 Y: -180000000 - - X: 770000000 + - X: 670000000 Y: -200000000 - - X: 790000000 + - X: 690000000 + Y: -200000000 + - - X: 640000000 + Y: -180000000 + - X: 620000000 + Y: -180000000 + - X: 620000000 + Y: -200000000 + - X: 640000000 + Y: -200000000 + - - X: 990000000 + Y: -180000000 + - X: 930000000 + Y: -180000000 + - X: 930000000 + Y: -200000000 + - X: 990000000 + Y: -200000000 + - - X: 540000000 + Y: -180000000 + - X: 520000000 + Y: -180000000 + - X: 520000000 + Y: -200000000 + - X: 540000000 + Y: -200000000 + - - X: 1110000000 + Y: -180000000 + - X: 1020000000 + Y: -180000000 + - X: 1020000000 + Y: -200000000 + - X: 1110000000 + Y: -200000000 + - - X: 590000000 + Y: -180000000 + - X: 570000000 + Y: -180000000 + - X: 570000000 + Y: -200000000 + - X: 590000000 Y: -200000000 m_CompositePaths: m_Paths: @@ -4070,6 +3998,22 @@ CompositeCollider2D: - {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} + - {x: 165.99997, y: 32} + - {x: 162, y: 32.00003} + - {x: 162.00003, y: 36} + - {x: 163, y: 36.00003} + - {x: 162.99997, y: 37} + - {x: 162, y: 37.00003} + - {x: 161.99997, y: 38} + - {x: 159, y: 37.999973} + - {x: 158.99997, y: 6} + - {x: 157, y: 5.999971} + - {x: 157.00003, y: 4} + - {x: 159, y: 3.9999704} + - {x: 159.00003, y: -7} - - {x: -4.000029, y: 17} - {x: -3.9999704, y: 20} - {x: -3, y: 20.000029} @@ -4190,22 +4134,6 @@ CompositeCollider2D: - {x: -5.0000296, y: 19} - {x: -6, y: 18.999971} - {x: -5.999971, y: 17} - - - {x: 161.99997, y: -7} - - {x: 162.00003, y: 30} - - {x: 166, y: 30.000029} - - {x: 165.99997, y: 32} - - {x: 162, y: 32.00003} - - {x: 162.00003, y: 36} - - {x: 163, y: 36.00003} - - {x: 162.99997, y: 37} - - {x: 162, y: 37.00003} - - {x: 161.99997, y: 38} - - {x: 159, y: 37.999973} - - {x: 158.99997, y: 6} - - {x: 157, y: 5.999971} - - {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} @@ -4242,70 +4170,66 @@ CompositeCollider2D: - {x: -9, y: 24.000029} - {x: -8.99997, y: 33} - {x: -7, y: 33.00003} - - {x: -6.9999704, y: 33.999992} - - {x: 3, y: 33.99996} + - {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: 1.9999708, y: 30} - - {x: 1.9999708, y: 32} - - {x: -2, y: 31.999971} - - {x: -1.9999708, y: 30} - - - {x: -4.000029, y: 30} - - {x: -4.000029, y: 32} - - {x: -8, y: 31.999971} - - {x: -7.9999704, 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: 217.99997, y: 31} - {x: 217.99997, y: 32} - {x: 216, y: 31.999971} - {x: 216.00003, y: 31} - - - {x: 211.99997, y: 31} - - {x: 211.99997, y: 32} - - {x: 210, y: 31.999971} - - {x: 210.00003, y: 31} - - - {x: 205.99997, y: 31} - - {x: 205.99997, y: 32} - - {x: 204, y: 31.999971} - - {x: 204.00003, y: 31} - - - {x: 199.99997, y: 31} - - {x: 199.99997, y: 32} - - {x: 198, y: 31.999971} - - {x: 198.00003, y: 31} - - - {x: 193.99997, y: 31} - - {x: 193.99997, y: 32} - - {x: 192, y: 31.999971} - - {x: 192.00003, y: 31} - - - {x: 187.99997, y: 31} - - {x: 187.99997, y: 32} - - {x: 186, y: 31.999971} - - {x: 186.00003, y: 31} - - - {x: 181.99997, y: 31} - - {x: 181.99997, y: 32} - - {x: 178, y: 31.999971} - - {x: 178.00003, y: 31} + - - {x: 1.9999708, y: 30} + - {x: 1.9999708, y: 32} + - {x: -2, y: 31.999971} + - {x: -1.9999708, y: 30} + - - {x: 137.99997, y: 30} + - {x: 137.99997, y: 32} + - {x: 127, y: 31.999971} + - {x: 127.00003, y: 30} - - {x: 170.99997, y: 30} - {x: 171.00003, y: 31} - {x: 174, y: 31.000029} - {x: 173.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: 40.999973, y: 28} - - {x: 40.999973, y: 30} - - {x: 27, y: 29.999971} - - {x: 27.000029, y: 28} + - - {x: 181.99997, y: 31} + - {x: 181.99997, y: 32} + - {x: 178, y: 31.999971} + - {x: 178.00003, y: 31} + - - {x: 187.99997, y: 31} + - {x: 187.99997, y: 32} + - {x: 186, y: 31.999971} + - {x: 186.00003, y: 31} + - - {x: 193.99997, y: 31} + - {x: 193.99997, y: 32} + - {x: 192, y: 31.999971} + - {x: 192.00003, y: 31} + - - {x: 199.99997, y: 31} + - {x: 199.99997, y: 32} + - {x: 198, y: 31.999971} + - {x: 198.00003, y: 31} + - - {x: 211.99997, y: 31} + - {x: 211.99997, y: 32} + - {x: 210, y: 31.999971} + - {x: 210.00003, y: 31} + - - {x: 223.99997, y: 31} + - {x: 223.99997, y: 32} + - {x: 222, y: 31.999971} + - {x: 222.00003, y: 31} + - - {x: 205.99997, y: 31} + - {x: 205.99997, y: 32} + - {x: 204, y: 31.999971} + - {x: 204.00003, y: 31} + - - {x: 228.99997, y: 30} + - {x: 228.99997, y: 32} + - {x: 228, y: 31.999971} + - {x: 228.00003, y: 30} + - - {x: -4.000029, y: 30} + - {x: -4.000029, y: 32} + - {x: -8, y: 31.999971} + - {x: -7.9999704, y: 30} - - {x: 100.99997, y: 7} - {x: 101.00003, y: 9} - {x: 102, y: 9.00003} @@ -4420,6 +4344,10 @@ CompositeCollider2D: - {x: 98.99997, y: 9} - {x: 86, y: 8.99997} - {x: 86.00003, y: 7} + - - {x: 40.999973, y: 28} + - {x: 40.999973, y: 30} + - {x: 27, y: 29.999971} + - {x: 27.000029, y: 28} - - {x: 0.99997073, y: 27} - {x: 0.99997073, y: 29} - {x: -1, y: 28.999971} @@ -4432,32 +4360,14 @@ CompositeCollider2D: - {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: 223.99997, y: 24} - {x: 223.99997, y: 26} - {x: 216.99998, y: 25.999971} - {x: 217.00002, y: 24} - - - {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: -1.0000293, y: 25} + - {x: -1.0000293, y: 26} + - {x: -5, y: 25.999971} + - {x: -4.999971, y: 25} - - {x: 189.99997, y: 16} - {x: 189.99997, y: 20} - {x: 189, y: 20.000029} @@ -4468,22 +4378,48 @@ CompositeCollider2D: - {x: 186.99997, y: 21} - {x: 186, y: 20.999971} - {x: 186.00003, y: 16} - - - {x: 42.999973, y: 20} - - {x: 42.999973, y: 22} - - {x: 41, y: 21.999971} - - {x: 41.00003, y: 20} - - - {x: 185.99997, y: 21} - - {x: 185.99997, y: 22} - - {x: 185, y: 21.999971} - - {x: 185.00003, y: 21} - - - {x: 142.99997, y: 20} - - {x: 142.99997, y: 22} - - {x: 122, y: 21.999971} - - {x: 122.00003, y: 20} - - {x: 191.99997, y: 21} - {x: 191.99997, y: 22} - {x: 191, y: 21.999971} - {x: 191.00003, y: 21} + - - {x: 42.999973, y: 20} + - {x: 42.999973, y: 22} + - {x: 41, y: 21.999971} + - {x: 41.00003, y: 20} + - - {x: 142.99997, y: 20} + - {x: 142.99997, y: 22} + - {x: 122, y: 21.999971} + - {x: 122.00003, y: 20} + - - {x: 185.99997, y: 21} + - {x: 185.99997, y: 22} + - {x: 185, y: 21.999971} + - {x: 185.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: 204.99997, y: 21} + - {x: 204.99997, y: 22} + - {x: 204, y: 21.999971} + - {x: 204.00003, y: 21} + - - {x: 190.99997, y: 20} + - {x: 190.99997, y: 21} + - {x: 190, y: 20.999971} + - {x: 190.00003, y: 20} + - - {x: 199.99997, y: 20} + - {x: 199.99997, y: 21} + - {x: 199, y: 20.999971} + - {x: 199.00003, y: 20} - - {x: 215.99997, y: 15} - {x: 215.99997, y: 21} - {x: 213, y: 20.999971} @@ -4496,14 +4432,6 @@ CompositeCollider2D: - {x: 212.00003, y: 16} - {x: 213, y: 15.999971} - {x: 213.00003, y: 15} - - - {x: 199.99997, y: 20} - - {x: 199.99997, y: 21} - - {x: 199, y: 20.999971} - - {x: 199.00003, y: 20} - - - {x: 190.99997, y: 20} - - {x: 190.99997, y: 21} - - {x: 190, y: 20.999971} - - {x: 190.00003, y: 20} - - {x: 176.99997, y: 14} - {x: 177.00003, y: 16} - {x: 178, y: 16.000029} @@ -4536,14 +4464,14 @@ CompositeCollider2D: - {x: 177, y: 18.999971} - {x: 176.99997, y: 18} - {x: 176, y: 17.999971} - - - {x: 70.99997, y: 18} - - {x: 70.99997, y: 20} - - {x: 69, y: 19.999971} - - {x: 69.00003, y: 18} - - {x: 115.99998, y: 19} - {x: 115.99998, y: 20} - {x: 115, y: 19.999971} - {x: 115.00003, y: 19} + - - {x: 70.99997, y: 18} + - {x: 70.99997, y: 20} + - {x: 69, y: 19.999971} + - {x: 69.00003, y: 18} - - {x: 195.99997, y: 12} - {x: 195.99997, y: 19} - {x: 194, y: 18.999971} @@ -4560,12 +4488,6 @@ CompositeCollider2D: - {x: 72.99997, y: 15} - {x: 71, y: 14.999971} - {x: 71.00003, y: 13} - - - {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: 210.99997, y: 12} - {x: 210.99997, y: 14} - {x: 209, y: 13.999971} @@ -4576,6 +4498,12 @@ CompositeCollider2D: - {x: 51.999973, y: 14} - {x: 48, y: 13.999971} - {x: 48.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} @@ -4584,14 +4512,6 @@ CompositeCollider2D: - {x: 44.999973, y: 12} - {x: 37, y: 11.99997} - {x: 37.00003, y: 10} - - - {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: 127.99998, y: 1} - {x: 128.00003, y: 2} - {x: 130, y: 2.0000293} @@ -4644,6 +4564,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: 203.99997, y: 4} - {x: 204.00003, y: 5} - {x: 205, y: 5.000029} @@ -4664,14 +4592,14 @@ CompositeCollider2D: - {x: 185.00003, y: 5} - {x: 186, y: 4.9999704} - {x: 186.00003, y: 4} - - - {x: 221.99997, y: 5} - - {x: 221.99997, y: 8} - - {x: 216.99998, y: 7.9999704} - - {x: 217.00002, y: 5} - - {x: 28.999971, y: 6} - {x: 28.999971, y: 8} - {x: 24, y: 7.9999704} - {x: 24.000029, y: 6} + - - {x: 221.99997, y: 5} + - {x: 221.99997, y: 8} + - {x: 216.99998, y: 7.9999704} + - {x: 217.00002, y: 5} - - {x: 202, y: 5.0000296} - {x: 188, y: 5.0000296} - {x: 188.00003, y: 7} @@ -4680,10 +4608,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} @@ -4724,30 +4648,30 @@ 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} - {x: 76.00003, y: 3} - - - {x: 104.99998, y: 0.99999} - - {x: 104.99998, y: 3.00001} - - {x: 102.999985, y: 2.9999747} - - {x: 103.00003, y: 0.99999} - - - {x: 58.99997, y: 1} - - {x: 58.99997, y: 3} - - {x: 52, y: 2.999971} - - {x: 52.00003, y: 1} - - {x: 24.999971, y: 1} - {x: 24.999971, y: 3} - {x: 16, y: 2.999971} - {x: 16.000029, y: 1} + - - {x: 58.99997, y: 1} + - {x: 58.99997, y: 3} + - {x: 52, y: 2.999971} + - {x: 52.00003, y: 1} + - - {x: 104.99997, y: 1} + - {x: 104.99997, y: 3} + - {x: 103, y: 2.999971} + - {x: 103.00003, y: 1} - - {x: 226.99998, y: 1} - {x: 226.99998, y: 2} - {x: 226, y: 1.9999708} - {x: 226.00003, y: 1} - - - {x: 99.99998, y: -1.00001} - - {x: 99.99998, y: 1.00001} - - {x: 93.999985, y: 0.9999748} - - {x: 94.00002, y: -1.00001} - - {x: 215.99997, y: -6} - {x: 215.99997, y: -4} - {x: 215.00002, y: -3.9999704} @@ -4782,6 +4706,10 @@ CompositeCollider2D: - {x: 174.99997, y: 1} - {x: 167, y: 0.99997073} - {x: 167.00003, y: -2} + - - {x: 99.99997, y: -1} + - {x: 99.99997, y: 1} + - {x: 94, y: 0.99997073} + - {x: 94.00003, y: -1} - - {x: 165.99997, y: -14} - {x: 165.99997, y: -4} - {x: 164, y: -4.000029} @@ -47083,7 +47011,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: @@ -47161,7 +47089,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} @@ -47329,7 +47257,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1671840916} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 178, y: 8, z: 0} + m_LocalPosition: {x: 63, y: 4, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1008122163} @@ -47532,7 +47460,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} @@ -47691,22 +47619,126 @@ Tilemap: e31: 0 e32: 0 e33: 1 +--- !u!4 &1727766209 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1882958979} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -7.8, y: 7.65, z: 10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1146013793} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1727766210 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1882958979} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + 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: 1067504601 + m_SortingLayer: -1 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: e33008ddf5593464c90eced40f3f28e8, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 16, y: 16} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &1727766211 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1882958979} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: af4fa3c5d20488d4fa39fb11819d3f97, type: 3} + m_Name: + m_EditorClassIdentifier: + camera: {fileID: 1337282922} + renderer: {fileID: 1727766210} + scrollRate: {x: 0.4, y: 0.4} +--- !u!4 &1842108763 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + m_PrefabInstance: {fileID: 1879087608} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1879087608 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1008122163} m_Modifications: + - target: {fileID: 3827363133515929328, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_Offset.y + value: -0.022842407 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929328, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_Size.y + value: 2.624854 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929328, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_Offset.x + value: -0.001704216 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929328, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_Size.x + value: 3.1920948 + objectReference: {fileID: 0} - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, type: 3} propertyPath: m_LocalPosition.x - value: 20.83 + value: 20.5 objectReference: {fileID: 0} - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, type: 3} propertyPath: m_LocalPosition.y - value: 4.49 + value: 4.5 objectReference: {fileID: 0} - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, type: 3} @@ -47716,17 +47748,17 @@ PrefabInstance: - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, type: 3} @@ -47736,7 +47768,7 @@ PrefabInstance: - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, type: 3} propertyPath: m_RootOrder - value: 1 + value: 5 objectReference: {fileID: 0} - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, type: 3} @@ -47788,16 +47820,6 @@ PrefabInstance: propertyPath: player value: objectReference: {fileID: 1671840921} - - target: {fileID: 3827363133515929335, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, - type: 3} - propertyPath: eventTriggerCount - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 3827363133515929335, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, - type: 3} - propertyPath: controlTriggerCounterEvent - value: 2 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, type: 3} --- !u!1 &1882958979 @@ -47818,84 +47840,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1727766209 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1727766208} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -7.8, y: 7.65, z: 10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1146013793} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &1727766210 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1727766208} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - 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: 1067504601 - m_SortingLayer: -1 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: e33008ddf5593464c90eced40f3f28e8, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 16, y: 16} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!114 &1727766211 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1727766208} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: af4fa3c5d20488d4fa39fb11819d3f97, type: 3} - m_Name: - m_EditorClassIdentifier: - camera: {fileID: 1337282922} - renderer: {fileID: 1727766210} - scrollRate: {x: 0.4, y: 0.4} --- !u!1 &1895829829 GameObject: m_ObjectHideFlags: 0 @@ -48121,7 +48065,7 @@ PrefabInstance: - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_RootOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} @@ -48206,12 +48150,12 @@ PrefabInstance: - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, type: 3} propertyPath: m_LocalPosition.x - value: 2.73 + value: 2.5 objectReference: {fileID: 0} - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, type: 3} propertyPath: m_LocalPosition.y - value: -2.65 + value: -2.5 objectReference: {fileID: 0} - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, type: 3} @@ -48241,7 +48185,7 @@ PrefabInstance: - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, type: 3} propertyPath: m_RootOrder - value: 2 + value: 4 objectReference: {fileID: 0} - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, type: 3} @@ -48298,6 +48242,16 @@ PrefabInstance: propertyPath: player value: objectReference: {fileID: 1671840921} + - target: {fileID: 3827363133515929335, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: eventTriggerCount + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929335, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: controlTriggerCounterEvent + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, type: 3} --- !u!1001 &7653345758327600075 @@ -48390,7 +48344,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/EventControls.cs b/Assets/Scripts/EventControls.cs index c76cdc6..4ffb257 100644 --- a/Assets/Scripts/EventControls.cs +++ b/Assets/Scripts/EventControls.cs @@ -178,7 +178,7 @@ public class EventControls : MonoBehaviour eventTriggered = false; eventCycleAccumalator = 0; - if (maxNumberOfControlTiles == numberOfEventsCount) + if (maxNumberOfEvents == numberOfEventsCount) { player.EndEncounter(); isInBattle = false; @@ -242,7 +242,7 @@ public class EventControls : MonoBehaviour eventDrawn = false; numberOfControlTilesSet = 0; - if (maxNumberOfControlTiles == numberOfEventsCount) + if (maxNumberOfEvents == numberOfEventsCount) { if (currentEnemyCollider != null && hasFailed) Physics2D.IgnoreCollision(currentPlayerCollider, currentEnemyCollider, false); diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index cf704b7..d526b7d 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -30,17 +30,20 @@ public class Player : MonoBehaviour private Animator animator; private bool isMovementEnabled = true; private bool isFighting = false; + private bool isHurt = false; private void Start() { rigidBody = GetComponent(); collider = GetComponent(); animator = GetComponent(); - currentHealth = 1; // startHealth; - currentStamina = 50; // startStamina; + + currentHealth = startHealth; healthBar.size = new Vector2(1.5f * startHealth, healthBar.size.y); + + currentStamina = startStamina; staminaInitialSize = staminaBar.size.x; - staminaBar.size = new Vector2(staminaInitialSize * 0.5f, staminaBar.size.y); + staminaBar.size = new Vector2(staminaInitialSize, staminaBar.size.y); } private void Update() @@ -98,11 +101,13 @@ public class Player : MonoBehaviour { int result = currentStamina - GetStaminaValueChange(bugStaminaDamagePercent); currentStamina = result < 0 ? 0 : result; + float multiplier = currentStamina * 1f / startStamina; + staminaBar.size = new Vector2(staminaInitialSize * multiplier, staminaBar.size.y); } private int GetStaminaValueChange(int percentage) { - return currentStamina < startStamina ? (startStamina * percentage / 100) : 0; + return currentStamina <= startStamina ? (startStamina * percentage / 100) : 0; } @@ -115,6 +120,11 @@ public class Player : MonoBehaviour FlipSprite(); } + if (Mathf.Abs(rigidBody.velocity.y) < runErrorThreshold) + { + isHurt = false; + }; + HandleAnimations(); } @@ -217,6 +227,7 @@ public class Player : MonoBehaviour animator.SetBool("IsGround", IsPlayerOnGround()); animator.SetFloat("YVelocity", rigidBody.velocity.y); animator.SetBool("IsFighting", isFighting); + animator.SetBool("IsHurt", isHurt); } public void StartEncounter() @@ -229,11 +240,13 @@ public class Player : MonoBehaviour { isFighting = false; isMovementEnabled = true; + DecreaseStaminaAfterBugFight(); } public void ThrowUserInTheAirHurt() { GetComponent().velocity += new Vector2(Mathf.Sign(transform.localScale.x) * -1 * hurtVelocity, hurtVelocity); isFighting = false; + isHurt = true; } } diff --git a/Assets/Sprites/Enemy/Bug Physics Material.physicsMaterial2D b/Assets/Sprites/Enemy/Bug Physics Material.physicsMaterial2D new file mode 100644 index 0000000..367b283 --- /dev/null +++ b/Assets/Sprites/Enemy/Bug Physics Material.physicsMaterial2D @@ -0,0 +1,11 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!62 &6200000 +PhysicsMaterial2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Bug Physics Material + friction: 0.05 + bounciness: 0 diff --git a/Assets/Sprites/Enemy/Bug Physics Material.physicsMaterial2D.meta b/Assets/Sprites/Enemy/Bug Physics Material.physicsMaterial2D.meta new file mode 100644 index 0000000..6ace10f --- /dev/null +++ b/Assets/Sprites/Enemy/Bug Physics Material.physicsMaterial2D.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8bbf95d8d23ff94449785e66e0ae11ec +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 6200000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Hud/Controls/Buttons.png.meta b/Assets/Sprites/Hud/Controls/Buttons.png.meta index 74ab22d..98316d3 100644 --- a/Assets/Sprites/Hud/Controls/Buttons.png.meta +++ b/Assets/Sprites/Hud/Controls/Buttons.png.meta @@ -178,7 +178,7 @@ TextureImporter: width: 22 height: 22 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -197,9 +197,9 @@ TextureImporter: x: 25 y: 265 width: 22 - height: 21 + height: 22 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -218,9 +218,9 @@ TextureImporter: x: 1 y: 241 width: 22 - height: 21 + height: 22 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -239,9 +239,9 @@ TextureImporter: x: 25 y: 241 width: 22 - height: 21 + height: 22 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -262,7 +262,7 @@ TextureImporter: width: 22 height: 22 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -281,9 +281,9 @@ TextureImporter: x: 25 y: 217 width: 22 - height: 21 + height: 22 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -302,9 +302,9 @@ TextureImporter: x: 1 y: 193 width: 22 - height: 21 + height: 22 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -323,9 +323,9 @@ TextureImporter: x: 25 y: 193 width: 22 - height: 21 + height: 22 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -346,7 +346,7 @@ TextureImporter: width: 22 height: 22 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -365,9 +365,9 @@ TextureImporter: x: 25 y: 169 width: 22 - height: 21 + height: 22 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -386,9 +386,9 @@ TextureImporter: x: 1 y: 145 width: 22 - height: 21 + height: 22 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -407,9 +407,9 @@ TextureImporter: x: 25 y: 145 width: 22 - height: 21 + height: 22 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -430,7 +430,7 @@ TextureImporter: width: 22 height: 22 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -449,9 +449,9 @@ TextureImporter: x: 25 y: 121 width: 22 - height: 21 + height: 22 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -470,9 +470,9 @@ TextureImporter: x: 1 y: 97 width: 22 - height: 21 + height: 22 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -491,9 +491,9 @@ TextureImporter: x: 25 y: 97 width: 22 - height: 21 + height: 22 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -514,7 +514,7 @@ TextureImporter: width: 22 height: 22 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -533,9 +533,9 @@ TextureImporter: x: 25 y: 73 width: 22 - height: 21 + height: 22 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -554,9 +554,9 @@ TextureImporter: x: 1 y: 49 width: 22 - height: 21 + height: 22 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -575,9 +575,9 @@ TextureImporter: x: 25 y: 49 width: 22 - height: 21 + height: 22 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -598,7 +598,7 @@ TextureImporter: width: 22 height: 22 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -617,9 +617,9 @@ TextureImporter: x: 25 y: 25 width: 22 - height: 21 + height: 22 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -638,9 +638,9 @@ TextureImporter: x: 1 y: 1 width: 22 - height: 21 + height: 22 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -659,9 +659,9 @@ TextureImporter: x: 25 y: 1 width: 22 - height: 21 + height: 22 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] diff --git a/Assets/Sprites/Player/Player.controller b/Assets/Sprites/Player/Player.controller index 7c69833..22becd8 100644 --- a/Assets/Sprites/Player/Player.controller +++ b/Assets/Sprites/Player/Player.controller @@ -30,7 +30,6 @@ AnimatorStateMachine: m_ChildStateMachines: [] m_AnyStateTransitions: - {fileID: 3708718943660755162} - - {fileID: -1637549219293370904} - {fileID: -5898471161503941254} m_EntryTransitions: [] m_StateMachineTransitions: {} @@ -65,6 +64,31 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &-5886567639466225223 +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: IsHurt + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3898215635428985453} + 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: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &-4427708455344951909 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -139,7 +163,7 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &-2394224690546515301 +--- !u!1101 &-2246283339113395046 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -150,6 +174,9 @@ AnimatorStateTransition: - m_ConditionMode: 2 m_ConditionEvent: IsFighting m_EventTreshold: 0 + - m_ConditionMode: 2 + m_ConditionEvent: IsHurt + m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 0} m_Solo: 0 @@ -158,8 +185,8 @@ AnimatorStateTransition: serializedVersion: 3 m_TransitionDuration: 0.25 m_TransitionOffset: 0 - m_ExitTime: 0.75 - m_HasExitTime: 0 + m_ExitTime: 0 + m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -203,31 +230,31 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: IsGround m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: YVelocity m_Type: 1 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: IsFighting m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: IsHurt m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -488,7 +515,8 @@ AnimatorState: m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: -2394224690546515301} + - {fileID: -5886567639466225223} + - {fileID: -2246283339113395046} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index a06aa01..935a93b 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -6,6 +6,7 @@ TagManager: tags: - Pizza - Coffee + - Kat Bug layers: - Default - TransparentFX @@ -49,3 +50,6 @@ TagManager: - name: Stats uniqueID: 4179335367 locked: 0 + - name: Control Buttons + uniqueID: 2641203435 + locked: 0