diff --git a/Assets/Resources/Sprites/Games/MonkeyWatch/Animations/YellowMonkey.controller b/Assets/Resources/Sprites/Games/MonkeyWatch/Animations/YellowMonkey.controller index 3ac90f14c..e69c23873 100644 --- a/Assets/Resources/Sprites/Games/MonkeyWatch/Animations/YellowMonkey.controller +++ b/Assets/Resources/Sprites/Games/MonkeyWatch/Animations/YellowMonkey.controller @@ -508,8 +508,8 @@ AnimatorStateTransition: serializedVersion: 3 m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 1 - m_HasExitTime: 1 + m_ExitTime: 0 + m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -613,8 +613,8 @@ AnimatorStateTransition: serializedVersion: 3 m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 1 - m_HasExitTime: 1 + m_ExitTime: 0 + m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -1061,8 +1061,8 @@ AnimatorStateTransition: serializedVersion: 3 m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 1 - m_HasExitTime: 1 + m_ExitTime: 0 + m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -1412,8 +1412,8 @@ AnimatorStateTransition: serializedVersion: 3 m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 1 - m_HasExitTime: 1 + m_ExitTime: 0 + m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -1513,8 +1513,8 @@ AnimatorStateTransition: serializedVersion: 3 m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 1 - m_HasExitTime: 1 + m_ExitTime: 0 + m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -1762,8 +1762,8 @@ AnimatorStateTransition: serializedVersion: 3 m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 1 - m_HasExitTime: 1 + m_ExitTime: 0 + m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 diff --git a/Assets/Scripts/Games/MonkeyWatch/MonkeyWatch.cs b/Assets/Scripts/Games/MonkeyWatch/MonkeyWatch.cs index c9713cfa1..6926a40ab 100644 --- a/Assets/Scripts/Games/MonkeyWatch/MonkeyWatch.cs +++ b/Assets/Scripts/Games/MonkeyWatch/MonkeyWatch.cs @@ -258,7 +258,7 @@ namespace HeavenStudio.Games { new BeatAction.Action(beat + i - 4, delegate { - monkeyHandler.SpawnMonkey(beat + index, false, beat + index - 4 < persistBeat); + monkeyHandler.SpawnMonkey(beat + index, true, beat + index - 4 < persistBeat); }), new BeatAction.Action(beat + i - 1, delegate { diff --git a/Assets/Scripts/Games/MonkeyWatch/WatchMonkey.cs b/Assets/Scripts/Games/MonkeyWatch/WatchMonkey.cs index c0d136209..5f8533657 100644 --- a/Assets/Scripts/Games/MonkeyWatch/WatchMonkey.cs +++ b/Assets/Scripts/Games/MonkeyWatch/WatchMonkey.cs @@ -32,7 +32,7 @@ namespace HeavenStudio.Games.Scripts_MonkeyWatch direction = dir; holeAnim = hole; holeAnim.DoScaledAnimationAsync("HoleOpen", 0.5f); - anim.DoScaledAnimationAsync(isPink ? "Pink" : "" + "Appear", 0.5f, instant ? 1 : 0); + anim.DoScaledAnimationAsync(isPink ? "PinkAppear" : "Appear", 0.5f, instant ? 1 : 0); } public void Disappear() @@ -43,32 +43,37 @@ namespace HeavenStudio.Games.Scripts_MonkeyWatch public void Prepare(double prepareBeat, double inputBeat) { - anim.DoScaledAnimationAsync(isPink ? "Pink" : "" + "Prepare" + direction, 0); + anim.DoScaledAnimationAsync(isPink ? "PinkPrepare" + direction : "Prepare" + direction, 0); inputEvent = game.ScheduleInput(prepareBeat, inputBeat - prepareBeat, InputType.STANDARD_DOWN, Just, Miss, Empty); BeatAction.New(gameObject, new List() { new BeatAction.Action(prepareBeat, delegate { - anim.DoScaledAnimationAsync(isPink ? "Pink" : "" + "Prepare" + direction, 0.5f); + anim.DoScaledAnimationAsync(isPink ? "PinkPrepare" + direction : "Prepare" + direction, 0.5f); }) }); } private void Just(PlayerActionEvent caller, float state) { - game.PlayerMonkeyClap(isPink, state >= 1f || state <= -1f); if (state >= 1f || state <= -1f) { SoundByte.PlayOneShot("miss"); - return; + anim.SetInteger("hitState", 1); } - SoundByte.PlayOneShotGame(isPink ? "monkeyWatch/clapOffbeat" : $"monkeyWatch/clapOnbeat{UnityEngine.Random.Range(1, 6)}"); - anim.DoScaledAnimationAsync(isPink ? "Pink" : "" + "Clap" + direction, 0.5f); + else + { + SoundByte.PlayOneShotGame(isPink ? "monkeyWatch/clapOffbeat" : $"monkeyWatch/clapOnbeat{UnityEngine.Random.Range(1, 6)}"); + anim.SetInteger("hitState", 2); + } + + game.PlayerMonkeyClap(isPink, state >= 1f || state <= -1f); + anim.DoScaledAnimationAsync(isPink ? "PinkClap" + direction : "Clap" + direction, 0.5f); } private void Miss(PlayerActionEvent caller) { - + anim.DoScaledAnimationAsync(isPink ? "PinkMiss" : "Miss", 0.5f); } private void Empty(PlayerActionEvent caller) { }