From c30927ec1133c458491616faf413204615377493 Mon Sep 17 00:00:00 2001 From: blank3times <105398129+blank3times@users.noreply.github.com> Date: Wed, 24 Jan 2024 17:56:19 -0800 Subject: [PATCH] Add script to its prefab aaaaaaaaaa Also renamed RvlGolfLoader to RvlHoleInOneLoader to promote typing and larger character counts --- Assets/Resources/Games/holeInOne.prefab | 16 ++++++++++ Assets/Scripts/Games/HoleInOne/HoleInOne.cs | 7 ++--- ...mes.Minigames.MinigameLoaderGenerator.g.cs | 6 ++-- ...Generator.Editor.ProjectSettingsData.asset | 31 +------------------ 4 files changed, 23 insertions(+), 37 deletions(-) diff --git a/Assets/Resources/Games/holeInOne.prefab b/Assets/Resources/Games/holeInOne.prefab index bae41e99d..a6d504ecc 100644 --- a/Assets/Resources/Games/holeInOne.prefab +++ b/Assets/Resources/Games/holeInOne.prefab @@ -9346,6 +9346,7 @@ GameObject: m_Component: - component: {fileID: 7844333623642782309} - component: {fileID: 882449378495216115} + - component: {fileID: 6680257999378264794} m_Layer: 0 m_Name: Water m_TagString: Untagged @@ -9420,6 +9421,21 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!114 &6680257999378264794 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7109454805972067665} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bbf9f4378f696e54199e67826811b1a6, type: 3} + m_Name: + m_EditorClassIdentifier: + SoundSequences: [] + scheduledInputs: [] + Monkey: {fileID: 0} --- !u!1 &7115749403813548106 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Games/HoleInOne/HoleInOne.cs b/Assets/Scripts/Games/HoleInOne/HoleInOne.cs index 3dd779e7f..e73b4045d 100644 --- a/Assets/Scripts/Games/HoleInOne/HoleInOne.cs +++ b/Assets/Scripts/Games/HoleInOne/HoleInOne.cs @@ -12,7 +12,7 @@ using Jukebox; namespace HeavenStudio.Games.Loaders { using static Minigames; - public static class RvlGolfLoader + public static class RvlHoleInOneLoader { public static Minigame AddGame(EventCaller eventCaller) { @@ -44,7 +44,7 @@ namespace HeavenStudio.Games // Awake is called before the first frame update void Awake() { - instance = this; + HoleInOne.instance = this; } void Update() @@ -59,8 +59,7 @@ namespace HeavenStudio.Games // BeatAction.New(instance, new List() // { // new BeatAction.Action(beat, delegate { Monkey.DoScaledAnimationAsync("MonkeySpin", 0.5f);}), - // }); - + // }); } } } \ No newline at end of file diff --git a/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs b/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs index 8018fe1cc..bd7b7caa1 100644 --- a/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs +++ b/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs @@ -222,15 +222,15 @@ namespace HeavenStudio Debug.LogWarning("Game loader NtrGleeClubLoader failed!"); } - Debug.Log("Running game loader RvlGolfLoader"); - game = RvlGolfLoader.AddGame(eventCaller); + Debug.Log("Running game loader RvlHoleInOneLoader"); + game = RvlHoleInOneLoader.AddGame(eventCaller); if (game != null) { eventCaller.minigames.Add(game.name, game); } else { - Debug.LogWarning("Game loader RvlGolfLoader failed!"); + Debug.LogWarning("Game loader RvlHoleInOneLoader failed!"); } Debug.Log("Running game loader RvlNewKarateLoader"); diff --git a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset index 03e0aa529..9367e35ad 100644 --- a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset +++ b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset @@ -17,36 +17,7 @@ MonoBehaviour: DenseViewWidthThreshold: 512 _disableAutoReloadInBackground: 0 ImportedScriptPaths: - - Assets/Scripts/Minigames.cs - - Assets/Editor/CreateAssetBundles.cs - - Assets/Editor/CreateMinigameScriptTemplate.cs - - Assets/Scripts/Games/Minigame.cs - - Assets/Scripts/Games/FanClub/FanClub.cs - - Assets/Scripts/GameManager.cs - - Assets/Editor/SpritesheetScaler.cs + - Assets/Scripts/Games/HoleInOne/HoleInOne.cs - Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs - - Assets/Scripts/Games/TheDazzles/TheDazzles.cs - - Assets/Scripts/Games/FirstContact/FirstContact.cs - - Assets/Scripts/SourceGenerators/ControllerLoaderGenerator.cs - - Assets/Scripts/InputSystem/PlayerInput.cs - - Assets/Scripts/JudgementManager.cs - - Assets/Scripts/LevelEditor/RemixPropertiesDialog/PropertyPrefabs/RatingScreenPropertyDialog.cs - - Assets/Scripts/GlobalGameManager.cs - - Assets/Scripts/Games/KarateMan/KarateMan.cs - - Assets/Scripts/Games/KarateMan/KarateManJoe.cs - - Assets/Scripts/Games/KarateMan/KarateManNoriController.cs - - Assets/Scripts/Util/BeatAction.cs - - Assets/Scripts/Games/TossBoys/TossBoys.cs - - Assets/Scripts/Games/DoubleDate/DoubleDate.cs - - Assets/Scripts/Games/AirRally/AirRally.cs - - Assets/Scripts/LevelEditor/Editor.cs - - Assets/Scripts/Common/MemRenderer.cs - - Assets/Scripts/Games/BoardMeeting/BoardMeeting.cs - - Assets/Scripts/PersistentDataManager.cs - - Assets/Scripts/UI/Overlays/OverlaysManager.cs - - Assets/Scripts/TitleManager.cs - - Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/SectionDialog.cs - - Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/TimelineObjs/SectionTimelineObj.cs - - Assets/Scripts/Games/DJSchool/Student.cs PathsToSkipImportEvent: [] PathsToIgnoreOverwriteSettingOnAttribute: []