From 4ca09299388fb1ac926a0d383c233009a81c0aea Mon Sep 17 00:00:00 2001 From: Spencer Date: Sun, 18 Apr 2021 18:45:27 -0500 Subject: [PATCH] Forgot to save the scene --- .../Animations/Protagonist Jump Land v1.anim | 39 ++++++++++++++++--- .../Protagonist Run Cycle.controller | 28 ++++++++++--- 2 files changed, 56 insertions(+), 11 deletions(-) diff --git a/MuseumGame/Assets/Animations/Protagonist Jump Land v1.anim b/MuseumGame/Assets/Animations/Protagonist Jump Land v1.anim index 684acef..91349cf 100644 --- a/MuseumGame/Assets/Animations/Protagonist Jump Land v1.anim +++ b/MuseumGame/Assets/Animations/Protagonist Jump Land v1.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: + m_Name: Protagonist Jump Land v1 serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 @@ -17,21 +17,48 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -1355301765853423626, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3} + - time: 0.083333336 + value: {fileID: 1540433061672771331, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3} + - time: 0.16666667 + value: {fileID: -5324470790269307012, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3} + - time: 0.25 + value: {fileID: -3023117061024659501, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3} + - time: 0.33333334 + value: {fileID: 5481875011490478117, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 12 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -1355301765853423626, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3} + - {fileID: 1540433061672771331, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3} + - {fileID: -5324470790269307012, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3} + - {fileID: -3023117061024659501, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3} + - {fileID: 5481875011490478117, guid: c8e2cf18de8fd7742b48c17d509d358c, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 0.4166667 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/MuseumGame/Assets/Animations/Protagonist Run Cycle.controller b/MuseumGame/Assets/Animations/Protagonist Run Cycle.controller index 66065e7..8a7a067 100644 --- a/MuseumGame/Assets/Animations/Protagonist Run Cycle.controller +++ b/MuseumGame/Assets/Animations/Protagonist Run Cycle.controller @@ -7,7 +7,13 @@ AnimatorStateTransition: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: - m_Conditions: [] + m_Conditions: + - m_ConditionMode: 3 + m_ConditionEvent: velocityY + m_EventTreshold: 0 + - m_ConditionMode: 2 + m_ConditionEvent: isGrounded + m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -7548201986605107798} m_Solo: 0 @@ -87,7 +93,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 7017e4bf141d99e4e80e0efcc98e51fa, type: 2} + m_Motion: {fileID: 7400000, guid: 56c62be1789ab084f90a106333e715dd, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -100,7 +106,13 @@ AnimatorStateTransition: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: - m_Conditions: [] + m_Conditions: + - m_ConditionMode: 3 + m_ConditionEvent: velocityY + m_EventTreshold: 0 + - m_ConditionMode: 2 + m_ConditionEvent: isGrounded + m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -7548201986605107798} m_Solo: 0 @@ -122,7 +134,10 @@ AnimatorStateTransition: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: - m_Conditions: [] + m_Conditions: + - m_ConditionMode: 4 + m_ConditionEvent: velocityY + m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 3480931448333261977} m_Solo: 0 @@ -400,7 +415,10 @@ AnimatorStateTransition: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: - m_Conditions: [] + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: isGrounded + m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 3540272782171852713} m_Solo: 0