diff --git a/Assets/Scripts/Games/MonkeyWatch/MonkeyWatch.cs b/Assets/Scripts/Games/MonkeyWatch/MonkeyWatch.cs index cdea8230b..bf31f6285 100644 --- a/Assets/Scripts/Games/MonkeyWatch/MonkeyWatch.cs +++ b/Assets/Scripts/Games/MonkeyWatch/MonkeyWatch.cs @@ -365,10 +365,6 @@ namespace HeavenStudio.Games { monkeyHandler.GetMonkeyAtBeat(beat).Prepare(beat, beat + 1); }), - new BeatAction.Action(beat + 1, delegate - { - monkeyClockArrow.Move(); - }) }); } @@ -395,10 +391,6 @@ namespace HeavenStudio.Games { monkeyHandler.GetMonkeyAtBeat(beat + index).Prepare(beat + index, beat + index + 0.5); }), - new BeatAction.Action(beat + i + 0.5, delegate - { - monkeyClockArrow.Move(); - }) }); } actions.Sort((x, y) => x.beat.CompareTo(y.beat)); @@ -431,10 +423,6 @@ namespace HeavenStudio.Games { monkeyHandler.GetMonkeyAtBeat(e.beat).Prepare(e.beat - 0.5, e.beat); }), - new BeatAction.Action(e.beat, delegate - { - monkeyClockArrow.Move(); - }) }); } actions.Sort((x, y) => x.beat.CompareTo(y.beat)); diff --git a/Assets/Scripts/Games/MonkeyWatch/WatchMonkey.cs b/Assets/Scripts/Games/MonkeyWatch/WatchMonkey.cs index fa4d863fd..87bba9ab4 100644 --- a/Assets/Scripts/Games/MonkeyWatch/WatchMonkey.cs +++ b/Assets/Scripts/Games/MonkeyWatch/WatchMonkey.cs @@ -89,14 +89,15 @@ namespace HeavenStudio.Games.Scripts_MonkeyWatch bool barely = state >= 1f || state <= -1f; if (barely) { - SoundByte.PlayOneShot("miss"); + SoundByte.PlayOneShot("nearMiss"); } else { SoundByte.PlayOneShotGame(isPink ? "monkeyWatch/clapOffbeat" : $"monkeyWatch/clapOnbeat{UnityEngine.Random.Range(1, 6)}"); } - + game.monkeyClockArrow.Move(); game.PlayerMonkeyClap(isPink, barely); + anim.DoScaledAnimationAsync(isPink ? "PinkClap" + direction : "Clap" + direction, 0.4f); BeatAction.New(gameObject, new List() { @@ -111,6 +112,7 @@ namespace HeavenStudio.Games.Scripts_MonkeyWatch private void Miss(PlayerActionEvent caller) { anim.DoScaledAnimationAsync(isPink ? "PinkMiss" : "Miss", 0.4f); + game.monkeyClockArrow.Move(); } private void Empty(PlayerActionEvent caller) { }