From 401ae023a2779b54be7cf14fd95475956314b1e1 Mon Sep 17 00:00:00 2001 From: Giovani Date: Sun, 2 Feb 2020 13:21:44 -0500 Subject: [PATCH] fixed jack bug levitating --- Assets/Prefabs/GioBug.prefab | 2 +- Assets/Prefabs/JackBug Variant.prefab | 137 ++++++++ Assets/Prefabs/JackBug Variant.prefab.meta | 7 + Assets/Scenes/LevelOne.unity | 322 +++++++++++++----- Assets/Scripts/Player.cs | 4 + .../Sprites/Collectibles/Coffee Animation.png | Bin 0 -> 1094 bytes .../Collectibles/Coffee Animation.png.meta | 91 +++++ .../Bug Physics Material.physicsMaterial2D | 2 +- Assets/Sprites/Player/Player.controller | 5 +- ProjectSettings/TagManager.asset | 1 + 10 files changed, 485 insertions(+), 86 deletions(-) create mode 100644 Assets/Prefabs/JackBug Variant.prefab create mode 100644 Assets/Prefabs/JackBug Variant.prefab.meta create mode 100644 Assets/Sprites/Collectibles/Coffee Animation.png create mode 100644 Assets/Sprites/Collectibles/Coffee Animation.png.meta diff --git a/Assets/Prefabs/GioBug.prefab b/Assets/Prefabs/GioBug.prefab index 5c6ae07..7146893 100644 --- a/Assets/Prefabs/GioBug.prefab +++ b/Assets/Prefabs/GioBug.prefab @@ -151,7 +151,7 @@ Rigidbody2D: m_Interpolate: 0 m_SleepingMode: 0 m_CollisionDetection: 1 - m_Constraints: 0 + m_Constraints: 4 --- !u!95 &-6605527394410161759 Animator: serializedVersion: 3 diff --git a/Assets/Prefabs/JackBug Variant.prefab b/Assets/Prefabs/JackBug Variant.prefab new file mode 100644 index 0000000..863287e --- /dev/null +++ b/Assets/Prefabs/JackBug Variant.prefab @@ -0,0 +1,137 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &4498330050389957151 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4815066122311201376, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: playerCollider + value: + objectReference: {fileID: 0} + - target: {fileID: 4815066122311201376, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: eventControls + value: + objectReference: {fileID: 0} + - target: {fileID: 4815066122311201376, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: player + value: + objectReference: {fileID: 0} + - target: {fileID: 4815066122311201376, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: movementSpeed + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4815066122311201377, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 6200000, guid: 8bbf95d8d23ff94449785e66e0ae11ec, type: 2} + - target: {fileID: 4815066122311201377, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: m_Constraints + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 4815066122311201378, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: m_Name + value: JackBug Variant + objectReference: {fileID: 0} + - target: {fileID: 4815066122311201378, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: m_TagString + value: Jack Bug + objectReference: {fileID: 0} + - target: {fileID: 4815066122311201381, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: m_LocalPosition.x + value: 55.5 + objectReference: {fileID: 0} + - target: {fileID: 4815066122311201381, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: m_LocalPosition.y + value: -11.5 + 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: 0 + 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} + - target: {fileID: 4815066122311201381, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: m_LocalScale.x + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 4815066122311201382, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -6315775801511994756, guid: 62b02404473a1014f8c946f474c39aa9, + type: 3} + - target: {fileID: 4815066122311201383, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: m_SpriteTilingProperty.pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4815066122311201383, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: m_SpriteTilingProperty.oldSize.y + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6024541455133375798, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: m_Controller + value: + objectReference: {fileID: 9100000, guid: fd65b2863cc560a40b6ad3af267aac55, type: 2} + - target: {fileID: 6024541455133375798, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: m_ApplyRootMotion + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c98830a6bebcdc24b91c550a26c9b621, type: 3} diff --git a/Assets/Prefabs/JackBug Variant.prefab.meta b/Assets/Prefabs/JackBug Variant.prefab.meta new file mode 100644 index 0000000..c1701d1 --- /dev/null +++ b/Assets/Prefabs/JackBug Variant.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: cc74a3ff6f657d842b5731190a6074d7 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/LevelOne.unity b/Assets/Scenes/LevelOne.unity index cd79654..b49a56e 100644 --- a/Assets/Scenes/LevelOne.unity +++ b/Assets/Scenes/LevelOne.unity @@ -167,6 +167,7 @@ MonoBehaviour: m_EditorClassIdentifier: player: {fileID: 1671840921} camera: {fileID: 1337282922} + music: {fileID: 0} tiles: - {fileID: 11400000, guid: 1f7bfa5ee72002646806268d14bfeb3b, type: 2} - {fileID: 11400000, guid: e85f8319cdf4358448a9002845cfbd5a, type: 2} @@ -1486,6 +1487,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} +--- !u!4 &851631687 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3827363133515929330, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, + type: 3} + m_PrefabInstance: {fileID: 1879087608} + m_PrefabAsset: {fileID: 0} --- !u!1 &925144586 GameObject: m_ObjectHideFlags: 0 @@ -1766,12 +1773,20 @@ Transform: - {fileID: 1491654} - {fileID: 193535121} - {fileID: 1247097598} - - {fileID: 1842108763} + - {fileID: 851631687} - {fileID: 8021909} - {fileID: 951888605} + - {fileID: 1200440357} + - {fileID: 1028395223} m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &1028395223 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8989126000173721722, guid: cc74a3ff6f657d842b5731190a6074d7, + type: 3} + m_PrefabInstance: {fileID: 8942784746345332693} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1028911173 PrefabInstance: m_ObjectHideFlags: 0 @@ -46886,6 +46901,111 @@ Tilemap: e31: 0 e32: 0 e33: 1 +--- !u!1001 &1200440356 +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: 4815066122311201376, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: movementSpeed + value: 3 + objectReference: {fileID: 0} + - 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: 14 + objectReference: {fileID: 0} + - target: {fileID: 4815066122311201381, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: m_LocalPosition.y + value: -13 + 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: 8 + 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} + - target: {fileID: 4815066122311201381, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c98830a6bebcdc24b91c550a26c9b621, type: 3} +--- !u!4 &1200440357 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4815066122311201381, guid: c98830a6bebcdc24b91c550a26c9b621, + type: 3} + m_PrefabInstance: {fileID: 1200440356} + m_PrefabAsset: {fileID: 0} --- !u!1 &1220663790 GameObject: m_ObjectHideFlags: 0 @@ -47257,7 +47377,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1671840916} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 63, y: 4, z: 0} + m_LocalPosition: {x: 62.5, y: 4.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1008122163} @@ -47675,7 +47795,7 @@ SpriteRenderer: m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 - m_DrawMode: 0 + m_DrawMode: 2 m_Size: {x: 16, y: 16} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 @@ -47694,8 +47814,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: af4fa3c5d20488d4fa39fb11819d3f97, type: 3} m_Name: m_EditorClassIdentifier: - camera: {fileID: 1337282922} - renderer: {fileID: 1727766210} + baseCamera: {fileID: 1337282922} + baseRenderer: {fileID: 1727766210} scrollRate: {x: 0.4, y: 0.4} --- !u!1001 &1879087608 PrefabInstance: @@ -47834,84 +47954,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: 2 - 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: - baseCamera: {fileID: 1337282922} - baseRenderer: {fileID: 1727766210} - scrollRate: {x: 0.4, y: 0.4} --- !u!1 &1895829829 GameObject: m_ObjectHideFlags: 0 @@ -48435,3 +48477,117 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2ccb08e2c4b8851498f8ecbf1a873146, type: 3} +--- !u!1001 &8942784746345332693 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1008122163} + m_Modifications: + - target: {fileID: 8989126000173721720, guid: cc74a3ff6f657d842b5731190a6074d7, + type: 3} + propertyPath: m_Offset.y + value: -0.031505585 + objectReference: {fileID: 0} + - target: {fileID: 8989126000173721720, guid: cc74a3ff6f657d842b5731190a6074d7, + type: 3} + propertyPath: m_Size.y + value: 4.7140064 + objectReference: {fileID: 0} + - target: {fileID: 8989126000173721720, guid: cc74a3ff6f657d842b5731190a6074d7, + type: 3} + propertyPath: m_Offset.x + value: 0.037693024 + objectReference: {fileID: 0} + - target: {fileID: 8989126000173721720, guid: cc74a3ff6f657d842b5731190a6074d7, + type: 3} + propertyPath: m_Size.x + value: 3.5875473 + objectReference: {fileID: 0} + - target: {fileID: 8989126000173721722, guid: cc74a3ff6f657d842b5731190a6074d7, + type: 3} + propertyPath: m_LocalPosition.x + value: 60 + objectReference: {fileID: 0} + - target: {fileID: 8989126000173721722, guid: cc74a3ff6f657d842b5731190a6074d7, + type: 3} + propertyPath: m_LocalPosition.y + value: -11.5 + objectReference: {fileID: 0} + - target: {fileID: 8989126000173721722, guid: cc74a3ff6f657d842b5731190a6074d7, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8989126000173721722, guid: cc74a3ff6f657d842b5731190a6074d7, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8989126000173721722, guid: cc74a3ff6f657d842b5731190a6074d7, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8989126000173721722, guid: cc74a3ff6f657d842b5731190a6074d7, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8989126000173721722, guid: cc74a3ff6f657d842b5731190a6074d7, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8989126000173721722, guid: cc74a3ff6f657d842b5731190a6074d7, + type: 3} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 8989126000173721722, guid: cc74a3ff6f657d842b5731190a6074d7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8989126000173721722, guid: cc74a3ff6f657d842b5731190a6074d7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8989126000173721722, guid: cc74a3ff6f657d842b5731190a6074d7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8989126000173721725, guid: cc74a3ff6f657d842b5731190a6074d7, + type: 3} + propertyPath: m_Name + value: JackBug + objectReference: {fileID: 0} + - target: {fileID: 8989126000173721726, guid: cc74a3ff6f657d842b5731190a6074d7, + type: 3} + propertyPath: m_GravityScale + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8989126000173721726, guid: cc74a3ff6f657d842b5731190a6074d7, + type: 3} + propertyPath: m_Constraints + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 8989126000173721727, guid: cc74a3ff6f657d842b5731190a6074d7, + type: 3} + propertyPath: playerCollider + value: + objectReference: {fileID: 1671840919} + - target: {fileID: 8989126000173721727, guid: cc74a3ff6f657d842b5731190a6074d7, + type: 3} + propertyPath: eventControls + value: + objectReference: {fileID: 1491655} + - target: {fileID: 8989126000173721727, guid: cc74a3ff6f657d842b5731190a6074d7, + type: 3} + propertyPath: player + value: + objectReference: {fileID: 1671840921} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cc74a3ff6f657d842b5731190a6074d7, type: 3} diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index 2e39837..16503d5 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -269,6 +269,8 @@ public class Player : MonoBehaviour isPlayerHurt = false; isFighting = true; isMovementEnabled = false; + rigidBody.gravityScale = 0f; + rigidBody.velocity = Vector2.zero; } public void EndEncounter() @@ -276,6 +278,7 @@ public class Player : MonoBehaviour isPlayerHurt = false; isFighting = false; isMovementEnabled = true; + rigidBody.gravityScale = 1f; DecreaseStaminaAfterBugFight(); } @@ -285,5 +288,6 @@ public class Player : MonoBehaviour GetComponent().velocity += new Vector2(Mathf.Sign(transform.localScale.x) * -1 * hurtVelocity, hurtVelocity); isFighting = false; isHurt = true; + Hurt(); } } diff --git a/Assets/Sprites/Collectibles/Coffee Animation.png b/Assets/Sprites/Collectibles/Coffee Animation.png new file mode 100644 index 0000000000000000000000000000000000000000..eed1bdcd1ff79eadaaabc2b1a5743a8a8302000b GIT binary patch literal 1094 zcmV-M1iAZ(P)yG>x zBoZL+Z}TU2&>hGX(Vfqp@zOewTtIP)J2rbA^C#+@w3ZIA3CNQAFj5If-I=rZqjyX$1(THGt`46sa{Blg98EyF(>g_!pM~Gv0Z46Jb&3K9|AIRp?|+*j`OBlvj0FpS;3HH%>;hK5 zZp`uSeB&DY=lVj0b(9~$Gc_}WKiq-!S?BuK^Vg>;f(!^~W*EPBovq&rNT9#S==|Xh ze0bN#?qeTczf1E|MfbT6A{5Vd*G*|n_yJnP@83Kg%TsBNU)*9cwgOEH5}?@41gneH z^pA9)X+Z)syW-Uc>ZhK=%u2!jq&vFY5NJcYMYV=R*N1$-@IZxGVd&kcV%T4GBig%f z|0Bo`>cIAg5Q9FL zT&sXNIxwApR{&2eQvmONv!D)?7)uslWYl^?6Qm}};NcIlH=j5)zq>ruyOjRgG@rQn z#1A+CpLhhTgBu(LIn%@J85P}u7zcMAX74&%f=_JqZs9&|5ZZ@E^Fu#EjFvDjKmztB z9it`8i?9Hdy47L%{-h7O1I0!D44Q!48Pq6%n$O$xd@d9|?C!TTwja|He;mfUD7`?cBbh*(kwHKlNmdnRw ze4p6xk6v6>+dDR&c#0IxvF42IE%{1EyrF46u^Y`NhBl%3#5D`}2a9X1ByKL3I{*Lx M07*qoM6N<$g7*RNtN;K2 literal 0 HcmV?d00001 diff --git a/Assets/Sprites/Collectibles/Coffee Animation.png.meta b/Assets/Sprites/Collectibles/Coffee Animation.png.meta new file mode 100644 index 0000000..c24cded --- /dev/null +++ b/Assets/Sprites/Collectibles/Coffee Animation.png.meta @@ -0,0 +1,91 @@ +fileFormatVersion: 2 +guid: 2ab19b79ca1e5fd478932044e6ef3d11 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Enemy/Bug Physics Material.physicsMaterial2D b/Assets/Sprites/Enemy/Bug Physics Material.physicsMaterial2D index 367b283..2f525e3 100644 --- a/Assets/Sprites/Enemy/Bug Physics Material.physicsMaterial2D +++ b/Assets/Sprites/Enemy/Bug Physics Material.physicsMaterial2D @@ -7,5 +7,5 @@ PhysicsMaterial2D: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Bug Physics Material - friction: 0.05 + friction: 10 bounciness: 0 diff --git a/Assets/Sprites/Player/Player.controller b/Assets/Sprites/Player/Player.controller index 22becd8..5c4e2c9 100644 --- a/Assets/Sprites/Player/Player.controller +++ b/Assets/Sprites/Player/Player.controller @@ -239,7 +239,7 @@ AnimatorController: m_Controller: {fileID: 0} - m_Name: YVelocity m_Type: 1 - m_DefaultFloat: 0 + m_DefaultFloat: 1 m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 0} @@ -438,6 +438,9 @@ AnimatorStateTransition: - m_ConditionMode: 2 m_ConditionEvent: IsHurt m_EventTreshold: 0 + - m_ConditionMode: 2 + m_ConditionEvent: IsFighting + m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 3835953866042416} m_Solo: 0 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 935a93b..15b5aa6 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -7,6 +7,7 @@ TagManager: - Pizza - Coffee - Kat Bug + - Jack Bug layers: - Default - TransparentFX