diff --git a/Assets/Resources/Sfx/games/marchingOrders/faceTurnOther.ogg b/Assets/Resources/Sfx/games/marchingOrders/faceTurnOther.ogg new file mode 100644 index 000000000..6aa9a193c Binary files /dev/null and b/Assets/Resources/Sfx/games/marchingOrders/faceTurnOther.ogg differ diff --git a/Assets/Resources/Sfx/games/marchingOrders/step1.ogg.meta b/Assets/Resources/Sfx/games/marchingOrders/faceTurnOther.ogg.meta similarity index 91% rename from Assets/Resources/Sfx/games/marchingOrders/step1.ogg.meta rename to Assets/Resources/Sfx/games/marchingOrders/faceTurnOther.ogg.meta index 94136d4da..23808228a 100644 --- a/Assets/Resources/Sfx/games/marchingOrders/step1.ogg.meta +++ b/Assets/Resources/Sfx/games/marchingOrders/faceTurnOther.ogg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 072598f0f25ee574098a1c1a912d02b0 +guid: 216fb1053a001094682f72154e4c5b74 AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Resources/Sfx/games/marchingOrders/faceTurnPlayer.ogg b/Assets/Resources/Sfx/games/marchingOrders/faceTurnPlayer.ogg new file mode 100644 index 000000000..dba6a543e Binary files /dev/null and b/Assets/Resources/Sfx/games/marchingOrders/faceTurnPlayer.ogg differ diff --git a/Assets/Resources/Sfx/games/marchingOrders/leftFaceTurn4.ogg.meta b/Assets/Resources/Sfx/games/marchingOrders/faceTurnPlayer.ogg.meta similarity index 91% rename from Assets/Resources/Sfx/games/marchingOrders/leftFaceTurn4.ogg.meta rename to Assets/Resources/Sfx/games/marchingOrders/faceTurnPlayer.ogg.meta index 5ff8474bf..db9a72c49 100644 --- a/Assets/Resources/Sfx/games/marchingOrders/leftFaceTurn4.ogg.meta +++ b/Assets/Resources/Sfx/games/marchingOrders/faceTurnPlayer.ogg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 68bc11fbde502954bac98356e27ebf0a +guid: 3d783a872d3761248b36d824b1e55d88 AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Resources/Sfx/games/marchingOrders/leftFaceTurn4.ogg b/Assets/Resources/Sfx/games/marchingOrders/leftFaceTurn4.ogg deleted file mode 100644 index b068e467e..000000000 Binary files a/Assets/Resources/Sfx/games/marchingOrders/leftFaceTurn4.ogg and /dev/null differ diff --git a/Assets/Resources/Sfx/games/marchingOrders/rightFaceTurn4.ogg b/Assets/Resources/Sfx/games/marchingOrders/rightFaceTurn4.ogg deleted file mode 100644 index f3ace683c..000000000 Binary files a/Assets/Resources/Sfx/games/marchingOrders/rightFaceTurn4.ogg and /dev/null differ diff --git a/Assets/Resources/Sfx/games/marchingOrders/step1.ogg b/Assets/Resources/Sfx/games/marchingOrders/step1.ogg deleted file mode 100644 index 0dabbb7c7..000000000 Binary files a/Assets/Resources/Sfx/games/marchingOrders/step1.ogg and /dev/null differ diff --git a/Assets/Resources/Sfx/games/marchingOrders/stepOther.ogg b/Assets/Resources/Sfx/games/marchingOrders/stepOther.ogg new file mode 100644 index 000000000..85a0454db Binary files /dev/null and b/Assets/Resources/Sfx/games/marchingOrders/stepOther.ogg differ diff --git a/Assets/Resources/Sfx/games/marchingOrders/rightFaceTurn4.ogg.meta b/Assets/Resources/Sfx/games/marchingOrders/stepOther.ogg.meta similarity index 91% rename from Assets/Resources/Sfx/games/marchingOrders/rightFaceTurn4.ogg.meta rename to Assets/Resources/Sfx/games/marchingOrders/stepOther.ogg.meta index 0fdf155f1..d1ac62222 100644 --- a/Assets/Resources/Sfx/games/marchingOrders/rightFaceTurn4.ogg.meta +++ b/Assets/Resources/Sfx/games/marchingOrders/stepOther.ogg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a309c402deb4cec409b80f448812886f +guid: 501dcb9853aa30e4090a8084b37b1db5 AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Resources/Sfx/games/marchingOrders/stepPlayer.ogg b/Assets/Resources/Sfx/games/marchingOrders/stepPlayer.ogg new file mode 100644 index 000000000..6f022b136 Binary files /dev/null and b/Assets/Resources/Sfx/games/marchingOrders/stepPlayer.ogg differ diff --git a/Assets/Resources/Sfx/games/marchingOrders/stepPlayer.ogg.meta b/Assets/Resources/Sfx/games/marchingOrders/stepPlayer.ogg.meta new file mode 100644 index 000000000..2ddc4b17e --- /dev/null +++ b/Assets/Resources/Sfx/games/marchingOrders/stepPlayer.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: dff60d5367d760c4ea0f4d492a5a0748 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Games/MarchingOrders/MarchingOrders.cs b/Assets/Scripts/Games/MarchingOrders/MarchingOrders.cs index 5e0b5ba15..f55dbe3f2 100644 --- a/Assets/Scripts/Games/MarchingOrders/MarchingOrders.cs +++ b/Assets/Scripts/Games/MarchingOrders/MarchingOrders.cs @@ -144,7 +144,7 @@ namespace HeavenStudio.Games marchOtherCount += 1; var marchOtherAnim = (marchOtherCount % 2 != 0 ? "MarchR" : "MarchL"); - Jukebox.PlayOneShotGame("marchingOrders/step1"); + Jukebox.PlayOneShotGame("marchingOrders/stepOther"); Cadet1.DoScaledAnimationAsync(marchOtherAnim, 0.5f); Cadet2.DoScaledAnimationAsync(marchOtherAnim, 0.5f); Cadet3.DoScaledAnimationAsync(marchOtherAnim, 0.5f); @@ -160,7 +160,7 @@ namespace HeavenStudio.Games marchPlayerCount += 1; var marchPlayerAnim = (marchPlayerCount % 2 != 0 ? "MarchR" : "MarchL"); - Jukebox.PlayOneShotGame("marchingOrders/step1"); + Jukebox.PlayOneShotGame("marchingOrders/stepOther"); CadetPlayer.DoScaledAnimationAsync(marchPlayerAnim, 0.5f); } } @@ -216,7 +216,7 @@ namespace HeavenStudio.Games MultiSound.Play(new MultiSound.Sound[] { new MultiSound.Sound("marchingOrders/halt1", beat), new MultiSound.Sound("marchingOrders/halt2", beat + 1f), - new MultiSound.Sound("marchingOrders/step1", beat + 1f), + new MultiSound.Sound("marchingOrders/stepOther", beat + 1f), }, forcePlay:true); BeatAction.New(Player, new List() @@ -249,7 +249,7 @@ namespace HeavenStudio.Games new MultiSound.Sound("marchingOrders/leftFaceTurn1", beat), new MultiSound.Sound("marchingOrders/leftFaceTurn2", beat + 0.5f), new MultiSound.Sound("marchingOrders/leftFaceTurn3", beat + turnLength + 1f), - new MultiSound.Sound("marchingOrders/leftFaceTurn4", beat + turnLength + 2f), + new MultiSound.Sound("marchingOrders/faceTurnOther", beat + turnLength + 2f), }, forcePlay:true); BeatAction.New(Player, new List() @@ -260,12 +260,12 @@ namespace HeavenStudio.Games }); break; default: - ScheduleInput(beat, turnLength + 2f, InputType.DIRECTION_RIGHT_DOWN, RightSuccess, RightMiss, RightThrough); + ScheduleInput(beat, turnLength + 2f, InputType.DIRECTION_RIGHT_DOWN, RightSuccess, RightMiss, RightThrough); MultiSound.Play(new MultiSound.Sound[] { new MultiSound.Sound("marchingOrders/rightFaceTurn1", beat), new MultiSound.Sound("marchingOrders/rightFaceTurn2", beat + 0.5f), new MultiSound.Sound("marchingOrders/rightFaceTurn3", beat + turnLength + 1f), - new MultiSound.Sound("marchingOrders/rightFaceTurn4", beat + turnLength + 2f), + new MultiSound.Sound("marchingOrders/faceTurnOther", beat + turnLength + 2f), }, forcePlay:true); BeatAction.New(Player, new List() @@ -285,7 +285,7 @@ namespace HeavenStudio.Games } - + public static void AttentionSound(float beat) { MultiSound.Play(new MultiSound.Sound[] { @@ -310,12 +310,12 @@ namespace HeavenStudio.Games new MultiSound.Sound("marchingOrders/halt2", beat + 1f), }, forcePlay:true); } - - - - public void LeftSuccess(PlayerActionEvent caller, float state) + + + + public void LeftSuccess(PlayerActionEvent caller, float state) { - //Jukebox.PlayOneShotGame("spaceDance/inputGood"); + Jukebox.PlayOneShotGame("marchingOrders/faceTurnPlayer"); CadetHeadPlayer.DoScaledAnimationAsync("FaceL", 0.5f); } @@ -330,9 +330,9 @@ namespace HeavenStudio.Games } - public void RightSuccess(PlayerActionEvent caller, float state) + public void RightSuccess(PlayerActionEvent caller, float state) { - //Jukebox.PlayOneShotGame("spaceDance/inputGood"); + Jukebox.PlayOneShotGame("marchingOrders/faceTurnPlayer"); CadetHeadPlayer.DoScaledAnimationAsync("FaceR", 0.5f); }