From 1e1b5ad1a74e50c44a06442cba37680b704f35a2 Mon Sep 17 00:00:00 2001 From: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Sat, 30 Dec 2023 20:32:12 +0100 Subject: [PATCH] the deets have been fixed --- Assets/Resources/Games/totemClimb.prefab | 12 +- .../Animations/Jumper/HighFall.anim | 378 ++++++++++++++++++ .../Animations/Jumper/HighFall.anim.meta | 8 + .../Animations/Jumper/HighJump.anim | 67 +++- .../Animations/Jumper/Jumper.controller | 29 ++ Assets/Scripts/Games/TotemClimb/TCJumper.cs | 2 +- 6 files changed, 478 insertions(+), 18 deletions(-) create mode 100644 Assets/Resources/Sprites/Games/TotemClimb/Animations/Jumper/HighFall.anim create mode 100644 Assets/Resources/Sprites/Games/TotemClimb/Animations/Jumper/HighFall.anim.meta diff --git a/Assets/Resources/Games/totemClimb.prefab b/Assets/Resources/Games/totemClimb.prefab index c7435de76..565c3f129 100644 --- a/Assets/Resources/Games/totemClimb.prefab +++ b/Assets/Resources/Games/totemClimb.prefab @@ -403,14 +403,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1473018605763613365} - m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} - m_LocalPosition: {x: 0, y: -1.5, z: 0} + m_LocalRotation: {x: 0, y: 0, z: 0.9961947, w: 0.08715588} + m_LocalPosition: {x: 0, y: -1.44, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1298493099490371972} m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 170} --- !u!198 &5857671245641105680 ParticleSystem: m_ObjectHideFlags: 0 @@ -1183,7 +1183,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 arc: - value: 180 + value: 200 mode: 3 spread: 0 speed: @@ -1355,7 +1355,7 @@ ParticleSystem: countCurve: serializedVersion: 2 minMaxState: 0 - scalar: 5 + scalar: 4 minScalar: 30 maxCurve: serializedVersion: 2 @@ -5217,7 +5217,7 @@ ParticleSystemRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 5 + m_SortingOrder: 51 m_RenderMode: 0 m_MeshDistribution: 0 m_SortMode: 0 diff --git a/Assets/Resources/Sprites/Games/TotemClimb/Animations/Jumper/HighFall.anim b/Assets/Resources/Sprites/Games/TotemClimb/Animations/Jumper/HighFall.anim new file mode 100644 index 000000000..6b01de48b --- /dev/null +++ b/Assets/Resources/Sprites/Games/TotemClimb/Animations/Jumper/HighFall.anim @@ -0,0 +1,378 @@ +%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: HighFall + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -0.66, y: -0.77900004, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: footLeft + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1.01, y: -0.779, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: footRight + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_FlipX + path: footLeft + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 4 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SortingOrder + path: footLeft + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 3 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SortingOrder + path: footRight + classID: 212 + script: {fileID: 0} + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 2050925680, guid: 82ecf7d34cdde82478c1c03c649f7827, type: 3} + attribute: m_Sprite + path: footLeft + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: 2050925680, guid: 82ecf7d34cdde82478c1c03c649f7827, type: 3} + attribute: m_Sprite + path: footRight + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + 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: 12134035 + attribute: 555744692 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 12134035 + attribute: 3762991556 + script: {fileID: 0} + typeID: 212 + customType: 26 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2665447489 + attribute: 3762991556 + script: {fileID: 0} + typeID: 212 + customType: 26 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 12134035 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 2665447489 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 12134035 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2665447489 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: + - {fileID: 2050925680, guid: 82ecf7d34cdde82478c1c03c649f7827, type: 3} + - {fileID: 2050925680, guid: 82ecf7d34cdde82478c1c03c649f7827, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + 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: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.66 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: footLeft + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.77900004 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: footLeft + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: footLeft + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_FlipX + path: footLeft + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 4 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SortingOrder + path: footLeft + classID: 212 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1.01 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: footRight + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.779 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: footRight + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: footRight + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 3 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_SortingOrder + path: footRight + classID: 212 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/TotemClimb/Animations/Jumper/HighFall.anim.meta b/Assets/Resources/Sprites/Games/TotemClimb/Animations/Jumper/HighFall.anim.meta new file mode 100644 index 000000000..84f3373e2 --- /dev/null +++ b/Assets/Resources/Sprites/Games/TotemClimb/Animations/Jumper/HighFall.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 27f907aef0dc1cf4893d8ef1008b6d60 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/TotemClimb/Animations/Jumper/HighJump.anim b/Assets/Resources/Sprites/Games/TotemClimb/Animations/Jumper/HighJump.anim index 37576df1a..15b6fb831 100644 --- a/Assets/Resources/Sprites/Games/TotemClimb/Animations/Jumper/HighJump.anim +++ b/Assets/Resources/Sprites/Games/TotemClimb/Animations/Jumper/HighJump.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.39, y: -0.99000025, z: 0} + value: {x: -0.66, y: -0.77900004, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -36,7 +36,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 1.01, y: -0.99, z: 0} + value: {x: 1.01, y: -0.779, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -52,7 +52,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -1.81, y: 0.13, z: 0} + value: {x: -1.81, y: -0.424, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -68,7 +68,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 1.8, y: 0.13, z: 0} + value: {x: 1.8, y: -0.42400008, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -86,7 +86,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 2 + value: 4 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -119,6 +119,25 @@ AnimationClip: path: footRight classID: 212 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_FlipX + path: footLeft + classID: 212 + script: {fileID: 0} m_PPtrCurves: - curve: - time: 0 @@ -176,6 +195,13 @@ AnimationClip: typeID: 212 customType: 26 isPPtrCurve: 0 + - serializedVersion: 2 + path: 12134035 + attribute: 555744692 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 2073732236 attribute: 0 @@ -271,7 +297,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.39 + value: -0.66 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -290,7 +316,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.99000025 + value: -0.77900004 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -328,7 +354,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 2 + value: 4 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -366,7 +392,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.99 + value: -0.779 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -442,7 +468,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.13 + value: -0.424 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -499,7 +525,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.13 + value: -0.42400008 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -532,6 +558,25 @@ AnimationClip: path: wingRight classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_FlipX + path: footLeft + classID: 212 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Resources/Sprites/Games/TotemClimb/Animations/Jumper/Jumper.controller b/Assets/Resources/Sprites/Games/TotemClimb/Animations/Jumper/Jumper.controller index 69b0d98e7..1e5f653ef 100644 --- a/Assets/Resources/Sprites/Games/TotemClimb/Animations/Jumper/Jumper.controller +++ b/Assets/Resources/Sprites/Games/TotemClimb/Animations/Jumper/Jumper.controller @@ -162,6 +162,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: -5140467894433591657} m_Position: {x: 480, y: 520, z: 0} + - serializedVersion: 1 + m_State: {fileID: -2950319106508282680} + m_Position: {x: 515, y: 585, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -198,6 +201,32 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &-2950319106508282680 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: HighFall + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + 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: 27f907aef0dc1cf4893d8ef1008b6d60, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &-892583009286595277 AnimatorState: serializedVersion: 6 diff --git a/Assets/Scripts/Games/TotemClimb/TCJumper.cs b/Assets/Scripts/Games/TotemClimb/TCJumper.cs index e2444a58b..0c8e793ae 100644 --- a/Assets/Scripts/Games/TotemClimb/TCJumper.cs +++ b/Assets/Scripts/Games/TotemClimb/TCJumper.cs @@ -226,7 +226,7 @@ namespace HeavenStudio.Games.Scripts_TotemClimb if (normalizedBeat >= 0.5f && !playedFall) { - if (!miss) _anim.Play("Fall", 0, 0); + if (!miss) _anim.Play("HighFall", 0, 0); playedFall = true; }