From 27aded06f00502a23603b85599bd373b6fc640f5 Mon Sep 17 00:00:00 2001 From: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon, 7 Aug 2023 22:54:17 +0200 Subject: [PATCH] fixed the input bug --- .../Games/MonkeyWatch/MonkeyClockArrow.cs | 4 ++-- Assets/Scripts/Games/MonkeyWatch/WatchMonkey.cs | 16 ++++------------ 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/Assets/Scripts/Games/MonkeyWatch/MonkeyClockArrow.cs b/Assets/Scripts/Games/MonkeyWatch/MonkeyClockArrow.cs index a55ef9f35..2ee9164eb 100644 --- a/Assets/Scripts/Games/MonkeyWatch/MonkeyClockArrow.cs +++ b/Assets/Scripts/Games/MonkeyWatch/MonkeyClockArrow.cs @@ -47,8 +47,8 @@ namespace HeavenStudio.Games.Scripts_MonkeyWatch public void PlayerClap(bool big, bool barely, bool whiff) { - if (!playerMonkeyAnim.IsAnimationNotPlaying() && whiff) return; - + if (playerMonkeyAnim.IsPlayingAnimationName("PlayerClapBarely") && whiff) return; + if (whiff) SoundByte.PlayOneShot("miss"); if (barely || whiff) { playerMonkeyAnim.DoScaledAnimationAsync("PlayerClapBarely", 0.4f); diff --git a/Assets/Scripts/Games/MonkeyWatch/WatchMonkey.cs b/Assets/Scripts/Games/MonkeyWatch/WatchMonkey.cs index 0d5b45525..e7fbb5e1c 100644 --- a/Assets/Scripts/Games/MonkeyWatch/WatchMonkey.cs +++ b/Assets/Scripts/Games/MonkeyWatch/WatchMonkey.cs @@ -31,17 +31,6 @@ namespace HeavenStudio.Games.Scripts_MonkeyWatch private void Update() { - if (inputEvent != null && inputEvent.enabled) - { - if (PlayerInput.Pressed() && !game.IsExpectingInputNow(InputType.STANDARD_DOWN) && !game.monkeyClockArrow.PlayerIsClapAnim()) - { - SoundByte.PlayOneShot("miss"); - Miss(inputEvent); - inputEvent.Disable(); - game.ScoreMiss(); - } - } - if (disappear) { float normalizedBeat = Conductor.instance.GetPositionFromBeat(disappearBeat, 0.5f); @@ -115,7 +104,10 @@ namespace HeavenStudio.Games.Scripts_MonkeyWatch game.monkeyClockArrow.Move(); } - private void Empty(PlayerActionEvent caller) { } + private void Empty(PlayerActionEvent caller) + { + + } } }