From ec9dc73b5cdbf5fe2d3ac9940cec687be122c658 Mon Sep 17 00:00:00 2001 From: streitixy Date: Sat, 24 Feb 2024 16:38:16 -0300 Subject: [PATCH] super cool commit --- Assets/Resources/Fonts/WarioWareV2 SDF 1.mat | 2 +- Assets/Resources/Fonts/WarioWareV2 SDF 5.mat | 2 +- Assets/Scripts/Games/BonOdori/BonOdori.cs | 21 +++++++------------- 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/Assets/Resources/Fonts/WarioWareV2 SDF 1.mat b/Assets/Resources/Fonts/WarioWareV2 SDF 1.mat index 7066f4cd9..34e37b89f 100644 --- a/Assets/Resources/Fonts/WarioWareV2 SDF 1.mat +++ b/Assets/Resources/Fonts/WarioWareV2 SDF 1.mat @@ -102,7 +102,7 @@ Material: - _WeightBold: 0.75 - _WeightNormal: 0 m_Colors: - - _ClipRect: {r: -10, g: -10, b: -9.664387, a: 10} + - _ClipRect: {r: -10, g: -10, b: -10, a: 10} - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0} - _FaceColor: {r: 1, g: 1, b: 1, a: 1} - _GlowColor: {r: 0, g: 1, b: 0, a: 0.5} diff --git a/Assets/Resources/Fonts/WarioWareV2 SDF 5.mat b/Assets/Resources/Fonts/WarioWareV2 SDF 5.mat index 338c79e1a..159f272a5 100644 --- a/Assets/Resources/Fonts/WarioWareV2 SDF 5.mat +++ b/Assets/Resources/Fonts/WarioWareV2 SDF 5.mat @@ -102,7 +102,7 @@ Material: - _WeightBold: 0.75 - _WeightNormal: 0 m_Colors: - - _ClipRect: {r: -10, g: -10, b: -9.429543, a: 10} + - _ClipRect: {r: -10, g: -10, b: -9.431391, a: 10} - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0} - _FaceColor: {r: 1, g: 1, b: 1, a: 1} - _GlowColor: {r: 0, g: 1, b: 0, a: 0.5} diff --git a/Assets/Scripts/Games/BonOdori/BonOdori.cs b/Assets/Scripts/Games/BonOdori/BonOdori.cs index 8134e5226..91bf55f34 100644 --- a/Assets/Scripts/Games/BonOdori/BonOdori.cs +++ b/Assets/Scripts/Games/BonOdori/BonOdori.cs @@ -355,16 +355,13 @@ namespace HeavenStudio.Games } Player.Play(clapTypeString); - CPU1.Play(clapTypeString); - CPU2.Play(clapTypeString); - CPU3.Play(clapTypeString); if (!goBopDonpans) { BeatAction.New(instance, new List() { - new BeatAction.Action(beatUniversal + 1d, delegate { Player.Play("NeutralClapped"); CPU1.Play("NeutralClapped"); CPU2.Play("NeutralClapped"); CPU3.Play("NeutralClapped");}) + new BeatAction.Action(beatUniversal + 1d, delegate { Player.Play("NeutralClapped"); CPU1.Play("NeutralClapped"); CPU2.Play("NeutralClapped"); CPU3.Play("NeutralClapped"); goBopDonpans = true;}) }); } @@ -506,16 +503,15 @@ namespace HeavenStudio.Games new BeatAction.Action(beatUniversal + 1d, delegate { Player.Play("NeutralClapped"); CPU1.Play("NeutralClapped"); CPU2.Play("NeutralClapped"); CPU3.Play("NeutralClapped");}), }); } - MultiSound.Play(new MultiSound.Sound[] { - new MultiSound.Sound("bonOdori/clap", 0f, offset: 0.01f), - }); +SoundByte.PlayOneShotGame("bonOdori/clap") } public void Miss(PlayerActionEvent caller) { - MultiSound.Play(new MultiSound.Sound[] { - new MultiSound.Sound("miss", 0f, offset: 0.01f), - }); + CPU1.Play(clapTypeString); + CPU2.Play(clapTypeString); + CPU3.Play(clapTypeString); + SoundByte.PlayOneShot("miss"); BeatAction.New(instance, new List() { new BeatAction.Action(beatUniversal + 1d, delegate { Face.Play("Sad");}), @@ -550,10 +546,7 @@ namespace HeavenStudio.Games }); } - MultiSound.Play(new MultiSound.Sound[] { - new MultiSound.Sound("bonOdori/nearMiss", 0f, offset: 0.01f), - }); - + SoundByte.PlayOneShot("nearMiss"); }