From 78de3e1b03b1ffa8b814d44e6dbff2c1a76536b0 Mon Sep 17 00:00:00 2001 From: streitixy <85808002+streitixy@users.noreply.github.com> Date: Sat, 9 Mar 2024 21:36:44 -0300 Subject: [PATCH] pa, pa-n and do, do-n were switched, this pr fixes it (#769) * started working on bon odori * bon odori is now playable, just no animations and sounds * bon odori is functional now, just missing the art, better audio and animations * nothing new, my git is always 1 commit behind * Revert "nothing new, my git is always 1 commit behind" This reverts commit b96a70004de5964902f7bc87d819a9e6047e77fb. * changed the background im only commiting because saladplainzone is gonna do the anims now * Accurate BG * Good prefab * finalized player prefab * Finalize Prefab * More animation stuff * Bow anim done * text is now functional, passing the project to AstrlJelly * merging w master branch * text scrolling is ALMOST functional * scrolling is ALMOST ALMOST functional * FINALLY!!!! TEXT SCOLLING IS DONE!!!!! * TEXT SCROLLING IS (almost) PERFECT!!!! now we gotta wait for the animations * minor bug fixes * TEXT SCROLLING IS ACTUALLY PERFECT NOW. also updated the font * i forgor to change the outline on the fonts * some bon odori changes (please dont break anything please) * LAST COMMIT BEFORE PUSHING!!!!!!! * forgot fix some minor things lol * organized the folders and made the dark bg an ease and not an animation * super cool commit * bug fixes * added pitching to pans and dons * changing Clap() and Sound() to a prefunction * prefunctions done :thumbsup: * the smallest change ever --------- Co-authored-by: saladplainzone Co-authored-by: wookywok <62037083+wookywok@users.noreply.github.com> Co-authored-by: minenice55 --- Assets/Scripts/Games/BonOdori/BonOdori.cs | 8 +-- ...Generator.Editor.ProjectSettingsData.asset | 61 +++++++++++++++++++ 2 files changed, 65 insertions(+), 4 deletions(-) diff --git a/Assets/Scripts/Games/BonOdori/BonOdori.cs b/Assets/Scripts/Games/BonOdori/BonOdori.cs index ce10566a4..d16060406 100644 --- a/Assets/Scripts/Games/BonOdori/BonOdori.cs +++ b/Assets/Scripts/Games/BonOdori/BonOdori.cs @@ -445,8 +445,8 @@ namespace HeavenStudio.Games string clip = typeSpeak switch { 0 => "pan", - 1 => "pa_n", - 2 or _ => "pa", + 1 => "pa", + 2 or _ => "pa_n", }; var pitch = SoundByte.GetPitchFromSemiTones(semitone, true); SoundByte.PlayOneShotGame($"bonOdori/" + clip + (variation + 1), beat, pitch); @@ -463,8 +463,8 @@ namespace HeavenStudio.Games string clip = typeSpeak switch { 0 => "don", - 1 => "do_n", - 2 or _ => "do", + 1 => "do", + 2 or _ => "do_n", }; var pitch = SoundByte.GetPitchFromSemiTones(semitone, true); diff --git a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset index a1cbca8dd..6c3c1ea46 100644 --- a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset +++ b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset @@ -17,5 +17,66 @@ MonoBehaviour: DenseViewWidthThreshold: 512 _disableAutoReloadInBackground: 0 ImportedScriptPaths: + - Assets/Scripts/Games/RapMen/RapMen.cs + - Assets/Scripts/Games/Cannery/Cannery.cs + - Assets/Scripts/Games/LumBEARjack/LBJBear.cs + - Assets/Scripts/LevelEditor/Commands/Block.cs + - Assets/Scripts/Games/ClapTrap/ClapTrap.cs + - Assets/Scripts/Games/SoundEffects.cs + - Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/ColorPropertyPrefab.cs + - Assets/Scripts/Games/RhythmTweezers/RhythmTweezers.cs + - Assets/Scripts/LevelEditor/Tooltip.cs + - Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/BoolPropertyPrefab.cs + - Assets/Scripts/LevelEditor/EventSelector/EventParameterManager.cs + - Assets/Scripts/Util/SoundByte.cs + - Assets/Scripts/Games/Rockers/Rockers.cs + - Assets/Scripts/Games/NailCarpenter/LongNail.cs + - Assets/Scripts/Games/LumBEARjack/LumBEARjack.cs + - Assets/Scripts/LevelEditor/EventSelector/EventPropertyPrefab.cs + - Assets/Scripts/Games/BonOdori/BonOdori.cs + - Assets/Scripts/Minigames.cs + - Assets/Scripts/Games/LumBEARjack/LBJBigObject.cs + - Assets/Scripts/LevelEditor/Timeline/TimelineEventObj.cs + - Assets/Scripts/Games/Cannery/Can.cs + - Assets/Scripts/UI/SettingsDialog/Tabs/EditorSettings.cs + - Assets/Scripts/GameManager.cs + - Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/StringPropertyPrefab.cs + - Assets/Scripts/Games/RhythmTestGBA/RhythmTestGBA.cs + - Assets/Scripts/Games/LumBEARjack/LBJBomb.cs + - Assets/Scripts/Games/TossBoys/TossBoys.cs + - Assets/Scripts/Games/LumBEARjack/LBJBaby.cs + - Assets/Scripts/Games/LumBEARjack/LBJObjectRotate.cs + - Assets/Scripts/Util/MultiSound.cs + - Assets/Scripts/Games/Tambourine/Tambourine.cs + - Assets/Scripts/Util/ParticleSystemHelpers.cs + - Assets/Scripts/Games/SpaceDance/SpaceDance.cs + - Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/NumberPropertyPrefab.cs + - Assets/Scripts/Util/EntityTypes.cs + - Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs + - Assets/Scripts/Games/LumBEARjack/LBJCatMove.cs + - Assets/Scripts/Games/LumBEARjack/LBJSmallObject.cs + - Assets/Scripts/Games/LumBEARjack/LBJMissObject.cs + - Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/DropdownPropertyPrefab.cs + - Assets/Scripts/LevelEditor/Timeline/Timeline.cs + - Assets/Scripts/PersistentDataManager.cs + - Assets/Scripts/Games/NailCarpenter/Nail.cs + - Assets/Scripts/Games/ForkLifter/ForkLifter.cs + - Assets/Scripts/Games/CoinToss/CoinToss.cs + - Assets/Scripts/Games/DrummingPractice/DrummingPractice.cs + - Assets/Scripts/Games/Minigame.cs + - Assets/Scripts/Games/Kitties/Kitties.cs + - Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs + - Assets/Scripts/LevelEditor/EventSelector/PropertyPrefabs/ButtonPropertyPrefab.cs + - Assets/Scripts/Games/LumBEARjack/LBJHugeObject.cs + - Assets/Scripts/Games/ClapTrap/Sword.cs + - Assets/Scripts/Games/KarateMan/KarateMan.cs + - Assets/Scripts/Games/ClappyTrio/ClappyTrio.cs + - Assets/Scripts/Games/NailCarpenter/NailCarpenter.cs + - Assets/Scripts/Games/NailCarpenter/Sweet.cs + - Assets/Scripts/Games/SpaceSoccer/SpaceSoccer.cs + - Assets/Scripts/Games/LumBEARjack/LBJBGCat.cs + - Assets/Scripts/Games/SamuraiSliceNtr/SamuraiSliceNtr.cs + - Assets/Scripts/Games/PowerCalligraphy/Writing.cs + - Assets/Scripts/Games/PowerCalligraphy/PowerCalligraphy.cs PathsToSkipImportEvent: [] PathsToIgnoreOverwriteSettingOnAttribute: []