From ea84b2aaa10540337deb270a1d77815e8ebec3a8 Mon Sep 17 00:00:00 2001 From: ev <85412919+iloveoatmeal2022@users.noreply.github.com> Date: Sun, 4 Feb 2024 15:46:30 -0500 Subject: [PATCH] anim fixes --- .../Lumbearjack/Animations/BeastBop.anim | 193 ++++++++++++++---- .../Lumbearjack/Animations/BeastCutMid.anim | 44 +++- .../Lumbearjack/Animations/BeastWhiff.anim | 81 -------- 3 files changed, 192 insertions(+), 126 deletions(-) diff --git a/Assets/Resources/Sprites/Games/Lumbearjack/Animations/BeastBop.anim b/Assets/Resources/Sprites/Games/Lumbearjack/Animations/BeastBop.anim index d9438c987..09ea54279 100644 --- a/Assets/Resources/Sprites/Games/Lumbearjack/Animations/BeastBop.anim +++ b/Assets/Resources/Sprites/Games/Lumbearjack/Animations/BeastBop.anim @@ -31,7 +31,7 @@ AnimationClip: time: 0.2 value: {x: -0.092, y: 2.624094, z: 0} inSlope: {x: 0, y: 1.3298433, z: 0} - outSlope: {x: 0, y: 1.3298433, z: 0} + outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -70,11 +70,20 @@ 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.13333334 + value: {x: -0.079, y: -1.716, z: 0} + inSlope: {x: 0, y: 0.485, z: 0} + outSlope: {x: 0, y: 0.485, 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.2 value: {x: -0.079, y: -1.685, z: 0} inSlope: {x: 0, y: 0.6899995, z: 0} - outSlope: {x: 0, y: 0.6899995, z: 0} + outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -82,7 +91,7 @@ AnimationClip: - serializedVersion: 3 time: 0.23333333 value: {x: -0.079, y: -1.621, z: 0} - inSlope: {x: 0, y: 0, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 weightedMode: 0 @@ -116,17 +125,17 @@ AnimationClip: - serializedVersion: 3 time: 0.13333334 value: {x: -0.08, y: 0.408, z: 0} - inSlope: {x: 0, y: 0.9650001, z: 0} - outSlope: {x: 0, y: 0.9650001, z: 0} + inSlope: {x: 0, y: 0.9200001, z: 0} + outSlope: {x: 0, y: 0.9200001, 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.2 - value: {x: -0.08, y: 0.492, z: 0} + value: {x: -0.08, y: 0.483, z: 0} inSlope: {x: 0, y: 1.9700004, z: 0} - outSlope: {x: 0, y: 1.9700004, z: 0} + outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -178,7 +187,7 @@ AnimationClip: time: 0.2 value: {x: -0.064, y: 2.069, z: 0} inSlope: {x: 0, y: 1.7693735, z: 0} - outSlope: {x: 0, y: 1.7693735, z: 0} + outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -218,6 +227,24 @@ 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.2 + value: {x: 0.6526942, y: 0.64518803, z: 0.6526942} + inSlope: {x: 0, y: 0.08042234, z: 0} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + 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: 0.6526942, y: 0.64987934, z: 0.6526942} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: 0, y: 0.11259197, 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.26666668 value: {x: 0.6526942, y: 0.65269417, z: 0.6526942} @@ -236,6 +263,8 @@ AnimationClip: - curve: - time: 0 value: {fileID: -489202221, guid: 350211a952379f945877518b7bc85c0d, type: 3} + - time: 0.2 + value: {fileID: -489202221, guid: 350211a952379f945877518b7bc85c0d, type: 3} - time: 0.23333333 value: {fileID: -532368244, guid: 350211a952379f945877518b7bc85c0d, type: 3} - time: 0.26666668 @@ -295,6 +324,7 @@ AnimationClip: isPPtrCurve: 1 pptrCurveMapping: - {fileID: -489202221, guid: 350211a952379f945877518b7bc85c0d, type: 3} + - {fileID: -489202221, guid: 350211a952379f945877518b7bc85c0d, type: 3} - {fileID: -532368244, guid: 350211a952379f945877518b7bc85c0d, type: 3} - {fileID: -532368244, guid: 350211a952379f945877518b7bc85c0d, type: 3} m_AnimationClipSettings: @@ -334,8 +364,8 @@ AnimationClip: time: 0.2 value: -0.092 inSlope: 0 - outSlope: 0 - tangentMode: 136 + outSlope: Infinity + tangentMode: 97 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -380,8 +410,8 @@ AnimationClip: time: 0.2 value: 2.624094 inSlope: 1.3298433 - outSlope: 1.3298433 - tangentMode: 136 + outSlope: Infinity + tangentMode: 97 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -426,8 +456,8 @@ AnimationClip: time: 0.2 value: 0 inSlope: 0 - outSlope: 0 - tangentMode: 136 + outSlope: Infinity + tangentMode: 97 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -469,20 +499,29 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.2 + time: 0.13333334 value: -0.079 inSlope: 0 outSlope: 0 - tangentMode: 136 + tangentMode: 1 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.2 + value: -0.079 + inSlope: 0 + outSlope: Infinity + tangentMode: 97 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.23333333 value: -0.079 - inSlope: 0 + inSlope: Infinity outSlope: 0 - tangentMode: 136 + tangentMode: 7 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -514,21 +553,30 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: -1.716 + inSlope: 0.485 + outSlope: 0.485 + tangentMode: 1 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.2 value: -1.685 inSlope: 0.6899995 - outSlope: 0.6899995 - tangentMode: 136 + outSlope: Infinity + tangentMode: 97 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.23333333 value: -1.621 - inSlope: 0 + inSlope: Infinity outSlope: 0 - tangentMode: 136 + tangentMode: 7 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -561,20 +609,29 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.2 + time: 0.13333334 value: 0 inSlope: 0 outSlope: 0 - tangentMode: 136 + tangentMode: 1 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.2 + value: 0 + inSlope: 0 + outSlope: Infinity + tangentMode: 97 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.23333333 value: 0 - inSlope: 0 + inSlope: Infinity outSlope: 0 - tangentMode: 136 + tangentMode: 7 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -619,8 +676,8 @@ AnimationClip: time: 0.2 value: -0.08 inSlope: 0 - outSlope: 0 - tangentMode: 136 + outSlope: Infinity + tangentMode: 97 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -664,18 +721,18 @@ AnimationClip: - serializedVersion: 3 time: 0.13333334 value: 0.408 - inSlope: 0.9650001 - outSlope: 0.9650001 + inSlope: 0.9200001 + outSlope: 0.9200001 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.2 - value: 0.492 + value: 0.483 inSlope: 1.9700004 - outSlope: 1.9700004 - tangentMode: 136 + outSlope: Infinity + tangentMode: 97 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -729,8 +786,8 @@ AnimationClip: time: 0.2 value: 0 inSlope: 0 - outSlope: 0 - tangentMode: 136 + outSlope: Infinity + tangentMode: 97 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -784,8 +841,8 @@ AnimationClip: time: 0.2 value: -0.064 inSlope: 0 - outSlope: 0 - tangentMode: 136 + outSlope: Infinity + tangentMode: 97 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -839,8 +896,8 @@ AnimationClip: time: 0.2 value: 2.069 inSlope: 1.7693735 - outSlope: 1.7693735 - tangentMode: 136 + outSlope: Infinity + tangentMode: 97 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -894,8 +951,8 @@ AnimationClip: time: 0.2 value: 0 inSlope: 0 - outSlope: 0 - tangentMode: 136 + outSlope: Infinity + tangentMode: 97 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -936,6 +993,24 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.2 + value: 0.6526942 + inSlope: 0 + outSlope: Infinity + tangentMode: 97 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 0.6526942 + inSlope: Infinity + outSlope: 0 + tangentMode: 7 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.26666668 value: 0.6526942 @@ -964,6 +1039,24 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.2 + value: 0.64518803 + inSlope: 0.08042234 + outSlope: Infinity + tangentMode: 97 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 0.64987934 + inSlope: Infinity + outSlope: 0.11259197 + tangentMode: 7 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.26666668 value: 0.65269417 @@ -992,6 +1085,24 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.2 + value: 0.6526942 + inSlope: 0 + outSlope: Infinity + tangentMode: 97 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.23333333 + value: 0.6526942 + inSlope: Infinity + outSlope: 0 + tangentMode: 7 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.26666668 value: 0.6526942 diff --git a/Assets/Resources/Sprites/Games/Lumbearjack/Animations/BeastCutMid.anim b/Assets/Resources/Sprites/Games/Lumbearjack/Animations/BeastCutMid.anim index e6f189d47..b3b164fab 100644 --- a/Assets/Resources/Sprites/Games/Lumbearjack/Animations/BeastCutMid.anim +++ b/Assets/Resources/Sprites/Games/Lumbearjack/Animations/BeastCutMid.anim @@ -540,9 +540,18 @@ AnimationClip: 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 - serializedVersion: 3 time: 0.26666668 - value: 0.12941177 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -586,9 +595,18 @@ AnimationClip: weightedMode: 0 inWeight: 0 outWeight: 0 + - serializedVersion: 3 + time: 0.23333333 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 - serializedVersion: 3 time: 0.4 - value: 1 + value: 0 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1857,9 +1875,18 @@ AnimationClip: 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 - serializedVersion: 3 time: 0.26666668 - value: 0.12941177 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -2071,9 +2098,18 @@ AnimationClip: weightedMode: 0 inWeight: 0 outWeight: 0 + - serializedVersion: 3 + time: 0.23333333 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 - serializedVersion: 3 time: 0.4 - value: 1 + value: 0 inSlope: Infinity outSlope: Infinity tangentMode: 103 diff --git a/Assets/Resources/Sprites/Games/Lumbearjack/Animations/BeastWhiff.anim b/Assets/Resources/Sprites/Games/Lumbearjack/Animations/BeastWhiff.anim index 107951b63..1424ed726 100644 --- a/Assets/Resources/Sprites/Games/Lumbearjack/Animations/BeastWhiff.anim +++ b/Assets/Resources/Sprites/Games/Lumbearjack/Animations/BeastWhiff.anim @@ -498,43 +498,6 @@ AnimationClip: path: Impact classID: 1 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.9832884 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.33333334 - value: 0.12941177 - inSlope: -1.4117651 - outSlope: -1.4117651 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.36666667 - 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_Color.a - path: Impact - classID: 212 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -679,13 +642,6 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 - - serializedVersion: 2 - path: 3282421041 - attribute: 304273561 - script: {fileID: 0} - typeID: 212 - customType: 0 - isPPtrCurve: 0 - serializedVersion: 2 path: 4230754021 attribute: 2086281974 @@ -1707,43 +1663,6 @@ AnimationClip: path: Impact classID: 1 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.9832884 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.33333334 - value: 0.12941177 - inSlope: -1.4117651 - outSlope: -1.4117651 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.36666667 - 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_Color.a - path: Impact - classID: 212 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: