From 33265d8af6cdc990d1607236e2b1fd5b7a5aab57 Mon Sep 17 00:00:00 2001 From: blank3times <105398129+blank3times@users.noreply.github.com> Date: Fri, 26 Jan 2024 16:42:24 -0800 Subject: [PATCH] Connect monkey animator to script finally --- Assets/Resources/Games/holeInOne.prefab | 3 +-- Assets/Scripts/Games/HoleInOne/HoleInOne.cs | 6 ++---- ...ng.UnitySourceGenerator.Editor.ProjectSettingsData.asset | 3 +++ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Assets/Resources/Games/holeInOne.prefab b/Assets/Resources/Games/holeInOne.prefab index 523825838..d572f1397 100644 --- a/Assets/Resources/Games/holeInOne.prefab +++ b/Assets/Resources/Games/holeInOne.prefab @@ -11152,8 +11152,7 @@ MonoBehaviour: m_EditorClassIdentifier: SoundSequences: [] scheduledInputs: [] - MonkeyAnimator: {fileID: 0} - Monkey: {fileID: 0} + MonkeyAnim: {fileID: 1030266998071523622} --- !u!1 &8142126674384551194 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Games/HoleInOne/HoleInOne.cs b/Assets/Scripts/Games/HoleInOne/HoleInOne.cs index 0a052c869..b7d57b328 100644 --- a/Assets/Scripts/Games/HoleInOne/HoleInOne.cs +++ b/Assets/Scripts/Games/HoleInOne/HoleInOne.cs @@ -47,8 +47,7 @@ namespace HeavenStudio.Games /// Minigame inherits directly from MonoBehaviour, and adds Heaven Studio specific methods to override. public class HoleInOne : Minigame { - public Animator MonkeyAnimator; - public GameObject Monkey; + public Animator MonkeyAnim; public static HoleInOne instance; @@ -56,13 +55,12 @@ namespace HeavenStudio.Games void Awake() { HoleInOne.instance = this; - MonkeyAnimator = Monkey.GetComponent(); } public void DoTestAnim(double beat) { SoundByte.PlayOneShotGame("holeInOne/whale"); - MonkeyAnimator.Play("MonkeySpin"); + MonkeyAnim.Play("MonkeySpin"); } public void DoMandrill(double beat) diff --git a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset index 64cbbd987..edc1baf9f 100644 --- a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset +++ b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset @@ -52,5 +52,8 @@ MonoBehaviour: - Assets/Scripts/Games/PlayerActionEvent.cs - Assets/Scripts/Games/KarateMan/KarateManPot.cs - Assets/Scripts/Games/DJSchool/DJSchool.cs + - Assets/Scripts/Games/Minigame.cs + - Assets/Scripts/GameManager.cs + - Assets/Scripts/Minigames.cs PathsToSkipImportEvent: [] PathsToIgnoreOverwriteSettingOnAttribute: []