From 67006269203acf7f9307a907cfdf13fe0b6074fe Mon Sep 17 00:00:00 2001 From: blank3times <105398129+blank3times@users.noreply.github.com> Date: Mon, 25 Mar 2024 01:36:25 -0700 Subject: [PATCH] Call ev's ball effects for mandrill I dread the actual ball itself --- Assets/Resources/Games/holeInOne.prefab | 2 ++ Assets/Scripts/Games/HoleInOne/HoleInOne.cs | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Assets/Resources/Games/holeInOne.prefab b/Assets/Resources/Games/holeInOne.prefab index 7dce41fd3..2c1e3676d 100644 --- a/Assets/Resources/Games/holeInOne.prefab +++ b/Assets/Resources/Games/holeInOne.prefab @@ -14755,6 +14755,8 @@ MonoBehaviour: MandrillAnim: {fileID: 7328032147480881436} GolferAnim: {fileID: 4858532593007320755} HoleAnim: {fileID: 4009601525859638624} + GrassEffectAnim: {fileID: 519266665242695000} + BallEffectAnim: {fileID: 5742260183545522460} --- !u!1 &8142126674384551194 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Games/HoleInOne/HoleInOne.cs b/Assets/Scripts/Games/HoleInOne/HoleInOne.cs index 9311224da..8f7e48bd1 100644 --- a/Assets/Scripts/Games/HoleInOne/HoleInOne.cs +++ b/Assets/Scripts/Games/HoleInOne/HoleInOne.cs @@ -68,6 +68,8 @@ namespace HeavenStudio.Games public Animator MandrillAnim; public Animator GolferAnim; public Animator HoleAnim; + public Animator GrassEffectAnim; + public Animator BallEffectAnim; double whaleStartBeat; float whaleLength; @@ -187,6 +189,7 @@ namespace HeavenStudio.Games new MultiSound.Sound("holeInOne/hole2", beat + 1f)// temp should be splash }); GolferAnim.DoScaledAnimationAsync("GolferMiss", 1.0f); + BallEffectAnim.Play("BallEffectJust"); } else { @@ -200,6 +203,7 @@ 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);}), }); } @@ -210,7 +214,8 @@ namespace HeavenStudio.Games { SoundByte.PlayOneShotGame("holeInOne/whale"); MonkeyAnim.Play("MonkeySpin"); - GolferAnim.Play("GolferThroughMandrill"); + BallEffectAnim.Play("BallEffectThrough"); + GolferAnim.Play("GolferThroughMandrill"); } public void MonkeySuccess(PlayerActionEvent caller, float state)