From c4ea2558faa470d92a595a71d17cc4e617f26a32 Mon Sep 17 00:00:00 2001 From: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue, 27 Feb 2024 22:37:34 +0100 Subject: [PATCH] fixed broken shit --- .../Games/AnimalAcrobat/GiraffeInput.cs | 4 +- .../Games/AnimalAcrobat/ObstacleInput.cs | 4 +- ...mes.Minigames.MinigameLoaderGenerator.g.cs | 10 ++ ...Generator.Editor.ProjectSettingsData.asset | 92 +++++++++++++++++++ 4 files changed, 106 insertions(+), 4 deletions(-) diff --git a/Assets/Scripts/Games/AnimalAcrobat/GiraffeInput.cs b/Assets/Scripts/Games/AnimalAcrobat/GiraffeInput.cs index e4ba1e605..6a17ab351 100644 --- a/Assets/Scripts/Games/AnimalAcrobat/GiraffeInput.cs +++ b/Assets/Scripts/Games/AnimalAcrobat/GiraffeInput.cs @@ -31,8 +31,8 @@ namespace HeavenStudio.Games.Scripts_AnimalAcrobat public void Init(double beat, bool beforeGiraffe) { - _game.ScheduleInput(beat - 1, 1, InputType.STANDARD_DOWN, beforeGiraffe ? JustHoldGiraffe : JustHold, Miss, Empty); - _releaseAction = _game.ScheduleInput(beat, 4, InputType.STANDARD_UP, JustRelease, Miss, Empty); + _game.ScheduleInput(beat - 1, 1, Minigame.InputAction_BasicPress, beforeGiraffe ? JustHoldGiraffe : JustHold, Miss, Empty); + _releaseAction = _game.ScheduleInput(beat, 4, Minigame.InputAction_FlickRelease, JustRelease, Miss, Empty); _monkey.gameObject.SetActive(false); MultiSound.Play(new MultiSound.Sound[] diff --git a/Assets/Scripts/Games/AnimalAcrobat/ObstacleInput.cs b/Assets/Scripts/Games/AnimalAcrobat/ObstacleInput.cs index 99983dac5..850fcffb3 100644 --- a/Assets/Scripts/Games/AnimalAcrobat/ObstacleInput.cs +++ b/Assets/Scripts/Games/AnimalAcrobat/ObstacleInput.cs @@ -26,8 +26,8 @@ namespace HeavenStudio.Games.Scripts_AnimalAcrobat public void Init(double beat, bool beforeGiraffe) { - _game.ScheduleInput(beat - 1, 1, InputType.STANDARD_DOWN, beforeGiraffe ? JustHoldGiraffe : JustHold, Miss, Empty); - _releaseAction = _game.ScheduleInput(beat, _holdLength, InputType.STANDARD_UP, JustRelease, Miss, Empty); + _game.ScheduleInput(beat - 1, 1, Minigame.InputAction_BasicPress, beforeGiraffe ? JustHoldGiraffe : JustHold, Miss, Empty); + _releaseAction = _game.ScheduleInput(beat, _holdLength, Minigame.InputAction_FlickRelease, JustRelease, Miss, Empty); _monkey.gameObject.SetActive(false); MultiSound.Play(new MultiSound.Sound[] diff --git a/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs b/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs index c7dd5fc85..87202147a 100644 --- a/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs +++ b/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs @@ -23,6 +23,16 @@ namespace HeavenStudio Debug.LogWarning("Game loader RvlBadmintonLoader failed!"); } + game = CtrAnimalAcrobatLoader.AddGame(eventCaller); + if (game != null) + { + eventCaller.minigames.Add(game.name, game); + } + else + { + Debug.LogWarning("Game loader CtrAnimalAcrobatLoader failed!"); + } + game = CtrBearLoader.AddGame(eventCaller); if (game != null) { diff --git a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset index 85de28d5f..4b8be2fd9 100644 --- a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset +++ b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset @@ -20,5 +20,97 @@ MonoBehaviour: - Assets/Scripts/Games/Tunnel/Tunnel.cs - Assets/Scripts/Games/SumoBrothers/SumoBrothers.cs - Assets/Scripts/Games/RhythmTestGBA/RhythmTestGBA.cs + - Assets/Scripts/Games/FanClub/NtrIdolFan.cs + - Assets/Scripts/LevelEditor/Commands/Block.cs + - Assets/Plugins/Color picker/ColorPreview.cs + - Assets/Scripts/Games/RhythmTweezers/RhythmTweezers.cs + - Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/ColorPropertyPrefab.cs + - Assets/Scripts/LevelEditor/Tooltip.cs + - Assets/Scripts/Games/AnimalAcrobat/EarFlap.cs + - Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/BoolPropertyPrefab.cs + - Assets/Scripts/Util/SoundByte.cs + - Assets/Scripts/Games/Rockers/Rockers.cs + - Assets/Scripts/Minigames.cs + - Assets/Scripts/InputSystem/ControllerTypes/InputJoyshock.cs + - Assets/Scripts/Games/AnimalAcrobat/GiraffeInput.cs + - Assets/Scripts/SourceGenerators/ControllerLoaderGenerator.cs + - Assets/Scripts/Games/MonkeyWatch/WatchBackgroundHandler.cs + - Assets/Scripts/Games/Global/Filter.cs + - Assets/Scripts/GlobalGameManager.cs + - Assets/Scripts/Games/AnimalAcrobat/AcrobatPlayer.cs + - Assets/Scripts/UI/SettingsDialog/Tabs/EditorSettings.cs + - Assets/Scripts/GameManager.cs + - Assets/Scripts/InputSystem/InputController.cs + - Assets/Scripts/LevelEditor/BeatGrid.cs + - Assets/Scripts/Util/Sound.cs + - Assets/Scripts/Games/DrummingPractice/Drummer.cs + - Assets/Scripts/TitleManager.cs + - Assets/Scripts/LevelEditor/EventSelector/GridGameSelector.cs + - Assets/Scripts/Games/Tambourine/Tambourine.cs + - Assets/Scripts/Util/EntityTypes.cs + - Assets/Scripts/Util/MultiSound.cs + - Assets/Scripts/Util/ParticleSystemHelpers.cs + - Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs + - Assets/Scripts/Games/Ringside/Ringside.cs + - Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/DropdownPropertyPrefab.cs + - Assets/Scripts/PersistentDataManager.cs + - Assets/Scripts/LevelEditor/Timeline/Timeline.cs + - Assets/Scripts/Util/MathUtils.cs + - Assets/Scripts/Games/AnimalAcrobat/AnimalAcrobat.cs + - Assets/Scripts/Games/WizardsWaltz/WizardsWaltz.cs + - Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs + - Assets/Scripts/Games/SlotMonster/SlotButton.cs + - Assets/Scripts/Games/ClappyTrio/ClappyTrio.cs + - Assets/Scripts/Games/SlotMonster/SlotMonster.cs + - Assets/Scripts/Util/StringUtils.cs + - Assets/Scripts/Conductor.cs + - Assets/Scripts/LevelEditor/RemixPropertiesDialog/PropertyPrefabs/BoolChartPropertyPrefab.cs + - Assets/Scripts/Games/AirRally/AirRally.cs + - Assets/Scripts/Games/FirstContact/Translator.cs + - Assets/Scripts/LevelEditor/RemixPropertiesDialog/PropertyPrefabs/NumberChartPropertyPrefab.cs + - Assets/Scripts/Games/SoundEffects.cs + - Assets/Scripts/Games/Manzai/Manzai.cs + - Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/SpecialTimeline.cs + - Assets/Scripts/InputSystem/USG.g/InitInputControllers.PlayerInput.ControllerLoaderGenerator.g.cs + - Assets/Scripts/LevelEditor/RemixPropertiesDialog/PropertyPrefabs/StringChartPropertyPrefab.cs + - Assets/Scripts/InputSystem/ControllerTypes/InputKeyboard.cs + - Assets/Scripts/SourceGenerators/MinigameLoaderGenerator.cs + - Assets/Scripts/Games/AnimalAcrobat/ObstacleInput.cs + - Assets/Scripts/Games/AnimalAcrobat/AcrobatObstacle.cs + - Assets/Scripts/Games/DJSchool/Student.cs + - Assets/Scripts/LevelEditor/EventSelector/EventParameterManager.cs + - Assets/Scripts/Games/AnimalAcrobat/WhiteMonkeysSwing.cs + - Assets/Scripts/LevelEditor/EventSelector/EventPropertyPrefab.cs + - Assets/Scripts/Games/BonOdori/BonOdori.cs + - Assets/Scripts/Games/WorkingDough/PlayerEnterDoughBall.cs + - Assets/Scripts/LevelEditor/EditorTheme.cs + - Assets/Scripts/AppInfo.cs + - Assets/Scripts/Games/ForkLifter/ForkLifterPlayer.cs + - Assets/Scripts/Games/DoubleDate/SoccerBall.cs + - Assets/Plugins/JoyShockLibrary/JoyShockLibrary.cs + - Assets/Scripts/Games/RhythmTweezers/Tweezers.cs + - Assets/Scripts/LevelEditor/Timeline/TimelineEventObj.cs + - Assets/Scripts/Games/CheerReaders/CheerReaders.cs + - Assets/Scripts/Games/MonkeyWatch/MonkeyClockArrow.cs + - Assets/Scripts/InputSystem/ControllerTypes/InputMouse.cs + - Assets/Scripts/Games/WorkingDough/WorkingDough.cs + - Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/StringPropertyPrefab.cs + - Assets/Scripts/Games/Rockers/RockersRocker.cs + - Assets/Scripts/InputSystem/ControllerTypes/InputJoyconPair.cs + - Assets/Scripts/UI/SettingsDialog/Tabs/ControllerSettings.cs + - Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/NumberPropertyPrefab.cs + - Assets/Scripts/LevelEditor/RemixPropertiesDialog/PropertyPrefabs/ColorChartPropertyPrefab.cs + - Assets/Scripts/Games/MrUpbeat/UpbeatMan.cs + - Assets/Scripts/Games/AirRally/IslandsManager.cs + - Assets/Scripts/Games/CallAndResponseHandler.cs + - Assets/Scripts/LevelEditor/BoxSelection.cs + - Assets/Scripts/Games/AnimalAcrobat/BGTileManager.cs + - Assets/Scripts/Games/ForkLifter/ForkLifter.cs + - Assets/Scripts/Games/DrummingPractice/DrummingPractice.cs + - Assets/Scripts/LevelEditor/Theme.cs + - Assets/Scripts/LevelEditor/RemixPropertiesDialog/RemixPropertyPrefab.cs + - Assets/Scripts/Games/ForkLifter/Pea.cs + - Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/ButtonPropertyPrefab.cs + - Assets/Scripts/LevelEditor/Timeline/LayerLabel.cs PathsToSkipImportEvent: [] PathsToIgnoreOverwriteSettingOnAttribute: []