From 5c1a69fecc7588de62ce42d8b00b591febfd73b7 Mon Sep 17 00:00:00 2001 From: AstrlJelly Date: Thu, 9 Nov 2023 06:18:44 -0500 Subject: [PATCH] fork lifter weird reset thingy fixed --- .../ForkLifter/Animations/Hand_Flick.anim | 111 +++++------------- Assets/Scripts/Games/ForkLifter/ForkLifter.cs | 11 +- 2 files changed, 33 insertions(+), 89 deletions(-) diff --git a/Assets/Resources/Sprites/Games/ForkLifter/Animations/Hand_Flick.anim b/Assets/Resources/Sprites/Games/ForkLifter/Animations/Hand_Flick.anim index e3404d1e8..4cd470dfb 100644 --- a/Assets/Resources/Sprites/Games/ForkLifter/Animations/Hand_Flick.anim +++ b/Assets/Resources/Sprites/Games/ForkLifter/Animations/Hand_Flick.anim @@ -98,6 +98,15 @@ AnimationClip: - serializedVersion: 3 time: 0.35 value: {x: 0.017, y: 0.261, z: 74.52776} + inSlope: {x: 2.7443511, y: -2.188788, z: 0} + outSlope: {x: 2.7443511, y: -2.188788, 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.4 + value: {x: 0.1744351, y: 0.1891212, z: 74.52776} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -192,59 +201,6 @@ AnimationClip: classID: 1 script: {fileID: 0} m_PPtrCurves: - - curve: - - time: 0 - value: {fileID: 0} - - time: 0.016666668 - value: {fileID: 0} - - time: 0.033333335 - value: {fileID: 0} - - time: 0.05 - value: {fileID: 0} - - time: 0.06666667 - value: {fileID: 0} - - time: 0.083333336 - value: {fileID: 0} - - time: 0.1 - value: {fileID: 0} - - time: 0.11666667 - value: {fileID: 0} - - time: 0.13333334 - value: {fileID: 0} - - time: 0.15 - value: {fileID: 0} - - time: 0.16666667 - value: {fileID: 0} - - time: 0.18333334 - value: {fileID: 0} - - time: 0.2 - value: {fileID: 0} - - time: 0.21666667 - value: {fileID: 0} - - time: 0.23333333 - value: {fileID: 0} - - time: 0.25 - value: {fileID: 0} - - time: 0.26666668 - value: {fileID: 0} - - time: 0.28333333 - value: {fileID: 0} - - time: 0.3 - value: {fileID: 0} - - time: 0.31666666 - value: {fileID: 0} - - time: 0.33333334 - value: {fileID: 0} - - time: 0.35 - value: {fileID: 0} - - time: 0.36666667 - value: {fileID: 0} - - time: 0.38333333 - value: {fileID: 0} - attribute: m_Sprite - path: Fork_Lifter_Gameplay - classID: 212 - script: {fileID: 0} - curve: - time: 0 value: {fileID: -4922902375269903740, guid: 52117e1d5cd298c42adfea952676c7d6, type: 3} @@ -307,13 +263,6 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 - - serializedVersion: 2 - path: 345648135 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - serializedVersion: 2 path: 3267382320 attribute: 0 @@ -336,30 +285,6 @@ AnimationClip: customType: 0 isPPtrCurve: 0 pptrCurveMapping: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} - {fileID: -4922902375269903740, guid: 52117e1d5cd298c42adfea952676c7d6, type: 3} - {fileID: -3456084564025576355, guid: 52117e1d5cd298c42adfea952676c7d6, type: 3} - {fileID: -3456084564025576355, guid: 52117e1d5cd298c42adfea952676c7d6, type: 3} @@ -688,6 +613,15 @@ AnimationClip: - serializedVersion: 3 time: 0.35 value: 0.017 + inSlope: 2.7443511 + outSlope: 2.7443511 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.4 + value: 0.1744351 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -716,6 +650,15 @@ AnimationClip: - serializedVersion: 3 time: 0.35 value: 0.261 + inSlope: -2.188788 + outSlope: -2.188788 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.4 + value: 0.1891212 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Scripts/Games/ForkLifter/ForkLifter.cs b/Assets/Scripts/Games/ForkLifter/ForkLifter.cs index 26e904d00..9b5229735 100644 --- a/Assets/Scripts/Games/ForkLifter/ForkLifter.cs +++ b/Assets/Scripts/Games/ForkLifter/ForkLifter.cs @@ -134,6 +134,12 @@ namespace HeavenStudio.Games BackgroundColorUpdate(); } + public override void OnPlay(double beat) + { + base.OnPlay(beat); + OnGameSwitch(beat); + } + public override void OnGameSwitch(double beat) { base.OnGameSwitch(beat); @@ -257,10 +263,5 @@ namespace HeavenStudio.Games BackgroundColorGrad(lastEventGrad.beat, lastEventGrad.length, lastEventGrad["start"], lastEventGrad["end"], lastEventGrad["ease"]); } } - - public override void OnPlay(double beat) - { - PersistColor(beat); - } } } \ No newline at end of file