From 4ea1e3f1ff0ea69fa04ac9f8c88cffacda93387e Mon Sep 17 00:00:00 2001 From: Jenny Crowe Date: Mon, 28 Feb 2022 00:08:33 -0700 Subject: [PATCH 1/3] Crop Stomp: Scrolling stops when paused. --- Assets/Scripts/Games/CropStomp/CropStomp.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/Scripts/Games/CropStomp/CropStomp.cs b/Assets/Scripts/Games/CropStomp/CropStomp.cs index b7e7b759d..fff21df05 100644 --- a/Assets/Scripts/Games/CropStomp/CropStomp.cs +++ b/Assets/Scripts/Games/CropStomp/CropStomp.cs @@ -19,7 +19,7 @@ namespace RhythmHeavenMania.Games.CropStomp private int currentMarchBeat; private int stepCount; - public bool isMarching => marchStartBeat != -1f; + public bool isMarching => marchStartBeat != -1f && Conductor.instance.isPlaying; public Animator legsAnim; public Transform farmerTrans; From 5871716bd1a8957b5da907d3dace49d01ec5c447 Mon Sep 17 00:00:00 2001 From: Jenny Crowe Date: Mon, 28 Feb 2022 01:33:11 -0700 Subject: [PATCH 2/3] Crop Stomp: Basic stomping --- Assets/Resources/Games/cropStomp.prefab | 31 +- Assets/Resources/Sfx/games/cropStomp.meta | 8 + Assets/Resources/Sfx/games/cropStomp/hmm.ogg | Bin 0 -> 7568 bytes .../Sfx/games/cropStomp/hmm.ogg.meta | 22 + .../Resources/Sfx/games/cropStomp/stomp.ogg | Bin 0 -> 13694 bytes .../Sfx/games/cropStomp/stomp.ogg.meta | 22 + .../CropStomp/Animations/Legs/Legs.controller | 64 ++- .../CropStomp/Animations/Legs/LiftBack.anim | 86 ++-- .../CropStomp/Animations/Legs/LiftFront.anim | 86 ++-- .../CropStomp/Animations/Legs/StepBack.anim | 56 +-- .../CropStomp/Animations/Legs/StepFront.anim | 58 +-- .../CropStomp/Animations/Legs/StompBack.anim | 435 ++++++++++++++++++ .../Animations/Legs/StompBack.anim.meta | 8 + .../CropStomp/Animations/Legs/StompFront.anim | 435 ++++++++++++++++++ .../Animations/Legs/StompFront.anim.meta | 8 + Assets/Scripts/Games/CropStomp/CropStomp.cs | 47 +- Assets/Scripts/Games/CropStomp/Farmer.cs | 52 +++ Assets/Scripts/Games/CropStomp/Farmer.cs.meta | 11 + Assets/Scripts/Games/PlayerActionObject.cs | 4 +- 19 files changed, 1280 insertions(+), 153 deletions(-) create mode 100644 Assets/Resources/Sfx/games/cropStomp.meta create mode 100644 Assets/Resources/Sfx/games/cropStomp/hmm.ogg create mode 100644 Assets/Resources/Sfx/games/cropStomp/hmm.ogg.meta create mode 100644 Assets/Resources/Sfx/games/cropStomp/stomp.ogg create mode 100644 Assets/Resources/Sfx/games/cropStomp/stomp.ogg.meta create mode 100644 Assets/Resources/Sprites/Games/CropStomp/Animations/Legs/StompBack.anim create mode 100644 Assets/Resources/Sprites/Games/CropStomp/Animations/Legs/StompBack.anim.meta create mode 100644 Assets/Resources/Sprites/Games/CropStomp/Animations/Legs/StompFront.anim create mode 100644 Assets/Resources/Sprites/Games/CropStomp/Animations/Legs/StompFront.anim.meta create mode 100644 Assets/Scripts/Games/CropStomp/Farmer.cs create mode 100644 Assets/Scripts/Games/CropStomp/Farmer.cs.meta diff --git a/Assets/Resources/Games/cropStomp.prefab b/Assets/Resources/Games/cropStomp.prefab index 22d7ce7a0..da78a5c41 100644 --- a/Assets/Resources/Games/cropStomp.prefab +++ b/Assets/Resources/Games/cropStomp.prefab @@ -330,6 +330,7 @@ MonoBehaviour: grass: {fileID: 6072388044625575886} grassTrans: {fileID: 9053856824134827426} scrollingHolder: {fileID: 3229117913716202416} + farmer: {fileID: 2943047049103139379} --- !u!1 &5813499711658895222 GameObject: m_ObjectHideFlags: 0 @@ -639,6 +640,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2890674062888421961} + - component: {fileID: 2943047049103139379} m_Layer: 0 m_Name: FarmerHolder m_TagString: Untagged @@ -662,6 +664,31 @@ Transform: m_Father: {fileID: 3229117913716202416} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2943047049103139379 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8284146705987220773} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55894391661380d42b64a4793d3befb6, type: 3} + m_Name: + m_EditorClassIdentifier: + inList: 0 + lastState: 0 + state: + gameObject: {fileID: 0} + early: 0 + perfect: 0 + late: 0 + createBeat: 0 + eligibleHitsList: [] + aceTimes: 0 + isEligible: 0 + triggersAutoplay: 0 + nextStompBeat: 0 --- !u!1 &8897652086585911321 GameObject: m_ObjectHideFlags: 0 @@ -687,7 +714,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8897652086585911321} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.47, y: -0.02, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2890674062888421961} @@ -733,7 +760,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 5 - m_Sprite: {fileID: 2952886495766980894, guid: 2deb728f30830dd438f91e9a4dff8cd4, type: 3} + m_Sprite: {fileID: -6951489029472693398, guid: 2deb728f30830dd438f91e9a4dff8cd4, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 0.25490198} m_FlipX: 0 m_FlipY: 0 diff --git a/Assets/Resources/Sfx/games/cropStomp.meta b/Assets/Resources/Sfx/games/cropStomp.meta new file mode 100644 index 000000000..5707447d7 --- /dev/null +++ b/Assets/Resources/Sfx/games/cropStomp.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f5a4b4690a9baf14ebe2ae517bf5a5db +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/cropStomp/hmm.ogg b/Assets/Resources/Sfx/games/cropStomp/hmm.ogg new file mode 100644 index 0000000000000000000000000000000000000000..01609212069270e9711835e6c8f1cefaaa8ad77e GIT binary patch literal 7568 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 kTh^0?cZ^h(uQUCw| literal 0 HcmV?d00001 diff --git a/Assets/Resources/Sfx/games/cropStomp/hmm.ogg.meta b/Assets/Resources/Sfx/games/cropStomp/hmm.ogg.meta new file mode 100644 index 000000000..4adb1bcd0 --- /dev/null +++ b/Assets/Resources/Sfx/games/cropStomp/hmm.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 0d1deeccb3c2b0b45bf44a7087cfc855 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/cropStomp/stomp.ogg b/Assets/Resources/Sfx/games/cropStomp/stomp.ogg new file mode 100644 index 0000000000000000000000000000000000000000..fe91a383d57abefd171bd51500f4d7a0edd418ff GIT binary patch literal 13694 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
    ~#hJ58)6x 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 marchStartBeat != -1f && Conductor.instance.isPlaying; @@ -26,6 +28,9 @@ namespace RhythmHeavenMania.Games.CropStomp public SpriteRenderer grass; public Transform grassTrans; public Transform scrollingHolder; + public Farmer farmer; + + private Tween shakeTween; public static CropStomp instance; @@ -58,10 +63,18 @@ namespace RhythmHeavenMania.Games.CropStomp // Step. if (currentMarchBeat % 2 != 0) { - stepCount += 1; - var stepAnim = (stepCount % 2 != 0 ? "StepFront" : "StepBack"); - - legsAnim.Play(stepAnim, 0, 0); + // Don't step if already stomped. + if (!isStepping) + { + stepCount += 1; + var stepAnim = (stepCount % 2 != 0 ? "StepFront" : "StepBack"); + + legsAnim.Play(stepAnim, 0, 0); + + isStepping = true; + } + + Jukebox.PlayOneShotGame("cropStomp/hmm"); } // Lift. else @@ -71,6 +84,8 @@ namespace RhythmHeavenMania.Games.CropStomp var farmerPos = farmerTrans.localPosition; farmerTrans.localPosition = new Vector3(farmerPos.x - stepDistance, farmerPos.y, farmerPos.z); + + isStepping = false; } } @@ -94,6 +109,30 @@ namespace RhythmHeavenMania.Games.CropStomp marchOffset = (marchStartBeat % 1) * Conductor.instance.secPerBeat / Conductor.instance.musicSource.pitch; currentMarchBeat = 0; stepCount = 0; + + farmer.nextStompBeat = beat; + } + + public void Stomp() + { + // Don't increment step counter if autostep stepped already. + if (!isStepping) + stepCount += 1; + + var stompAnim = (stepCount % 2 != 0 ? "StompFront" : "StompBack"); + + legsAnim.Play(stompAnim, 0, 0); + + Jukebox.PlayOneShotGame("cropStomp/stomp"); + + if (shakeTween != null) + shakeTween.Kill(true); + + var camTrans = GameCamera.instance.transform; + camTrans.localPosition = new Vector3(camTrans.localPosition.x, 0.75f, camTrans.localPosition.z); + camTrans.DOLocalMoveY(0f, 0.5f).SetEase(Ease.OutElastic, 1f); + + isStepping = true; } } } diff --git a/Assets/Scripts/Games/CropStomp/Farmer.cs b/Assets/Scripts/Games/CropStomp/Farmer.cs new file mode 100644 index 000000000..1c89c5ae6 --- /dev/null +++ b/Assets/Scripts/Games/CropStomp/Farmer.cs @@ -0,0 +1,52 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +using RhythmHeavenMania.Util; + +namespace RhythmHeavenMania.Games.CropStomp +{ + public class Farmer : PlayerActionObject + { + public float nextStompBeat; + + private CropStomp game; + + private void Start() + { + game = CropStomp.instance; + } + + private void Update() + { + if (!game.isMarching) + return; + + float normalizedBeat = Conductor.instance.GetPositionFromMargin(nextStompBeat, 1f); + + StateCheck(normalizedBeat); + + if (normalizedBeat > Minigame.LateTime()) + { + nextStompBeat += 2f; + ResetState(); + return; + } + + if (PlayerInput.Pressed()) + { + if (state.perfect) + { + game.Stomp(); + nextStompBeat += 2f; + ResetState(); + } + else if (state.notPerfect()) + { + nextStompBeat += 2f; + ResetState(); + } + } + } + } +} diff --git a/Assets/Scripts/Games/CropStomp/Farmer.cs.meta b/Assets/Scripts/Games/CropStomp/Farmer.cs.meta new file mode 100644 index 000000000..f8987bd88 --- /dev/null +++ b/Assets/Scripts/Games/CropStomp/Farmer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 55894391661380d42b64a4793d3befb6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Games/PlayerActionObject.cs b/Assets/Scripts/Games/PlayerActionObject.cs index 5f08be964..ba53a092d 100644 --- a/Assets/Scripts/Games/PlayerActionObject.cs +++ b/Assets/Scripts/Games/PlayerActionObject.cs @@ -19,6 +19,8 @@ namespace RhythmHeavenMania.Games public bool isEligible; //value never used for anything private bool autoPlayEnabledOnStart; //value never used for anything + public bool triggersAutoplay = true; + public void PlayerActionInit(GameObject g, float createBeat) { state.gameObject = g; @@ -31,7 +33,7 @@ namespace RhythmHeavenMania.Games { if (aceTimes == 0) { - if ((GameManager.instance.autoplay || autoPlay) && normalizedBeat > 0.99f) + if (triggersAutoplay && (GameManager.instance.autoplay || autoPlay) && normalizedBeat > 0.99f) { OnAce(); if (!autoPlay) From 77af9197223db1e4a85e5605a5e107e5ba147e86 Mon Sep 17 00:00:00 2001 From: Jenny Crowe Date: Mon, 28 Feb 2022 01:38:43 -0700 Subject: [PATCH 3/3] Editor: Tempo Finder button tooltip --- Assets/Scenes/Editor.unity | 3 +++ Assets/Scripts/LevelEditor/Editor.cs | 2 ++ 2 files changed, 5 insertions(+) diff --git a/Assets/Scenes/Editor.unity b/Assets/Scenes/Editor.unity index d10dd0e06..89a67a1ac 100644 --- a/Assets/Scenes/Editor.unity +++ b/Assets/Scenes/Editor.unity @@ -8862,6 +8862,7 @@ MonoBehaviour: valB: 0 valC: 0 type: 0 + type2: 0 ease: 0 colorA: {r: 0, g: 0, b: 0, a: 0} colorB: {r: 0, g: 0, b: 0, a: 0} @@ -9137,6 +9138,7 @@ MonoBehaviour: valB: 0 valC: 0 type: 0 + type2: 0 ease: 0 colorA: {r: 0, g: 0, b: 0, a: 0} colorB: {r: 0, g: 0, b: 0, a: 0} @@ -14152,6 +14154,7 @@ MonoBehaviour: EditorSettingsBTN: {fileID: 3236232} EditorThemeBTN: {fileID: 528192061} FullScreenBTN: {fileID: 151246938} + TempoFinderBTN: {fileID: 1478799966} discordDuringTesting: 0 canSelect: 1 --- !u!114 &1423699438 diff --git a/Assets/Scripts/LevelEditor/Editor.cs b/Assets/Scripts/LevelEditor/Editor.cs index bc6cd6184..1007cce20 100644 --- a/Assets/Scripts/LevelEditor/Editor.cs +++ b/Assets/Scripts/LevelEditor/Editor.cs @@ -48,6 +48,7 @@ namespace RhythmHeavenMania.Editor [SerializeField] private Button EditorSettingsBTN; [SerializeField] private Button EditorThemeBTN; [SerializeField] private Button FullScreenBTN; + [SerializeField] private Button TempoFinderBTN; [Header("Properties")] private bool changedMusic = false; @@ -93,6 +94,7 @@ namespace RhythmHeavenMania.Editor Tooltip.AddTooltip(EditorSettingsBTN.gameObject, "Editor Settings [Ctrl+Shift+O]"); Tooltip.AddTooltip(EditorThemeBTN.gameObject, "Editor Theme"); Tooltip.AddTooltip(FullScreenBTN.gameObject, "Preview [Tab]"); + Tooltip.AddTooltip(TempoFinderBTN.gameObject, "Tempo Finder"); UpdateEditorStatus(true); }