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

ticks on input now

Browse source
This commit is contained in:
Rapandrasmus 2023-08-07 22:08:09 +02:00
parent 39b6c80e4a
commit 9d3c78dd20
2 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Assets/Scripts/Games/MonkeyWatch/MonkeyWatch.cs
View file

@ -365,10 +365,6 @@ namespace HeavenStudio.Games
{ {
monkeyHandler.GetMonkeyAtBeat(beat).Prepare(beat, beat + 1); 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); 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)); 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); 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)); actions.Sort((x, y) => x.beat.CompareTo(y.beat));

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

@ -89,14 +89,15 @@ namespace HeavenStudio.Games.Scripts_MonkeyWatch
bool barely = state >= 1f || state <= -1f; bool barely = state >= 1f || state <= -1f;
if (barely) if (barely)
{ {
SoundByte.PlayOneShot("miss"); SoundByte.PlayOneShot("nearMiss");
} }
else else
{ {
SoundByte.PlayOneShotGame(isPink ? "monkeyWatch/clapOffbeat" : $"monkeyWatch/clapOnbeat{UnityEngine.Random.Range(1, 6)}"); SoundByte.PlayOneShotGame(isPink ? "monkeyWatch/clapOffbeat" : $"monkeyWatch/clapOnbeat{UnityEngine.Random.Range(1, 6)}");
} }
game.monkeyClockArrow.Move();
game.PlayerMonkeyClap(isPink, barely); game.PlayerMonkeyClap(isPink, barely);
anim.DoScaledAnimationAsync(isPink ? "PinkClap" + direction : "Clap" + direction, 0.4f); anim.DoScaledAnimationAsync(isPink ? "PinkClap" + direction : "Clap" + direction, 0.4f);
BeatAction.New(gameObject, new List<BeatAction.Action>() BeatAction.New(gameObject, new List<BeatAction.Action>()
{ {
@ -111,6 +112,7 @@ namespace HeavenStudio.Games.Scripts_MonkeyWatch
private void Miss(PlayerActionEvent caller) private void Miss(PlayerActionEvent caller)
{ {
anim.DoScaledAnimationAsync(isPink ? "PinkMiss" : "Miss", 0.4f); anim.DoScaledAnimationAsync(isPink ? "PinkMiss" : "Miss", 0.4f);
game.monkeyClockArrow.Move();
} }
private void Empty(PlayerActionEvent caller) { } private void Empty(PlayerActionEvent caller) { }