From 881e9c468ec32701729ab895be4c859f803ce38a Mon Sep 17 00:00:00 2001 From: Ivy Date: Sun, 2 May 2021 16:14:59 -0500 Subject: [PATCH] Fixed buggy jump animation --- .../Assets/Animations/Protagonist Jump Land v1.anim | 4 ++-- MuseumGame/Assets/Animations/Protagonist Jump v1.anim | 2 +- .../Assets/Animations/Protagonist Run Cycle.controller | 8 ++++---- MuseumGame/Assets/Scripts/Glider.cs | 10 ++++++++++ 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/MuseumGame/Assets/Animations/Protagonist Jump Land v1.anim b/MuseumGame/Assets/Animations/Protagonist Jump Land v1.anim index 91349cf..978fdc8 100644 --- a/MuseumGame/Assets/Animations/Protagonist Jump Land v1.anim +++ b/MuseumGame/Assets/Animations/Protagonist Jump Land v1.anim @@ -58,12 +58,12 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.4166667 + m_StopTime: 0.41666666 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/MuseumGame/Assets/Animations/Protagonist Jump v1.anim b/MuseumGame/Assets/Animations/Protagonist Jump v1.anim index 62bf66f..dbb6e72 100644 --- a/MuseumGame/Assets/Animations/Protagonist Jump v1.anim +++ b/MuseumGame/Assets/Animations/Protagonist Jump v1.anim @@ -66,7 +66,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/MuseumGame/Assets/Animations/Protagonist Run Cycle.controller b/MuseumGame/Assets/Animations/Protagonist Run Cycle.controller index c210a1f..2468a02 100644 --- a/MuseumGame/Assets/Animations/Protagonist Run Cycle.controller +++ b/MuseumGame/Assets/Animations/Protagonist Run Cycle.controller @@ -138,17 +138,17 @@ AnimatorStateTransition: m_Conditions: - m_ConditionMode: 4 m_ConditionEvent: velocityY - m_EventTreshold: 0 + m_EventTreshold: -0.75 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 3480931448333261977} m_Solo: 0 m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0.33901125 m_TransitionOffset: 0 - m_ExitTime: 0.25 - m_HasExitTime: 0 + m_ExitTime: 0.47147307 + m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 diff --git a/MuseumGame/Assets/Scripts/Glider.cs b/MuseumGame/Assets/Scripts/Glider.cs index dcc0f39..461af23 100644 --- a/MuseumGame/Assets/Scripts/Glider.cs +++ b/MuseumGame/Assets/Scripts/Glider.cs @@ -8,6 +8,8 @@ public class Glider : MonoBehaviour [SerializeField] private float m_FallSpeed = 0f; + private Animator animator; + /// /// /// @@ -18,13 +20,21 @@ public class Glider : MonoBehaviour void Awake() { m_Rigidbody2D = GetComponent(); + animator = GetComponent(); } // Update is called once per frame void Update() { if (IsGliding && m_Rigidbody2D.velocity.y < 0f && Mathf.Abs(m_Rigidbody2D.velocity.y) > m_FallSpeed) + { m_Rigidbody2D.velocity = new Vector2(m_Rigidbody2D.velocity.x, Mathf.Sign(m_Rigidbody2D.velocity.y) * m_FallSpeed); + animator.SetBool("isGliding", true); + } + else + { + animator.SetBool("isGliding", false); + } } public void StartGliding()