diff --git a/Assets/Resources/Games/holeInOne.prefab b/Assets/Resources/Games/holeInOne.prefab index 2c1e3676d..7d6fde75e 100644 --- a/Assets/Resources/Games/holeInOne.prefab +++ b/Assets/Resources/Games/holeInOne.prefab @@ -14754,6 +14754,7 @@ MonoBehaviour: MonkeyHeadAnim: {fileID: 705573325190657106} MandrillAnim: {fileID: 7328032147480881436} GolferAnim: {fileID: 4858532593007320755} + Hole: {fileID: 3327539419043557242} HoleAnim: {fileID: 4009601525859638624} GrassEffectAnim: {fileID: 519266665242695000} BallEffectAnim: {fileID: 5742260183545522460} diff --git a/Assets/Scripts/Games/HoleInOne/HoleInOne.cs b/Assets/Scripts/Games/HoleInOne/HoleInOne.cs index 38f9a23a3..a90954fe0 100644 --- a/Assets/Scripts/Games/HoleInOne/HoleInOne.cs +++ b/Assets/Scripts/Games/HoleInOne/HoleInOne.cs @@ -48,10 +48,11 @@ namespace HeavenStudio.Games.Loaders }, resizable = true }, - }//, - // new List() { "rvl", "normal" }, - // "rvlgolf", "en", - // new List() { } + }, + new List() { "rvl", "normal" }, + "rvlgolf", "en", + new List() {}, + chronologicalSortKey: 1 ); } } @@ -99,7 +100,7 @@ namespace HeavenStudio.Games SoundByte.PlayOneShotGame("holeInOne/hole1"); // temp should be whiff GolferAnim.Play("GolferWhiff", 0, 0); } - UpdateWhale(conductor.songPositionInBeatsAsDouble); // unswungSongPositionInBeatsAsDouble + UpdateWhale(conductor.unswungSongPositionInBeatsAsDouble); } public void ToggleBop(double beat, float length, bool shouldBop, bool autoBop) diff --git a/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs b/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs index 9555b4649..d5a89b0ba 100644 --- a/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs +++ b/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs @@ -333,8 +333,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader NtrGleeClubLoader failed!"); } - Debug.Log("Running game loader RvlHoleInOneLoader"); - game = RvlHoleInOneLoader.AddGame(eventCaller); if (game != null) { @@ -345,7 +343,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader RvlHoleInOneLoader failed!"); } - Debug.Log("Running game loader RvlNewKarateLoader"); game = RvlNewKarateLoader.AddGame(eventCaller); if (game != null) {