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
This commit is contained in:
Sam
2023-04-29 18:10:36 -07:00
parent 3ec0e985fb
commit 3318e11fd1
14 changed files with 1053 additions and 7 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: e8796439973e24a15aa1e67870c1e0fb
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -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: []

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 372a92126b64d49e98e9f73fa737b09d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -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:

View File

@@ -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