diff --git a/Assets/Art/Animations/Characters/Pulver/ANIM_PulverCombine.anim b/Assets/Art/Animations/Characters/Pulver/ANIM_PulverCombine.anim new file mode 100644 index 00000000..3633aca1 --- /dev/null +++ b/Assets/Art/Animations/Characters/Pulver/ANIM_PulverCombine.anim @@ -0,0 +1,373 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ANIM_PulverCombine + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.6, y: 0.6, 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} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 263105632, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 0.033333335 + value: {fileID: -1812988591, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 0.06666667 + value: {fileID: -1090178663, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 0.1 + value: {fileID: 435788048, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 0.13333334 + value: {fileID: 1131685978, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 0.16666667 + value: {fileID: 1731845327, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 0.2 + value: {fileID: 1607961555, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 0.23333333 + value: {fileID: -2004317814, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 0.26666668 + value: {fileID: -1112803850, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 0.3 + value: {fileID: 1365610583, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 0.33333334 + value: {fileID: 532678314, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 0.36666667 + value: {fileID: -2121275635, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 0.4 + value: {fileID: -627404477, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 0.43333334 + value: {fileID: 266738615, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 0.46666667 + value: {fileID: 1949553887, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 0.5 + value: {fileID: 838312546, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 0.53333336 + value: {fileID: -1672482298, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 0.56666666 + value: {fileID: 1942478426, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 0.6 + value: {fileID: -1711440152, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 0.6333333 + value: {fileID: 149110574, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 0.6666667 + value: {fileID: 707155314, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 0.7 + value: {fileID: 1633370117, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 0.73333335 + value: {fileID: -1725739569, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 0.76666665 + value: {fileID: -1993146538, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 0.8 + value: {fileID: -1126419074, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 0.8333333 + value: {fileID: -155569751, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 0.8666667 + value: {fileID: -1837712550, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 0.9 + value: {fileID: -139197686, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 0.93333334 + value: {fileID: -978546395, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 0.96666664 + value: {fileID: 404084961, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 1 + value: {fileID: -807765816, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 1.0333333 + value: {fileID: -605922950, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 1.0666667 + value: {fileID: 2001239777, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 1.1 + value: {fileID: 1655593012, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 1.1333333 + value: {fileID: -1738512165, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 1.1666666 + value: {fileID: -1137739122, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 1.2 + value: {fileID: 1285172798, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 1.2333333 + value: {fileID: -1896649918, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 1.2666667 + value: {fileID: 1806292744, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 1.3 + value: {fileID: -1160886992, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 1.3333334 + value: {fileID: 496162698, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 1.3666667 + value: {fileID: -153119636, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 1.4 + value: {fileID: -982091652, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 1.4333333 + value: {fileID: -470044154, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 1.4666667 + value: {fileID: -973132521, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 1.5 + value: {fileID: 633286941, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 1.5333333 + value: {fileID: -1891868464, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 1.5666667 + value: {fileID: -1689168775, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 1.6 + value: {fileID: -55477105, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 1.6333333 + value: {fileID: -1987357179, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 1.6666666 + value: {fileID: 589807064, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 1.7 + value: {fileID: 1949537853, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 1.7333333 + value: {fileID: 127442646, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 1.7666667 + value: {fileID: -1098328029, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 1.8 + value: {fileID: 1429341976, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 1.8333334 + value: {fileID: 239290956, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - time: 1.8666667 + value: {fileID: -1528274889, guid: 9a28c23c27c7fb345a5a588d28dd3997, type: 3} + - time: 1.9 + value: {fileID: -1929627303, guid: 9a28c23c27c7fb345a5a588d28dd3997, type: 3} + - time: 1.9333333 + value: {fileID: 1523615096, guid: 9a28c23c27c7fb345a5a588d28dd3997, type: 3} + - time: 1.9666667 + value: {fileID: 1799079079, guid: 9a28c23c27c7fb345a5a588d28dd3997, type: 3} + - time: 2 + value: {fileID: -1038491181, guid: 9a28c23c27c7fb345a5a588d28dd3997, type: 3} + - time: 2.0333333 + value: {fileID: 1206872090, guid: 9a28c23c27c7fb345a5a588d28dd3997, type: 3} + - time: 2.0666666 + value: {fileID: 1820647834, guid: 9a28c23c27c7fb345a5a588d28dd3997, type: 3} + - time: 2.1 + value: {fileID: 2010811095, guid: 9a28c23c27c7fb345a5a588d28dd3997, type: 3} + - time: 2.1333334 + value: {fileID: -1103412090, guid: 9a28c23c27c7fb345a5a588d28dd3997, type: 3} + - time: 2.1666667 + value: {fileID: -2117110224, guid: 9a28c23c27c7fb345a5a588d28dd3997, type: 3} + - time: 2.2 + value: {fileID: 361146204, guid: 9a28c23c27c7fb345a5a588d28dd3997, type: 3} + - time: 2.2333333 + value: {fileID: -2065035201, guid: 9a28c23c27c7fb345a5a588d28dd3997, type: 3} + - time: 2.2666667 + value: {fileID: -832214342, guid: 9a28c23c27c7fb345a5a588d28dd3997, type: 3} + - time: 2.3 + value: {fileID: 1510424321, guid: 9a28c23c27c7fb345a5a588d28dd3997, type: 3} + - time: 2.3333333 + value: {fileID: 1613224031, guid: 9a28c23c27c7fb345a5a588d28dd3997, type: 3} + - time: 2.3666666 + value: {fileID: 1882383981, guid: 9a28c23c27c7fb345a5a588d28dd3997, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 30 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 263105632, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: -1812988591, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: -1090178663, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: 435788048, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: 1131685978, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: 1731845327, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: 1607961555, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: -2004317814, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: -1112803850, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: 1365610583, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: 532678314, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: -2121275635, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: -627404477, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: 266738615, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: 1949553887, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: 838312546, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: -1672482298, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: 1942478426, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: -1711440152, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: 149110574, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: 707155314, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: 1633370117, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: -1725739569, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: -1993146538, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: -1126419074, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: -155569751, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: -1837712550, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: -139197686, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: -978546395, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: 404084961, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: -807765816, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: -605922950, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: 2001239777, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: 1655593012, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: -1738512165, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: -1137739122, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: 1285172798, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: -1896649918, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: 1806292744, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: -1160886992, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: 496162698, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: -153119636, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: -982091652, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: -470044154, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: -973132521, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: 633286941, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: -1891868464, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: -1689168775, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: -55477105, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: -1987357179, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: 589807064, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: 1949537853, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: 127442646, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: -1098328029, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: 1429341976, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: 239290956, guid: c88473e983731e34ab9b788192786c8f, type: 3} + - {fileID: -1528274889, guid: 9a28c23c27c7fb345a5a588d28dd3997, type: 3} + - {fileID: -1929627303, guid: 9a28c23c27c7fb345a5a588d28dd3997, type: 3} + - {fileID: 1523615096, guid: 9a28c23c27c7fb345a5a588d28dd3997, type: 3} + - {fileID: 1799079079, guid: 9a28c23c27c7fb345a5a588d28dd3997, type: 3} + - {fileID: -1038491181, guid: 9a28c23c27c7fb345a5a588d28dd3997, type: 3} + - {fileID: 1206872090, guid: 9a28c23c27c7fb345a5a588d28dd3997, type: 3} + - {fileID: 1820647834, guid: 9a28c23c27c7fb345a5a588d28dd3997, type: 3} + - {fileID: 2010811095, guid: 9a28c23c27c7fb345a5a588d28dd3997, type: 3} + - {fileID: -1103412090, guid: 9a28c23c27c7fb345a5a588d28dd3997, type: 3} + - {fileID: -2117110224, guid: 9a28c23c27c7fb345a5a588d28dd3997, type: 3} + - {fileID: 361146204, guid: 9a28c23c27c7fb345a5a588d28dd3997, type: 3} + - {fileID: -2065035201, guid: 9a28c23c27c7fb345a5a588d28dd3997, type: 3} + - {fileID: -832214342, guid: 9a28c23c27c7fb345a5a588d28dd3997, type: 3} + - {fileID: 1510424321, guid: 9a28c23c27c7fb345a5a588d28dd3997, type: 3} + - {fileID: 1613224031, guid: 9a28c23c27c7fb345a5a588d28dd3997, type: 3} + - {fileID: 1882383981, guid: 9a28c23c27c7fb345a5a588d28dd3997, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 2.3999999 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.6 + 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_LocalScale.x + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.6 + 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_LocalScale.y + path: + classID: 4 + script: {fileID: 0} + flags: 0 + - 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 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: + classID: 4 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Art/Animations/Characters/Pulver/ANIM_PulverCombine.anim.meta b/Assets/Art/Animations/Characters/Pulver/ANIM_PulverCombine.anim.meta new file mode 100644 index 00000000..ddf4e90f --- /dev/null +++ b/Assets/Art/Animations/Characters/Pulver/ANIM_PulverCombine.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f7bb725eefec4cc4ebfea7eb1320225d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Animations/Characters/Pulver/PulverCharacter.controller b/Assets/Art/Animations/Characters/Pulver/PulverCharacter.controller index a03ecd16..41add40f 100644 --- a/Assets/Art/Animations/Characters/Pulver/PulverCharacter.controller +++ b/Assets/Art/Animations/Characters/Pulver/PulverCharacter.controller @@ -41,6 +41,7 @@ AnimatorState: m_Transitions: - {fileID: 6488712265377033592} - {fileID: -6831218080075643105} + - {fileID: -1978909245681655681} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -275,6 +276,31 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-3896677794248683722 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 3 + m_ConditionEvent: Speed + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 2622372861974612142} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0.8333348 + m_ExitTime: 1.0000001 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-3587196186956943417 AnimatorState: serializedVersion: 6 @@ -301,6 +327,56 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-3094487439667569827 +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: Combine + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 5090778142067604499} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0.10416673 + m_ExitTime: 1.0000002 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-2673443173799312521 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 4 + m_ConditionEvent: Speed + m_EventTreshold: 0.01 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -8236784231784223406} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 8.571349 + m_ExitTime: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-2498421205022408257 AnimatorState: serializedVersion: 6 @@ -353,6 +429,31 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-1978909245681655681 +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: Combine + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 5090778142067604499} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.0008273423 + m_TransitionOffset: 0.103821985 + m_ExitTime: 8.543061 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-1470202593299212195 AnimatorState: serializedVersion: 6 @@ -464,7 +565,7 @@ AnimatorStateMachine: m_Position: {x: 1400, y: 350, z: 0} - serializedVersion: 1 m_State: {fileID: -6538542043237772027} - m_Position: {x: 30, y: 210, z: 0} + m_Position: {x: -20, y: 240, z: 0} - serializedVersion: 1 m_State: {fileID: -8457947249421688616} m_Position: {x: -70, y: 420, z: 0} @@ -498,6 +599,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: 2622372861974612142} m_Position: {x: 330, y: 450, z: 0} + - serializedVersion: 1 + m_State: {fileID: 5090778142067604499} + m_Position: {x: 550, y: 350, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -541,6 +645,12 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 9100000} + - m_Name: Combine + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -749,6 +859,7 @@ AnimatorState: - {fileID: -5591788849566758409} - {fileID: -6586474288352708716} - {fileID: 344782664058374094} + - {fileID: -3094487439667569827} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -863,6 +974,34 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &5090778142067604499 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ANIM_PulverCombine + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -3896677794248683722} + - {fileID: -2673443173799312521} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: f7bb725eefec4cc4ebfea7eb1320225d, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1101 &5493228531130196948 AnimatorStateTransition: m_ObjectHideFlags: 1 diff --git a/Assets/Art/Animations/Characters/Pulver/Pulver_Cucumbatacc.anim b/Assets/Art/Animations/Characters/Pulver/Pulver_Cucumbatacc.anim index 3f1db31d..07d21120 100644 --- a/Assets/Art/Animations/Characters/Pulver/Pulver_Cucumbatacc.anim +++ b/Assets/Art/Animations/Characters/Pulver/Pulver_Cucumbatacc.anim @@ -22,52 +22,6 @@ AnimationClip: curve: - time: 0 value: {fileID: -948023933063867427, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0 - value: {fileID: -6122512210190206414, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0 - value: {fileID: 9004259394944233097, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0 - value: {fileID: 3127634723059022987, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0 - value: {fileID: 5241555131770433374, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0 - value: {fileID: 5418535750275563471, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0 - value: {fileID: -5829126979446497464, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0 - value: {fileID: -5251324859876319832, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0 - value: {fileID: 8451039844062163247, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0 - value: {fileID: -8575418099464798719, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0 - value: {fileID: -2885076971222660228, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0 - value: {fileID: -2461877082101491878, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0 - value: {fileID: -5495871994767198068, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0 - value: {fileID: -4720941432450666265, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0 - value: {fileID: -7678607646472632250, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0 - value: {fileID: 1852608027429398406, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0 - value: {fileID: 6260421290162468957, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0 - value: {fileID: 4701796658047755360, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0 - value: {fileID: -1422632302640868973, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0 - value: {fileID: -3093709647181459402, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0 - value: {fileID: -5941807999972599246, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0 - value: {fileID: 9040987707557795275, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0 - value: {fileID: 8200196815439204935, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0 - value: {fileID: 370516306874588968, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - time: 0 value: {fileID: 583659896831181404, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - time: 0 @@ -102,110 +56,156 @@ AnimationClip: value: {fileID: -6144861062711228038, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - time: 0 value: {fileID: 816948775718538035, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0.016666668 - value: {fileID: 7268251130221382757, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 0 + value: {fileID: 370516306874588968, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 0 + value: {fileID: 8200196815439204935, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 0 + value: {fileID: 9040987707557795275, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 0 + value: {fileID: -8575418099464798719, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 0 + value: {fileID: 9004259394944233097, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 0 + value: {fileID: 3127634723059022987, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 0 + value: {fileID: 5241555131770433374, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 0 + value: {fileID: 5418535750275563471, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 0 + value: {fileID: -5829126979446497464, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 0 + value: {fileID: -5251324859876319832, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 0 + value: {fileID: 8451039844062163247, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 0 + value: {fileID: -5941807999972599246, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 0 + value: {fileID: -6122512210190206414, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 0 + value: {fileID: -2885076971222660228, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 0 + value: {fileID: -5495871994767198068, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 0 + value: {fileID: -4720941432450666265, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 0 + value: {fileID: -7678607646472632250, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 0 + value: {fileID: 1852608027429398406, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 0 + value: {fileID: 6260421290162468957, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 0 + value: {fileID: 4701796658047755360, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 0 + value: {fileID: -1422632302640868973, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 0 + value: {fileID: -3093709647181459402, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 0 + value: {fileID: -2461877082101491878, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - time: 0.033333335 - value: {fileID: -6155945168965275997, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0.05 - value: {fileID: 6055894852475098276, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + value: {fileID: 7268251130221382757, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - time: 0.06666667 - value: {fileID: -1872323050923806924, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0.083333336 - value: {fileID: -218485811651797319, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + value: {fileID: -6155945168965275997, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - time: 0.1 - value: {fileID: -9145811295112430833, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0.11666667 - value: {fileID: 707719447927042100, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + value: {fileID: 6055894852475098276, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - time: 0.13333334 - value: {fileID: -1899480426505933510, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0.15 - value: {fileID: 495667686541154928, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + value: {fileID: -1872323050923806924, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - time: 0.16666667 - value: {fileID: 6033513452423013518, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0.18333334 - value: {fileID: -5112435306935384435, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + value: {fileID: -218485811651797319, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - time: 0.2 - value: {fileID: 8277773178645673980, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0.21666667 - value: {fileID: -6348222578903551975, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + value: {fileID: -9145811295112430833, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - time: 0.23333333 - value: {fileID: 1012493429146717157, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0.25 - value: {fileID: 4792913595866398020, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + value: {fileID: 707719447927042100, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - time: 0.26666668 - value: {fileID: -8824659666325047412, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0.28333333 - value: {fileID: -7043248392265045076, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + value: {fileID: -1899480426505933510, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - time: 0.3 - value: {fileID: 4238046711953322335, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0.31666666 - value: {fileID: -7076566494781610440, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + value: {fileID: 495667686541154928, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - time: 0.33333334 - value: {fileID: 3398004430136482052, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0.35 - value: {fileID: 2414326302200951870, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + value: {fileID: 6033513452423013518, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - time: 0.36666667 - value: {fileID: 5647400913391173419, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0.38333333 - value: {fileID: 3114151857075485226, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + value: {fileID: -5112435306935384435, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - time: 0.4 - value: {fileID: -66809740385176572, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0.41666666 - value: {fileID: 2075791085322810856, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + value: {fileID: 8277773178645673980, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - time: 0.43333334 - value: {fileID: 5342473987548908441, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0.45 - value: {fileID: 6242346481588343462, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + value: {fileID: -6348222578903551975, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - time: 0.46666667 - value: {fileID: -2210437966972237992, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0.48333332 - value: {fileID: 2670476402852867823, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + value: {fileID: 1012493429146717157, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - time: 0.5 - value: {fileID: -1468689691554643586, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0.51666665 - value: {fileID: -8592060110415417728, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + value: {fileID: 4792913595866398020, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - time: 0.53333336 - value: {fileID: -4793827868425458382, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0.55 - value: {fileID: 421025590861002917, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + value: {fileID: -8824659666325047412, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - time: 0.56666666 - value: {fileID: 2377029882580041476, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0.5833333 - value: {fileID: -3886380176840394301, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + value: {fileID: -7043248392265045076, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - time: 0.6 - value: {fileID: -4164205548875457946, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0.6166667 - value: {fileID: -7779208966408002042, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + value: {fileID: 4238046711953322335, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - time: 0.6333333 - value: {fileID: 4991514781843096631, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0.65 - value: {fileID: 562425017544918081, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + value: {fileID: -7076566494781610440, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - time: 0.6666667 - value: {fileID: -1665571147687848569, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0.68333334 - value: {fileID: 8615687395798544850, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + value: {fileID: 3398004430136482052, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - time: 0.7 - value: {fileID: 3938042639155156558, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0.71666664 - value: {fileID: -8162364684805889228, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + value: {fileID: 2414326302200951870, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - time: 0.73333335 - value: {fileID: -2906672229352723421, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0.75 - value: {fileID: 5931874581548458631, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + value: {fileID: 5647400913391173419, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - time: 0.76666665 - value: {fileID: 1381774713037384365, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0.78333336 - value: {fileID: -1619470289518259383, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + value: {fileID: 3114151857075485226, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - time: 0.8 + value: {fileID: -66809740385176572, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 0.8333333 + value: {fileID: 2075791085322810856, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 0.8666667 + value: {fileID: 5342473987548908441, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 0.9 + value: {fileID: 6242346481588343462, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 0.93333334 + value: {fileID: -2210437966972237992, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 0.96666664 + value: {fileID: 2670476402852867823, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 1 + value: {fileID: -1468689691554643586, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 1.0333333 + value: {fileID: -8592060110415417728, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 1.0666667 + value: {fileID: -4793827868425458382, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 1.1 + value: {fileID: 421025590861002917, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 1.1333333 + value: {fileID: 2377029882580041476, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 1.1666666 + value: {fileID: -3886380176840394301, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 1.2 + value: {fileID: -4164205548875457946, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 1.2333333 + value: {fileID: -7779208966408002042, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 1.2666667 + value: {fileID: 4991514781843096631, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 1.3 + value: {fileID: 562425017544918081, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 1.3333334 + value: {fileID: -1665571147687848569, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 1.3666667 + value: {fileID: 8615687395798544850, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 1.4 + value: {fileID: 3938042639155156558, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 1.4333333 + value: {fileID: -8162364684805889228, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 1.4666667 + value: {fileID: -2906672229352723421, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 1.5 + value: {fileID: 5931874581548458631, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 1.5333333 + value: {fileID: 1381774713037384365, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 1.5666667 + value: {fileID: -1619470289518259383, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - time: 1.6 value: {fileID: 3608851087769527028, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - time: 0.81666666 + - time: 1.6333333 value: {fileID: 3848402288349167688, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} attribute: m_Sprite path: classID: 212 script: {fileID: 0} flags: 2 - m_SampleRate: 60 + m_SampleRate: 30 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} @@ -223,29 +223,6 @@ AnimationClip: isSerializeReferenceCurve: 0 pptrCurveMapping: - {fileID: -948023933063867427, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - {fileID: -6122512210190206414, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - {fileID: 9004259394944233097, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - {fileID: 3127634723059022987, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - {fileID: 5241555131770433374, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - {fileID: 5418535750275563471, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - {fileID: -5829126979446497464, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - {fileID: -5251324859876319832, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - {fileID: 8451039844062163247, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - {fileID: -8575418099464798719, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - {fileID: -2885076971222660228, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - {fileID: -2461877082101491878, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - {fileID: -5495871994767198068, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - {fileID: -4720941432450666265, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - {fileID: -7678607646472632250, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - {fileID: 1852608027429398406, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - {fileID: 6260421290162468957, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - {fileID: 4701796658047755360, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - {fileID: -1422632302640868973, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - {fileID: -3093709647181459402, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - {fileID: -5941807999972599246, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - {fileID: 9040987707557795275, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - {fileID: 8200196815439204935, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - - {fileID: 370516306874588968, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - {fileID: 583659896831181404, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - {fileID: -2937703658432899079, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - {fileID: -5055880670759659210, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} @@ -263,6 +240,29 @@ AnimationClip: - {fileID: -2151723912499346623, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - {fileID: -6144861062711228038, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - {fileID: 816948775718538035, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - {fileID: 370516306874588968, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - {fileID: 8200196815439204935, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - {fileID: 9040987707557795275, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - {fileID: -8575418099464798719, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - {fileID: 9004259394944233097, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - {fileID: 3127634723059022987, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - {fileID: 5241555131770433374, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - {fileID: 5418535750275563471, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - {fileID: -5829126979446497464, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - {fileID: -5251324859876319832, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - {fileID: 8451039844062163247, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - {fileID: -5941807999972599246, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - {fileID: -6122512210190206414, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - {fileID: -2885076971222660228, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - {fileID: -5495871994767198068, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - {fileID: -4720941432450666265, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - {fileID: -7678607646472632250, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - {fileID: 1852608027429398406, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - {fileID: 6260421290162468957, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - {fileID: 4701796658047755360, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - {fileID: -1422632302640868973, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - {fileID: -3093709647181459402, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} + - {fileID: -2461877082101491878, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - {fileID: 7268251130221382757, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - {fileID: -6155945168965275997, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} - {fileID: 6055894852475098276, guid: d641d9522dd44e745b89a598cd35bec7, type: 3} @@ -317,7 +317,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.8333333 + m_StopTime: 1.6666666 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Scripts/Movement/FollowerController.cs b/Assets/Scripts/Movement/FollowerController.cs index e40b0dff..3aba4b8b 100644 --- a/Assets/Scripts/Movement/FollowerController.cs +++ b/Assets/Scripts/Movement/FollowerController.cs @@ -444,6 +444,7 @@ public class FollowerController: MonoBehaviour public CombinationResult TryCombineItems(Pickup pickupA, out GameObject newItem) { + _animator.ResetTrigger("Combine"); newItem = null; if (_cachedPickupObject == null) { @@ -466,6 +467,7 @@ public class FollowerController: MonoBehaviour Destroy(pickupA.gameObject); Destroy(pickupB.gameObject); TryPickupItem(newItem, itemData); + _animator.SetTrigger("Combine"); return CombinationResult.Successful; } @@ -539,6 +541,7 @@ public class FollowerController: MonoBehaviour item.transform.SetParent(null); item.SetActive(true); follower.ClearHeldItem(); + _animator.SetBool("IsCarrying", false); // Optionally: fire event, update UI, etc. }