diff --git a/Assets/Prefabs/Bug.prefab b/Assets/Prefabs/GioBug.prefab similarity index 79% rename from Assets/Prefabs/Bug.prefab rename to Assets/Prefabs/GioBug.prefab index b76863e..1dc2ff9 100644 --- a/Assets/Prefabs/Bug.prefab +++ b/Assets/Prefabs/GioBug.prefab @@ -13,8 +13,9 @@ GameObject: - component: {fileID: 3827363133515929328} - component: {fileID: 3827363133515929335} - component: {fileID: 3827363133515929334} + - component: {fileID: -6605527394410161759} m_Layer: 9 - m_Name: Bug + m_Name: GioBug m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -72,8 +73,9 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 96053fa04d918a448a0636f9fec1c373, type: 3} - m_Color: {r: 1, g: 0, b: 0, a: 1} + m_Sprite: {fileID: 7874731793569252650, guid: 843576248a0c2dc4eb92d627ffe951a6, + type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -96,18 +98,18 @@ BoxCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} + m_Offset: {x: 0.03701496, y: -0.01850748} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1, y: 1} + oldSize: {x: 3.1875, y: 2.6875} newSize: {x: 1, y: 1} adaptiveTilingThreshold: 0.5 drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 1, y: 1} + m_Size: {x: 2.51762, y: 2.6286669} m_EdgeRadius: 0 --- !u!114 &3827363133515929335 MonoBehaviour: @@ -123,9 +125,12 @@ MonoBehaviour: m_EditorClassIdentifier: secondsGoingLeft: 0.8 secondsGoingRight: 0.8 - movementSpeed: 2 + movementSpeed: 2.2 + eventTriggerCount: 1 + controlTriggerCounterEvent: 1 playerCollider: {fileID: 0} eventControls: {fileID: 0} + player: {fileID: 0} --- !u!50 &3827363133515929334 Rigidbody2D: serializedVersion: 4 @@ -147,3 +152,22 @@ Rigidbody2D: m_SleepingMode: 0 m_CollisionDetection: 1 m_Constraints: 0 +--- !u!95 &-6605527394410161759 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3827363133515929333} + 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 diff --git a/Assets/Prefabs/Bug.prefab.meta b/Assets/Prefabs/GioBug.prefab.meta similarity index 100% rename from Assets/Prefabs/Bug.prefab.meta rename to Assets/Prefabs/GioBug.prefab.meta diff --git a/Assets/Resources/Audio/Eat.ogg b/Assets/Resources/Audio/Eat.ogg new file mode 100644 index 0000000..96d4581 Binary files /dev/null and b/Assets/Resources/Audio/Eat.ogg differ diff --git a/Assets/Resources/Audio/Eat.ogg.meta b/Assets/Resources/Audio/Eat.ogg.meta new file mode 100644 index 0000000..aee8605 --- /dev/null +++ b/Assets/Resources/Audio/Eat.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 969fb43c02f3e464c8e0907e44dc946c +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/HardPunch.ogg b/Assets/Resources/Audio/HardPunch.ogg new file mode 100644 index 0000000..992a534 Binary files /dev/null and b/Assets/Resources/Audio/HardPunch.ogg differ diff --git a/Assets/Resources/Audio/HardPunch.ogg.meta b/Assets/Resources/Audio/HardPunch.ogg.meta new file mode 100644 index 0000000..4252a56 --- /dev/null +++ b/Assets/Resources/Audio/HardPunch.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 3095e099213c73c4182d9feeae77ebbd +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/HardSlap.ogg b/Assets/Resources/Audio/HardSlap.ogg new file mode 100644 index 0000000..45be628 Binary files /dev/null and b/Assets/Resources/Audio/HardSlap.ogg differ diff --git a/Assets/Resources/Audio/HardSlap.ogg.meta b/Assets/Resources/Audio/HardSlap.ogg.meta new file mode 100644 index 0000000..7f9b79d --- /dev/null +++ b/Assets/Resources/Audio/HardSlap.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 292f0e8e04642864daaf315efade99c7 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/Punch.ogg b/Assets/Resources/Audio/Punch.ogg new file mode 100644 index 0000000..9c8b8b7 Binary files /dev/null and b/Assets/Resources/Audio/Punch.ogg differ diff --git a/Assets/Resources/Audio/Punch.ogg.meta b/Assets/Resources/Audio/Punch.ogg.meta new file mode 100644 index 0000000..5877632 --- /dev/null +++ b/Assets/Resources/Audio/Punch.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 33e618f5ded88f7449cf8c6b88e71c8f +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/Slap.ogg b/Assets/Resources/Audio/Slap.ogg new file mode 100644 index 0000000..d0169ab Binary files /dev/null and b/Assets/Resources/Audio/Slap.ogg differ diff --git a/Assets/Resources/Audio/Slap.ogg.meta b/Assets/Resources/Audio/Slap.ogg.meta new file mode 100644 index 0000000..36a929d --- /dev/null +++ b/Assets/Resources/Audio/Slap.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: aafb1c137c5574744b6c2c5b7d5e7055 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/LevelOne.unity b/Assets/Scenes/LevelOne.unity index 03e12dc..34fc486 100644 --- a/Assets/Scenes/LevelOne.unity +++ b/Assets/Scenes/LevelOne.unity @@ -192,7 +192,6 @@ MonoBehaviour: framesPerControlTile: 8 nextControlYOffset: 2 tileMapClearDelayInSeconds: 0.5 - maxNumberOfControlTiles: 2 --- !u!483693784 &1491656 TilemapRenderer: m_ObjectHideFlags: 0 @@ -356,6 +355,21 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1518483160148691188, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_BodyType + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1747974818995494046, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_SortingLayerID + value: -115631929 + objectReference: {fileID: 0} + - target: {fileID: 1747974818995494046, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_SortingLayer + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_Offset.x @@ -424,7 +438,7 @@ PrefabInstance: - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_RootOrder - value: 6 + value: 7 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -450,6 +464,21 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1518483160148691188, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_BodyType + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1747974818995494046, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_SortingLayerID + value: -115631929 + objectReference: {fileID: 0} + - target: {fileID: 1747974818995494046, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_SortingLayer + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6870250841519595495, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_Name @@ -498,7 +527,7 @@ PrefabInstance: - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_RootOrder - value: 10 + value: 11 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -1161,6 +1190,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 256661142209474860, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_SortingLayerID + value: -115631929 + objectReference: {fileID: 0} + - target: {fileID: 256661142209474860, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_SortingLayer + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1137786072160203054, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_Name @@ -1209,7 +1248,7 @@ PrefabInstance: - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_RootOrder - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} @@ -1235,6 +1274,21 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1518483160148691188, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_BodyType + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1747974818995494046, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_SortingLayerID + value: -115631929 + objectReference: {fileID: 0} + - target: {fileID: 1747974818995494046, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_SortingLayer + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6870250841519595495, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_Name @@ -1283,7 +1337,7 @@ PrefabInstance: - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_RootOrder - value: 9 + value: 10 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -1440,7 +1494,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1008122161 GameObject: @@ -1488,7 +1542,7 @@ Transform: - {fileID: 1491654} - {fileID: 193535121} m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1028911173 PrefabInstance: @@ -1497,6 +1551,21 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1518483160148691188, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_BodyType + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1747974818995494046, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_SortingLayerID + value: -115631929 + objectReference: {fileID: 0} + - target: {fileID: 1747974818995494046, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_SortingLayer + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_Offset.x @@ -1565,7 +1634,7 @@ PrefabInstance: - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_RootOrder - value: 7 + value: 8 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -1891,26 +1960,6 @@ 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 @@ -2195,6 +2244,26 @@ 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 @@ -2259,21 +2328,21 @@ CompositeCollider2D: Y: 240000000 - X: 10000000 Y: 220000000 - - - X: -40000000 + - - X: 2289999872 Y: 320000000 - - X: -80000000 + - X: 2280000000 Y: 320000000 - - X: -80000000 + - X: 2280000000 Y: 300000000 - - X: -40000000 + - X: 2289999872 Y: 300000000 - - - X: 1880000000 + - - X: 1940000000 Y: 320000000 - - X: 1860000000 + - X: 1920000000 Y: 320000000 - - X: 1860000000 + - X: 1920000000 Y: 310000000 - - X: 1880000000 + - X: 1940000000 Y: 310000000 - - X: 2060000000 Y: 320000000 @@ -2283,34 +2352,22 @@ CompositeCollider2D: Y: 310000000 - X: 2060000000 Y: 310000000 - - - X: 1940000000 + - - X: 1880000000 Y: 320000000 - - X: 1920000000 + - X: 1860000000 Y: 320000000 - - X: 1920000000 + - X: 1860000000 Y: 310000000 - - X: 1940000000 + - X: 1880000000 Y: 310000000 - - - X: 1710000000 - Y: 310000000 - - X: 1740000000 - Y: 310000000 - - X: 1740000000 + - - X: -40000000 Y: 320000000 - - X: 1700000000 + - X: -80000000 Y: 320000000 - - X: 1700000000 + - X: -80000000 Y: 300000000 - - X: 1710000000 + - X: -40000000 Y: 300000000 - - - X: 1820000000 - Y: 320000000 - - X: 1780000000 - Y: 320000000 - - X: 1780000000 - Y: 310000000 - - X: 1820000000 - Y: 310000000 - - X: 1380000000 Y: 320000000 - X: 1270000000 @@ -2335,30 +2392,18 @@ CompositeCollider2D: Y: 310000000 - X: 2000000000 Y: 310000000 - - - X: 2289999872 - Y: 320000000 - - X: 2280000000 - Y: 320000000 - - X: 2280000000 - Y: 300000000 - - X: 2289999872 - Y: 300000000 - - - X: 20000000 - Y: 320000000 - - X: -20000000 - Y: 320000000 - - X: -20000000 - Y: 300000000 - - X: 20000000 - Y: 300000000 - - - X: 2240000000 - Y: 320000000 - - X: 2220000000 - Y: 320000000 - - X: 2220000000 + - - X: 1710000000 Y: 310000000 - - X: 2240000000 + - X: 1740000000 Y: 310000000 + - X: 1740000000 + Y: 320000000 + - X: 1700000000 + Y: 320000000 + - X: 1700000000 + Y: 300000000 + - X: 1710000000 + Y: 300000000 - - X: 2120000000 Y: 320000000 - X: 2100000000 @@ -2367,6 +2412,30 @@ CompositeCollider2D: Y: 310000000 - X: 2120000000 Y: 310000000 + - - X: 2240000000 + Y: 320000000 + - X: 2220000000 + Y: 320000000 + - X: 2220000000 + Y: 310000000 + - X: 2240000000 + Y: 310000000 + - - X: 1820000000 + Y: 320000000 + - X: 1780000000 + Y: 320000000 + - X: 1780000000 + Y: 310000000 + - X: 1820000000 + Y: 310000000 + - - X: 20000000 + Y: 320000000 + - X: -20000000 + Y: 320000000 + - X: -20000000 + Y: 300000000 + - X: 20000000 + Y: 300000000 - - X: 960000100 Y: 69999959 - X: 960000100 @@ -2478,13 +2547,13 @@ CompositeCollider2D: - X: 659999900 Y: 280000000 - X: 659999900 - Y: 269999959 + Y: 280000041 - X: 659999959 - Y: 269999900 + Y: 280000100 - X: 670000041 - Y: 269999900 + Y: 280000100 - X: 670000100 - Y: 269999959 + Y: 280000041 - X: 670000100 Y: 280000000 - X: 770000000 @@ -2735,22 +2804,6 @@ CompositeCollider2D: Y: 239999900 - X: 2220000041 Y: 239999900 - - - X: 2050000000 - Y: 220000000 - - X: 2040000000 - Y: 220000000 - - X: 2040000000 - Y: 210000000 - - X: 2050000000 - Y: 210000000 - - - X: 1920000000 - Y: 220000000 - - X: 1910000000 - Y: 220000000 - - X: 1910000000 - Y: 210000000 - - X: 1920000000 - Y: 210000000 - - X: 430000000 Y: 220000000 - X: 410000000 @@ -2767,6 +2820,22 @@ CompositeCollider2D: Y: 210000000 - X: 1990000000 Y: 210000000 + - - X: 2050000000 + Y: 220000000 + - X: 2040000000 + Y: 220000000 + - X: 2040000000 + Y: 210000000 + - X: 2050000000 + Y: 210000000 + - - X: 1920000000 + Y: 220000000 + - X: 1910000000 + Y: 220000000 + - X: 1910000000 + Y: 210000000 + - X: 1920000000 + Y: 210000000 - - X: 1860000000 Y: 220000000 - X: 1850000000 @@ -2911,22 +2980,6 @@ CompositeCollider2D: Y: 180000000 - X: 1760000000 Y: 160000000 - - - 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: 710000000 Y: 200000000 - X: 690000000 @@ -2943,14 +2996,22 @@ CompositeCollider2D: Y: 190000000 - X: 1160000000 Y: 190000000 - - - X: 1170000000 + - - X: 2140000000 + Y: 160000000 + - X: 2140000000 + Y: 170000000 + - X: 2130000000 + Y: 170000000 + - X: 2130000000 Y: 190000000 - - X: 1160000000 + - X: 2140000000 Y: 190000000 - - X: 1160000000 - Y: 180000000 - - X: 1170000000 - Y: 180000000 + - X: 2140000000 + Y: 200000000 + - X: 2150000128 + Y: 200000000 + - X: 2150000128 + Y: 160000000 - - X: 1960000000 Y: 190000000 - X: 1940000000 @@ -2959,6 +3020,14 @@ CompositeCollider2D: Y: 120000000 - X: 1960000000 Y: 120000000 + - - X: 1170000000 + Y: 190000000 + - X: 1160000000 + Y: 190000000 + - X: 1160000000 + Y: 180000000 + - X: 1170000000 + Y: 180000000 - - X: 1470000000 Y: 180000000 - X: 1450000000 @@ -2975,6 +3044,22 @@ 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 @@ -2987,14 +3072,6 @@ CompositeCollider2D: Y: 120000000 - X: 2110000000 Y: 120000000 - - - X: 1510000000 - Y: 140000000 - - X: 1490000000 - Y: 140000000 - - X: 1490000000 - Y: 120000000 - - X: 1510000000 - Y: 120000000 - - X: 1800000000 Y: 130000000 - X: 1810000000 @@ -3007,14 +3084,6 @@ CompositeCollider2D: Y: 120000000 - X: 1800000000 Y: 120000000 - - - X: 520000000 - Y: 140000000 - - X: 480000000 - Y: 140000000 - - X: 480000000 - Y: 120000000 - - X: 520000000 - Y: 120000000 - - X: 450000000 Y: 120000000 - X: 370000000 @@ -3023,6 +3092,22 @@ 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 + Y: 100000000 + - X: 700000000 + Y: 80000000 + - X: 760000000 + Y: 80000000 - - X: 1280000000 Y: 20000000 - X: 1300000000 @@ -3127,22 +3212,6 @@ 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 - Y: 100000000 - - X: 700000000 - Y: 80000000 - - X: 760000000 - Y: 80000000 - - X: 1950000100 Y: 39999959 - X: 1950000100 @@ -3207,14 +3276,6 @@ CompositeCollider2D: Y: 39999900 - X: 1950000041 Y: 39999900 - - - X: 290000000 - Y: 80000000 - - X: 240000000 - Y: 80000000 - - X: 240000000 - Y: 60000000 - - X: 290000000 - Y: 60000000 - - X: 2200000100 Y: 49999959 - X: 2200000100 @@ -3235,6 +3296,14 @@ CompositeCollider2D: Y: 49999900 - X: 2200000041 Y: 49999900 + - - X: 290000000 + Y: 80000000 + - X: 240000000 + Y: 80000000 + - X: 240000000 + Y: 60000000 + - X: 290000000 + Y: 60000000 - - X: 1880000000 Y: 50000000 - X: 1880000000 @@ -3475,6 +3544,14 @@ CompositeCollider2D: Y: -10000100 - X: 1000000041 Y: -10000100 + - - X: 1750000000 + Y: 10000000 + - X: 1670000000 + Y: 10000000 + - X: 1670000000 + Y: -20000000 + - X: 1750000000 + Y: -20000000 - - X: 2030000100 Y: -60000041 - X: 2030000100 @@ -3547,14 +3624,6 @@ CompositeCollider2D: Y: -60000100 - X: 2030000041 Y: -60000100 - - - X: 1750000000 - Y: 10000000 - - X: 1670000000 - Y: 10000000 - - X: 1670000000 - Y: -20000000 - - X: 1750000000 - Y: -20000000 - - X: 1660000000 Y: -40000000 - X: 1640000000 @@ -3587,6 +3656,34 @@ CompositeCollider2D: Y: -110000000 - X: 1160000000 Y: -110000000 + - - X: 1240000000 + Y: -90000000 + - X: 1180000000 + Y: -90000000 + - X: 1180000000 + Y: -110000000 + - X: 1240000000 + Y: -110000000 + - - X: 1550000000 + Y: -90000000 + - X: 1530000000 + Y: -90000000 + - X: 1530000000 + Y: -100000000 + - X: 1540000000 + Y: -100000000 + - X: 1540000000 + Y: -110000000 + - X: 1550000000 + Y: -110000000 + - - X: 1470000000 + Y: -90000000 + - X: 1450000000 + Y: -90000000 + - X: 1450000000 + Y: -110000000 + - X: 1470000000 + Y: -110000000 - - X: 2140000000 Y: -110000000 - X: 2159999900 @@ -3619,34 +3716,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: 1550000000 - Y: -90000000 - - X: 1530000000 - Y: -90000000 - - X: 1530000000 - Y: -100000000 - - X: 1540000000 - Y: -100000000 - - X: 1540000000 - Y: -110000000 - - X: 1550000000 - Y: -110000000 - - - X: 1470000000 - Y: -90000000 - - X: 1450000000 - Y: -90000000 - - X: 1450000000 - Y: -110000000 - - X: 1470000000 - Y: -110000000 - - X: 1780000000 Y: -120000000 - X: 1730000000 @@ -3655,6 +3724,14 @@ CompositeCollider2D: Y: -140000000 - X: 1780000000 Y: -140000000 + - - X: 1320000000 + Y: -130000000 + - X: 1240000000 + Y: -130000000 + - X: 1240000000 + Y: -150000000 + - X: 1320000000 + Y: -150000000 - - X: 1140000000 Y: -130000000 - X: 1050000000 @@ -3695,14 +3772,6 @@ CompositeCollider2D: Y: -160000000 - X: -90000000 Y: -160000000 - - - X: 1320000000 - Y: -130000000 - - X: 1240000000 - Y: -130000000 - - X: 1240000000 - Y: -150000000 - - X: 1320000000 - Y: -150000000 - - X: 2270000128 Y: -140000000 - X: 2260000000 @@ -3893,19 +3962,7 @@ CompositeCollider2D: - {x: 234.99998, y: 44} - {x: -18, y: 43.999973} - {x: -17.999971, y: -26} - - - {x: 151, y: -22.999971} - - {x: 139, y: -22.999971} - - {x: 138.99997, y: -16} - - {x: 135, y: -16.000029} - - {x: 135.00003, y: -18} - - {x: 136, y: -18.000029} - - {x: 135.99997, y: -23} - - {x: 40, y: -22.999971} - - {x: 39.999973, y: -19} - - {x: 38, y: -18.999971} - - {x: 37.999973, y: -15} - - {x: 36, y: -15.000029} - - {x: 35.999973, y: -23} + - - {x: 36, y: -22.999971} - {x: -2, y: -22.999971} - {x: -2.0000293, y: -17} - {x: -4, y: -17.000029} @@ -3991,6 +4048,18 @@ CompositeCollider2D: - {x: 153, y: -22.999971} - {x: 152.99997, y: -22} - {x: 151, y: -22.000029} + - {x: 150.99997, y: -23} + - {x: 139, y: -22.999971} + - {x: 138.99997, y: -16} + - {x: 135, y: -16.000029} + - {x: 135.00003, y: -18} + - {x: 136, y: -18.000029} + - {x: 135.99997, y: -23} + - {x: 40, y: -22.999971} + - {x: 39.999973, y: -19} + - {x: 38, y: -18.999971} + - {x: 37.999973, y: -15} + - {x: 36, y: -15.000029} - - {x: 95.99997, y: 34} - {x: 96.00003, y: 35} - {x: 97, y: 35.00003} @@ -4001,32 +4070,6 @@ CompositeCollider2D: - {x: 98.99997, y: 40} - {x: 95, y: 39.999973} - {x: 95.00003, y: 34} - - - {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: 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} @@ -4147,6 +4190,32 @@ 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} + - {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: 135.99997, y: 35} - {x: 135.99997, y: 37} - {x: 129, y: 36.999973} @@ -4179,6 +4248,14 @@ CompositeCollider2D: - {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} @@ -4225,14 +4302,6 @@ CompositeCollider2D: - {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: -4.000029, y: 30} - - {x: -4.000029, y: 32} - - {x: -8, y: 31.999971} - - {x: -7.9999704, y: 30} - - {x: 40.999973, y: 28} - {x: 40.999973, y: 30} - {x: 27, y: 29.999971} @@ -4283,10 +4352,6 @@ CompositeCollider2D: - {x: 78.99997, y: 30} - {x: 43, y: 29.999971} - {x: 43.00003, y: 28} - - {x: 65.999985, y: 27.999971} - - {x: 66.00002, y: 26.99999} - - {x: 67.000015, y: 27.000027} - - {x: 67.00004, y: 28} - {x: 77, y: 27.999971} - {x: 76.99997, y: 23} - {x: 75, y: 22.999971} @@ -4355,14 +4420,14 @@ CompositeCollider2D: - {x: 98.99997, y: 9} - {x: 86, y: 8.99997} - {x: 86.00003, y: 7} - - - {x: -4.000029, y: 27} - - {x: -4.000029, y: 29} - - {x: -6, y: 28.999971} - - {x: -5.999971, y: 27} - - {x: 0.99997073, y: 27} - {x: 0.99997073, y: 29} - {x: -1, y: 28.999971} - {x: -0.99997073, y: 27} + - - {x: -4.000029, y: 27} + - {x: -4.000029, y: 29} + - {x: -6, y: 28.999971} + - {x: -5.999971, y: 27} - - {x: 139.99997, y: 25} - {x: 139.99997, y: 27} - {x: 125, y: 26.999971} @@ -4375,18 +4440,10 @@ CompositeCollider2D: - {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: 185.99997, y: 21} - - {x: 185.99997, y: 22} - - {x: 185, y: 21.999971} - - {x: 185.00003, y: 21} - - - {x: 42.999973, y: 20} - - {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} @@ -4397,6 +4454,10 @@ CompositeCollider2D: - {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: 189.99997, y: 16} - {x: 189.99997, y: 20} - {x: 189, y: 20.000029} @@ -4407,6 +4468,14 @@ 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} @@ -4415,10 +4484,18 @@ CompositeCollider2D: - {x: 191.99997, y: 22} - {x: 191, y: 21.999971} - {x: 191.00003, y: 21} - - - {x: 198.99997, y: 21} - - {x: 198.99997, y: 22} - - {x: 198, y: 21.999971} - - {x: 198.00003, y: 21} + - - {x: 215.99997, y: 15} + - {x: 215.99997, y: 21} + - {x: 213, y: 20.999971} + - {x: 212.99997, y: 20} + - {x: 212, y: 19.999971} + - {x: 211.99997, y: 19} + - {x: 211, y: 18.999971} + - {x: 211.00003, y: 18} + - {x: 212, y: 17.999971} + - {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} @@ -4441,18 +4518,6 @@ CompositeCollider2D: - {x: 173.00003, y: 15} - {x: 174, y: 14.999971} - {x: 174.00003, y: 14} - - - {x: 215.99997, y: 15} - - {x: 215.99997, y: 21} - - {x: 213, y: 20.999971} - - {x: 212.99997, y: 20} - - {x: 212, y: 19.999971} - - {x: 211.99997, y: 19} - - {x: 211, y: 18.999971} - - {x: 211.00003, y: 18} - - {x: 212, y: 17.999971} - - {x: 212.00003, y: 16} - - {x: 213, y: 15.999971} - - {x: 213.00003, y: 15} - - {x: 215.00002, y: 16.000029} - {x: 214, y: 16.000029} - {x: 213.99997, y: 17} @@ -4471,22 +4536,22 @@ CompositeCollider2D: - {x: 177, y: 18.999971} - {x: 176.99997, y: 18} - {x: 176, y: 17.999971} - - - {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: 116.99998, y: 18} - - {x: 116.99998, y: 19} - - {x: 116, y: 18.999971} - - {x: 116.00003, y: 18} + - - {x: 115.99998, y: 19} + - {x: 115.99998, y: 20} + - {x: 115, y: 19.999971} + - {x: 115.00003, y: 19} - - {x: 195.99997, y: 12} - {x: 195.99997, y: 19} - {x: 194, y: 18.999971} - {x: 194.00003, y: 12} + - - {x: 116.99998, y: 18} + - {x: 116.99998, y: 19} + - {x: 116, y: 18.999971} + - {x: 116.00003, y: 18} - - {x: 146.99997, y: 16} - {x: 146.99997, y: 18} - {x: 145, y: 17.999971} @@ -4519,6 +4584,10 @@ 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} @@ -4575,10 +4644,6 @@ CompositeCollider2D: - {x: 125.00003, y: 2} - {x: 127, y: 1.9999707} - {x: 127.00003, y: 1} - - - {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} @@ -4667,14 +4732,14 @@ CompositeCollider2D: - {x: 104.99998, y: 3.00001} - {x: 102.999985, y: 2.9999747} - {x: 103.00003, y: 0.99999} - - - {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: 24.999971, y: 1} + - {x: 24.999971, y: 3} + - {x: 16, y: 2.999971} + - {x: 16.000029, y: 1} - - {x: 226.99998, y: 1} - {x: 226.99998, y: 2} - {x: 226, y: 1.9999708} @@ -4683,10 +4748,6 @@ CompositeCollider2D: - {x: 99.99998, y: 1.00001} - {x: 93.999985, y: 0.9999748} - {x: 94.00002, y: -1.00001} - - - {x: 174.99997, y: -2} - - {x: 174.99997, y: 1} - - {x: 167, y: 0.99997073} - - {x: 167.00003, y: -2} - - {x: 215.99997, y: -6} - {x: 215.99997, y: -4} - {x: 215.00002, y: -3.9999704} @@ -4717,18 +4778,22 @@ CompositeCollider2D: - {x: 185.99997, y: -3} - {x: 177, y: -3.0000293} - {x: 177.00003, y: -6} + - - {x: 174.99997, y: -2} + - {x: 174.99997, y: 1} + - {x: 167, y: 0.99997073} + - {x: 167.00003, y: -2} - - {x: 165.99997, y: -14} - {x: 165.99997, y: -4} - {x: 164, y: -4.000029} - {x: 164.00003, y: -14} - - - {x: 226.99998, y: -6} - - {x: 226.99998, y: -5} - - {x: 226, y: -5.000029} - - {x: 226.00003, y: -6} - - {x: 142.99997, y: -7} - {x: 142.99997, y: -5} - {x: 141, y: -5.000029} - {x: 141.00003, y: -7} + - - {x: 226.99998, y: -6} + - {x: 226.99998, y: -5} + - {x: 226, y: -5.000029} + - {x: 226.00003, y: -6} - - {x: 115.99998, y: -11} - {x: 115.99998, y: -8} - {x: 113, y: -8.00003} @@ -4761,18 +4826,10 @@ CompositeCollider2D: - {x: 177.99997, y: -12} - {x: 173, y: -12.00003} - {x: 173.00003, y: -14} - - - {x: 150.99997, y: -15} - - {x: 150.99997, y: -13} - - {x: 149, y: -13.00003} - - {x: 149.00003, y: -15} - - {x: 131.99997, y: -15} - {x: 131.99997, y: -13} - {x: 124, y: -13.00003} - {x: 124.00003, y: -15} - - - {x: 113.99998, y: -15} - - {x: 113.99998, y: -13} - - {x: 105, y: -13.00003} - - {x: 105.00003, y: -15} - - {x: -9.00003, y: -16} - {x: -8.99997, y: -15} - {x: -5, y: -14.999971} @@ -4785,6 +4842,14 @@ CompositeCollider2D: - {x: -13.999971, y: -15} - {x: -10, y: -15.000029} - {x: -9.99997, y: -16} + - - {x: 150.99997, y: -15} + - {x: 150.99997, y: -13} + - {x: 149, y: -13.00003} + - {x: 149.00003, y: -15} + - - {x: 113.99998, y: -15} + - {x: 113.99998, y: -13} + - {x: 105, y: -13.00003} + - {x: 105.00003, y: -15} - - {x: 226.99998, y: -15} - {x: 226.99998, y: -14} - {x: 226, y: -14.000029} @@ -4817,42 +4882,42 @@ CompositeCollider2D: - {x: 171.99997, y: -17} - {x: 164, y: -17.000029} - {x: 164.00003, y: -20} - - - {x: 53.99997, y: -20} - - {x: 53.99997, y: -18} - - {x: 52, y: -18.000029} - - {x: 52.00003, y: -20} - - - {x: 58.99997, y: -20} - - {x: 58.99997, y: -18} - - {x: 57, y: -18.000029} - - {x: 57.000034, y: -20} - - - {x: 98.99997, y: -20} - - {x: 98.99997, y: -18} - - {x: 93, y: -18.000029} - - {x: 93.00003, y: -20} - - - {x: 63.99997, y: -20} - - {x: 63.99997, y: -18} - - {x: 62, y: -18.000029} - - {x: 62.000034, y: -20} - - - {x: 68.99997, y: -20} - - {x: 68.99997, y: -18} - - {x: 67, y: -18.000029} - - {x: 67.00003, y: -20} - - - {x: 73.99997, y: -20} - - {x: 73.99997, y: -18} - - {x: 72, y: -18.000029} - - {x: 72.00003, y: -20} - - - {x: 78.99997, y: -20} - - {x: 78.99997, y: -18} - - {x: 77, y: -18.000029} - - {x: 77.00003, y: -20} - - - {x: 83.99997, y: -20} - - {x: 83.99997, y: -18} - - {x: 82, y: -18.000029} - - {x: 82.00003, y: -20} - - {x: 110.99998, y: -20} - {x: 110.99998, y: -18} - {x: 102, y: -18.000029} - {x: 102.00003, y: -20} + - - {x: 98.99997, y: -20} + - {x: 98.99997, y: -18} + - {x: 93, y: -18.000029} + - {x: 93.00003, y: -20} + - - {x: 53.99997, y: -20} + - {x: 53.99997, y: -18} + - {x: 52, y: -18.000029} + - {x: 52.00003, y: -20} + - - {x: 83.99997, y: -20} + - {x: 83.99997, y: -18} + - {x: 82, y: -18.000029} + - {x: 82.00003, y: -20} + - - {x: 78.99997, y: -20} + - {x: 78.99997, y: -18} + - {x: 77, y: -18.000029} + - {x: 77.00003, y: -20} + - - {x: 73.99997, y: -20} + - {x: 73.99997, y: -18} + - {x: 72, y: -18.000029} + - {x: 72.00003, y: -20} + - - {x: 68.99997, y: -20} + - {x: 68.99997, y: -18} + - {x: 67, y: -18.000029} + - {x: 67.00003, y: -20} + - - {x: 63.99997, y: -20} + - {x: 63.99997, y: -18} + - {x: 62, y: -18.000029} + - {x: 62.000034, y: -20} + - - {x: 58.99997, y: -20} + - {x: 58.99997, y: -18} + - {x: 57, y: -18.000029} + - {x: 57.000034, y: -20} m_VertexDistance: 0.0005 m_OffsetDistance: 0.00005 --- !u!50 &1168076125 @@ -36159,15 +36224,6 @@ Tilemap: m_ObjectToInstantiate: {fileID: 0} m_TileFlags: 1 m_ColliderType: 1 - - first: {x: 66, y: 27, z: 0} - second: - m_TileIndex: 1 - m_TileSpriteIndex: 1 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_ObjectToInstantiate: {fileID: 0} - m_TileFlags: 1 - m_ColliderType: 1 - first: {x: 77, y: 27, z: 0} second: m_TileIndex: 13 @@ -46693,7 +46749,7 @@ Tilemap: m_TileAssetArray: - m_RefCount: 512 m_Data: {fileID: 11400000, guid: b98293ab7079f3946af95fe3be8f180f, type: 2} - - m_RefCount: 64 + - m_RefCount: 63 m_Data: {fileID: 11400000, guid: dc76772538c87ba458001f32837928d8, type: 2} - m_RefCount: 11 m_Data: {fileID: 11400000, guid: 1ee6b2c7cac195443bfce27e445dcfa1, type: 2} @@ -46761,7 +46817,7 @@ Tilemap: - m_RefCount: 512 m_Data: {fileID: 4953425847005770445, guid: 49aff731d4c5d904cb4a96efda174435, type: 3} - - m_RefCount: 64 + - m_RefCount: 63 m_Data: {fileID: -5673457028595952737, guid: 49aff731d4c5d904cb4a96efda174435, type: 3} - m_RefCount: 11 @@ -46858,7 +46914,7 @@ Tilemap: m_Data: {fileID: -4413646081541789752, guid: 49aff731d4c5d904cb4a96efda174435, type: 3} m_TileMatrixArray: - - m_RefCount: 4638 + - m_RefCount: 4637 m_Data: e00: 1 e01: 0 @@ -46877,7 +46933,7 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 4638 + - m_RefCount: 4637 m_Data: {r: 1, g: 1, b: 1, a: 1} m_AnimationFrameRate: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -47027,7 +47083,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1247097598 stripped Transform: @@ -47042,6 +47098,21 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1518483160148691188, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_BodyType + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1747974818995494046, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_SortingLayerID + value: -115631929 + objectReference: {fileID: 0} + - target: {fileID: 1747974818995494046, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_SortingLayer + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6870250841519595495, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_Name @@ -47090,7 +47161,7 @@ PrefabInstance: - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_RootOrder - value: 8 + value: 9 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -47258,7 +47329,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1671840916} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -5.5, y: -2, z: 0} + m_LocalPosition: {x: 178, y: 8, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1008122163} @@ -47403,6 +47474,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 256661142209474860, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_SortingLayerID + value: -115631929 + objectReference: {fileID: 0} + - target: {fileID: 256661142209474860, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_SortingLayer + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1137786072160203054, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_Name @@ -47451,7 +47532,7 @@ PrefabInstance: - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_RootOrder - value: 5 + value: 6 objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} @@ -47610,7 +47691,116 @@ Tilemap: e31: 0 e32: 0 e33: 1 ---- !u!1 &1727766208 +--- !u!1001 &1879087608 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalPosition.x + value: 20.83 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_LocalPosition.y + value: 4.49 + 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: 1 + 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: GioBug + 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} + - 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 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -47873,6 +48063,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 256661142209474860, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_SortingLayerID + value: -115631929 + objectReference: {fileID: 0} + - target: {fileID: 256661142209474860, guid: f859e1c9214db2c4eaaeff51febb3222, + type: 3} + propertyPath: m_SortingLayer + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1137786072160203054, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_Name @@ -47886,12 +48086,12 @@ PrefabInstance: - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_LocalPosition.x - value: 42.01 + value: 54.1 objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_LocalPosition.y - value: 22.76 + value: 32.6 objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} @@ -47947,16 +48147,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1008122163} m_Modifications: - - target: {fileID: 3827363133515929328, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, - type: 3} - 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 @@ -48003,6 +48193,16 @@ PrefabInstance: propertyPath: m_Color.b value: 1 objectReference: {fileID: 0} + - target: {fileID: 3827363133515929329, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_SortingLayerID + value: -115631929 + objectReference: {fileID: 0} + - target: {fileID: 3827363133515929329, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + propertyPath: m_SortingLayer + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, type: 3} propertyPath: m_LocalPosition.x @@ -48076,27 +48276,12 @@ PrefabInstance: - target: {fileID: 3827363133515929333, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, type: 3} propertyPath: m_Name - value: Bug + value: GioBug objectReference: {fileID: 0} - target: {fileID: 3827363133515929334, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, type: 3} - propertyPath: m_BodyType - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3827363133515929335, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, - type: 3} - propertyPath: movementSpeed - value: 2.2 - objectReference: {fileID: 0} - - target: {fileID: 3827363133515929335, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, - type: 3} - propertyPath: secondsGoingLeft - value: 0.8 - objectReference: {fileID: 0} - - target: {fileID: 3827363133515929335, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, - type: 3} - propertyPath: secondsGoingRight - value: 0.8 + propertyPath: m_Constraints + value: 4 objectReference: {fileID: 0} - target: {fileID: 3827363133515929335, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, type: 3} @@ -48122,6 +48307,21 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1518483160148691188, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_BodyType + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1747974818995494046, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_SortingLayerID + value: -115631929 + objectReference: {fileID: 0} + - target: {fileID: 1747974818995494046, guid: 2ccb08e2c4b8851498f8ecbf1a873146, + type: 3} + propertyPath: m_SortingLayer + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5520736153122788072, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_Offset.x @@ -48155,12 +48355,12 @@ PrefabInstance: - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_LocalPosition.x - value: 64.76 + value: 62.25 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_LocalPosition.y - value: 14.07 + value: 13.71 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} @@ -48190,7 +48390,7 @@ PrefabInstance: - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} propertyPath: m_RootOrder - value: 4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 7123021364386132083, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} diff --git a/Assets/Scripts/BugMovement.cs b/Assets/Scripts/BugMovement.cs index f9f26ef..a649756 100644 --- a/Assets/Scripts/BugMovement.cs +++ b/Assets/Scripts/BugMovement.cs @@ -7,6 +7,8 @@ public class BugMovement : MonoBehaviour [SerializeField] private float secondsGoingLeft = 1; [SerializeField] private float secondsGoingRight = 1; [SerializeField] private float movementSpeed = 10; + [SerializeField] public int eventTriggerCount = 3; + [SerializeField] public int controlTriggerCounterEvent = 3; [SerializeField] Collider2D playerCollider; [SerializeField] EventControls eventControls; [SerializeField] Player player; @@ -14,6 +16,7 @@ public class BugMovement : MonoBehaviour private int leftAccumalator = 0; private int rightAccumalator = 0; private Rigidbody2D rigidBody; + private bool isMovementDisabled = false; private int framesPerSecond => 60; @@ -27,6 +30,8 @@ public class BugMovement : MonoBehaviour { if (HasEncounteredPlayer()) eventControls.TriggerEvent(playerCollider, GetComponent(), player); + if (isMovementDisabled) + return; var totalFramesGoingLeft = framesPerSecond * secondsGoingLeft; var totalFramesGoingRight = framesPerSecond * secondsGoingRight; @@ -65,4 +70,14 @@ public class BugMovement : MonoBehaviour { return rigidBody.IsTouchingLayers(LayerMask.GetMask(LayerNames.Player)); } + + public void DisableMovement() + { + isMovementDisabled = true; + } + + public void EnableMovement() + { + isMovementDisabled = false; + } } diff --git a/Assets/Scripts/EventControls.cs b/Assets/Scripts/EventControls.cs index b9f8b89..95f2308 100644 --- a/Assets/Scripts/EventControls.cs +++ b/Assets/Scripts/EventControls.cs @@ -13,11 +13,19 @@ public class EventControls : MonoBehaviour [SerializeField] private List successTiles; [SerializeField] private List failTiles; [SerializeField] private Tile plusTile; + [SerializeField] private float framesPerControlTile = 15; [SerializeField] private int nextControlYOffset = 0; private int nextControlXOffset => 0 - maxNumberOfControlTiles + 1; [SerializeField] private float tileMapClearDelayInSeconds = 0.5f; - [SerializeField] private int maxNumberOfControlTiles = 2; + private int numberOfEventsCount = 0; + + private int maxNumberOfEvents => currentEnemyCollider.gameObject + .GetComponent() + .eventTriggerCount; + private int maxNumberOfControlTiles => currentEnemyCollider.gameObject + .GetComponent() + .controlTriggerCounterEvent; private Tilemap tilemap; @@ -33,6 +41,7 @@ public class EventControls : MonoBehaviour private int tileMapClearDelayAccumalator = 0; private EventControlTile currentEventControl; private bool isInBattle = false; + private bool hasFailed = false; private Collider2D currentPlayerCollider; private Collider2D currentEnemyCollider; @@ -46,10 +55,15 @@ public class EventControls : MonoBehaviour public void TriggerEvent(Collider2D playerCollider, Collider2D enemyCollider, Player player) { + if (isInBattle) + return; + currentPlayerCollider = playerCollider; currentEnemyCollider = enemyCollider; enemyCollider.gameObject.GetComponent().enabled = false; + enemyCollider.gameObject.GetComponent().DisableMovement(); + player.StartEncounter(); Physics2D.IgnoreCollision(playerCollider, enemyCollider, true); @@ -160,10 +174,18 @@ public class EventControls : MonoBehaviour currentEventControl = null; if (eventControlTilesInCycle.Where(x => !x.isPlusTile && !x.isPerformed).Count() == 0) { + numberOfEventsCount++; eventTriggered = false; eventCycleAccumalator = 0; - // Destroy(currentEnemyCollider.gameObject); - // currentEnemyCollider = null; + + if (maxNumberOfControlTiles == numberOfEventsCount) + { + player.EndEncounter(); + isInBattle = false; + // Destroy(currentEnemyCollider.gameObject); + // currentEnemyCollider = null; + hasFailed = false; + } } return; @@ -174,9 +196,16 @@ public class EventControls : MonoBehaviour isInBattle = false; eventCycleAccumalator = 0; currentEventControl = null; - + numberOfEventsCount = 0; + hasFailed = true; + player.ThrowUserInTheAirHurt(); SoundManagerScript.PlaySound("bug laugh"); + + currentEnemyCollider.gameObject.GetComponent().enabled = true; + currentEnemyCollider.gameObject.GetComponent().EnableMovement(); + player.EndEncounter(); + return; } else if (FailedToClickCorrect(currentEventControl.keyCode)) @@ -187,8 +216,15 @@ public class EventControls : MonoBehaviour isInBattle = false; eventCycleAccumalator = 0; currentEventControl = null; + numberOfEventsCount = 0; + hasFailed = true; player.ThrowUserInTheAirHurt(); + + currentEnemyCollider.gameObject.GetComponent().enabled = true; + currentEnemyCollider.gameObject.GetComponent().EnableMovement(); + player.EndEncounter(); + SoundManagerScript.PlaySound("bug laugh"); return; } @@ -206,16 +242,26 @@ public class EventControls : MonoBehaviour eventDrawn = false; numberOfControlTilesSet = 0; - if (currentEnemyCollider != null) - Physics2D.IgnoreCollision(currentPlayerCollider, currentEnemyCollider, false); - if (!isInBattle) + if (maxNumberOfControlTiles == numberOfEventsCount) { - currentEnemyCollider.gameObject.GetComponent().enabled = true; - player.EndEncounter(); - } + if (currentEnemyCollider != null && hasFailed) + Physics2D.IgnoreCollision(currentPlayerCollider, currentEnemyCollider, false); - currentPlayerCollider = null; - currentEnemyCollider = null; + numberOfEventsCount = 0; + currentPlayerCollider = null; + currentEnemyCollider = null; + } + else + { + eventTriggered = true && !hasFailed; + isInBattle = true && !hasFailed; + + if (hasFailed) + { + if (currentEnemyCollider != null) + Physics2D.IgnoreCollision(currentPlayerCollider, currentEnemyCollider, false); + } + } } else { @@ -228,7 +274,7 @@ public class EventControls : MonoBehaviour // var offset = camera.transform.position.x - (int)camera.transform.position.x; // transform.position = new Vector3(transform.position.x + offset, transform.position.y, 0); //} - + private EventControlTile GenerateEventControlTile(Vector3Int position) { var randomNumber = Random.Range(0, TileToKeyMappings.TileToKey.Count); diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index 7ffa1fe..9f2eb07 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -31,6 +31,8 @@ public class Player : MonoBehaviour private bool isMovementEnabled = true; private bool isFighting = false; + private bool isPlayerHurt = false; + private void Start() { rigidBody = GetComponent(); @@ -75,6 +77,7 @@ public class Player : MonoBehaviour if (coll.gameObject.tag == "Pizza") { Destroy(coll.gameObject); + SoundManagerScript.PlaySound("eat"); currentHealth += currentHealth < startHealth ? 1 : 0; healthBar.size = new Vector2(1.5f * currentHealth, this.healthBar.size.y); } @@ -114,7 +117,7 @@ public class Player : MonoBehaviour Run(); FlipSprite(); } - + PlayFightSound(); HandleAnimations(); } @@ -219,20 +222,39 @@ public class Player : MonoBehaviour animator.SetBool("IsFighting", isFighting); } + private void PlayFightSound() + { + if (isFighting && !isPlayerHurt) + { + SoundManagerScript.PlaySound(GetRandomFightClipName()); + } + } + + private string GetRandomFightClipName() + { + var fightClipNames = new List { "punch", "hard punch", "slap", "hard slap" }; + var randomNumber = UnityEngine.Random.Range(0, fightClipNames.Count); + return fightClipNames[randomNumber]; + } + public void StartEncounter() { + isPlayerHurt = false; isFighting = true; isMovementEnabled = false; } public void EndEncounter() { + isPlayerHurt = false; isFighting = false; isMovementEnabled = true; } public void ThrowUserInTheAirHurt() - { + { + isPlayerHurt = true; GetComponent().velocity += new Vector2(Mathf.Sign(transform.localScale.x) * -1 * hurtVelocity, hurtVelocity); + isFighting = false; } } diff --git a/Assets/Scripts/SoundManagerScript.cs b/Assets/Scripts/SoundManagerScript.cs index 8964c0f..7b13777 100644 --- a/Assets/Scripts/SoundManagerScript.cs +++ b/Assets/Scripts/SoundManagerScript.cs @@ -5,7 +5,9 @@ using UnityEngine; public class SoundManagerScript : MonoBehaviour { - public static AudioClip jumpSound, screamSound, wrongButtonSound, bugLaughSound, drinkSound; + public static AudioClip jumpSound, screamSound, wrongButtonSound, + bugLaughSound, drinkSound, eatSound, punchSound, hardPunchSound, + slapSound, hardSlapSound, winSound; static AudioSource audioSrc; // Start is called before the first frame update @@ -16,6 +18,11 @@ public class SoundManagerScript : MonoBehaviour wrongButtonSound = Resources.Load("Audio/WrongButton"); bugLaughSound = Resources.Load("Audio/BugLaugh"); drinkSound = Resources.Load("Audio/Drink"); + eatSound = Resources.Load("Audio/Eat"); + punchSound = Resources.Load("Audio/Punch"); + hardPunchSound = Resources.Load("Audio/HardPunch"); + slapSound = Resources.Load("Audio/Slap"); + hardSlapSound = Resources.Load("Audio/HardSlap"); audioSrc = GetComponent(); } @@ -45,6 +52,25 @@ public class SoundManagerScript : MonoBehaviour case "drink": audioSrc.PlayOneShot(drinkSound); break; + case "eat": + audioSrc.PlayOneShot(eatSound); + break; + case "punch": + audioSrc.PlayOneShot(punchSound); + break; + case "hard punch": + audioSrc.PlayOneShot(hardPunchSound); + break; + case "slap": + audioSrc.PlayOneShot(slapSound); + break; + case "hard slap": + audioSrc.PlayOneShot(hardSlapSound); + break; + case "win": + audioSrc.PlayOneShot(winSound); + break; + } } } diff --git a/Assets/Sprites/Player/Player.controller b/Assets/Sprites/Player/Player.controller index 6de6176..7c69833 100644 --- a/Assets/Sprites/Player/Player.controller +++ b/Assets/Sprites/Player/Player.controller @@ -31,6 +31,7 @@ AnimatorStateMachine: m_AnyStateTransitions: - {fileID: 3708718943660755162} - {fileID: -1637549219293370904} + - {fileID: -5898471161503941254} m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] @@ -39,7 +40,7 @@ AnimatorStateMachine: m_ExitPosition: {x: 390, y: 70, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: -2991084837782200938} ---- !u!1101 &-5610768259902955866 +--- !u!1101 &-5898471161503941254 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -47,11 +48,11 @@ AnimatorStateTransition: m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - - m_ConditionMode: 2 + - m_ConditionMode: 1 m_ConditionEvent: IsFighting m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -2991084837782200938} + m_DstState: {fileID: 5819910786424590319} m_Solo: 0 m_Mute: 0 m_IsExit: 0 @@ -123,7 +124,6 @@ AnimatorState: m_CycleOffset: 0 m_Transitions: - {fileID: -4109286016316069763} - - {fileID: -880235167412170940} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -139,7 +139,7 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &-1637549219293370904 +--- !u!1101 &-2394224690546515301 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -147,16 +147,16 @@ AnimatorStateTransition: m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: IsHurt + - m_ConditionMode: 2 + m_ConditionEvent: IsFighting m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 3898215635428985453} + m_DstState: {fileID: 0} m_Solo: 0 m_Mute: 0 - m_IsExit: 0 + m_IsExit: 1 serializedVersion: 3 - m_TransitionDuration: 0 + m_TransitionDuration: 0.25 m_TransitionOffset: 0 m_ExitTime: 0.75 m_HasExitTime: 0 @@ -488,7 +488,7 @@ AnimatorState: m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: -5610768259902955866} + - {fileID: -2394224690546515301} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0