diff --git a/Assets/Resources/Games/monkeyWatch.prefab b/Assets/Resources/Games/monkeyWatch.prefab index 0b70165e2..0c180d81a 100644 --- a/Assets/Resources/Games/monkeyWatch.prefab +++ b/Assets/Resources/Games/monkeyWatch.prefab @@ -21570,6 +21570,7 @@ MonoBehaviour: monkeyClockArrow: {fileID: 8220690735241008560} monkeyHandler: {fileID: 8572779002997729184} backgroundHandler: {fileID: 2778587498033096836} + middleMonkey: {fileID: 5520703815918216618} fullZoomOut: 80 --- !u!1 &6181011653585253546 GameObject: diff --git a/Assets/Scripts/Games/MonkeyWatch/MonkeyClockArrow.cs b/Assets/Scripts/Games/MonkeyWatch/MonkeyClockArrow.cs index 2ee9164eb..7b473b856 100644 --- a/Assets/Scripts/Games/MonkeyWatch/MonkeyClockArrow.cs +++ b/Assets/Scripts/Games/MonkeyWatch/MonkeyClockArrow.cs @@ -48,7 +48,11 @@ namespace HeavenStudio.Games.Scripts_MonkeyWatch public void PlayerClap(bool big, bool barely, bool whiff) { if (playerMonkeyAnim.IsPlayingAnimationName("PlayerClapBarely") && whiff) return; - if (whiff) SoundByte.PlayOneShot("miss"); + if (whiff) + { + game.middleMonkey.DoScaledAnimationAsync("MiddleMonkeyMiss", 0.4f); + SoundByte.PlayOneShot("miss"); + } if (barely || whiff) { playerMonkeyAnim.DoScaledAnimationAsync("PlayerClapBarely", 0.4f); diff --git a/Assets/Scripts/Games/MonkeyWatch/MonkeyWatch.cs b/Assets/Scripts/Games/MonkeyWatch/MonkeyWatch.cs index bf31f6285..1b0e469ab 100644 --- a/Assets/Scripts/Games/MonkeyWatch/MonkeyWatch.cs +++ b/Assets/Scripts/Games/MonkeyWatch/MonkeyWatch.cs @@ -132,6 +132,7 @@ namespace HeavenStudio.Games public MonkeyClockArrow monkeyClockArrow; [SerializeField] private WatchMonkeyHandler monkeyHandler; [SerializeField] private WatchBackgroundHandler backgroundHandler; + public Animator middleMonkey; [Header("Properties")] [SerializeField] private float fullZoomOut = 40f; @@ -154,9 +155,15 @@ namespace HeavenStudio.Games CameraUpdate(); } + private double lastReportedBeat = 0; + private void Update() { CameraUpdate(); + if (Conductor.instance.ReportBeat(ref lastReportedBeat)) + { + middleMonkey.DoScaledAnimationAsync("MiddleMonkeyBop", 0.4f); + } } public void PlayerMonkeyClap(bool big, bool barely)