From 78e5278ea8150e20356f4e9be6dd956e3a5abf51 Mon Sep 17 00:00:00 2001 From: AstrlJelly Date: Mon, 15 Jan 2024 08:06:38 -0500 Subject: [PATCH] Last Minute R1 Fixes (#622) * passed out seven times but here's your mr upbeat im so tired. and r1 is right here. but mr upbeat is better now i guess and dog ninja's bopping is fixed * also a little bit more --- Assets/Resources/Games/mrUpbeat.prefab | 74 +- .../Animations/UpbeatAnims/FallL.anim | 218 ++-- .../Animations/UpbeatAnims/FallR.anim | 1112 ++++++++--------- .../MrUpbeat/Animations/UpbeatAnims/Idle.anim | 74 +- .../MrUpbeat/Animations/UpbeatAnims/Step.anim | 264 ++-- Assets/Scripts/Games/DogNinja/DogNinja.cs | 5 +- Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs | 66 +- Assets/Scripts/Games/MrUpbeat/UpbeatMan.cs | 51 +- 8 files changed, 962 insertions(+), 902 deletions(-) diff --git a/Assets/Resources/Games/mrUpbeat.prefab b/Assets/Resources/Games/mrUpbeat.prefab index 94bce604..135f367a 100644 --- a/Assets/Resources/Games/mrUpbeat.prefab +++ b/Assets/Resources/Games/mrUpbeat.prefab @@ -26,11 +26,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1089093179602596564} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.008, y: 0, z: 0} + m_LocalPosition: {x: 0.008000017, y: 9.313226e-10, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 8730184864405069350} + m_Children: [] m_Father: {fileID: 1039565176908573975} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -200,7 +199,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1584121333826078951} - - component: {fileID: 2256168985014220240} m_Layer: 0 m_Name: Holder m_TagString: Untagged @@ -225,27 +223,6 @@ Transform: m_Father: {fileID: 862280508089709600} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!95 &2256168985014220240 -Animator: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1488695648487991734} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: a5f93a456c442bc458973d17286581d9, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 --- !u!1 &1895376594866699655 GameObject: m_ObjectHideFlags: 0 @@ -790,7 +767,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8730184864405069350 RectTransform: m_ObjectHideFlags: 0 @@ -798,17 +775,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6119064787687059058} - m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4485966734002228350} - m_RootOrder: 0 + m_Father: {fileID: 7248900333300803150} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.718, y: -0} + m_AnchoredPosition: {x: -0.6750004, y: 3.33} m_SizeDelta: {x: 1, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!23 &4356944761482350703 @@ -873,7 +850,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: + m_text: R m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8597c35f18a008c428fc5870aec75766, type: 2} m_sharedMaterial: {fileID: 2100000, guid: fa00f193fe038984592034ad7d5c2a42, type: 2} @@ -916,15 +893,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 + m_TextWrappingMode: 0 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 0 + m_ActiveFontFeatures: m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -1150,6 +1129,7 @@ Transform: m_Children: - {fileID: 8701843541313247389} - {fileID: 7821851253613277009} + - {fileID: 8730184864405069350} - {fileID: 862280508089709600} m_Father: {fileID: 0} m_RootOrder: 0 @@ -1167,7 +1147,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: SoundSequences: [] - EligibleHits: [] scheduledInputs: [] metronomeAnim: {fileID: 4547664343140929301} man: {fileID: 8160414645038680372} @@ -1273,6 +1252,7 @@ GameObject: m_Component: - component: {fileID: 862280508089709600} - component: {fileID: 8160414645038680372} + - component: {fileID: 3985421115508172561} m_Layer: 0 m_Name: MrUpbeat m_TagString: Untagged @@ -1296,7 +1276,7 @@ Transform: - {fileID: 4285463118267461702} - {fileID: 1584121333826078951} m_Father: {fileID: 7248900333300803150} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8160414645038680372 MonoBehaviour: @@ -1310,8 +1290,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e4fa18aec69a2e949a7e2d4e33bdd2b9, type: 3} m_Name: m_EditorClassIdentifier: - anim: {fileID: 2256168985014220240} + anim: {fileID: 3985421115508172561} blipAnim: {fileID: 1614535701461294964} + antennaLight: {fileID: 4485966734002228350} shadows: - {fileID: 8412912829583803381} - {fileID: 2066794384027118212} @@ -1320,6 +1301,29 @@ MonoBehaviour: shouldGrow: 0 shouldBlip: 1 blipString: M + canStep: 1 + canStepFromAnim: 1 +--- !u!95 &3985421115508172561 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8472146464158439961} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: a5f93a456c442bc458973d17286581d9, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &8959999179820051615 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/UpbeatAnims/FallL.anim b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/UpbeatAnims/FallL.anim index 1305ab29..9523212b 100644 --- a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/UpbeatAnims/FallL.anim +++ b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/UpbeatAnims/FallL.anim @@ -30,7 +30,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: Body/FallFX + path: Holder/Body/FallFX - curve: serializedVersion: 2 m_Curve: @@ -46,7 +46,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: Body/FallSmear + path: Holder/Body/FallSmear - curve: serializedVersion: 2 m_Curve: @@ -89,7 +89,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: Head + path: Holder/Head m_ScaleCurves: [] m_FloatCurves: - curve: @@ -117,7 +117,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_IsActive - path: Body/FallFX + path: Holder/Body/FallFX classID: 1 script: {fileID: 0} - curve: @@ -145,7 +145,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_IsActive - path: Body/FallSmear + path: Holder/Body/FallSmear classID: 1 script: {fileID: 0} - curve: @@ -164,7 +164,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_IsActive - path: Body/ShadowFall + path: Holder/Body/ShadowFall classID: 1 script: {fileID: 0} m_PPtrCurves: @@ -178,7 +178,7 @@ AnimationClip: - time: 0.1 value: {fileID: -3983884386284601651, guid: 2781bda31bd88924b9bc88f6c301b1d9, type: 3} attribute: m_Sprite - path: Body + path: Holder/Body classID: 212 script: {fileID: 0} - curve: @@ -187,7 +187,7 @@ AnimationClip: - time: 0.1 value: {fileID: -1641719250182597347, guid: 2781bda31bd88924b9bc88f6c301b1d9, type: 3} attribute: m_Sprite - path: Head + path: Holder/Head classID: 212 script: {fileID: 0} m_SampleRate: 60 @@ -198,56 +198,56 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 3235357039 + path: 983726004 attribute: 1 script: {fileID: 0} typeID: 4 customType: 0 isPPtrCurve: 0 - serializedVersion: 2 - path: 4033203276 + path: 2260005197 attribute: 1 script: {fileID: 0} typeID: 4 customType: 0 isPPtrCurve: 0 - serializedVersion: 2 - path: 130111906 + path: 862337961 attribute: 1 script: {fileID: 0} typeID: 4 customType: 0 isPPtrCurve: 0 - serializedVersion: 2 - path: 3235357039 + path: 983726004 attribute: 2086281974 script: {fileID: 0} typeID: 1 customType: 0 isPPtrCurve: 0 - serializedVersion: 2 - path: 4033203276 + path: 2260005197 attribute: 2086281974 script: {fileID: 0} typeID: 1 customType: 0 isPPtrCurve: 0 - serializedVersion: 2 - path: 326924850 + path: 1678613401 attribute: 2086281974 script: {fileID: 0} typeID: 1 customType: 0 isPPtrCurve: 0 - serializedVersion: 2 - path: 2073732236 + path: 1329448583 attribute: 0 script: {fileID: 0} typeID: 212 customType: 23 isPPtrCurve: 1 - serializedVersion: 2 - path: 130111906 + path: 862337961 attribute: 0 script: {fileID: 0} typeID: 212 @@ -281,34 +281,6 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.033333335 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_IsActive - path: Body/FallFX - classID: 1 - script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -325,7 +297,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.x - path: Body/FallFX + path: Holder/Body/FallFX classID: 4 script: {fileID: 0} - curve: @@ -344,7 +316,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.y - path: Body/FallFX + path: Holder/Body/FallFX classID: 4 script: {fileID: 0} - curve: @@ -363,64 +335,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.z - path: Body/FallFX - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.x - path: Body/FallSmear - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.76 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.y - path: Body/FallSmear - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.z - path: Body/FallSmear + path: Holder/Body/FallFX classID: 4 script: {fileID: 0} - curve: @@ -448,7 +363,92 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_IsActive - path: Body/FallSmear + path: Holder/Body/FallFX + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: Holder/Body/FallSmear + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.76 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: Holder/Body/FallSmear + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: Holder/Body/FallSmear + 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 + - serializedVersion: 3 + time: 0.033333335 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Holder/Body/FallSmear classID: 1 script: {fileID: 0} - curve: @@ -467,7 +467,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_IsActive - path: Body/ShadowFall + path: Holder/Body/ShadowFall classID: 1 script: {fileID: 0} - curve: @@ -504,7 +504,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.x - path: Head + path: Holder/Head classID: 4 script: {fileID: 0} - curve: @@ -550,7 +550,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.y - path: Head + path: Holder/Head classID: 4 script: {fileID: 0} - curve: @@ -569,7 +569,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.z - path: Head + path: Holder/Head classID: 4 script: {fileID: 0} m_EulerEditorCurves: [] diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/UpbeatAnims/FallR.anim b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/UpbeatAnims/FallR.anim index b287b0b2..7331ab82 100644 --- a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/UpbeatAnims/FallR.anim +++ b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/UpbeatAnims/FallR.anim @@ -29,92 +29,8 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: Body/FallFX + path: Holder/Body/FallFX m_PositionCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: -0.11, y: 0.501, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - 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.033333335 - value: {x: -0.061, y: 0.54, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - 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.05 - value: {x: 0.017, y: 0.592, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - 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.06666667 - value: {x: 0.092, y: 0.642, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - 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.11666667 - value: {x: 0.086, y: 0.731, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - 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} - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - path: Head - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 1.205, y: 0.448, z: 0} - inSlope: {x: Infinity, y: 0, z: 0} - outSlope: {x: Infinity, 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: Body/FallFX - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 0, y: 0.76, z: 0} - inSlope: {x: Infinity, y: 0, z: 0} - outSlope: {x: Infinity, 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: Body/FallSmear - curve: serializedVersion: 2 m_Curve: @@ -166,7 +82,39 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: Body + path: Holder/Body + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1.205, y: 0.448, z: 0} + inSlope: {x: Infinity, y: 0, z: 0} + outSlope: {x: Infinity, 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: Holder/Body/FallFX + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0.76, z: 0} + inSlope: {x: Infinity, y: 0, z: 0} + outSlope: {x: Infinity, 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: Holder/Body/FallSmear - curve: serializedVersion: 2 m_Curve: @@ -182,7 +130,59 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: Body/ShadowFall + path: Holder/Body/ShadowFall + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -0.11, y: 0.501, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + 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.033333335 + value: {x: -0.061, y: 0.54, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + 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.05 + value: {x: 0.017, y: 0.592, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + 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.06666667 + value: {x: 0.092, y: 0.642, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + 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.11666667 + value: {x: 0.086, y: 0.731, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + 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} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Holder/Head m_ScaleCurves: [] m_FloatCurves: - curve: @@ -219,7 +219,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_IsActive - path: Body/FallFX + path: Holder/Body/FallFX classID: 1 script: {fileID: 0} - curve: @@ -238,7 +238,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_IsActive - path: Body/ShadowFall + path: Holder/Body/ShadowFall classID: 1 script: {fileID: 0} m_PPtrCurves: @@ -250,7 +250,7 @@ AnimationClip: - time: 0.11666667 value: {fileID: 1416775875, guid: 2781bda31bd88924b9bc88f6c301b1d9, type: 3} attribute: m_Sprite - path: Body + path: Holder/Body classID: 212 script: {fileID: 0} - curve: @@ -259,7 +259,7 @@ AnimationClip: - time: 0.11666667 value: {fileID: -1641719250182597347, guid: 2781bda31bd88924b9bc88f6c301b1d9, type: 3} attribute: m_Sprite - path: Head + path: Holder/Head classID: 212 script: {fileID: 0} m_SampleRate: 60 @@ -270,70 +270,70 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 130111906 + path: 1329448583 attribute: 1 script: {fileID: 0} typeID: 4 customType: 0 isPPtrCurve: 0 - serializedVersion: 2 - path: 3235357039 + path: 983726004 attribute: 1 script: {fileID: 0} typeID: 4 customType: 0 isPPtrCurve: 0 - serializedVersion: 2 - path: 4033203276 + path: 2260005197 attribute: 1 script: {fileID: 0} typeID: 4 customType: 0 isPPtrCurve: 0 - serializedVersion: 2 - path: 2073732236 + path: 1678613401 attribute: 1 script: {fileID: 0} typeID: 4 customType: 0 isPPtrCurve: 0 - serializedVersion: 2 - path: 326924850 + path: 862337961 attribute: 1 script: {fileID: 0} typeID: 4 customType: 0 isPPtrCurve: 0 - serializedVersion: 2 - path: 3235357039 + path: 983726004 attribute: 4 script: {fileID: 0} typeID: 4 customType: 4 isPPtrCurve: 0 - serializedVersion: 2 - path: 3235357039 + path: 983726004 attribute: 2086281974 script: {fileID: 0} typeID: 1 customType: 0 isPPtrCurve: 0 - serializedVersion: 2 - path: 326924850 + path: 1678613401 attribute: 2086281974 script: {fileID: 0} typeID: 1 customType: 0 isPPtrCurve: 0 - serializedVersion: 2 - path: 2073732236 + path: 1329448583 attribute: 0 script: {fileID: 0} typeID: 212 customType: 23 isPPtrCurve: 1 - serializedVersion: 2 - path: 130111906 + path: 862337961 attribute: 0 script: {fileID: 0} typeID: 212 @@ -366,6 +366,455 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.07 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 0.121 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.05 + value: 0.178 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 0.217 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.11666667 + value: 0.26 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: Holder/Body + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.05 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.11666667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: Holder/Body + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.05 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.11666667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: Holder/Body + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1.205 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: Holder/Body/FallFX + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.448 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: Holder/Body/FallFX + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: Holder/Body/FallFX + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: Holder/Body/FallFX + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: Holder/Body/FallFX + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: Holder/Body/FallFX + 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 + - serializedVersion: 3 + time: 0.033333335 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.05 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Holder/Body/FallFX + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: Holder/Body/FallSmear + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.76 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: Holder/Body/FallSmear + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: Holder/Body/FallSmear + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.0831 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: Holder/Body/ShadowFall + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.016 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: Holder/Body/ShadowFall + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: Holder/Body/ShadowFall + 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_IsActive + path: Holder/Body/ShadowFall + classID: 1 + script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -418,7 +867,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.x - path: Head + path: Holder/Head classID: 4 script: {fileID: 0} - curve: @@ -473,7 +922,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.y - path: Head + path: Holder/Head classID: 4 script: {fileID: 0} - curve: @@ -528,456 +977,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.z - path: Head - 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 - - serializedVersion: 3 - time: 0.033333335 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.05 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_IsActive - path: Body/FallFX - classID: 1 - 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_IsActive - path: Body/ShadowFall - classID: 1 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1.205 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.x - path: Body/FallFX - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.448 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.y - path: Body/FallFX - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.z - path: Body/FallFX - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.x - path: Body/FallSmear - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.76 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.y - path: Body/FallSmear - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.z - path: Body/FallSmear - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.07 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.033333335 - value: 0.121 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.05 - value: 0.178 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.06666667 - value: 0.217 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.11666667 - value: 0.26 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.x - path: Body - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.033333335 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.05 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.06666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.11666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.y - path: Body - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.033333335 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.05 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.06666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.11666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.z - path: Body - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.x - path: Body/FallFX - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.y - path: Body/FallFX - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.z - path: Body/FallFX - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.0831 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.x - path: Body/ShadowFall - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.016 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.y - path: Body/ShadowFall - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.z - path: Body/ShadowFall + path: Holder/Head classID: 4 script: {fileID: 0} m_EulerEditorCurves: @@ -988,7 +988,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: Body/FallFX + path: Holder/Body/FallFX classID: 4 script: {fileID: 0} - curve: @@ -998,7 +998,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: Body/FallFX + path: Holder/Body/FallFX classID: 4 script: {fileID: 0} - curve: @@ -1008,7 +1008,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: Body/FallFX + path: Holder/Body/FallFX classID: 4 script: {fileID: 0} m_HasGenericRootTransform: 0 diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/UpbeatAnims/Idle.anim b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/UpbeatAnims/Idle.anim index fa78bcd2..e0129283 100644 --- a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/UpbeatAnims/Idle.anim +++ b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/UpbeatAnims/Idle.anim @@ -39,7 +39,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: Head + path: Holder/Head m_ScaleCurves: [] m_FloatCurves: - curve: @@ -67,7 +67,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_IsActive - path: Body/ShadowFall + path: Holder/Body/ShadowFall classID: 1 script: {fileID: 0} m_PPtrCurves: @@ -75,7 +75,7 @@ AnimationClip: - time: 0 value: {fileID: -4373096660332669510, guid: 2781bda31bd88924b9bc88f6c301b1d9, type: 3} attribute: m_Sprite - path: Body + path: Holder/Body classID: 212 script: {fileID: 0} m_SampleRate: 60 @@ -86,21 +86,21 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 326924850 + path: 1678613401 attribute: 2086281974 script: {fileID: 0} typeID: 1 customType: 0 isPPtrCurve: 0 - serializedVersion: 2 - path: 2073732236 + path: 1329448583 attribute: 0 script: {fileID: 0} typeID: 212 customType: 23 isPPtrCurve: 1 - serializedVersion: 2 - path: 130111906 + path: 862337961 attribute: 1 script: {fileID: 0} typeID: 4 @@ -129,6 +129,34 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.016666668 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Holder/Body/ShadowFall + classID: 1 + script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -154,7 +182,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.x - path: Head + path: Holder/Head classID: 4 script: {fileID: 0} - curve: @@ -182,7 +210,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.y - path: Head + path: Holder/Head classID: 4 script: {fileID: 0} - curve: @@ -210,37 +238,9 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.z - path: Head + path: Holder/Head classID: 4 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.016666668 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_IsActive - path: Body/ShadowFall - classID: 1 - script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/UpbeatAnims/Step.anim b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/UpbeatAnims/Step.anim index 41a3aed6..835281bc 100644 --- a/Assets/Resources/Sprites/Games/MrUpbeat/Animations/UpbeatAnims/Step.anim +++ b/Assets/Resources/Sprites/Games/MrUpbeat/Animations/UpbeatAnims/Step.anim @@ -48,7 +48,7 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: Head + path: Holder/Head m_ScaleCurves: [] m_FloatCurves: - curve: @@ -56,15 +56,6 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.016666668 value: 0 inSlope: Infinity outSlope: Infinity @@ -85,7 +76,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_IsActive - path: Body/StepSmearHead + path: Holder/Body/ShadowFall classID: 1 script: {fileID: 0} - curve: @@ -122,7 +113,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_IsActive - path: Body/StepSmearFoot + path: Holder/Body/StepSmearFoot classID: 1 script: {fileID: 0} - curve: @@ -130,6 +121,15 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.016666668 value: 0 inSlope: Infinity outSlope: Infinity @@ -150,7 +150,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_IsActive - path: Body/ShadowFall + path: Holder/Body/StepSmearHead classID: 1 script: {fileID: 0} m_PPtrCurves: @@ -162,7 +162,7 @@ AnimationClip: - time: 0.033333335 value: {fileID: -4373096660332669510, guid: 2781bda31bd88924b9bc88f6c301b1d9, type: 3} attribute: m_Sprite - path: Body + path: Holder/Body classID: 212 script: {fileID: 0} m_SampleRate: 60 @@ -173,35 +173,35 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 130111906 + path: 862337961 attribute: 1 script: {fileID: 0} typeID: 4 customType: 0 isPPtrCurve: 0 - serializedVersion: 2 - path: 2429381691 + path: 1678613401 attribute: 2086281974 script: {fileID: 0} typeID: 1 customType: 0 isPPtrCurve: 0 - serializedVersion: 2 - path: 4273054516 + path: 1274778309 attribute: 2086281974 script: {fileID: 0} typeID: 1 customType: 0 isPPtrCurve: 0 - serializedVersion: 2 - path: 326924850 + path: 629628362 attribute: 2086281974 script: {fileID: 0} typeID: 1 customType: 0 isPPtrCurve: 0 - serializedVersion: 2 - path: 2073732236 + path: 1329448583 attribute: 0 script: {fileID: 0} typeID: 212 @@ -232,6 +232,108 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.050000004 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Holder/Body/ShadowFall + classID: 1 + 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 + - serializedVersion: 3 + time: 0.016666668 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.050000004 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Holder/Body/StepSmearFoot + classID: 1 + 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 + - serializedVersion: 3 + time: 0.016666668 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.050000004 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Holder/Body/StepSmearHead + classID: 1 + script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: @@ -266,7 +368,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.x - path: Head + path: Holder/Head classID: 4 script: {fileID: 0} - curve: @@ -303,7 +405,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.y - path: Head + path: Holder/Head classID: 4 script: {fileID: 0} - curve: @@ -340,112 +442,24 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.z - path: Head + path: Holder/Head 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 - - serializedVersion: 3 - time: 0.016666668 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.050000004 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_IsActive - path: Body/StepSmearHead - classID: 1 - 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 - - serializedVersion: 3 - time: 0.016666668 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.050000004 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_IsActive - path: Body/StepSmearFoot - classID: 1 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.050000004 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_IsActive - path: Body/ShadowFall - classID: 1 - script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0 + functionName: ToggleStepping + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 + - time: 0.033333335 + functionName: ToggleStepping + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 1 + messageOptions: 0 diff --git a/Assets/Scripts/Games/DogNinja/DogNinja.cs b/Assets/Scripts/Games/DogNinja/DogNinja.cs index 1a91666d..5bba6860 100644 --- a/Assets/Scripts/Games/DogNinja/DogNinja.cs +++ b/Assets/Scripts/Games/DogNinja/DogNinja.cs @@ -215,8 +215,9 @@ namespace HeavenStudio.Games public override void OnBeatPulse(double beat) { - if (!BeatIsInBopRegion(beat)) return; - DogAnim.DoScaledAnimationAsync("Bop", 0.5f); + if (BeatIsInBopRegion(beat) && DogAnim.IsAnimationNotPlaying() || DogAnim.IsPlayingAnimationNames("Idle")) { + DogAnim.DoScaledAnimationAsync("Bop", 0.5f); + } } private void Update() diff --git a/Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs b/Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs index 7ff4e120..f2344a8e 100644 --- a/Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs +++ b/Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs @@ -30,7 +30,11 @@ namespace HeavenStudio.Games.Loaders { preFunction = delegate { var e = eventCaller.currentEntity; - MrUpbeat.Ding(e.beat, e["toggle"], e["stopBlipping"], e["playDing"]); + if (GameManager.instance.currentGame == "mrUpbeat") { + MrUpbeat.instance.Ding(e.beat, e["toggle"], e["stopBlipping"], e["playDing"]); + } else { + MrUpbeat.DingSfx(e.beat, e["toggle"], e["playDing"]); + } }, defaultLength = 0.5f, parameters = new List() @@ -173,6 +177,8 @@ namespace HeavenStudio.Games public override void OnGameSwitch(double beat) { + List prevEntities = GameManager.instance.Beatmap.Entities.FindAll(c => c.beat <= beat && c.datamodel.Split(0) == "mrUpbeat"); + if (beat >= startBlippingBeat) { double tempBeat = ((beat % 1 == 0.5) ? Mathf.Floor((float)beat) : Mathf.Round((float)beat)) + (startBlippingBeat % 1); BeatAction.New(instance, new List() { @@ -182,7 +188,6 @@ namespace HeavenStudio.Games } // init background color/blip color stuff by getting the last of each of those blocks - List prevEntities = GameManager.instance.Beatmap.Entities.FindAll(c => c.beat <= beat && c.datamodel.Split(0) == "mrUpbeat"); var bgColorEntity = prevEntities.FindLast(x => x.datamodel.Split(1) == "changeBG" && x.beat <= beat); var upbeatColorEntity = prevEntities.FindLast(x => x.datamodel.Split(1) == "upbeatColors" && x.beat <= beat); @@ -205,57 +210,76 @@ namespace HeavenStudio.Games { var cond = Conductor.instance; if (cond.isPlaying && !cond.isPaused) { - if (cond.songPositionInBeatsAsDouble >= startSteppingBeat) { + var songPos = cond.songPositionInBeatsAsDouble; + + if (songPos >= startSteppingBeat - 2) { + man.canStep = true; + } + + if (songPos >= startSteppingBeat) { RecursiveStepping(startSteppingBeat); startSteppingBeat = double.MaxValue; } - if (cond.songPositionInBeats >= startBlippingBeat) { + if (songPos >= startBlippingBeat) { man.RecursiveBlipping(startBlippingBeat); startBlippingBeat = double.MaxValue; } } } - public static void Ding(double beat, bool applause, bool stopBlipping, bool playDing) + public void Ding(double beat, bool applause, bool stopBlipping, bool playDing) { BeatAction.New(instance, new List() { new BeatAction.Action(beat - 0.5, delegate { - instance.stopStepping = true; - if (stopBlipping) instance.stopBlipping = true; + stopStepping = true; + if (stopBlipping) this.stopBlipping = true; + }), + new BeatAction.Action(beat, delegate { + man.canStep = false; }), new BeatAction.Action(beat + 0.5, delegate { - instance.stopStepping = false; + stopStepping = false; }), }); + DingSfx(beat, applause, playDing); + } + + public static void DingSfx(double beat, bool applause, bool playDing) + { if (playDing) SoundByte.PlayOneShotGame("mrUpbeat/ding", beat: beat, forcePlay: true); if (applause) SoundByte.PlayOneShot("applause", beat: beat); } - public static void PrePrepare(double beat, float length, bool forceOffbeat) + public static void PrePrepare(double beat, float length, bool mrDownbeat) { bool isGame = GameManager.instance.currentGame == "mrUpbeat"; - if (forceOffbeat) { - startBlippingBeat = beat; - startSteppingBeat = beat + length - 0.5f; - if (!isGame) Blipping(beat, length); - } else { - startBlippingBeat = Mathf.Floor((float)beat) + 0.5; - startSteppingBeat = Mathf.Floor((float)beat) + Mathf.Round(length); - if (!isGame) Blipping(Mathf.Floor((float)beat) + 0.5f, length); + if (!mrDownbeat) { + beat = Mathf.Floor((float)beat) + 0.5; + length = Mathf.Round(length); } + startBlippingBeat = beat; + startSteppingBeat = beat + length - 0.5f; + if (!isGame) Blipping(beat, length); + } + + private void ScheduleStep(double beat) + { + PlayerActionEvent input = ScheduleInput(beat, 0.5f, InputAction_BasicPress, Success, Miss, Nothing); + input.IsHittable = () => man.canStep && man.canStepFromAnim && man.FacingCorrectly(); } private void RecursiveStepping(double beat) { if (stopStepping) { + stopStepping = false; return; } string dir = (stepIterate % 2 == 1) ? "Right" : "Left"; metronomeAnim.DoScaledAnimationAsync("MetronomeGo" + dir, 0.5f); SoundByte.PlayOneShotGame("mrUpbeat/metronome" + dir); - ScheduleInput(beat, 0.5f, InputAction_BasicPress, Success, Miss, Nothing); + ScheduleStep(beat); BeatAction.New(this, new List() { new(beat + 1, delegate { RecursiveStepping(beat + 1); }) }); @@ -267,7 +291,7 @@ namespace HeavenStudio.Games var actions = new List(); for (int i = 0; i < length; i++) { - ScheduleInput(beat + i, 0.5f, InputAction_BasicPress, Success, Miss, Nothing); + ScheduleStep(beat); actions.Add(new BeatAction.Action(beat + i, delegate { string dir = (stepIterate % 2 == 1) ? "Right" : "Left"; metronomeAnim.DoScaledAnimationAsync("MetronomeGo" + dir, 0.5f); @@ -283,7 +307,7 @@ namespace HeavenStudio.Games RiqEntity gameSwitch = GameManager.instance.Beatmap.Entities.Find(c => c.beat > beat && c.datamodel == "gameManager/switchGame/mrUpbeat"); if (gameSwitch.beat <= beat || gameSwitch.beat >= beat + length + 1) return; - List inactiveBlips = new List(); + List inactiveBlips = new(); for (int i = 0; i < gameSwitch.beat - beat; i++) { inactiveBlips.Add(new MultiSound.Sound("mrUpbeat/blip", beat + i)); } @@ -294,7 +318,7 @@ namespace HeavenStudio.Games public void Success(PlayerActionEvent caller, float state) { man.Step(); - if (state >= 1f || state <= -1f) SoundByte.PlayOneShot("nearMiss"); + if (state is >= 1f or <= -1f) SoundByte.PlayOneShot("nearMiss"); } public void Miss(PlayerActionEvent caller) diff --git a/Assets/Scripts/Games/MrUpbeat/UpbeatMan.cs b/Assets/Scripts/Games/MrUpbeat/UpbeatMan.cs index 6d8076e3..97558de5 100644 --- a/Assets/Scripts/Games/MrUpbeat/UpbeatMan.cs +++ b/Assets/Scripts/Games/MrUpbeat/UpbeatMan.cs @@ -11,6 +11,7 @@ namespace HeavenStudio.Games.Scripts_MrUpbeat [Header("References")] [SerializeField] Animator anim; [SerializeField] Animator blipAnim; + [SerializeField] Transform antennaLight; [SerializeField] GameObject[] shadows; [SerializeField] TMP_Text blipText; @@ -18,19 +19,24 @@ namespace HeavenStudio.Games.Scripts_MrUpbeat public bool shouldGrow; public bool shouldBlip = true; public string blipString = "M"; + public bool canStep = false; // just disabled when you normally couldn't step, which is anything less than 2 beats before you would start stepping and any time after the Ding! + public bool canStepFromAnim = true; // disabled when stepping, then reenabled in the animation events. you can step JUST BARELY before the animation ends in fever - static MrUpbeat game; + private static MrUpbeat game; void Awake() { game = MrUpbeat.instance; + + canStep = false; } - void Update() + void Update() { - blipText.transform.localScale = Vector3.one; - - if (PlayerInput.GetIsAction(MrUpbeat.InputAction_BasicPress) && !game.IsExpectingInputNow(MrUpbeat.InputAction_BasicPress)) { + blipText.transform.localPosition = new Vector3(antennaLight.position.x, antennaLight.position.y + 0.7f); + + if (PlayerInput.GetIsAction(MrUpbeat.InputAction_BasicPress) && !game.IsExpectingInputNow(MrUpbeat.InputAction_BasicPress) + && canStep && canStepFromAnim) { Step(true); } } @@ -42,27 +48,29 @@ namespace HeavenStudio.Games.Scripts_MrUpbeat return; } if (shouldBlip) { - Blipping(beat); + Blipping(); } BeatAction.New(this, new List() { new BeatAction.Action(beat + 1, delegate { RecursiveBlipping(beat + 1); }) }); } - public void Blipping(double beat) + public void Blipping() { SoundByte.PlayOneShotGame("mrUpbeat/blip"); - blipAnim.Play("Blip"+(blipSize+1), 0, 0); - blipText.text = (blipSize == 4 && blipString != "") ? blipString : ""; + blipAnim.Play("Blip" + (blipSize + 1), 0, 0); + blipText.gameObject.SetActive(blipSize >= 4); + + blipText.text = blipString != "" ? blipString : ""; if (shouldGrow && blipSize < 4) blipSize++; } public void Step(bool isInput = false) { - if (isInput || ((game.stepIterate % 2 == 0) == IsMirrored())) { - shadows[0].SetActive(IsMirrored()); - shadows[1].SetActive(!IsMirrored()); - transform.localScale = new Vector3((IsMirrored() ? 1 : -1), 1, 1); + if (isInput || FacingCorrectly()) { + shadows[0].SetActive(transform.localScale.x < 0); + shadows[1].SetActive(transform.localScale.x > 0); + Flip(); } anim.DoScaledAnimationAsync("Step", 0.5f); @@ -71,16 +79,25 @@ namespace HeavenStudio.Games.Scripts_MrUpbeat public void Fall() { - anim.DoScaledAnimationAsync((game.stepIterate % 2 == 0) == IsMirrored() ? "FallR" : "FallL", 1f); + anim.DoScaledAnimationAsync(FacingCorrectly() ? "FallR" : "FallL", 1f); SoundByte.PlayOneShot("miss"); shadows[0].SetActive(false); shadows[1].SetActive(false); - transform.localScale = new Vector3((IsMirrored() ? 1 : -1), 1, 1); + Flip(); } - bool IsMirrored() + void Flip() { + var scale = transform.localScale; + transform.localScale = new Vector3(-scale.x, scale.y, scale.z); + } + + + public bool FacingCorrectly() => (game.stepIterate % 2 == 0) == (transform.localScale.x < 0); + + // animation event + public void ToggleStepping(int canStep) // why do unity animation events not support booleans??? this is a 1 for true or 0 for false { - return transform.localScale != Vector3.one; + canStepFromAnim = canStep == 1; } } } \ No newline at end of file