diff --git a/Assets/Scripts/Games/HoleInOne/HoleInOne.cs b/Assets/Scripts/Games/HoleInOne/HoleInOne.cs index 8f7e48bd1..2c968057b 100644 --- a/Assets/Scripts/Games/HoleInOne/HoleInOne.cs +++ b/Assets/Scripts/Games/HoleInOne/HoleInOne.cs @@ -89,9 +89,9 @@ namespace HeavenStudio.Games { if (BeatIsInBopRegion(beat)) { - MonkeyAnim.DoScaledAnimationAsync("MonkeyBop", 0.3f); - MandrillAnim.DoScaledAnimationAsync("MandrillBop", 0.3f); - GolferAnim.DoScaledAnimationAsync("GolferBop", 0.3f); + MonkeyAnim.DoScaledAnimationAsync("MonkeyBop", 0.5f); + MandrillAnim.DoScaledAnimationAsync("MandrillBop", 0.5f); + GolferAnim.DoScaledAnimationAsync("GolferBop", 0.5f); } } @@ -116,9 +116,9 @@ namespace HeavenStudio.Games { new BeatAction.Action(beat + i, delegate { - MonkeyAnim.DoScaledAnimationAsync("MonkeyBop", 0.3f); - MandrillAnim.DoScaledAnimationAsync("MandrillBop", 0.3f); - GolferAnim.DoScaledAnimationAsync("GolferBop", 0.3f); + MonkeyAnim.DoScaledAnimationAsync("MonkeyBop", 0.5f); + MandrillAnim.DoScaledAnimationAsync("MandrillBop", 0.5f); + GolferAnim.DoScaledAnimationAsync("GolferBop", 0.5f); // TODO add bops for other characters }) }); @@ -148,13 +148,13 @@ namespace HeavenStudio.Games BeatAction.New(instance, new List() { - new BeatAction.Action(beat, delegate { MandrillAnim.DoScaledAnimationAsync("MandrillReady1", 0.2f);}), - new BeatAction.Action(beat + 1f, delegate { MandrillAnim.DoScaledAnimationAsync("MandrillReady2", 0.3f);}), - new BeatAction.Action(beat + 2f, delegate { MandrillAnim.DoScaledAnimationAsync("MandrillReady3", 0.3f);}), - new BeatAction.Action(beat + 2f, delegate { GolferAnim.DoScaledAnimationAsync("GolferPrepare", 1.0f);}), - new BeatAction.Action(beat + 3f, delegate { GolferAnim.DoScaledAnimationAsync("GolferThrough", 1.0f);}), - new BeatAction.Action(beat + 3f, delegate { MandrillAnim.DoScaledAnimationAsync("MandrillPitch", 0.4f);}), - new BeatAction.Action(beat + 3f, delegate { MonkeyAnim.DoScaledAnimationAsync("MonkeySpin", 2.0f);}), + new BeatAction.Action(beat, delegate { MandrillAnim.DoScaledAnimationAsync("MandrillReady1", 0.5f);}), + new BeatAction.Action(beat + 1f, delegate { MandrillAnim.DoScaledAnimationAsync("MandrillReady2", 0.5f);}), + new BeatAction.Action(beat + 2f, delegate { MandrillAnim.DoScaledAnimationAsync("MandrillReady3", 0.5f);}), + new BeatAction.Action(beat + 2f, delegate { GolferAnim.DoScaledAnimationAsync("GolferPrepare", 0.5f);}), + new BeatAction.Action(beat + 3f, delegate { GolferAnim.DoScaledAnimationAsync("GolferThrough", 0.5f);}), + new BeatAction.Action(beat + 3f, delegate { MandrillAnim.DoScaledAnimationAsync("MandrillPitch", 0.5f);}), + new BeatAction.Action(beat + 3f, delegate { MonkeyAnim.DoScaledAnimationAsync("MonkeySpin", 0.5f);}), }); } @@ -170,10 +170,10 @@ namespace HeavenStudio.Games BeatAction.New(instance, new List() { - new BeatAction.Action(beat, delegate { MonkeyAnim.Play("MonkeyPrepare");}), - new BeatAction.Action(beat + 1f, delegate { MonkeyAnim.Play("MonkeyThrow");}), - new BeatAction.Action(beat + 1f, delegate { GolferAnim.DoScaledAnimationAsync("GolferPrepare", 1.0f);}), - new BeatAction.Action(beat + 2f, delegate { GolferAnim.DoScaledAnimationAsync("GolferThrough", 1.0f);}), + new BeatAction.Action(beat, delegate { MonkeyAnim.DoScaledAnimationAsync("MonkeyPrepare", 0.5f);}), + new BeatAction.Action(beat + 1f, delegate { MonkeyAnim.DoScaledAnimationAsync("MonkeyThrow", 0.5f);}), + new BeatAction.Action(beat + 1f, delegate { GolferAnim.DoScaledAnimationAsync("GolferPrepare", 0.5f);}), + new BeatAction.Action(beat + 2f, delegate { GolferAnim.DoScaledAnimationAsync("GolferThrough", 0.5f);}), }); } @@ -202,9 +202,9 @@ namespace HeavenStudio.Games BeatAction.New(instance, new List() { - new BeatAction.Action(beat, delegate { GolferAnim.DoScaledAnimationAsync("GolferJust", 1.0f);}), - new BeatAction.Action(beat, delegate { BallEffectAnim.Play("BallEffectJust");}), - new BeatAction.Action(beat + 2f, delegate { HoleAnim.DoScaledAnimationAsync("ZoomBig", 2.5f);}), + new BeatAction.Action(beat, delegate { GolferAnim.DoScaledAnimationAsync("GolferJust", 0.5f);}), + new BeatAction.Action(beat, delegate { BallEffectAnim.DoScaledAnimationAsync("BallEffectJust", 0.5f);}), + new BeatAction.Action(beat + 2f, delegate { HoleAnim.DoScaledAnimationAsync("ZoomBig", 0.5f);}), }); } @@ -228,8 +228,8 @@ namespace HeavenStudio.Games new MultiSound.Sound("holeInOne/mandrill1", beat),// temp should be miss new MultiSound.Sound("holeInOne/hole2", beat + 1f)// temp should be splash }); - MonkeyHeadAnim.DoScaledAnimationAsync("MonkeyMissHead", 2.0f); - GolferAnim.DoScaledAnimationAsync("GolferMiss", 1.0f); + MonkeyHeadAnim.DoScaledAnimationAsync("MonkeyMissHead", 0.5f); + GolferAnim.DoScaledAnimationAsync("GolferMiss", 0.5f); } else { @@ -243,9 +243,9 @@ namespace HeavenStudio.Games BeatAction.New(instance, new List() { - new BeatAction.Action(beat, delegate { MonkeyHeadAnim.DoScaledAnimationAsync("MonkeyJustHead", 3.5f);}), - new BeatAction.Action(beat, delegate { GolferAnim.DoScaledAnimationAsync("GolferJust", 1.0f);}), - new BeatAction.Action(beat + 2f, delegate { HoleAnim.DoScaledAnimationAsync("ZoomSmall" + randomSuccess, 2.5f);}), + new BeatAction.Action(beat, delegate { MonkeyHeadAnim.DoScaledAnimationAsync("MonkeyJustHead", 0.5f);}), + new BeatAction.Action(beat, delegate { GolferAnim.DoScaledAnimationAsync("GolferJust", 0.5f);}), + new BeatAction.Action(beat + 2f, delegate { HoleAnim.DoScaledAnimationAsync("ZoomSmall" + randomSuccess, 0.5f);}), }); } } @@ -253,7 +253,7 @@ namespace HeavenStudio.Games public void MonkeyMiss(PlayerActionEvent caller) { SoundByte.PlayOneShotGame("holeInOne/whale"); - MonkeyHeadAnim.DoScaledAnimationAsync("MonkeySadHead", 0.2f); + MonkeyHeadAnim.DoScaledAnimationAsync("MonkeySadHead", 0.5f); } public void Nothing(PlayerActionEvent caller)