From 3318e11fd11f25e0d01fc5a0bc8a5377d52444fb Mon Sep 17 00:00:00 2001 From: Sam Date: Sat, 29 Apr 2023 18:10:36 -0700 Subject: [PATCH] Added explosion on enemy defeat Also added a little force for when you land on an enemy, but sometimes it YEETS the player if done at the right moment with a trumpet jump --- .../Armadillo Sprite Sheet_12.controller | 89 ++++- .../Animations/Bat/BatController.controller | 65 +++- Assets/Animations/Effects.meta | 8 + Assets/Animations/Effects/Explosion.anim | 99 +++++ Assets/Animations/Effects/Explosion.anim.meta | 8 + Assets/Animations/Fox/Fox.controller | 65 +++- .../Snake/SnakeAnimations.controller | 65 +++- Assets/Scripts/EnemyPatrol.cs | 8 + Assets/Scripts/PlayerBehavior.cs | 1 + Assets/Sprites/Effects.meta | 8 + Assets/Sprites/Effects/bling_effect.png | Bin 0 -> 511 bytes Assets/Sprites/Effects/bling_effect.png.meta | 300 +++++++++++++++ Assets/Sprites/Effects/explosion_effect.png | Bin 0 -> 1522 bytes .../Sprites/Effects/explosion_effect.png.meta | 344 ++++++++++++++++++ 14 files changed, 1053 insertions(+), 7 deletions(-) create mode 100644 Assets/Animations/Effects.meta create mode 100644 Assets/Animations/Effects/Explosion.anim create mode 100644 Assets/Animations/Effects/Explosion.anim.meta create mode 100644 Assets/Sprites/Effects.meta create mode 100644 Assets/Sprites/Effects/bling_effect.png create mode 100644 Assets/Sprites/Effects/bling_effect.png.meta create mode 100644 Assets/Sprites/Effects/explosion_effect.png create mode 100644 Assets/Sprites/Effects/explosion_effect.png.meta diff --git a/Assets/Animations/Armadillo/Armadillo Sprite Sheet_12.controller b/Assets/Animations/Armadillo/Armadillo Sprite Sheet_12.controller index 54e1394..98f9940 100644 --- a/Assets/Animations/Armadillo/Armadillo Sprite Sheet_12.controller +++ b/Assets/Animations/Armadillo/Armadillo Sprite Sheet_12.controller @@ -15,6 +15,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: -7092147516102079984} m_Position: {x: 300, y: 160, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1849971846463569581} + m_Position: {x: 540, y: 120, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -37,6 +40,7 @@ AnimatorState: m_CycleOffset: 0 m_Transitions: - {fileID: 8393474814137964335} + - {fileID: 3970489131176494647} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -82,7 +86,13 @@ AnimatorController: m_PrefabAsset: {fileID: 0} m_Name: Armadillo Sprite Sheet_12 serializedVersion: 5 - m_AnimatorParameters: [] + m_AnimatorParameters: + - m_Name: Defeated + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -96,6 +106,82 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} +--- !u!1102 &1849971846463569581 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Explosion + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 372a92126b64d49e98e9f73fa737b09d, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &3970489131176494647 +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: Defeated + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1849971846463569581} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &4428692602777480535 +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: Defeated + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1849971846463569581} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &7917335408761690891 AnimatorState: serializedVersion: 6 @@ -108,6 +194,7 @@ AnimatorState: m_CycleOffset: 0 m_Transitions: - {fileID: -3394939486366751126} + - {fileID: 4428692602777480535} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 diff --git a/Assets/Animations/Bat/BatController.controller b/Assets/Animations/Bat/BatController.controller index b740dec..0df2907 100644 --- a/Assets/Animations/Bat/BatController.controller +++ b/Assets/Animations/Bat/BatController.controller @@ -1,5 +1,31 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-9098804192751846194 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Explosion + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 372a92126b64d49e98e9f73fa737b09d, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1107 &-1120805670155518336 AnimatorStateMachine: serializedVersion: 6 @@ -12,6 +38,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: 8499720518961295116} m_Position: {x: 130, y: 220, z: 0} + - serializedVersion: 1 + m_State: {fileID: -9098804192751846194} + m_Position: {x: 393.617, y: 344.09576, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -30,7 +59,13 @@ AnimatorController: m_PrefabAsset: {fileID: 0} m_Name: BatController serializedVersion: 5 - m_AnimatorParameters: [] + m_AnimatorParameters: + - m_Name: Defeated + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -44,6 +79,31 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} +--- !u!1101 &7566858024768548282 +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: Defeated + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -9098804192751846194} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &8499720518961295116 AnimatorState: serializedVersion: 6 @@ -54,7 +114,8 @@ AnimatorState: m_Name: BatFly m_Speed: 0.5 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: 7566858024768548282} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 diff --git a/Assets/Animations/Effects.meta b/Assets/Animations/Effects.meta new file mode 100644 index 0000000..7960048 --- /dev/null +++ b/Assets/Animations/Effects.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e8796439973e24a15aa1e67870c1e0fb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Effects/Explosion.anim b/Assets/Animations/Effects/Explosion.anim new file mode 100644 index 0000000..d2c0e06 --- /dev/null +++ b/Assets/Animations/Effects/Explosion.anim @@ -0,0 +1,99 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Explosion + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: -26058723, guid: 92e73c6a27aac4173a6e8d54acf9fe0b, type: 3} + - time: 0.083333336 + value: {fileID: 281161528, guid: 92e73c6a27aac4173a6e8d54acf9fe0b, type: 3} + - time: 0.16666667 + value: {fileID: 617933608, guid: 92e73c6a27aac4173a6e8d54acf9fe0b, type: 3} + - time: 0.25 + value: {fileID: 1125023128, guid: 92e73c6a27aac4173a6e8d54acf9fe0b, type: 3} + - time: 0.33333334 + value: {fileID: -520789876, guid: 92e73c6a27aac4173a6e8d54acf9fe0b, type: 3} + - time: 0.41666666 + value: {fileID: 1166439870, guid: 92e73c6a27aac4173a6e8d54acf9fe0b, type: 3} + - time: 0.5 + value: {fileID: -73333410, guid: 92e73c6a27aac4173a6e8d54acf9fe0b, type: 3} + - time: 0.5833333 + value: {fileID: 738581303, guid: 92e73c6a27aac4173a6e8d54acf9fe0b, type: 3} + - time: 0.6666667 + value: {fileID: -1832562378, guid: 92e73c6a27aac4173a6e8d54acf9fe0b, type: 3} + - time: 0.75 + value: {fileID: -509926637, guid: 92e73c6a27aac4173a6e8d54acf9fe0b, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 12 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: -26058723, guid: 92e73c6a27aac4173a6e8d54acf9fe0b, type: 3} + - {fileID: 281161528, guid: 92e73c6a27aac4173a6e8d54acf9fe0b, type: 3} + - {fileID: 617933608, guid: 92e73c6a27aac4173a6e8d54acf9fe0b, type: 3} + - {fileID: 1125023128, guid: 92e73c6a27aac4173a6e8d54acf9fe0b, type: 3} + - {fileID: -520789876, guid: 92e73c6a27aac4173a6e8d54acf9fe0b, type: 3} + - {fileID: 1166439870, guid: 92e73c6a27aac4173a6e8d54acf9fe0b, type: 3} + - {fileID: -73333410, guid: 92e73c6a27aac4173a6e8d54acf9fe0b, type: 3} + - {fileID: 738581303, guid: 92e73c6a27aac4173a6e8d54acf9fe0b, type: 3} + - {fileID: -1832562378, guid: 92e73c6a27aac4173a6e8d54acf9fe0b, type: 3} + - {fileID: -509926637, guid: 92e73c6a27aac4173a6e8d54acf9fe0b, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.8333333 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/Effects/Explosion.anim.meta b/Assets/Animations/Effects/Explosion.anim.meta new file mode 100644 index 0000000..5afdaa2 --- /dev/null +++ b/Assets/Animations/Effects/Explosion.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 372a92126b64d49e98e9f73fa737b09d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Fox/Fox.controller b/Assets/Animations/Fox/Fox.controller index 02da100..22f3a4c 100644 --- a/Assets/Animations/Fox/Fox.controller +++ b/Assets/Animations/Fox/Fox.controller @@ -12,6 +12,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: -8681055588992258672} m_Position: {x: 170, y: 230, z: 0} + - serializedVersion: 1 + m_State: {fileID: 2625646461967861107} + m_Position: {x: 448.1914, y: 355.15952, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -32,7 +35,8 @@ AnimatorState: m_Name: FoxAnim m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: 157851566133517200} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -56,7 +60,13 @@ AnimatorController: m_PrefabAsset: {fileID: 0} m_Name: Fox serializedVersion: 5 - m_AnimatorParameters: [] + m_AnimatorParameters: + - m_Name: Defeated + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -70,3 +80,54 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} +--- !u!1101 &157851566133517200 +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: Defeated + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 2625646461967861107} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &2625646461967861107 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Explosion + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 372a92126b64d49e98e9f73fa737b09d, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Animations/Snake/SnakeAnimations.controller b/Assets/Animations/Snake/SnakeAnimations.controller index 17a63b4..0902ab0 100644 --- a/Assets/Animations/Snake/SnakeAnimations.controller +++ b/Assets/Animations/Snake/SnakeAnimations.controller @@ -10,7 +10,8 @@ AnimatorState: m_Name: SnakeMove m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: 2274622284724467006} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -26,6 +27,32 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &-4620393008618106935 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Explosion + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 372a92126b64d49e98e9f73fa737b09d, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1107 &-1805609291362184474 AnimatorStateMachine: serializedVersion: 6 @@ -38,6 +65,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: -7539166485765785913} m_Position: {x: 190, y: 270, z: 0} + - serializedVersion: 1 + m_State: {fileID: -4620393008618106935} + m_Position: {x: 330, y: 360, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -56,7 +86,13 @@ AnimatorController: m_PrefabAsset: {fileID: 0} m_Name: SnakeAnimations serializedVersion: 5 - m_AnimatorParameters: [] + m_AnimatorParameters: + - m_Name: Defeated + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -70,3 +106,28 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} +--- !u!1101 &2274622284724467006 +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: Defeated + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -4620393008618106935} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/Assets/Scripts/EnemyPatrol.cs b/Assets/Scripts/EnemyPatrol.cs index edeac8f..a4943eb 100644 --- a/Assets/Scripts/EnemyPatrol.cs +++ b/Assets/Scripts/EnemyPatrol.cs @@ -69,6 +69,14 @@ public class EnemyPatrol : MonoBehaviour { } public void DefeatEnemy() { + StartCoroutine(Defeat()); + } + + IEnumerator Defeat() { + this.gameObject.GetComponent().enabled = false; + animator.Play("Explosion"); + yield return new WaitForSeconds(animator.GetCurrentAnimatorStateInfo(0).length); + this.gameObject.GetComponent().enabled = true; this.gameObject.SetActive(false); } diff --git a/Assets/Scripts/PlayerBehavior.cs b/Assets/Scripts/PlayerBehavior.cs index f9c5bc9..191ee94 100644 --- a/Assets/Scripts/PlayerBehavior.cs +++ b/Assets/Scripts/PlayerBehavior.cs @@ -179,6 +179,7 @@ public class PlayerBehavior : MonoBehaviour void OnCollisionEnter2D(Collision2D collision) { if (collision.gameObject.tag == "Enemy") { if (collision.transform.position.y < transform.position.y) { + _rb.AddForce(Vector2.up * 8, ForceMode2D.Impulse); collision.gameObject.GetComponent().DefeatEnemy(); } else { DestroyPlayer(); diff --git a/Assets/Sprites/Effects.meta b/Assets/Sprites/Effects.meta new file mode 100644 index 0000000..8b011d8 --- /dev/null +++ b/Assets/Sprites/Effects.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2237d3b957a534bbdb9aaccf58f2cc0a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Effects/bling_effect.png b/Assets/Sprites/Effects/bling_effect.png new file mode 100644 index 0000000000000000000000000000000000000000..cbd2cc4526564e8fbcec6e49c6abb5f87a74b0d8 GIT binary patch literal 511 zcmeAS@N?(olHy`uVBq!ia0y~yU|7Jwz~I2d%)r3#;OP__1_lO&WRDEamTas28O$G&C*9#>fxvo#SW(;tY) zG`hZQQZC@?GjM;ABz9u?92LI|k2z{m3$u;|6-Lj?slUy6Ks{$(rTpwU&pSW+IB*sI z5EMDi$=q{HKjUv~y_?x!u;G@is-fhV+eUw;dHe2Dss+aS=S+iOkXw~9mo&B9%gLBT4rm)#6 z8|oW-8Mg~;=}cK<#uolNUz8)fxtb^KNXo$-wkp3^KJk`6$UOCi!*<5Hq%9)ajT4$K z&Z;!HJ1?VvVg%)r2KQTEXz1_lO&WRDgJ|`t&ApY42Q;e65*IvoOn9?%`kmI74)6bSthV=B;mTL|o>cO@V(zlywyHZ9^w;gxVf@1}f4OFCkg~(w z_s@k6tbfd?=YLe2Den5$pabgtmc91Pvl;F^E;9E$q017-Si|<=g{ z&vnD@mYn5%Z=MSkng5LlXVJ6!ZPNZauAf`{x#h0t6VKml^#0s%;IP_>%U^%#S@*=w zW4amjdwI&vma;Psa?iy!ckqc%PtK3ancxs6b0hY-THT)garf-m57#pMkGvkgigkC# z?$_F#rQxbQ7Cy0R6VKgkz5QZywboc-c{VYbH=<#P@nQVLX^`66DTfWh;@-_uE(Cb)@J zO*m#W<+aqELcY(^jnUEbIoZBeSu%@-wLhFvWw7GZoUGK}*Vvn1ujQZMv^acr%k4L% zF-tfr_S$H(xY_k3*5wMORiA#pTG=u`zjDLsyPw?*)MH;8l)R8E`|?1Mtv&ZI-@1x2 zuLsrb~JEn=xu+?Ro%Y0cq<9MMJ!TGt{aNK4uS)Nw^cDgy!vRH@mqf3^k=T|%2`1{S9vAS>TX`^5R zPRn<{=T`kcVsXIz&%8frjcb&D=$8(O$y$N2mmPx_pfNk5G+t(TrbF&rCEV%yg?1aqh zO~DCyY^uD((Tti zS&AO0@zbtlF1s%Ij!Pk?>PlFt^mm7>%PJEOF7chQ$1O5(--)Vw`vhzA-8arZd#EO` z{B`Q|VxO(LT-tx9UgzGHFFu(~xlwhm*rN4YSR8Zu;We zqJ)$!f+kIM+!AlveI5NOMAt0I7jV09I$^SNu7aC!mCm{7gAdYd=k3*Xy|+_F*{c41 z?z|cLGk$aZ*eIh^c=lkzAKRZ76M7F6?wQD6&+l3C#b3POR7qjy22i<;vOn&$TysuG!l7Xicl&=Gwcr-OL`?G0lEe z-}YW0LU4_=YUi=t>v-IL$Gs3P@!Oy*oY#2xW#gfYSG-+Z`Op7dl;B@A?@wE;N;6-m zsJ2h0_K~YyAGZZqt~$b2^n)#Ee$1&@Qz0YA)x1@6`E^1K&A3$ONSxYypexj`VACb< n