diff --git a/Assets/Animations/EnemyAnimations/1/v1/Enemy1.controller b/Assets/Animations/EnemyAnimations/1/v1/Enemy1.controller index b129f8d..8a93fb0 100644 --- a/Assets/Animations/EnemyAnimations/1/v1/Enemy1.controller +++ b/Assets/Animations/EnemyAnimations/1/v1/Enemy1.controller @@ -1,5 +1,30 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-8579140838966655327 +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: Strangle + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 5449203074349302286} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1107 &-4949393410711050712 AnimatorStateMachine: serializedVersion: 6 @@ -11,23 +36,48 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -3618960495364978089} - m_Position: {x: 400, y: 250, z: 0} + m_Position: {x: 260, y: 260, z: 0} - serializedVersion: 1 m_State: {fileID: 5449203074349302286} - m_Position: {x: 380, y: 150, z: 0} + m_Position: {x: 260, y: 160, z: 0} - serializedVersion: 1 m_State: {fileID: -2447546725586102994} - m_Position: {x: 340, y: 20, z: 0} + m_Position: {x: 250, y: 40, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_AnyStatePosition: {x: 150, y: -30, z: 0} m_EntryPosition: {x: 50, y: 120, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: -2447546725586102994} +--- !u!1101 &-3809272486806039993 +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: Die + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -3618960495364978089} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-3618960495364978089 AnimatorState: serializedVersion: 6 @@ -65,7 +115,7 @@ AnimatorState: m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: 6741793112270124902} + - {fileID: -8579140838966655327} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -115,31 +165,6 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} ---- !u!1101 &148394794518211540 -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: Die - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -3618960495364978089} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1102 &5449203074349302286 AnimatorState: serializedVersion: 6 @@ -151,7 +176,7 @@ AnimatorState: m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: 148394794518211540} + - {fileID: -3809272486806039993} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -167,28 +192,3 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &6741793112270124902 -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: Strangle - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 5449203074349302286} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.75 - m_HasExitTime: 0 - m_HasFixedDuration: 0 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 diff --git a/Assets/Animations/EnemyAnimations/1/v1/Enemy1v1DeathAni.anim b/Assets/Animations/EnemyAnimations/1/v1/Enemy1v1DeathAni.anim index 7d99790..385b83a 100644 --- a/Assets/Animations/EnemyAnimations/1/v1/Enemy1v1DeathAni.anim +++ b/Assets/Animations/EnemyAnimations/1/v1/Enemy1v1DeathAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.9, y: 0, z: 0} + value: {x: 1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -81,7 +81,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.25 + m_StopTime: 0.33333334 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -103,7 +103,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.9 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -163,4 +163,11 @@ AnimationClip: m_EulerEditorCurves: [] m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0.33333334 + functionName: DestroyGameobject + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Animations/EnemyAnimations/1/v1/Enemy1v1StrangleAni.anim b/Assets/Animations/EnemyAnimations/1/v1/Enemy1v1StrangleAni.anim index 5be1e40..f3f587a 100644 --- a/Assets/Animations/EnemyAnimations/1/v1/Enemy1v1StrangleAni.anim +++ b/Assets/Animations/EnemyAnimations/1/v1/Enemy1v1StrangleAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.9, y: 0, z: 0} + value: {x: 1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -97,7 +97,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.9 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/1/v1/Enemy_1_Sliced0001.png.meta b/Assets/Animations/EnemyAnimations/1/v1/Enemy_1_Sliced0001.png.meta index 979de62..d55e89a 100644 --- a/Assets/Animations/EnemyAnimations/1/v1/Enemy_1_Sliced0001.png.meta +++ b/Assets/Animations/EnemyAnimations/1/v1/Enemy_1_Sliced0001.png.meta @@ -43,7 +43,7 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 2 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -108,7 +108,28 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 - sprites: [] + sprites: + - serializedVersion: 2 + name: Enemy_1_Sliced0001_0 + rect: + serializedVersion: 2 + x: 205 + y: 13 + width: 144 + height: 228 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e10411fae48e5c64888ea90107100525 + internalID: 1787229520 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] @@ -119,7 +140,8 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - nameFileIdTable: {} + nameFileIdTable: + Enemy_1_Sliced0001_0: 1787229520 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Animations/EnemyAnimations/1/v2/Enemy1v2.controller b/Assets/Animations/EnemyAnimations/1/v2/Enemy1v2.controller index 481777a..d71676c 100644 --- a/Assets/Animations/EnemyAnimations/1/v2/Enemy1v2.controller +++ b/Assets/Animations/EnemyAnimations/1/v2/Enemy1v2.controller @@ -71,7 +71,7 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0.75 m_HasExitTime: 0 @@ -93,13 +93,13 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: Strangle m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -133,7 +133,7 @@ AnimatorStateTransition: m_TransitionDuration: 0.25 m_TransitionOffset: 0 m_ExitTime: 0 - m_HasExitTime: 0 + m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 diff --git a/Assets/Animations/EnemyAnimations/1/v2/Enemy1v2DeathAni.anim b/Assets/Animations/EnemyAnimations/1/v2/Enemy1v2DeathAni.anim index 4cd6679..ed5ee2b 100644 --- a/Assets/Animations/EnemyAnimations/1/v2/Enemy1v2DeathAni.anim +++ b/Assets/Animations/EnemyAnimations/1/v2/Enemy1v2DeathAni.anim @@ -14,7 +14,32 @@ AnimationClip: m_RotationCurves: [] m_CompressedRotationCurves: [] m_EulerCurves: [] - m_PositionCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.23333333 + value: {x: 1, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: @@ -47,6 +72,15 @@ AnimationClip: isPPtrCurve: 1 isIntCurve: 0 isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: - {fileID: 21300000, guid: 30f71fced0ba5894a91c09f887c7b1ad, type: 3} - {fileID: 21300000, guid: 64fedaa3eff21e14eb1c64afca1de287, type: 3} @@ -56,7 +90,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.25 + m_StopTime: 0.33333334 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -71,8 +105,105 @@ AnimationClip: m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 - m_EditorCurves: [] + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 + m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0.33333334 + functionName: DestroyGameobject + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Animations/EnemyAnimations/1/v2/Enemy1v2StrangleAni.anim b/Assets/Animations/EnemyAnimations/1/v2/Enemy1v2StrangleAni.anim index 1a3e33e..17211f5 100644 --- a/Assets/Animations/EnemyAnimations/1/v2/Enemy1v2StrangleAni.anim +++ b/Assets/Animations/EnemyAnimations/1/v2/Enemy1v2StrangleAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.9, y: 0, z: 0} + value: {x: 1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -97,7 +97,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.9 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/1/v3/Enemy13DeathAni.anim b/Assets/Animations/EnemyAnimations/1/v3/Enemy13DeathAni.anim index 38c225f..7b5a8a1 100644 --- a/Assets/Animations/EnemyAnimations/1/v3/Enemy13DeathAni.anim +++ b/Assets/Animations/EnemyAnimations/1/v3/Enemy13DeathAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.9, y: 0, z: 0} + value: {x: 1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -40,7 +40,7 @@ AnimationClip: value: {fileID: 21300000, guid: 9c60022201e9a4a469ca7b14462918ea, type: 3} - time: 0.1 value: {fileID: 21300000, guid: 6b82fc690cf4459419c5f3fd5a691a61, type: 3} - - time: 0.21666667 + - time: 0.23333333 value: {fileID: 21300000, guid: 0cb1db5a033e47d4eba3de86b005ec7f, type: 3} attribute: m_Sprite path: @@ -81,7 +81,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.23333333 + m_StopTime: 0.33333334 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -103,7 +103,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.9 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -163,4 +163,11 @@ AnimationClip: m_EulerEditorCurves: [] m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0.33333334 + functionName: DestroyGameobject + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Animations/EnemyAnimations/1/v3/Enemy1v3.controller b/Assets/Animations/EnemyAnimations/1/v3/Enemy1v3.controller index 9ee9337..b7b068f 100644 --- a/Assets/Animations/EnemyAnimations/1/v3/Enemy1v3.controller +++ b/Assets/Animations/EnemyAnimations/1/v3/Enemy1v3.controller @@ -20,7 +20,7 @@ AnimatorStateTransition: m_TransitionDuration: 0.25 m_TransitionOffset: 0 m_ExitTime: 0 - m_HasExitTime: 0 + m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -68,7 +68,7 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0.75 m_HasExitTime: 0 @@ -145,13 +145,13 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: Strangle m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer diff --git a/Assets/Animations/EnemyAnimations/1/v3/Enemy1v3StrangleAni.anim b/Assets/Animations/EnemyAnimations/1/v3/Enemy1v3StrangleAni.anim index 5ada58d..338f6c4 100644 --- a/Assets/Animations/EnemyAnimations/1/v3/Enemy1v3StrangleAni.anim +++ b/Assets/Animations/EnemyAnimations/1/v3/Enemy1v3StrangleAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.9, y: 0, z: 0} + value: {x: 1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -97,7 +97,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.9 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/2/v1/Enemy2v1.controller b/Assets/Animations/EnemyAnimations/2/v1/Enemy2v1.controller index e027060..00ac6ca 100644 --- a/Assets/Animations/EnemyAnimations/2/v1/Enemy2v1.controller +++ b/Assets/Animations/EnemyAnimations/2/v1/Enemy2v1.controller @@ -159,7 +159,7 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0.75 m_HasExitTime: 0 @@ -187,7 +187,7 @@ AnimatorStateTransition: m_TransitionDuration: 0.25 m_TransitionOffset: 0 m_ExitTime: 0 - m_HasExitTime: 0 + m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 diff --git a/Assets/Animations/EnemyAnimations/2/v1/Enemy2v1DeathAni.anim b/Assets/Animations/EnemyAnimations/2/v1/Enemy2v1DeathAni.anim index 1d0e52c..afc423b 100644 --- a/Assets/Animations/EnemyAnimations/2/v1/Enemy2v1DeathAni.anim +++ b/Assets/Animations/EnemyAnimations/2/v1/Enemy2v1DeathAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.9, y: 0, z: 0} + value: {x: 1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -37,7 +37,11 @@ AnimationClip: - serializedVersion: 2 curve: - time: 0 - value: {fileID: 21300000, guid: 3e598ee82a4073448a3688ec9ecdf1c8, type: 3} + value: {fileID: 21300000, guid: caf1255e9425b1f4ea1684918047cf65, type: 3} + - time: 0.13333334 + value: {fileID: 21300000, guid: 1be1213a169cfc844b9e8272ae05e7d9, type: 3} + - time: 0.23333333 + value: {fileID: 21300000, guid: 74bc3faa0afeb9042b9ae7840715cc26, type: 3} attribute: m_Sprite path: classID: 212 @@ -69,13 +73,15 @@ AnimationClip: isIntCurve: 0 isSerializeReferenceCurve: 0 pptrCurveMapping: - - {fileID: 21300000, guid: 3e598ee82a4073448a3688ec9ecdf1c8, type: 3} + - {fileID: 21300000, guid: caf1255e9425b1f4ea1684918047cf65, type: 3} + - {fileID: 21300000, guid: 1be1213a169cfc844b9e8272ae05e7d9, type: 3} + - {fileID: 21300000, guid: 74bc3faa0afeb9042b9ae7840715cc26, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.016666668 + m_StopTime: 0.33333334 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -97,7 +103,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.9 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -157,4 +163,11 @@ AnimationClip: m_EulerEditorCurves: [] m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0.33333334 + functionName: DestroyGameobject + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Animations/EnemyAnimations/2/v1/Enemy2v1StrangleAni.anim b/Assets/Animations/EnemyAnimations/2/v1/Enemy2v1StrangleAni.anim index d726fc5..270e01c 100644 --- a/Assets/Animations/EnemyAnimations/2/v1/Enemy2v1StrangleAni.anim +++ b/Assets/Animations/EnemyAnimations/2/v1/Enemy2v1StrangleAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.9, y: 0, z: 0} + value: {x: 1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -37,11 +37,7 @@ AnimationClip: - serializedVersion: 2 curve: - time: 0 - value: {fileID: 21300000, guid: caf1255e9425b1f4ea1684918047cf65, type: 3} - - time: 0.11666667 - value: {fileID: 21300000, guid: 1be1213a169cfc844b9e8272ae05e7d9, type: 3} - - time: 0.23333333 - value: {fileID: 21300000, guid: 74bc3faa0afeb9042b9ae7840715cc26, type: 3} + value: {fileID: 21300000, guid: 3e598ee82a4073448a3688ec9ecdf1c8, type: 3} attribute: m_Sprite path: classID: 212 @@ -73,15 +69,13 @@ AnimationClip: isIntCurve: 0 isSerializeReferenceCurve: 0 pptrCurveMapping: - - {fileID: 21300000, guid: caf1255e9425b1f4ea1684918047cf65, type: 3} - - {fileID: 21300000, guid: 1be1213a169cfc844b9e8272ae05e7d9, type: 3} - - {fileID: 21300000, guid: 74bc3faa0afeb9042b9ae7840715cc26, type: 3} + - {fileID: 21300000, guid: 3e598ee82a4073448a3688ec9ecdf1c8, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.25 + m_StopTime: 0.016666668 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -103,7 +97,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.9 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/2/v2/Enemy2v2.controller b/Assets/Animations/EnemyAnimations/2/v2/Enemy2v2.controller index 323591e..34fb60b 100644 --- a/Assets/Animations/EnemyAnimations/2/v2/Enemy2v2.controller +++ b/Assets/Animations/EnemyAnimations/2/v2/Enemy2v2.controller @@ -20,7 +20,7 @@ AnimatorStateTransition: m_TransitionDuration: 0.25 m_TransitionOffset: 0 m_ExitTime: 0 - m_HasExitTime: 0 + m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -70,7 +70,7 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0.75 m_HasExitTime: 0 diff --git a/Assets/Animations/EnemyAnimations/2/v2/Enemy2v2DieAni.anim b/Assets/Animations/EnemyAnimations/2/v2/Enemy2v2DieAni.anim index 5473cc7..225a75a 100644 --- a/Assets/Animations/EnemyAnimations/2/v2/Enemy2v2DieAni.anim +++ b/Assets/Animations/EnemyAnimations/2/v2/Enemy2v2DieAni.anim @@ -14,7 +14,32 @@ AnimationClip: m_RotationCurves: [] m_CompressedRotationCurves: [] m_EulerCurves: [] - m_PositionCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.23333333 + value: {x: 1, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: @@ -47,6 +72,15 @@ AnimationClip: isPPtrCurve: 1 isIntCurve: 0 isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: - {fileID: 21300000, guid: 1f79cfe251c887f4bb9cbbdd6e0ef5c4, type: 3} - {fileID: 21300000, guid: 9beef68b7eae5464ab24b046e4f1fe11, type: 3} @@ -56,7 +90,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.25 + m_StopTime: 0.33333334 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -71,8 +105,105 @@ AnimationClip: m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 - m_EditorCurves: [] + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 + m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0.33333334 + functionName: DestroyGameobject + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Animations/EnemyAnimations/2/v2/Enemy2v2StrangleAni.anim b/Assets/Animations/EnemyAnimations/2/v2/Enemy2v2StrangleAni.anim index 6ac3362..808e158 100644 --- a/Assets/Animations/EnemyAnimations/2/v2/Enemy2v2StrangleAni.anim +++ b/Assets/Animations/EnemyAnimations/2/v2/Enemy2v2StrangleAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.9, y: 0, z: 0} + value: {x: 1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -97,7 +97,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.9 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/2/v3/Enemy2v3.controller b/Assets/Animations/EnemyAnimations/2/v3/Enemy2v3.controller index e415785..c881370 100644 --- a/Assets/Animations/EnemyAnimations/2/v3/Enemy2v3.controller +++ b/Assets/Animations/EnemyAnimations/2/v3/Enemy2v3.controller @@ -162,7 +162,7 @@ AnimatorStateTransition: m_TransitionDuration: 0.25 m_TransitionOffset: 0 m_ExitTime: 0 - m_HasExitTime: 0 + m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -184,7 +184,7 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0.75 m_HasExitTime: 0 diff --git a/Assets/Animations/EnemyAnimations/2/v3/Enemy2v3DeathAni.anim b/Assets/Animations/EnemyAnimations/2/v3/Enemy2v3DeathAni.anim index 4caf109..b3c0dba 100644 --- a/Assets/Animations/EnemyAnimations/2/v3/Enemy2v3DeathAni.anim +++ b/Assets/Animations/EnemyAnimations/2/v3/Enemy2v3DeathAni.anim @@ -14,7 +14,32 @@ AnimationClip: m_RotationCurves: [] m_CompressedRotationCurves: [] m_EulerCurves: [] - m_PositionCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.23333333 + value: {x: 1, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: @@ -47,6 +72,15 @@ AnimationClip: isPPtrCurve: 1 isIntCurve: 0 isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: - {fileID: 21300000, guid: 8b4f8143b70c13641b4dd2b1aa46cfd2, type: 3} - {fileID: 21300000, guid: fd8ad2a0511ac3442993bfba9692b91e, type: 3} @@ -56,7 +90,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.25 + m_StopTime: 0.33333334 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -71,8 +105,105 @@ AnimationClip: m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 - m_EditorCurves: [] + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 + m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0.33333334 + functionName: DestroyGameobject + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Animations/EnemyAnimations/2/v3/Enemy2v3StrangleAni.anim b/Assets/Animations/EnemyAnimations/2/v3/Enemy2v3StrangleAni.anim index 848ddfc..9b889ee 100644 --- a/Assets/Animations/EnemyAnimations/2/v3/Enemy2v3StrangleAni.anim +++ b/Assets/Animations/EnemyAnimations/2/v3/Enemy2v3StrangleAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.9, y: 0, z: 0} + value: {x: 1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -97,7 +97,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.9 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/3/v1/Enemy3v1.controller b/Assets/Animations/EnemyAnimations/3/v1/Enemy3v1.controller index fd716ea..fb9b8b4 100644 --- a/Assets/Animations/EnemyAnimations/3/v1/Enemy3v1.controller +++ b/Assets/Animations/EnemyAnimations/3/v1/Enemy3v1.controller @@ -48,7 +48,7 @@ AnimatorStateTransition: m_TransitionDuration: 0.25 m_TransitionOffset: 0 m_ExitTime: 0 - m_HasExitTime: 0 + m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -157,7 +157,7 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0.75 m_HasExitTime: 0 diff --git a/Assets/Animations/EnemyAnimations/3/v1/Enemy3v1DeathAni.anim b/Assets/Animations/EnemyAnimations/3/v1/Enemy3v1DeathAni.anim index 5546c95..2b324e0 100644 --- a/Assets/Animations/EnemyAnimations/3/v1/Enemy3v1DeathAni.anim +++ b/Assets/Animations/EnemyAnimations/3/v1/Enemy3v1DeathAni.anim @@ -14,7 +14,32 @@ AnimationClip: m_RotationCurves: [] m_CompressedRotationCurves: [] m_EulerCurves: [] - m_PositionCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.23333333 + value: {x: 1, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: @@ -47,6 +72,15 @@ AnimationClip: isPPtrCurve: 1 isIntCurve: 0 isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: - {fileID: 21300000, guid: 5badcb8bbdcce4e4c9353ae172439070, type: 3} - {fileID: 21300000, guid: df886225d9695d14a92f1929e36b21aa, type: 3} @@ -56,7 +90,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.25 + m_StopTime: 0.33333334 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -71,8 +105,105 @@ AnimationClip: m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 - m_EditorCurves: [] + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 + m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0.33333334 + functionName: DestroyGameobject + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Animations/EnemyAnimations/3/v1/Enemy3v1StrangleAni.anim b/Assets/Animations/EnemyAnimations/3/v1/Enemy3v1StrangleAni.anim index 1d7e389..73f152b 100644 --- a/Assets/Animations/EnemyAnimations/3/v1/Enemy3v1StrangleAni.anim +++ b/Assets/Animations/EnemyAnimations/3/v1/Enemy3v1StrangleAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.9, y: 0, z: 0} + value: {x: 1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -97,7 +97,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.9 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/3/v2/Enemy3v2.controller b/Assets/Animations/EnemyAnimations/3/v2/Enemy3v2.controller index fc3e457..aa8d11e 100644 --- a/Assets/Animations/EnemyAnimations/3/v2/Enemy3v2.controller +++ b/Assets/Animations/EnemyAnimations/3/v2/Enemy3v2.controller @@ -101,7 +101,7 @@ AnimatorStateTransition: m_TransitionDuration: 0.25 m_TransitionOffset: 0 m_ExitTime: 0 - m_HasExitTime: 0 + m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -184,7 +184,7 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0.75 m_HasExitTime: 0 diff --git a/Assets/Animations/EnemyAnimations/3/v2/Enemy3v2DeathAni.anim b/Assets/Animations/EnemyAnimations/3/v2/Enemy3v2DeathAni.anim index 93f4277..aa377b7 100644 --- a/Assets/Animations/EnemyAnimations/3/v2/Enemy3v2DeathAni.anim +++ b/Assets/Animations/EnemyAnimations/3/v2/Enemy3v2DeathAni.anim @@ -14,7 +14,32 @@ AnimationClip: m_RotationCurves: [] m_CompressedRotationCurves: [] m_EulerCurves: [] - m_PositionCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.23333333 + value: {x: 1, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: @@ -47,6 +72,15 @@ AnimationClip: isPPtrCurve: 1 isIntCurve: 0 isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: - {fileID: 21300000, guid: 257fb928edbcc24489ebafe7cd2d107b, type: 3} - {fileID: 21300000, guid: c0f2fa775bdcbd94ebb7b84e62deee4a, type: 3} @@ -56,7 +90,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.25 + m_StopTime: 0.33333334 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -71,8 +105,105 @@ AnimationClip: m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 - m_EditorCurves: [] + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 + m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0.33333334 + functionName: DestroyGameobject + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Animations/EnemyAnimations/3/v2/Enemy3v2StrangleAni.anim b/Assets/Animations/EnemyAnimations/3/v2/Enemy3v2StrangleAni.anim index 060fa46..4c44704 100644 --- a/Assets/Animations/EnemyAnimations/3/v2/Enemy3v2StrangleAni.anim +++ b/Assets/Animations/EnemyAnimations/3/v2/Enemy3v2StrangleAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.9, y: 0, z: 0} + value: {x: 1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -97,7 +97,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.9 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/3/v3/Enemy3v3.controller b/Assets/Animations/EnemyAnimations/3/v3/Enemy3v3.controller index 9ef6b4d..25cbdaa 100644 --- a/Assets/Animations/EnemyAnimations/3/v3/Enemy3v3.controller +++ b/Assets/Animations/EnemyAnimations/3/v3/Enemy3v3.controller @@ -20,7 +20,7 @@ AnimatorStateTransition: m_TransitionDuration: 0.25 m_TransitionOffset: 0 m_ExitTime: 0 - m_HasExitTime: 0 + m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -70,7 +70,7 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0.75 m_HasExitTime: 0 diff --git a/Assets/Animations/EnemyAnimations/3/v3/Enemy3v3DeathAni.anim b/Assets/Animations/EnemyAnimations/3/v3/Enemy3v3DeathAni.anim index ca8ecbe..be0dd9d 100644 --- a/Assets/Animations/EnemyAnimations/3/v3/Enemy3v3DeathAni.anim +++ b/Assets/Animations/EnemyAnimations/3/v3/Enemy3v3DeathAni.anim @@ -14,7 +14,32 @@ AnimationClip: m_RotationCurves: [] m_CompressedRotationCurves: [] m_EulerCurves: [] - m_PositionCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.23333333 + value: {x: 1, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: @@ -47,6 +72,15 @@ AnimationClip: isPPtrCurve: 1 isIntCurve: 0 isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: - {fileID: 21300000, guid: 52bfa0c35d09d3d4ea7707eb897af446, type: 3} - {fileID: 21300000, guid: 5fb5a5ee14104284abd140c8254a3489, type: 3} @@ -56,7 +90,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.25 + m_StopTime: 0.33333334 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -71,8 +105,105 @@ AnimationClip: m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 - m_EditorCurves: [] + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 + m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0.33333334 + functionName: DestroyGameobject + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Animations/EnemyAnimations/3/v3/Enemy3v3StrangleAni.anim b/Assets/Animations/EnemyAnimations/3/v3/Enemy3v3StrangleAni.anim index 023d597..2a322e1 100644 --- a/Assets/Animations/EnemyAnimations/3/v3/Enemy3v3StrangleAni.anim +++ b/Assets/Animations/EnemyAnimations/3/v3/Enemy3v3StrangleAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.9, y: 0, z: 0} + value: {x: 1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -97,7 +97,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.9 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/4/v1/Enemy4v1.controller b/Assets/Animations/EnemyAnimations/4/v1/Enemy4v1.controller index a5f30fc..7139312 100644 --- a/Assets/Animations/EnemyAnimations/4/v1/Enemy4v1.controller +++ b/Assets/Animations/EnemyAnimations/4/v1/Enemy4v1.controller @@ -102,7 +102,7 @@ AnimatorStateTransition: m_TransitionDuration: 0.25 m_TransitionOffset: 0 m_ExitTime: 0 - m_HasExitTime: 0 + m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -121,13 +121,13 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: Strangle m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -158,7 +158,7 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0.75 m_HasExitTime: 0 diff --git a/Assets/Animations/EnemyAnimations/4/v1/Enemy4v1DeathAni.anim b/Assets/Animations/EnemyAnimations/4/v1/Enemy4v1DeathAni.anim index 9656bb8..fa47064 100644 --- a/Assets/Animations/EnemyAnimations/4/v1/Enemy4v1DeathAni.anim +++ b/Assets/Animations/EnemyAnimations/4/v1/Enemy4v1DeathAni.anim @@ -14,7 +14,32 @@ AnimationClip: m_RotationCurves: [] m_CompressedRotationCurves: [] m_EulerCurves: [] - m_PositionCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.3 + value: {x: 1, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: @@ -49,6 +74,15 @@ AnimationClip: isPPtrCurve: 1 isIntCurve: 0 isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: - {fileID: 21300000, guid: 979bc1ae91bd2e64f9134cbfd0ac9ca8, type: 3} - {fileID: 21300000, guid: 0bc85ad5e8a20214cba31c575b9e1be5, type: 3} @@ -59,7 +93,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.3166667 + m_StopTime: 0.41666666 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -74,8 +108,105 @@ AnimationClip: m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 - m_EditorCurves: [] + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.3 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.3 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.3 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 + m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0.41666666 + functionName: DestroyGameobject + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Animations/EnemyAnimations/4/v1/Enemy4v1StrangleAni.anim b/Assets/Animations/EnemyAnimations/4/v1/Enemy4v1StrangleAni.anim index 675c8cd..8dfdb78 100644 --- a/Assets/Animations/EnemyAnimations/4/v1/Enemy4v1StrangleAni.anim +++ b/Assets/Animations/EnemyAnimations/4/v1/Enemy4v1StrangleAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.9, y: 0, z: 0} + value: {x: 1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -97,7 +97,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.9 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/4/v2/Enemy4v2.controller b/Assets/Animations/EnemyAnimations/4/v2/Enemy4v2.controller index 167417a..b521e51 100644 --- a/Assets/Animations/EnemyAnimations/4/v2/Enemy4v2.controller +++ b/Assets/Animations/EnemyAnimations/4/v2/Enemy4v2.controller @@ -17,7 +17,7 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0.75 m_HasExitTime: 0 @@ -187,7 +187,7 @@ AnimatorStateTransition: m_TransitionDuration: 0.25 m_TransitionOffset: 0 m_ExitTime: 0 - m_HasExitTime: 0 + m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 diff --git a/Assets/Animations/EnemyAnimations/4/v2/Enemy4v2DeathAni.anim b/Assets/Animations/EnemyAnimations/4/v2/Enemy4v2DeathAni.anim index 323bd83..860a52c 100644 --- a/Assets/Animations/EnemyAnimations/4/v2/Enemy4v2DeathAni.anim +++ b/Assets/Animations/EnemyAnimations/4/v2/Enemy4v2DeathAni.anim @@ -14,7 +14,32 @@ AnimationClip: m_RotationCurves: [] m_CompressedRotationCurves: [] m_EulerCurves: [] - m_PositionCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.3 + value: {x: 1, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: @@ -49,6 +74,15 @@ AnimationClip: isPPtrCurve: 1 isIntCurve: 0 isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: - {fileID: 21300000, guid: 4c196e30ffd238646924ea150f4181b9, type: 3} - {fileID: 21300000, guid: e9fa853f230c33545807cc084a43efd7, type: 3} @@ -59,7 +93,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.3166667 + m_StopTime: 0.41666666 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -74,8 +108,105 @@ AnimationClip: m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 - m_EditorCurves: [] + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.3 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.3 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.3 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 + m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0.41666666 + functionName: DestroyGameobject + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Animations/EnemyAnimations/4/v2/Enemy4v2StrangleAni.anim b/Assets/Animations/EnemyAnimations/4/v2/Enemy4v2StrangleAni.anim index 1c7dda3..7091ff0 100644 --- a/Assets/Animations/EnemyAnimations/4/v2/Enemy4v2StrangleAni.anim +++ b/Assets/Animations/EnemyAnimations/4/v2/Enemy4v2StrangleAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.9, y: 0, z: 0} + value: {x: 1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -97,7 +97,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.9 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/4/v3/Enemy4v3.controller b/Assets/Animations/EnemyAnimations/4/v3/Enemy4v3.controller index abaeb30..7a58e01 100644 --- a/Assets/Animations/EnemyAnimations/4/v3/Enemy4v3.controller +++ b/Assets/Animations/EnemyAnimations/4/v3/Enemy4v3.controller @@ -74,7 +74,7 @@ AnimatorStateTransition: m_TransitionDuration: 0.25 m_TransitionOffset: 0 m_ExitTime: 0 - m_HasExitTime: 0 + m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -184,7 +184,7 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0.75 m_HasExitTime: 0 diff --git a/Assets/Animations/EnemyAnimations/4/v3/Enemy4v3DeathAni.anim b/Assets/Animations/EnemyAnimations/4/v3/Enemy4v3DeathAni.anim index 9dcba24..538d0a4 100644 --- a/Assets/Animations/EnemyAnimations/4/v3/Enemy4v3DeathAni.anim +++ b/Assets/Animations/EnemyAnimations/4/v3/Enemy4v3DeathAni.anim @@ -14,7 +14,32 @@ AnimationClip: m_RotationCurves: [] m_CompressedRotationCurves: [] m_EulerCurves: [] - m_PositionCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.3 + value: {x: 1, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: @@ -49,6 +74,15 @@ AnimationClip: isPPtrCurve: 1 isIntCurve: 0 isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: - {fileID: 21300000, guid: 04ce2b63f5b5d88439e82880b32b7a8c, type: 3} - {fileID: 21300000, guid: ae9851f7c03fa574880a213ff77e60ae, type: 3} @@ -59,7 +93,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.3166667 + m_StopTime: 0.41666666 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -74,8 +108,105 @@ AnimationClip: m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 - m_EditorCurves: [] + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.3 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.3 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.3 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 + m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0.41666666 + functionName: DestroyGameobject + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Animations/EnemyAnimations/4/v3/Enemy4v3StrangleAni.anim b/Assets/Animations/EnemyAnimations/4/v3/Enemy4v3StrangleAni.anim index 05f3eab..9cdb2ca 100644 --- a/Assets/Animations/EnemyAnimations/4/v3/Enemy4v3StrangleAni.anim +++ b/Assets/Animations/EnemyAnimations/4/v3/Enemy4v3StrangleAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.9, y: 0, z: 0} + value: {x: 1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -97,7 +97,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.9 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/5/v1/Enemy5v1.controller b/Assets/Animations/EnemyAnimations/5/v1/Enemy5v1.controller index fc6e17a..d8a98f0 100644 --- a/Assets/Animations/EnemyAnimations/5/v1/Enemy5v1.controller +++ b/Assets/Animations/EnemyAnimations/5/v1/Enemy5v1.controller @@ -159,7 +159,7 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0.75 m_HasExitTime: 0 @@ -187,7 +187,7 @@ AnimatorStateTransition: m_TransitionDuration: 0.25 m_TransitionOffset: 0 m_ExitTime: 0 - m_HasExitTime: 0 + m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 diff --git a/Assets/Animations/EnemyAnimations/5/v1/Enemy5v1DeathAni.anim b/Assets/Animations/EnemyAnimations/5/v1/Enemy5v1DeathAni.anim index f13a4d6..4122b07 100644 --- a/Assets/Animations/EnemyAnimations/5/v1/Enemy5v1DeathAni.anim +++ b/Assets/Animations/EnemyAnimations/5/v1/Enemy5v1DeathAni.anim @@ -14,7 +14,32 @@ AnimationClip: m_RotationCurves: [] m_CompressedRotationCurves: [] m_EulerCurves: [] - m_PositionCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.3 + value: {x: 1, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: @@ -49,6 +74,15 @@ AnimationClip: isPPtrCurve: 1 isIntCurve: 0 isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: - {fileID: 21300000, guid: 33bf30cb9a776134c8bc31b8047a22a2, type: 3} - {fileID: 21300000, guid: 757199d0bd83ddf4abbe736fb705576a, type: 3} @@ -59,7 +93,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.3166667 + m_StopTime: 0.41666666 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -74,8 +108,105 @@ AnimationClip: m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 - m_EditorCurves: [] + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.3 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.3 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.3 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 + m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0.41666666 + functionName: DestroyGameobject + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Animations/EnemyAnimations/5/v1/Enemy5v1StrangleAni.anim b/Assets/Animations/EnemyAnimations/5/v1/Enemy5v1StrangleAni.anim index 5a64117..6c27f74 100644 --- a/Assets/Animations/EnemyAnimations/5/v1/Enemy5v1StrangleAni.anim +++ b/Assets/Animations/EnemyAnimations/5/v1/Enemy5v1StrangleAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.9, y: 0, z: 0} + value: {x: 1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -97,7 +97,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.9 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/5/v2/Enemy5v2.controller b/Assets/Animations/EnemyAnimations/5/v2/Enemy5v2.controller index 8c6f7ee..024188c 100644 --- a/Assets/Animations/EnemyAnimations/5/v2/Enemy5v2.controller +++ b/Assets/Animations/EnemyAnimations/5/v2/Enemy5v2.controller @@ -73,7 +73,7 @@ AnimatorStateTransition: m_TransitionDuration: 0.25 m_TransitionOffset: 0 m_ExitTime: 0 - m_HasExitTime: 0 + m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -184,7 +184,7 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0.75 m_HasExitTime: 0 diff --git a/Assets/Animations/EnemyAnimations/5/v2/Enemy5v2DeathAni.anim b/Assets/Animations/EnemyAnimations/5/v2/Enemy5v2DeathAni.anim index b694c24..9a13f25 100644 --- a/Assets/Animations/EnemyAnimations/5/v2/Enemy5v2DeathAni.anim +++ b/Assets/Animations/EnemyAnimations/5/v2/Enemy5v2DeathAni.anim @@ -14,7 +14,32 @@ AnimationClip: m_RotationCurves: [] m_CompressedRotationCurves: [] m_EulerCurves: [] - m_PositionCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.3 + value: {x: 1, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: @@ -49,6 +74,15 @@ AnimationClip: isPPtrCurve: 1 isIntCurve: 0 isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: - {fileID: 21300000, guid: d8503d3442218a64995bdc145b5d9415, type: 3} - {fileID: 21300000, guid: acadd19c32f83ab45bfd667e18757ce5, type: 3} @@ -59,7 +93,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.3166667 + m_StopTime: 0.41666666 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -74,8 +108,105 @@ AnimationClip: m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 - m_EditorCurves: [] + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.3 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.3 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.3 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 + m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0.41666666 + functionName: DestroyGameobject + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Animations/EnemyAnimations/5/v2/Enemy5v2StrangleAni.anim b/Assets/Animations/EnemyAnimations/5/v2/Enemy5v2StrangleAni.anim index 72e2514..7c61b23 100644 --- a/Assets/Animations/EnemyAnimations/5/v2/Enemy5v2StrangleAni.anim +++ b/Assets/Animations/EnemyAnimations/5/v2/Enemy5v2StrangleAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.9, y: 0, z: 0} + value: {x: 1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -97,7 +97,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.9 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/5/v3/Enemy5v3.controller b/Assets/Animations/EnemyAnimations/5/v3/Enemy5v3.controller index d366f04..e0574f1 100644 --- a/Assets/Animations/EnemyAnimations/5/v3/Enemy5v3.controller +++ b/Assets/Animations/EnemyAnimations/5/v3/Enemy5v3.controller @@ -44,7 +44,7 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0.75 m_HasExitTime: 0 @@ -187,7 +187,7 @@ AnimatorStateTransition: m_TransitionDuration: 0.25 m_TransitionOffset: 0 m_ExitTime: 0 - m_HasExitTime: 0 + m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 diff --git a/Assets/Animations/EnemyAnimations/5/v3/Enemy5v3DeathAni.anim b/Assets/Animations/EnemyAnimations/5/v3/Enemy5v3DeathAni.anim index ebab7ae..d556e56 100644 --- a/Assets/Animations/EnemyAnimations/5/v3/Enemy5v3DeathAni.anim +++ b/Assets/Animations/EnemyAnimations/5/v3/Enemy5v3DeathAni.anim @@ -14,7 +14,32 @@ AnimationClip: m_RotationCurves: [] m_CompressedRotationCurves: [] m_EulerCurves: [] - m_PositionCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.3 + value: {x: 1, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: @@ -49,6 +74,15 @@ AnimationClip: isPPtrCurve: 1 isIntCurve: 0 isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: - {fileID: 21300000, guid: f9e997af651539947a15decfb535d447, type: 3} - {fileID: 21300000, guid: 25bb4f6ba6918564ebb2c3b36b5b553e, type: 3} @@ -59,7 +93,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.3166667 + m_StopTime: 0.41666666 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -74,8 +108,105 @@ AnimationClip: m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 - m_EditorCurves: [] + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.3 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.3 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.3 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 + m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0.41666666 + functionName: DestroyGameobject + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Animations/EnemyAnimations/5/v3/Enemy5v3StrangleAni.anim b/Assets/Animations/EnemyAnimations/5/v3/Enemy5v3StrangleAni.anim index 79a6399..0464a30 100644 --- a/Assets/Animations/EnemyAnimations/5/v3/Enemy5v3StrangleAni.anim +++ b/Assets/Animations/EnemyAnimations/5/v3/Enemy5v3StrangleAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.9, y: 0, z: 0} + value: {x: 1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -97,7 +97,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.9 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/6/v1/Enemy6v1.controller b/Assets/Animations/EnemyAnimations/6/v1/Enemy6v1.controller index 910dea8..4fa9ccb 100644 --- a/Assets/Animations/EnemyAnimations/6/v1/Enemy6v1.controller +++ b/Assets/Animations/EnemyAnimations/6/v1/Enemy6v1.controller @@ -17,7 +17,7 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0.75 m_HasExitTime: 0 @@ -100,7 +100,7 @@ AnimatorStateTransition: m_TransitionDuration: 0.25 m_TransitionOffset: 0 m_ExitTime: 0 - m_HasExitTime: 0 + m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 diff --git a/Assets/Animations/EnemyAnimations/6/v1/Enemy6v1DeathAni.anim b/Assets/Animations/EnemyAnimations/6/v1/Enemy6v1DeathAni.anim index 6873546..13429fd 100644 --- a/Assets/Animations/EnemyAnimations/6/v1/Enemy6v1DeathAni.anim +++ b/Assets/Animations/EnemyAnimations/6/v1/Enemy6v1DeathAni.anim @@ -14,7 +14,32 @@ AnimationClip: m_RotationCurves: [] m_CompressedRotationCurves: [] m_EulerCurves: [] - m_PositionCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.23333333 + value: {x: 1, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: @@ -47,6 +72,15 @@ AnimationClip: isPPtrCurve: 1 isIntCurve: 0 isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: - {fileID: 21300000, guid: 54131cd69657332468addc794a8321c1, type: 3} - {fileID: 21300000, guid: 3c567baa83057f0448449d043b6028e9, type: 3} @@ -56,7 +90,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.25 + m_StopTime: 0.33333334 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -71,8 +105,105 @@ AnimationClip: m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 - m_EditorCurves: [] + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 + m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0.33333334 + functionName: DestroyGameobject + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Animations/EnemyAnimations/6/v1/Enemy6v1StrangleAni.anim b/Assets/Animations/EnemyAnimations/6/v1/Enemy6v1StrangleAni.anim index 3c5e33d..7f83616 100644 --- a/Assets/Animations/EnemyAnimations/6/v1/Enemy6v1StrangleAni.anim +++ b/Assets/Animations/EnemyAnimations/6/v1/Enemy6v1StrangleAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.9, y: 0, z: 0} + value: {x: 1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -97,7 +97,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.9 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/6/v2/Enemy6v2.controller b/Assets/Animations/EnemyAnimations/6/v2/Enemy6v2.controller index 8cecdaf..7a7d67d 100644 --- a/Assets/Animations/EnemyAnimations/6/v2/Enemy6v2.controller +++ b/Assets/Animations/EnemyAnimations/6/v2/Enemy6v2.controller @@ -45,7 +45,7 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0.75 m_HasExitTime: 0 @@ -161,7 +161,7 @@ AnimatorStateTransition: m_TransitionDuration: 0.25 m_TransitionOffset: 0 m_ExitTime: 0 - m_HasExitTime: 0 + m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 diff --git a/Assets/Animations/EnemyAnimations/6/v2/Enemy6v2DeathAni.anim b/Assets/Animations/EnemyAnimations/6/v2/Enemy6v2DeathAni.anim index d834fcf..95802c9 100644 --- a/Assets/Animations/EnemyAnimations/6/v2/Enemy6v2DeathAni.anim +++ b/Assets/Animations/EnemyAnimations/6/v2/Enemy6v2DeathAni.anim @@ -14,7 +14,32 @@ AnimationClip: m_RotationCurves: [] m_CompressedRotationCurves: [] m_EulerCurves: [] - m_PositionCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.23333333 + value: {x: 1, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: @@ -47,6 +72,15 @@ AnimationClip: isPPtrCurve: 1 isIntCurve: 0 isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: - {fileID: 21300000, guid: 14ffcc601a6945b43ad3ec7c9013be7a, type: 3} - {fileID: 21300000, guid: f1329ee0728e3e04c90b582d00f9ab4c, type: 3} @@ -56,7 +90,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.25 + m_StopTime: 0.33333334 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -71,8 +105,105 @@ AnimationClip: m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 - m_EditorCurves: [] + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 + m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0.33333334 + functionName: DestroyGameobject + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Animations/EnemyAnimations/6/v2/Enemy6v2StrangleAni.anim b/Assets/Animations/EnemyAnimations/6/v2/Enemy6v2StrangleAni.anim index e871d49..db379d8 100644 --- a/Assets/Animations/EnemyAnimations/6/v2/Enemy6v2StrangleAni.anim +++ b/Assets/Animations/EnemyAnimations/6/v2/Enemy6v2StrangleAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.9, y: 0, z: 0} + value: {x: 1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -97,7 +97,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.9 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/6/v3/Enemy6v3.controller b/Assets/Animations/EnemyAnimations/6/v3/Enemy6v3.controller index c3f1738..ecb6b51 100644 --- a/Assets/Animations/EnemyAnimations/6/v3/Enemy6v3.controller +++ b/Assets/Animations/EnemyAnimations/6/v3/Enemy6v3.controller @@ -45,7 +45,7 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0.75 m_HasExitTime: 0 @@ -160,7 +160,7 @@ AnimatorStateTransition: m_TransitionDuration: 0.25 m_TransitionOffset: 0 m_ExitTime: 0 - m_HasExitTime: 0 + m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 diff --git a/Assets/Animations/EnemyAnimations/6/v3/Enemy6v3DeathAni.anim b/Assets/Animations/EnemyAnimations/6/v3/Enemy6v3DeathAni.anim index ad73d95..6de0c29 100644 --- a/Assets/Animations/EnemyAnimations/6/v3/Enemy6v3DeathAni.anim +++ b/Assets/Animations/EnemyAnimations/6/v3/Enemy6v3DeathAni.anim @@ -14,7 +14,32 @@ AnimationClip: m_RotationCurves: [] m_CompressedRotationCurves: [] m_EulerCurves: [] - m_PositionCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.23333333 + value: {x: 1, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: @@ -47,6 +72,15 @@ AnimationClip: isPPtrCurve: 1 isIntCurve: 0 isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: - {fileID: 21300000, guid: caaff7760c0332840bb6371871f340ee, type: 3} - {fileID: 21300000, guid: be6d15cbf2be31942a52372942c402d1, type: 3} @@ -56,7 +90,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.25 + m_StopTime: 0.33333334 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -71,8 +105,105 @@ AnimationClip: m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 - m_EditorCurves: [] + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 + m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0.33333334 + functionName: DestroyGameobject + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Animations/EnemyAnimations/6/v3/Enemy6v3StrangleAni.anim b/Assets/Animations/EnemyAnimations/6/v3/Enemy6v3StrangleAni.anim index 55fd369..5faaa8a 100644 --- a/Assets/Animations/EnemyAnimations/6/v3/Enemy6v3StrangleAni.anim +++ b/Assets/Animations/EnemyAnimations/6/v3/Enemy6v3StrangleAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.9, y: 0, z: 0} + value: {x: 1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -97,7 +97,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.9 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Resources/Enemies/1/Enemy1V1.prefab b/Assets/Resources/Enemies/1/Enemy1V1.prefab index 7959dd1..8372c60 100644 --- a/Assets/Resources/Enemies/1/Enemy1V1.prefab +++ b/Assets/Resources/Enemies/1/Enemy1V1.prefab @@ -95,6 +95,7 @@ GameObject: - component: {fileID: 3596055233112951220} - component: {fileID: 8224209185524732719} - component: {fileID: 7324983754635409392} + - component: {fileID: 8692487723845658519} m_Layer: 0 m_Name: Renderer m_TagString: Untagged @@ -190,6 +191,18 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &8692487723845658519 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 658931473633382931} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &6905705041633878913 GameObject: m_ObjectHideFlags: 0 @@ -199,7 +212,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3920219362688286786} - - component: {fileID: 1080557620588792846} - component: {fileID: 2938081276856164938} - component: {fileID: 944314729512195366} - component: {fileID: 8373694659570615877} @@ -208,7 +220,7 @@ GameObject: - component: {fileID: 58401337460216238} m_Layer: 0 m_Name: Enemy1V1 - m_TagString: Untagged + m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -230,18 +242,6 @@ Transform: - {fileID: 2526773998354774740} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1080557620588792846 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6905705041633878913} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &2938081276856164938 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/1/Enemy1V2.prefab b/Assets/Resources/Enemies/1/Enemy1V2.prefab index 2dc1a03..f41f7d3 100644 --- a/Assets/Resources/Enemies/1/Enemy1V2.prefab +++ b/Assets/Resources/Enemies/1/Enemy1V2.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 3596055233112951220} - component: {fileID: 8224209185524732719} - component: {fileID: 7324983754635409392} + - component: {fileID: 8996152629716142396} m_Layer: 0 m_Name: Renderer m_TagString: Untagged @@ -106,6 +107,18 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &8996152629716142396 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 658931473633382931} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &6905705041633878913 GameObject: m_ObjectHideFlags: 0 @@ -115,7 +128,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3920219362688286786} - - component: {fileID: 1080557620588792846} - component: {fileID: -4060921817738925561} - component: {fileID: 1240337968825240287} - component: {fileID: -7368324163293952402} @@ -123,7 +135,7 @@ GameObject: - component: {fileID: 4546369442828517320} m_Layer: 0 m_Name: Enemy1V2 - m_TagString: Untagged + m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -145,18 +157,6 @@ Transform: - {fileID: 3596055233112951220} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1080557620588792846 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6905705041633878913} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &-4060921817738925561 MonoBehaviour: m_ObjectHideFlags: 0 @@ -169,7 +169,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1fdfc885f1a69704b893825cf9e616ba, type: 3} m_Name: m_EditorClassIdentifier: - maxHealth: 100 + maxHealth: 1 OnHealthZero: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Resources/Enemies/1/Enemy1V3.prefab b/Assets/Resources/Enemies/1/Enemy1V3.prefab index 6c36ba0..1f93efb 100644 --- a/Assets/Resources/Enemies/1/Enemy1V3.prefab +++ b/Assets/Resources/Enemies/1/Enemy1V3.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 3596055233112951220} - component: {fileID: 8224209185524732719} - component: {fileID: 7324983754635409392} + - component: {fileID: 4650022438326706424} m_Layer: 0 m_Name: Renderer m_TagString: Untagged @@ -106,6 +107,18 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &4650022438326706424 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 658931473633382931} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &5264004513177534146 GameObject: m_ObjectHideFlags: 0 @@ -199,7 +212,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3920219362688286786} - - component: {fileID: 1080557620588792846} - component: {fileID: 1169561095041589923} - component: {fileID: -3565830332974631248} - component: {fileID: -99408799291400877} @@ -207,7 +219,7 @@ GameObject: - component: {fileID: 1757117162005437690} m_Layer: 0 m_Name: Enemy1V3 - m_TagString: Untagged + m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -229,18 +241,6 @@ Transform: - {fileID: 3596055233112951220} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1080557620588792846 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6905705041633878913} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &1169561095041589923 MonoBehaviour: m_ObjectHideFlags: 0 @@ -253,7 +253,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1fdfc885f1a69704b893825cf9e616ba, type: 3} m_Name: m_EditorClassIdentifier: - maxHealth: 100 + maxHealth: 1 OnHealthZero: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Resources/Enemies/2/Enemy2V1.prefab b/Assets/Resources/Enemies/2/Enemy2V1.prefab index 5e27435..9b12b37 100644 --- a/Assets/Resources/Enemies/2/Enemy2V1.prefab +++ b/Assets/Resources/Enemies/2/Enemy2V1.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 3596055233112951220} - component: {fileID: 8224209185524732719} - component: {fileID: 7324983754635409392} + - component: {fileID: 6676868702007323447} m_Layer: 0 m_Name: Renderer m_TagString: Untagged @@ -106,6 +107,18 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &6676868702007323447 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 658931473633382931} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &6905705041633878913 GameObject: m_ObjectHideFlags: 0 @@ -115,7 +128,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3920219362688286786} - - component: {fileID: 1080557620588792846} - component: {fileID: 2938081276856164938} - component: {fileID: 944314729512195366} - component: {fileID: 8373694659570615877} @@ -124,7 +136,7 @@ GameObject: - component: {fileID: 5347138904714296145} m_Layer: 0 m_Name: Enemy2V1 - m_TagString: Untagged + m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -146,18 +158,6 @@ Transform: - {fileID: 3596055233112951220} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1080557620588792846 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6905705041633878913} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &2938081276856164938 MonoBehaviour: m_ObjectHideFlags: 0 @@ -170,7 +170,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1fdfc885f1a69704b893825cf9e616ba, type: 3} m_Name: m_EditorClassIdentifier: - maxHealth: 100 + maxHealth: 1 OnHealthZero: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Resources/Enemies/2/Enemy2V2.prefab b/Assets/Resources/Enemies/2/Enemy2V2.prefab index d120a01..cc0b10c 100644 --- a/Assets/Resources/Enemies/2/Enemy2V2.prefab +++ b/Assets/Resources/Enemies/2/Enemy2V2.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 3596055233112951220} - component: {fileID: 8224209185524732719} - component: {fileID: 7324983754635409392} + - component: {fileID: 79027058586709562} m_Layer: 0 m_Name: Renderer m_TagString: Untagged @@ -106,6 +107,18 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &79027058586709562 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 658931473633382931} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &6240986660682715275 GameObject: m_ObjectHideFlags: 0 @@ -199,7 +212,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3920219362688286786} - - component: {fileID: 1080557620588792846} - component: {fileID: 2938081276856164938} - component: {fileID: 944314729512195366} - component: {fileID: 8373694659570615877} @@ -208,7 +220,7 @@ GameObject: - component: {fileID: 9116721273772261298} m_Layer: 0 m_Name: Enemy2V2 - m_TagString: Untagged + m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -230,18 +242,6 @@ Transform: - {fileID: 3596055233112951220} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1080557620588792846 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6905705041633878913} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &2938081276856164938 MonoBehaviour: m_ObjectHideFlags: 0 @@ -254,7 +254,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1fdfc885f1a69704b893825cf9e616ba, type: 3} m_Name: m_EditorClassIdentifier: - maxHealth: 100 + maxHealth: 1 OnHealthZero: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Resources/Enemies/2/Enemy2V3.prefab b/Assets/Resources/Enemies/2/Enemy2V3.prefab index 5104818..fa07a46 100644 --- a/Assets/Resources/Enemies/2/Enemy2V3.prefab +++ b/Assets/Resources/Enemies/2/Enemy2V3.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 3596055233112951220} - component: {fileID: 8224209185524732719} - component: {fileID: 7324983754635409392} + - component: {fileID: 1262270023421981356} m_Layer: 0 m_Name: Renderer m_TagString: Untagged @@ -106,6 +107,18 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &1262270023421981356 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 658931473633382931} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &737291232160764410 GameObject: m_ObjectHideFlags: 0 @@ -199,7 +212,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3920219362688286786} - - component: {fileID: 1080557620588792846} - component: {fileID: 2938081276856164938} - component: {fileID: 944314729512195366} - component: {fileID: 8373694659570615877} @@ -208,7 +220,7 @@ GameObject: - component: {fileID: 1597969697045467354} m_Layer: 0 m_Name: Enemy2V3 - m_TagString: Untagged + m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -230,18 +242,6 @@ Transform: - {fileID: 3596055233112951220} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1080557620588792846 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6905705041633878913} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &2938081276856164938 MonoBehaviour: m_ObjectHideFlags: 0 @@ -254,7 +254,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1fdfc885f1a69704b893825cf9e616ba, type: 3} m_Name: m_EditorClassIdentifier: - maxHealth: 100 + maxHealth: 1 OnHealthZero: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Resources/Enemies/3/Enemy3V1.prefab b/Assets/Resources/Enemies/3/Enemy3V1.prefab index 30a465f..97d2175 100644 --- a/Assets/Resources/Enemies/3/Enemy3V1.prefab +++ b/Assets/Resources/Enemies/3/Enemy3V1.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 3596055233112951220} - component: {fileID: 8224209185524732719} - component: {fileID: 7324983754635409392} + - component: {fileID: 380945553887586153} m_Layer: 0 m_Name: Renderer m_TagString: Untagged @@ -106,6 +107,18 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &380945553887586153 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 658931473633382931} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &6905705041633878913 GameObject: m_ObjectHideFlags: 0 @@ -115,7 +128,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3920219362688286786} - - component: {fileID: 1080557620588792846} - component: {fileID: 2938081276856164938} - component: {fileID: 944314729512195366} - component: {fileID: 8373694659570615877} @@ -124,7 +136,7 @@ GameObject: - component: {fileID: 5775148875117303771} m_Layer: 0 m_Name: Enemy3V1 - m_TagString: Untagged + m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -146,18 +158,6 @@ Transform: - {fileID: 3596055233112951220} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1080557620588792846 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6905705041633878913} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &2938081276856164938 MonoBehaviour: m_ObjectHideFlags: 0 @@ -170,7 +170,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1fdfc885f1a69704b893825cf9e616ba, type: 3} m_Name: m_EditorClassIdentifier: - maxHealth: 100 + maxHealth: 1 OnHealthZero: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Resources/Enemies/3/Enemy3V2.prefab b/Assets/Resources/Enemies/3/Enemy3V2.prefab index de18a86..d1389a3 100644 --- a/Assets/Resources/Enemies/3/Enemy3V2.prefab +++ b/Assets/Resources/Enemies/3/Enemy3V2.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 3596055233112951220} - component: {fileID: 8224209185524732719} - component: {fileID: 7324983754635409392} + - component: {fileID: 4743975154029219207} m_Layer: 0 m_Name: Renderer m_TagString: Untagged @@ -106,6 +107,18 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &4743975154029219207 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 658931473633382931} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &5163044581904956856 GameObject: m_ObjectHideFlags: 0 @@ -199,7 +212,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3920219362688286786} - - component: {fileID: 1080557620588792846} - component: {fileID: 2938081276856164938} - component: {fileID: 944314729512195366} - component: {fileID: 8373694659570615877} @@ -208,7 +220,7 @@ GameObject: - component: {fileID: 629574706924414947} m_Layer: 0 m_Name: Enemy3V2 - m_TagString: Untagged + m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -230,18 +242,6 @@ Transform: - {fileID: 3596055233112951220} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1080557620588792846 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6905705041633878913} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &2938081276856164938 MonoBehaviour: m_ObjectHideFlags: 0 @@ -254,7 +254,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1fdfc885f1a69704b893825cf9e616ba, type: 3} m_Name: m_EditorClassIdentifier: - maxHealth: 100 + maxHealth: 1 OnHealthZero: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Resources/Enemies/3/Enemy3V3.prefab b/Assets/Resources/Enemies/3/Enemy3V3.prefab index 13d34c7..7bf74d3 100644 --- a/Assets/Resources/Enemies/3/Enemy3V3.prefab +++ b/Assets/Resources/Enemies/3/Enemy3V3.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 3596055233112951220} - component: {fileID: 8224209185524732719} - component: {fileID: 7324983754635409392} + - component: {fileID: 6960271293301079662} m_Layer: 0 m_Name: Renderer m_TagString: Untagged @@ -106,6 +107,18 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &6960271293301079662 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 658931473633382931} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &5743397826554235676 GameObject: m_ObjectHideFlags: 0 @@ -199,7 +212,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3920219362688286786} - - component: {fileID: 1080557620588792846} - component: {fileID: 2938081276856164938} - component: {fileID: 944314729512195366} - component: {fileID: 8373694659570615877} @@ -208,7 +220,7 @@ GameObject: - component: {fileID: 9180341162620792323} m_Layer: 0 m_Name: Enemy3V3 - m_TagString: Untagged + m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -230,18 +242,6 @@ Transform: - {fileID: 3596055233112951220} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1080557620588792846 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6905705041633878913} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &2938081276856164938 MonoBehaviour: m_ObjectHideFlags: 0 @@ -254,7 +254,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1fdfc885f1a69704b893825cf9e616ba, type: 3} m_Name: m_EditorClassIdentifier: - maxHealth: 100 + maxHealth: 1 OnHealthZero: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Resources/Enemies/4/Enemy4V1.prefab b/Assets/Resources/Enemies/4/Enemy4V1.prefab index 72e7682..6540027 100644 --- a/Assets/Resources/Enemies/4/Enemy4V1.prefab +++ b/Assets/Resources/Enemies/4/Enemy4V1.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 3596055233112951220} - component: {fileID: 8224209185524732719} - component: {fileID: 7324983754635409392} + - component: {fileID: 7456228604330582986} m_Layer: 0 m_Name: Renderer m_TagString: Untagged @@ -106,6 +107,18 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &7456228604330582986 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 658931473633382931} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &6905705041633878913 GameObject: m_ObjectHideFlags: 0 @@ -115,7 +128,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3920219362688286786} - - component: {fileID: 1080557620588792846} - component: {fileID: 2938081276856164938} - component: {fileID: 944314729512195366} - component: {fileID: 8373694659570615877} @@ -124,7 +136,7 @@ GameObject: - component: {fileID: 1593837753105570956} m_Layer: 0 m_Name: Enemy4V1 - m_TagString: Untagged + m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -146,18 +158,6 @@ Transform: - {fileID: 3596055233112951220} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1080557620588792846 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6905705041633878913} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &2938081276856164938 MonoBehaviour: m_ObjectHideFlags: 0 @@ -170,7 +170,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1fdfc885f1a69704b893825cf9e616ba, type: 3} m_Name: m_EditorClassIdentifier: - maxHealth: 100 + maxHealth: 1 OnHealthZero: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Resources/Enemies/4/Enemy4V2.prefab b/Assets/Resources/Enemies/4/Enemy4V2.prefab index c3c1819..f420f1e 100644 --- a/Assets/Resources/Enemies/4/Enemy4V2.prefab +++ b/Assets/Resources/Enemies/4/Enemy4V2.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 3596055233112951220} - component: {fileID: 8224209185524732719} - component: {fileID: 7324983754635409392} + - component: {fileID: 3773768291929000510} m_Layer: 0 m_Name: Renderer m_TagString: Untagged @@ -106,6 +107,18 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &3773768291929000510 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 658931473633382931} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &3503255070657254113 GameObject: m_ObjectHideFlags: 0 @@ -199,7 +212,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3920219362688286786} - - component: {fileID: 1080557620588792846} - component: {fileID: 2938081276856164938} - component: {fileID: 944314729512195366} - component: {fileID: 8373694659570615877} @@ -208,7 +220,7 @@ GameObject: - component: {fileID: 6992716262122209801} m_Layer: 0 m_Name: Enemy4V2 - m_TagString: Untagged + m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -230,18 +242,6 @@ Transform: - {fileID: 3596055233112951220} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1080557620588792846 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6905705041633878913} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &2938081276856164938 MonoBehaviour: m_ObjectHideFlags: 0 @@ -254,7 +254,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1fdfc885f1a69704b893825cf9e616ba, type: 3} m_Name: m_EditorClassIdentifier: - maxHealth: 100 + maxHealth: 1 OnHealthZero: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Resources/Enemies/4/Enemy4V3.prefab b/Assets/Resources/Enemies/4/Enemy4V3.prefab index edcd94b..3126c68 100644 --- a/Assets/Resources/Enemies/4/Enemy4V3.prefab +++ b/Assets/Resources/Enemies/4/Enemy4V3.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 3596055233112951220} - component: {fileID: 8224209185524732719} - component: {fileID: 7324983754635409392} + - component: {fileID: 5310106354362304851} m_Layer: 0 m_Name: Renderer m_TagString: Untagged @@ -106,6 +107,18 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &5310106354362304851 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 658931473633382931} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &6550912095123086306 GameObject: m_ObjectHideFlags: 0 @@ -199,7 +212,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3920219362688286786} - - component: {fileID: 1080557620588792846} - component: {fileID: 2938081276856164938} - component: {fileID: 944314729512195366} - component: {fileID: 8373694659570615877} @@ -208,7 +220,7 @@ GameObject: - component: {fileID: 5275513863136233879} m_Layer: 0 m_Name: Enemy4V3 - m_TagString: Untagged + m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -230,18 +242,6 @@ Transform: - {fileID: 3596055233112951220} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1080557620588792846 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6905705041633878913} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &2938081276856164938 MonoBehaviour: m_ObjectHideFlags: 0 @@ -254,7 +254,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1fdfc885f1a69704b893825cf9e616ba, type: 3} m_Name: m_EditorClassIdentifier: - maxHealth: 100 + maxHealth: 1 OnHealthZero: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Resources/Enemies/5/Enemy5V1.prefab b/Assets/Resources/Enemies/5/Enemy5V1.prefab index e60b1d2..45513c6 100644 --- a/Assets/Resources/Enemies/5/Enemy5V1.prefab +++ b/Assets/Resources/Enemies/5/Enemy5V1.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 3596055233112951220} - component: {fileID: 8224209185524732719} - component: {fileID: 7324983754635409392} + - component: {fileID: 7705456131707405570} m_Layer: 0 m_Name: Renderer m_TagString: Untagged @@ -106,6 +107,18 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &7705456131707405570 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 658931473633382931} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &4734876489558749316 GameObject: m_ObjectHideFlags: 0 @@ -199,7 +212,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3920219362688286786} - - component: {fileID: 1080557620588792846} - component: {fileID: 2938081276856164938} - component: {fileID: 944314729512195366} - component: {fileID: 8373694659570615877} @@ -208,7 +220,7 @@ GameObject: - component: {fileID: 853766927484383816} m_Layer: 0 m_Name: Enemy5V1 - m_TagString: Untagged + m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -230,18 +242,6 @@ Transform: - {fileID: 3596055233112951220} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1080557620588792846 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6905705041633878913} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &2938081276856164938 MonoBehaviour: m_ObjectHideFlags: 0 @@ -254,7 +254,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1fdfc885f1a69704b893825cf9e616ba, type: 3} m_Name: m_EditorClassIdentifier: - maxHealth: 100 + maxHealth: 1 OnHealthZero: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Resources/Enemies/5/Enemy5V2.prefab b/Assets/Resources/Enemies/5/Enemy5V2.prefab index b677e31..3853aec 100644 --- a/Assets/Resources/Enemies/5/Enemy5V2.prefab +++ b/Assets/Resources/Enemies/5/Enemy5V2.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 3596055233112951220} - component: {fileID: 8224209185524732719} - component: {fileID: 7324983754635409392} + - component: {fileID: 3058428090352972272} m_Layer: 0 m_Name: Renderer m_TagString: Untagged @@ -106,6 +107,18 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &3058428090352972272 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 658931473633382931} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &6538858291398231023 GameObject: m_ObjectHideFlags: 0 @@ -199,7 +212,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3920219362688286786} - - component: {fileID: 1080557620588792846} - component: {fileID: 2938081276856164938} - component: {fileID: 944314729512195366} - component: {fileID: 8373694659570615877} @@ -208,7 +220,7 @@ GameObject: - component: {fileID: 1353826037353208613} m_Layer: 0 m_Name: Enemy5V2 - m_TagString: Untagged + m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -230,18 +242,6 @@ Transform: - {fileID: 3596055233112951220} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1080557620588792846 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6905705041633878913} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &2938081276856164938 MonoBehaviour: m_ObjectHideFlags: 0 @@ -254,7 +254,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1fdfc885f1a69704b893825cf9e616ba, type: 3} m_Name: m_EditorClassIdentifier: - maxHealth: 100 + maxHealth: 1 OnHealthZero: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Resources/Enemies/5/Enemy5V3.prefab b/Assets/Resources/Enemies/5/Enemy5V3.prefab index 8529e11..a5385da 100644 --- a/Assets/Resources/Enemies/5/Enemy5V3.prefab +++ b/Assets/Resources/Enemies/5/Enemy5V3.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 3596055233112951220} - component: {fileID: 8224209185524732719} - component: {fileID: 7324983754635409392} + - component: {fileID: 6431443862649221932} m_Layer: 0 m_Name: Renderer m_TagString: Untagged @@ -106,6 +107,18 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &6431443862649221932 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 658931473633382931} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2232121724853526948 GameObject: m_ObjectHideFlags: 0 @@ -199,7 +212,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3920219362688286786} - - component: {fileID: 1080557620588792846} - component: {fileID: 2938081276856164938} - component: {fileID: 944314729512195366} - component: {fileID: 8373694659570615877} @@ -208,7 +220,7 @@ GameObject: - component: {fileID: 1104779658182803384} m_Layer: 0 m_Name: Enemy5V3 - m_TagString: Untagged + m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -230,18 +242,6 @@ Transform: - {fileID: 3596055233112951220} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1080557620588792846 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6905705041633878913} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &2938081276856164938 MonoBehaviour: m_ObjectHideFlags: 0 @@ -254,7 +254,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1fdfc885f1a69704b893825cf9e616ba, type: 3} m_Name: m_EditorClassIdentifier: - maxHealth: 100 + maxHealth: 1 OnHealthZero: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Resources/Enemies/6/Enemy6V1.prefab b/Assets/Resources/Enemies/6/Enemy6V1.prefab index d51db18..370b4c3 100644 --- a/Assets/Resources/Enemies/6/Enemy6V1.prefab +++ b/Assets/Resources/Enemies/6/Enemy6V1.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 3596055233112951220} - component: {fileID: 8224209185524732719} - component: {fileID: 7324983754635409392} + - component: {fileID: 4797673360649615257} m_Layer: 0 m_Name: Renderer m_TagString: Untagged @@ -106,6 +107,18 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &4797673360649615257 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 658931473633382931} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1533843569211901549 GameObject: m_ObjectHideFlags: 0 @@ -199,7 +212,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3920219362688286786} - - component: {fileID: 1080557620588792846} - component: {fileID: 2938081276856164938} - component: {fileID: 944314729512195366} - component: {fileID: 8373694659570615877} @@ -208,7 +220,7 @@ GameObject: - component: {fileID: 7675421169139995944} m_Layer: 0 m_Name: Enemy6V1 - m_TagString: Untagged + m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -230,18 +242,6 @@ Transform: - {fileID: 3596055233112951220} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1080557620588792846 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6905705041633878913} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &2938081276856164938 MonoBehaviour: m_ObjectHideFlags: 0 @@ -254,7 +254,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1fdfc885f1a69704b893825cf9e616ba, type: 3} m_Name: m_EditorClassIdentifier: - maxHealth: 100 + maxHealth: 1 OnHealthZero: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Resources/Enemies/6/Enemy6V2.prefab b/Assets/Resources/Enemies/6/Enemy6V2.prefab index 94120fc..74dc37b 100644 --- a/Assets/Resources/Enemies/6/Enemy6V2.prefab +++ b/Assets/Resources/Enemies/6/Enemy6V2.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 3596055233112951220} - component: {fileID: 8224209185524732719} - component: {fileID: 7324983754635409392} + - component: {fileID: 5344301064774162108} m_Layer: 0 m_Name: Renderer m_TagString: Untagged @@ -106,6 +107,18 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &5344301064774162108 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 658931473633382931} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &6191794988166842775 GameObject: m_ObjectHideFlags: 0 @@ -199,7 +212,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3920219362688286786} - - component: {fileID: 1080557620588792846} - component: {fileID: 2938081276856164938} - component: {fileID: 944314729512195366} - component: {fileID: 8373694659570615877} @@ -208,7 +220,7 @@ GameObject: - component: {fileID: 4435590555684305438} m_Layer: 0 m_Name: Enemy6V2 - m_TagString: Untagged + m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -230,18 +242,6 @@ Transform: - {fileID: 3596055233112951220} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1080557620588792846 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6905705041633878913} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &2938081276856164938 MonoBehaviour: m_ObjectHideFlags: 0 @@ -254,7 +254,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1fdfc885f1a69704b893825cf9e616ba, type: 3} m_Name: m_EditorClassIdentifier: - maxHealth: 100 + maxHealth: 1 OnHealthZero: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Resources/Enemies/6/Enemy6V3.prefab b/Assets/Resources/Enemies/6/Enemy6V3.prefab index fae5c78..ab578e0 100644 --- a/Assets/Resources/Enemies/6/Enemy6V3.prefab +++ b/Assets/Resources/Enemies/6/Enemy6V3.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 3596055233112951220} - component: {fileID: 8224209185524732719} - component: {fileID: 7324983754635409392} + - component: {fileID: 6304181479893771717} m_Layer: 0 m_Name: Renderer m_TagString: Untagged @@ -106,6 +107,18 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &6304181479893771717 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 658931473633382931} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1602580555763979504 GameObject: m_ObjectHideFlags: 0 @@ -199,7 +212,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3920219362688286786} - - component: {fileID: 1080557620588792846} - component: {fileID: 2938081276856164938} - component: {fileID: 944314729512195366} - component: {fileID: 8373694659570615877} @@ -208,7 +220,7 @@ GameObject: - component: {fileID: 3935275739920240744} m_Layer: 0 m_Name: Enemy6V3 - m_TagString: Untagged + m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -230,18 +242,6 @@ Transform: - {fileID: 3596055233112951220} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1080557620588792846 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6905705041633878913} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &2938081276856164938 MonoBehaviour: m_ObjectHideFlags: 0 @@ -254,7 +254,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1fdfc885f1a69704b893825cf9e616ba, type: 3} m_Name: m_EditorClassIdentifier: - maxHealth: 100 + maxHealth: 1 OnHealthZero: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Scripts/Enemy/EnemyAnimationHandler.cs b/Assets/Scripts/Enemy/EnemyAnimationHandler.cs index f763da9..a510a5f 100644 --- a/Assets/Scripts/Enemy/EnemyAnimationHandler.cs +++ b/Assets/Scripts/Enemy/EnemyAnimationHandler.cs @@ -1,40 +1,48 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.AI; public class EnemyAnimationHandler : MonoBehaviour { Animator animator; + bool isDying = false; void Start() { - animator = GetComponentInChildren(); + animator = GetComponent(); if (animator != animator.enabled) animator.enabled = true; - GetComponent().OnHealthZero.AddListener(EnemyDie); + GetComponentInParent().OnHealthZero.AddListener(EnemyDie); } void EnemyDie() { + GetComponent().enabled = false; + GetComponent().enabled = false; + StartCoroutine(AnimationDie()); } IEnumerator AnimationDie() { + isDying = true; Strangle(); - yield return new WaitForSecondsRealtime(1f); + Debug.Log("Strangle"); + yield return new WaitForSecondsRealtime(0.1f); Die(); - while (animator.GetCurrentAnimatorStateInfo(0).normalizedTime < 1f) - yield return new WaitForEndOfFrame(); - Destroy(gameObject); } public void Strangle() { - animator.SetTrigger("Die"); + animator.SetTrigger("Strangle"); } public void Die() { animator.SetTrigger("Die"); + } + public void DestroyGameobject() + { + Destroy(transform.parent.gameObject); } } diff --git a/Assets/Scripts/Enemy/EnemyPathFinding.cs b/Assets/Scripts/Enemy/EnemyPathFinding.cs index 89e318a..e521546 100644 --- a/Assets/Scripts/Enemy/EnemyPathFinding.cs +++ b/Assets/Scripts/Enemy/EnemyPathFinding.cs @@ -29,6 +29,7 @@ public class EnemyPathFinding : MonoBehaviour Vector2 dir = closestTarget.position - transform.position; if (Physics2D.Raycast(transform.position, dir.normalized, ropeDistCheck, ropeCheckMask)) return; + agent.SetDestination(closestTarget.position); } diff --git a/Assets/Scripts/Player/HealthComponent.cs b/Assets/Scripts/Player/HealthComponent.cs index 15435da..dc4b7bb 100644 --- a/Assets/Scripts/Player/HealthComponent.cs +++ b/Assets/Scripts/Player/HealthComponent.cs @@ -6,6 +6,7 @@ using UnityUtils; public class HealthComponent : MonoBehaviour, ISquezeDamageReceiver { + [SerializeField] private bool onlyCallZeroHealthOnce = true; [SerializeField] float maxHealth = 100; [SerializeField] float damageTickDelay = 0.25f; @@ -26,6 +27,8 @@ public class HealthComponent : MonoBehaviour, ISquezeDamageReceiver [SerializeField] float squezeDamageScalor = 1f; + bool alreadyReachedZero = false; + void Awake() { currentHealth = maxHealth; @@ -62,12 +65,19 @@ public class HealthComponent : MonoBehaviour, ISquezeDamageReceiver accumulatedDamageInTick += damage; if (currentHealth <= 0) { + if (alreadyReachedZero && onlyCallZeroHealthOnce) return; + + alreadyReachedZero = true; // Make sure to flush accumulated when dying if (accumulatedDamageInTick > 1f) OnHealthChangeAtPos?.Invoke(transform.position.Add(y: 2f), accumulatedDamageInTick); OnHealthZero?.Invoke(); - BloodComputeShader.Instance.createBlood(transform.position, (int)(maxHealth *maxHealth * BloodComputeShader.Instance.scoreMult), maxHealth / 8.0f); + + int blood = (int)(maxHealth * 100.0f * BloodComputeShader.Instance.scoreMult); + + BloodComputeShader.Instance.createBlood(transform.position, blood/2, maxHealth / 8.0f); + BloodComputeShader.Instance.createBlood(transform.position, blood / 2, maxHealth / 8.0f); } } diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 68325ec..571ded4 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -3,7 +3,8 @@ --- !u!78 &1 TagManager: serializedVersion: 2 - tags: [] + tags: + - Enemy layers: - Default - TransparentFX