mirrors/HeavenStudio
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'MonkeyWatch' of https://github.com/Rapandrasmus/HeavenStudio into MonkeyWatch

Browse source
This commit is contained in:
ev 2023-08-07 16:55:42 -04:00
parent 66c87f9c37 74c603cf16
commit 7049f41226
2 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Assets/Scripts/Games/MonkeyWatch/MonkeyClockArrow.cs
View file

@ -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);

16
Assets/Scripts/Games/MonkeyWatch/WatchMonkey.cs
View file

@ -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)
{
}
}
}