diff --git a/Assets/Resources/Games/rhythmTestGBA.prefab b/Assets/Resources/Games/rhythmTestGBA.prefab
index b439a16d6..6be84f241 100644
--- a/Assets/Resources/Games/rhythmTestGBA.prefab
+++ b/Assets/Resources/Games/rhythmTestGBA.prefab
@@ -758,7 +758,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5566258577491883246}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: -0.01, z: -1.98}
+ m_LocalPosition: {x: 0, y: -0.41, z: 0}
m_LocalScale: {x: 40.2019, y: 0.8792758, z: 0.8792758}
m_ConstrainProportionsScale: 0
m_Children: []
diff --git a/Assets/Resources/Sprites/Games/RhythmTestGBA/Button_Practice_Upscale.png b/Assets/Resources/Sprites/Games/RhythmTestGBA/Button_Practice_Upscale.png
index f5d08dfe9..74038043c 100644
Binary files a/Assets/Resources/Sprites/Games/RhythmTestGBA/Button_Practice_Upscale.png and b/Assets/Resources/Sprites/Games/RhythmTestGBA/Button_Practice_Upscale.png differ
diff --git a/Assets/Resources/Sprites/Games/RhythmTestGBA/Button_Practice_Upscale.png.meta b/Assets/Resources/Sprites/Games/RhythmTestGBA/Button_Practice_Upscale.png.meta
index e0b085be8..1e5bc8c92 100644
--- a/Assets/Resources/Sprites/Games/RhythmTestGBA/Button_Practice_Upscale.png.meta
+++ b/Assets/Resources/Sprites/Games/RhythmTestGBA/Button_Practice_Upscale.png.meta
@@ -67,7 +67,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
- maxTextureSize: 2048
+ maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
diff --git a/Assets/Scripts/Games/RhythmTestGBA/RhythmTestGBA.cs b/Assets/Scripts/Games/RhythmTestGBA/RhythmTestGBA.cs
index 6671e4e4f..a9d187fc5 100644
--- a/Assets/Scripts/Games/RhythmTestGBA/RhythmTestGBA.cs
+++ b/Assets/Scripts/Games/RhythmTestGBA/RhythmTestGBA.cs
@@ -34,7 +34,7 @@ namespace HeavenStudio.Games.Loaders
{
public static Minigame AddGame(EventCaller eventCaller)
{
- return new Minigame("rhythmTestGBA", "Rhythm Test (GBA) \n(Rhythm-kan Check)", "ffffff", false, false, new List()
+ return new Minigame("rhythmTestGBA", "Rhythm Test (GBA) \n(Rhythm-kan Check)", "2DD816", false, false, new List()
{
new GameAction("countin", "Start Beeping")
@@ -70,7 +70,7 @@ namespace HeavenStudio.Games.Loaders
new GameAction("countdown", "Countdown")
{
- preFunction = delegate {RhythmTestGBA.instance.PreCountDown(eventCaller.currentEntity.beat, eventCaller.currentEntity.length, eventCaller.currentEntity["val1"]);},
+ function = delegate {RhythmTestGBA.instance.PreCountDown(eventCaller.currentEntity.beat, eventCaller.currentEntity.length, eventCaller.currentEntity["val1"]);},
defaultLength = 1f,
resizable = true,
parameters = new List()
@@ -220,7 +220,7 @@ namespace HeavenStudio.Games
{
new BeatAction.Action(beat + i, delegate
{
- flashAnimator.Play("KTBPulse", 0, 0);
+ PlayFlashFX();
SoundByte.PlayOneShotGame("rhythmTestGBA/blip");
})
@@ -230,7 +230,12 @@ namespace HeavenStudio.Games
}
}
-
+ public void PlayFlashFX()
+ {
+ numberAnimator.Play("Idle");
+ numberBGAnimator.Play("Idle");
+ flashAnimator.Play("KTBPulse", 0 ,0);
+ }
@@ -269,11 +274,11 @@ namespace HeavenStudio.Games
BeatAction.New(instance, new List()
{
- new BeatAction.Action(beat, delegate {flashAnimator.Play("KTBPulse");}),
+ new BeatAction.Action(beat, delegate {PlayFlashFX();}),
- new BeatAction.Action(beat+1, delegate {flashAnimator.Play("KTBPulse");}),
+ new BeatAction.Action(beat+1, delegate {PlayFlashFX();}),
- new BeatAction.Action(beat+2, delegate {flashAnimator.Play("KTBPulse");}),
+ new BeatAction.Action(beat+2, delegate {PlayFlashFX();}),
new BeatAction.Action(beat+3, delegate { SoundByte.PlayOneShotGame("rhythmTestGBA/end_ding", beat: beat, forcePlay: true);})
@@ -294,14 +299,14 @@ namespace HeavenStudio.Games
public void StopKeepbeatInput(double beat)
{
ScheduleInput(beat, 0f, InputAction_BasicPress, ButtonSuccess, ButtonFailure, ButtonEmpty);
- flashAnimator.Play("KTBPulse");
+ PlayFlashFX();
}
public override void OnBeatPulse(double beat)
{
if (goBeep)
{
- flashAnimator.Play("KTBPulse");
+ PlayFlashFX();
SoundByte.PlayOneShotGame("rhythmTestGBA/blip");
}
diff --git a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset
index ead3389e6..85de28d5f 100644
--- a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset
+++ b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset
@@ -18,5 +18,7 @@ MonoBehaviour:
_disableAutoReloadInBackground: 0
ImportedScriptPaths:
- Assets/Scripts/Games/Tunnel/Tunnel.cs
+ - Assets/Scripts/Games/SumoBrothers/SumoBrothers.cs
+ - Assets/Scripts/Games/RhythmTestGBA/RhythmTestGBA.cs
PathsToSkipImportEvent: []
PathsToIgnoreOverwriteSettingOnAttribute: []