diff --git a/Assets/Animations/EnemyAnimations/2/v1/Enemy2v1.controller b/Assets/Animations/EnemyAnimations/2/v1/Enemy2v1.controller index a64a77d..e027060 100644 --- a/Assets/Animations/EnemyAnimations/2/v1/Enemy2v1.controller +++ b/Assets/Animations/EnemyAnimations/2/v1/Enemy2v1.controller @@ -8,7 +8,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Walk - m_Speed: 1 + m_Speed: 0.9 m_CycleOffset: 0 m_Transitions: - {fileID: 5282573214845644438} diff --git a/Assets/Animations/EnemyAnimations/2/v2/Enemy2v2.controller b/Assets/Animations/EnemyAnimations/2/v2/Enemy2v2.controller index 3f29802..323591e 100644 --- a/Assets/Animations/EnemyAnimations/2/v2/Enemy2v2.controller +++ b/Assets/Animations/EnemyAnimations/2/v2/Enemy2v2.controller @@ -92,13 +92,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 @@ -120,7 +120,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Walk - m_Speed: 1 + m_Speed: 0.9 m_CycleOffset: 0 m_Transitions: - {fileID: -1830054964882670337} diff --git a/Assets/Animations/EnemyAnimations/2/v3/Enemy2v3.controller b/Assets/Animations/EnemyAnimations/2/v3/Enemy2v3.controller index f15ea02..e415785 100644 --- a/Assets/Animations/EnemyAnimations/2/v3/Enemy2v3.controller +++ b/Assets/Animations/EnemyAnimations/2/v3/Enemy2v3.controller @@ -69,13 +69,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 @@ -97,7 +97,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Walk - m_Speed: 1 + m_Speed: 0.9 m_CycleOffset: 0 m_Transitions: - {fileID: 6546347439896382980} diff --git a/Assets/Animations/EnemyAnimations/3/v1/Enemy3v1.controller b/Assets/Animations/EnemyAnimations/3/v1/Enemy3v1.controller index 5347167..fd716ea 100644 --- a/Assets/Animations/EnemyAnimations/3/v1/Enemy3v1.controller +++ b/Assets/Animations/EnemyAnimations/3/v1/Enemy3v1.controller @@ -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 @@ -121,7 +121,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Walk - m_Speed: 1 + m_Speed: 0.85 m_CycleOffset: 0 m_Transitions: - {fileID: 4766532431531928378} diff --git a/Assets/Animations/EnemyAnimations/3/v2/Enemy3v2.controller b/Assets/Animations/EnemyAnimations/3/v2/Enemy3v2.controller index 99c2f7b..fc3e457 100644 --- a/Assets/Animations/EnemyAnimations/3/v2/Enemy3v2.controller +++ b/Assets/Animations/EnemyAnimations/3/v2/Enemy3v2.controller @@ -120,13 +120,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 @@ -148,7 +148,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Walk - m_Speed: 1 + m_Speed: 0.85 m_CycleOffset: 0 m_Transitions: - {fileID: 8479572492955670265} diff --git a/Assets/Animations/EnemyAnimations/3/v3/Enemy3v3.controller b/Assets/Animations/EnemyAnimations/3/v3/Enemy3v3.controller index 332ec83..9ef6b4d 100644 --- a/Assets/Animations/EnemyAnimations/3/v3/Enemy3v3.controller +++ b/Assets/Animations/EnemyAnimations/3/v3/Enemy3v3.controller @@ -86,7 +86,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Walk - m_Speed: 1 + m_Speed: 0.85 m_CycleOffset: 0 m_Transitions: - {fileID: -3805631790868349570} @@ -119,13 +119,13 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: Strangler 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/4/v1/Walk.anim b/Assets/Animations/EnemyAnimations/4/v1/Walk.anim index a1e457a..63cc3a5 100644 --- a/Assets/Animations/EnemyAnimations/4/v1/Walk.anim +++ b/Assets/Animations/EnemyAnimations/4/v1/Walk.anim @@ -26,33 +26,6 @@ AnimationClip: 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.25 - value: {x: 0, y: 0, z: -8} - 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.5 - value: {x: 0, y: 0, z: 0} - inSlope: {x: 0, y: 0, z: 32} - outSlope: {x: 0, y: 0, z: 32} - 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.75 - value: {x: 0, y: 0, z: 8} - 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: 1 value: {x: 0, y: 0, z: 0} @@ -72,16 +45,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: -0.1, 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.25 - value: {x: 0.4, y: 0.1, z: 0} + value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -90,16 +54,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.5 - value: {x: 0, y: -0.1, z: 0} - inSlope: {x: -0.31999978, y: 0, z: 0} - outSlope: {x: -0.31999978, 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.75 - value: {x: -0.04, y: 0.1, z: 0} + value: {x: 0.2, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -108,7 +63,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 1 - value: {x: 0, y: -0.1, z: 0} + value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -125,16 +80,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 1, y: 0.95, z: 1} - 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.25 - value: {x: 1, y: 1.05, z: 1} + value: {x: 1, y: 1, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -143,16 +89,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.5 - value: {x: 1, y: 0.95, z: 1} - 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.75 - value: {x: 1, y: 1.05, z: 1} + value: {x: 0.9, y: 0.98, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -161,7 +98,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 1 - value: {x: 1, y: 0.95, z: 1} + value: {x: 1, y: 1, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -192,19 +129,19 @@ AnimationClip: isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 0 - attribute: 4 + attribute: 3 script: {fileID: 0} typeID: 4 - customType: 4 + customType: 0 isPPtrCurve: 0 isIntCurve: 0 isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 0 - attribute: 3 + attribute: 4 script: {fileID: 0} typeID: 4 - customType: 0 + customType: 4 isPPtrCurve: 0 isIntCurve: 0 isSerializeReferenceCurve: 0 @@ -230,66 +167,6 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0.25 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.75 - 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: localEulerAnglesRaw.x - path: - classID: 4 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0.25 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.75 - 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: localEulerAnglesRaw.y - path: - classID: 4 - script: {fileID: 0} - flags: 0 - serializedVersion: 2 curve: serializedVersion: 2 @@ -303,33 +180,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.25 - value: -8 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: 0 - inSlope: 32 - outSlope: 32 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.75 - value: 8 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - serializedVersion: 3 time: 1 value: 0 @@ -353,16 +203,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.95 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.25 - value: 1.05 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -371,16 +212,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.5 - value: 0.95 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.75 - value: 1.05 + value: 0.98 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -389,7 +221,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 0.95 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -417,27 +249,9 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.25 - value: 0.4 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - serializedVersion: 3 time: 0.5 - value: 0 - inSlope: -0.31999978 - outSlope: -0.31999978 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.75 - value: -0.04 + value: 0.2 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -467,34 +281,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.25 - value: 0.1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: -0.1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.75 - value: 0.1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -503,7 +290,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: -0.1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -523,8 +310,8 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0.25 - value: 0 + time: 0 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -532,8 +319,17 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.75 - value: 0 + time: 0.5 + value: 0.9 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -543,48 +339,12 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_LocalPosition.z + attribute: m_LocalScale.x path: classID: 4 script: {fileID: 0} - flags: 0 - m_EulerEditorCurves: - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x - path: - classID: 4 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.y - path: - classID: 4 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.z - path: - classID: 4 - script: {fileID: 0} - flags: 0 + flags: 8 + m_EulerEditorCurves: [] m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 m_Events: [] diff --git a/Assets/Animations/EnemyAnimations/4/v2/Enemy4v2.controller b/Assets/Animations/EnemyAnimations/4/v2/Enemy4v2.controller index 9b3cb21..167417a 100644 --- a/Assets/Animations/EnemyAnimations/4/v2/Enemy4v2.controller +++ b/Assets/Animations/EnemyAnimations/4/v2/Enemy4v2.controller @@ -46,7 +46,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 79f709beb8bba97498232b71e0a18819, type: 2} + m_Motion: {fileID: 7400000, guid: 9d19041e3de1fa6479a421eb0e4a8276, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -147,13 +147,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/4/v2/Walk.anim b/Assets/Animations/EnemyAnimations/4/v2/Walk.anim index a1e457a..63cc3a5 100644 --- a/Assets/Animations/EnemyAnimations/4/v2/Walk.anim +++ b/Assets/Animations/EnemyAnimations/4/v2/Walk.anim @@ -26,33 +26,6 @@ AnimationClip: 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.25 - value: {x: 0, y: 0, z: -8} - 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.5 - value: {x: 0, y: 0, z: 0} - inSlope: {x: 0, y: 0, z: 32} - outSlope: {x: 0, y: 0, z: 32} - 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.75 - value: {x: 0, y: 0, z: 8} - 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: 1 value: {x: 0, y: 0, z: 0} @@ -72,16 +45,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: -0.1, 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.25 - value: {x: 0.4, y: 0.1, z: 0} + value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -90,16 +54,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.5 - value: {x: 0, y: -0.1, z: 0} - inSlope: {x: -0.31999978, y: 0, z: 0} - outSlope: {x: -0.31999978, 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.75 - value: {x: -0.04, y: 0.1, z: 0} + value: {x: 0.2, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -108,7 +63,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 1 - value: {x: 0, y: -0.1, z: 0} + value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -125,16 +80,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 1, y: 0.95, z: 1} - 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.25 - value: {x: 1, y: 1.05, z: 1} + value: {x: 1, y: 1, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -143,16 +89,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.5 - value: {x: 1, y: 0.95, z: 1} - 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.75 - value: {x: 1, y: 1.05, z: 1} + value: {x: 0.9, y: 0.98, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -161,7 +98,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 1 - value: {x: 1, y: 0.95, z: 1} + value: {x: 1, y: 1, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -192,19 +129,19 @@ AnimationClip: isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 0 - attribute: 4 + attribute: 3 script: {fileID: 0} typeID: 4 - customType: 4 + customType: 0 isPPtrCurve: 0 isIntCurve: 0 isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 0 - attribute: 3 + attribute: 4 script: {fileID: 0} typeID: 4 - customType: 0 + customType: 4 isPPtrCurve: 0 isIntCurve: 0 isSerializeReferenceCurve: 0 @@ -230,66 +167,6 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0.25 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.75 - 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: localEulerAnglesRaw.x - path: - classID: 4 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0.25 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.75 - 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: localEulerAnglesRaw.y - path: - classID: 4 - script: {fileID: 0} - flags: 0 - serializedVersion: 2 curve: serializedVersion: 2 @@ -303,33 +180,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.25 - value: -8 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: 0 - inSlope: 32 - outSlope: 32 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.75 - value: 8 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - serializedVersion: 3 time: 1 value: 0 @@ -353,16 +203,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.95 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.25 - value: 1.05 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -371,16 +212,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.5 - value: 0.95 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.75 - value: 1.05 + value: 0.98 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -389,7 +221,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 0.95 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -417,27 +249,9 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.25 - value: 0.4 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - serializedVersion: 3 time: 0.5 - value: 0 - inSlope: -0.31999978 - outSlope: -0.31999978 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.75 - value: -0.04 + value: 0.2 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -467,34 +281,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.25 - value: 0.1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: -0.1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.75 - value: 0.1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -503,7 +290,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: -0.1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -523,8 +310,8 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0.25 - value: 0 + time: 0 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -532,8 +319,17 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.75 - value: 0 + time: 0.5 + value: 0.9 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -543,48 +339,12 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_LocalPosition.z + attribute: m_LocalScale.x path: classID: 4 script: {fileID: 0} - flags: 0 - m_EulerEditorCurves: - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x - path: - classID: 4 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.y - path: - classID: 4 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.z - path: - classID: 4 - script: {fileID: 0} - flags: 0 + flags: 8 + m_EulerEditorCurves: [] m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 m_Events: [] diff --git a/Assets/Animations/EnemyAnimations/4/v2/Walk.anim.meta b/Assets/Animations/EnemyAnimations/4/v2/Walk.anim.meta index 3175d08..6e305a3 100644 --- a/Assets/Animations/EnemyAnimations/4/v2/Walk.anim.meta +++ b/Assets/Animations/EnemyAnimations/4/v2/Walk.anim.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 79f709beb8bba97498232b71e0a18819 +guid: 9d19041e3de1fa6479a421eb0e4a8276 NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 diff --git a/Assets/Animations/EnemyAnimations/4/v3/Enemy4v3.controller b/Assets/Animations/EnemyAnimations/4/v3/Enemy4v3.controller index 91ac262..abaeb30 100644 --- a/Assets/Animations/EnemyAnimations/4/v3/Enemy4v3.controller +++ b/Assets/Animations/EnemyAnimations/4/v3/Enemy4v3.controller @@ -100,7 +100,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 24d40fe7a704c9b42845296a2babcefd, type: 2} + m_Motion: {fileID: 7400000, guid: 5a2cbb0de94ade142999fb0b8a4164c5, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -147,13 +147,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/4/v3/Walk.anim b/Assets/Animations/EnemyAnimations/4/v3/Walk.anim index a1e457a..63cc3a5 100644 --- a/Assets/Animations/EnemyAnimations/4/v3/Walk.anim +++ b/Assets/Animations/EnemyAnimations/4/v3/Walk.anim @@ -26,33 +26,6 @@ AnimationClip: 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.25 - value: {x: 0, y: 0, z: -8} - 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.5 - value: {x: 0, y: 0, z: 0} - inSlope: {x: 0, y: 0, z: 32} - outSlope: {x: 0, y: 0, z: 32} - 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.75 - value: {x: 0, y: 0, z: 8} - 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: 1 value: {x: 0, y: 0, z: 0} @@ -72,16 +45,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: -0.1, 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.25 - value: {x: 0.4, y: 0.1, z: 0} + value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -90,16 +54,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.5 - value: {x: 0, y: -0.1, z: 0} - inSlope: {x: -0.31999978, y: 0, z: 0} - outSlope: {x: -0.31999978, 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.75 - value: {x: -0.04, y: 0.1, z: 0} + value: {x: 0.2, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -108,7 +63,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 1 - value: {x: 0, y: -0.1, z: 0} + value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -125,16 +80,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 1, y: 0.95, z: 1} - 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.25 - value: {x: 1, y: 1.05, z: 1} + value: {x: 1, y: 1, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -143,16 +89,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.5 - value: {x: 1, y: 0.95, z: 1} - 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.75 - value: {x: 1, y: 1.05, z: 1} + value: {x: 0.9, y: 0.98, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -161,7 +98,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 1 - value: {x: 1, y: 0.95, z: 1} + value: {x: 1, y: 1, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -192,19 +129,19 @@ AnimationClip: isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 0 - attribute: 4 + attribute: 3 script: {fileID: 0} typeID: 4 - customType: 4 + customType: 0 isPPtrCurve: 0 isIntCurve: 0 isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 0 - attribute: 3 + attribute: 4 script: {fileID: 0} typeID: 4 - customType: 0 + customType: 4 isPPtrCurve: 0 isIntCurve: 0 isSerializeReferenceCurve: 0 @@ -230,66 +167,6 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0.25 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.75 - 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: localEulerAnglesRaw.x - path: - classID: 4 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0.25 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.75 - 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: localEulerAnglesRaw.y - path: - classID: 4 - script: {fileID: 0} - flags: 0 - serializedVersion: 2 curve: serializedVersion: 2 @@ -303,33 +180,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.25 - value: -8 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: 0 - inSlope: 32 - outSlope: 32 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.75 - value: 8 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - serializedVersion: 3 time: 1 value: 0 @@ -353,16 +203,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.95 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.25 - value: 1.05 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -371,16 +212,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.5 - value: 0.95 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.75 - value: 1.05 + value: 0.98 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -389,7 +221,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: 0.95 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -417,27 +249,9 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.25 - value: 0.4 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - serializedVersion: 3 time: 0.5 - value: 0 - inSlope: -0.31999978 - outSlope: -0.31999978 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.75 - value: -0.04 + value: 0.2 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -467,34 +281,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.25 - value: 0.1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: -0.1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.75 - value: 0.1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -503,7 +290,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1 - value: -0.1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -523,8 +310,8 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0.25 - value: 0 + time: 0 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -532,8 +319,17 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.75 - value: 0 + time: 0.5 + value: 0.9 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -543,48 +339,12 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_LocalPosition.z + attribute: m_LocalScale.x path: classID: 4 script: {fileID: 0} - flags: 0 - m_EulerEditorCurves: - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x - path: - classID: 4 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.y - path: - classID: 4 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.z - path: - classID: 4 - script: {fileID: 0} - flags: 0 + flags: 8 + m_EulerEditorCurves: [] m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 m_Events: [] diff --git a/Assets/Animations/EnemyAnimations/4/v3/Walk.anim.meta b/Assets/Animations/EnemyAnimations/4/v3/Walk.anim.meta index 8b9a986..9e9925d 100644 --- a/Assets/Animations/EnemyAnimations/4/v3/Walk.anim.meta +++ b/Assets/Animations/EnemyAnimations/4/v3/Walk.anim.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 24d40fe7a704c9b42845296a2babcefd +guid: 5a2cbb0de94ade142999fb0b8a4164c5 NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 diff --git a/Assets/Animations/EnemyAnimations/5/v1/Enemy5v1.controller b/Assets/Animations/EnemyAnimations/5/v1/Enemy5v1.controller index a1a4410..fc6e17a 100644 --- a/Assets/Animations/EnemyAnimations/5/v1/Enemy5v1.controller +++ b/Assets/Animations/EnemyAnimations/5/v1/Enemy5v1.controller @@ -95,13 +95,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 @@ -123,7 +123,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Walk - m_Speed: 1 + m_Speed: 0.5 m_CycleOffset: 0 m_Transitions: - {fileID: 5716838923156672773} diff --git a/Assets/Animations/EnemyAnimations/5/v2/Enemy5v2.controller b/Assets/Animations/EnemyAnimations/5/v2/Enemy5v2.controller index bea94ac..8c6f7ee 100644 --- a/Assets/Animations/EnemyAnimations/5/v2/Enemy5v2.controller +++ b/Assets/Animations/EnemyAnimations/5/v2/Enemy5v2.controller @@ -120,13 +120,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 @@ -148,7 +148,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Walk - m_Speed: 1 + m_Speed: 0.5 m_CycleOffset: 0 m_Transitions: - {fileID: 3896314861214014207} diff --git a/Assets/Animations/EnemyAnimations/5/v3/Enemy5v3.controller b/Assets/Animations/EnemyAnimations/5/v3/Enemy5v3.controller index 1af2718..d366f04 100644 --- a/Assets/Animations/EnemyAnimations/5/v3/Enemy5v3.controller +++ b/Assets/Animations/EnemyAnimations/5/v3/Enemy5v3.controller @@ -120,13 +120,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 @@ -148,7 +148,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Walk - m_Speed: 1 + m_Speed: 0.5 m_CycleOffset: 0 m_Transitions: - {fileID: -5647855233168233844} diff --git a/Assets/Animations/EnemyAnimations/6/v1/Enemy6v1.controller b/Assets/Animations/EnemyAnimations/6/v1/Enemy6v1.controller index a186fca..910dea8 100644 --- a/Assets/Animations/EnemyAnimations/6/v1/Enemy6v1.controller +++ b/Assets/Animations/EnemyAnimations/6/v1/Enemy6v1.controller @@ -119,13 +119,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 @@ -173,7 +173,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Walk - m_Speed: 1 + m_Speed: 0.77 m_CycleOffset: 0 m_Transitions: - {fileID: -8022167134580654369} diff --git a/Assets/Animations/EnemyAnimations/6/v2/Enemy6v2.controller b/Assets/Animations/EnemyAnimations/6/v2/Enemy6v2.controller index 369c5c7..8cecdaf 100644 --- a/Assets/Animations/EnemyAnimations/6/v2/Enemy6v2.controller +++ b/Assets/Animations/EnemyAnimations/6/v2/Enemy6v2.controller @@ -94,13 +94,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 @@ -122,7 +122,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Walk - m_Speed: 1 + m_Speed: 0.77 m_CycleOffset: 0 m_Transitions: - {fileID: -4046822942830146446} diff --git a/Assets/Animations/EnemyAnimations/6/v3/Enemy6v3.controller b/Assets/Animations/EnemyAnimations/6/v3/Enemy6v3.controller index 0dce7cd..c3f1738 100644 --- a/Assets/Animations/EnemyAnimations/6/v3/Enemy6v3.controller +++ b/Assets/Animations/EnemyAnimations/6/v3/Enemy6v3.controller @@ -17,7 +17,7 @@ AnimatorStateMachine: m_Position: {x: 430, y: 270, z: 0} - serializedVersion: 1 m_State: {fileID: 6438916828910197811} - m_Position: {x: 362.95642, y: 29.18254, z: 0} + m_Position: {x: 370, y: 30, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -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 @@ -173,7 +173,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Walk - m_Speed: 1 + m_Speed: 0.77 m_CycleOffset: 0 m_Transitions: - {fileID: -3716958511888357514}