diff --git a/Assets/Resources/Sfx/games/karateman/karate_through.wav b/Assets/Resources/Sfx/games/karateman/karate_through.wav index 60b595702..2feb9f870 100644 Binary files a/Assets/Resources/Sfx/games/karateman/karate_through.wav and b/Assets/Resources/Sfx/games/karateman/karate_through.wav differ diff --git a/Assets/Scripts/Games/MarchingOrders/MarchingOrders.cs b/Assets/Scripts/Games/MarchingOrders/MarchingOrders.cs index bd4d177e3..5e0b5ba15 100644 --- a/Assets/Scripts/Games/MarchingOrders/MarchingOrders.cs +++ b/Assets/Scripts/Games/MarchingOrders/MarchingOrders.cs @@ -244,7 +244,7 @@ namespace HeavenStudio.Games switch (type) { case (int) MarchingOrders.DirectionFaceTurn.Left: - //ScheduleInput(beat, turnLength + 2f, InputType.DIRECTION_RIGHT_DOWN, LeftSuccess, LeftMiss, LeftEmpty); + ScheduleInput(beat, turnLength + 2f, InputType.DIRECTION_LEFT_DOWN, LeftSuccess, LeftMiss, LeftThrough); MultiSound.Play(new MultiSound.Sound[] { new MultiSound.Sound("marchingOrders/leftFaceTurn1", beat), new MultiSound.Sound("marchingOrders/leftFaceTurn2", beat + 0.5f), @@ -260,6 +260,7 @@ namespace HeavenStudio.Games }); break; default: + 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), @@ -284,6 +285,7 @@ namespace HeavenStudio.Games } + public static void AttentionSound(float beat) { MultiSound.Play(new MultiSound.Sound[] { @@ -308,6 +310,42 @@ namespace HeavenStudio.Games new MultiSound.Sound("marchingOrders/halt2", beat + 1f), }, forcePlay:true); } + + + + public void LeftSuccess(PlayerActionEvent caller, float state) + { + //Jukebox.PlayOneShotGame("spaceDance/inputGood"); + CadetHeadPlayer.DoScaledAnimationAsync("FaceL", 0.5f); + } + + public void LeftMiss(PlayerActionEvent caller) + { + //Jukebox.PlayOneShotGame("spaceDance/inputBad2"); + } + + public void LeftThrough(PlayerActionEvent caller) + { + + } + + + public void RightSuccess(PlayerActionEvent caller, float state) + { + //Jukebox.PlayOneShotGame("spaceDance/inputGood"); + CadetHeadPlayer.DoScaledAnimationAsync("FaceR", 0.5f); + } + + public void RightMiss(PlayerActionEvent caller) + { + //Jukebox.PlayOneShotGame("spaceDance/inputBad2"); + } + + public void RightThrough(PlayerActionEvent caller) + { + + } + } } diff --git a/Assets/StreamingAssets/karate/common b/Assets/StreamingAssets/karate/common index a2eb531f1..64cf7f28a 100644 Binary files a/Assets/StreamingAssets/karate/common and b/Assets/StreamingAssets/karate/common differ diff --git a/Assets/StreamingAssets/karate/common.manifest b/Assets/StreamingAssets/karate/common.manifest index 5077cc2ca..2fc3fb012 100644 --- a/Assets/StreamingAssets/karate/common.manifest +++ b/Assets/StreamingAssets/karate/common.manifest @@ -1,9 +1,9 @@ ManifestFileVersion: 0 -CRC: 1499416464 +CRC: 993448115 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 7dbbb737179d1cc7db1edb0a31c7e1ab + Hash: cbd0fad2ce0944428f5007c0d28157a5 TypeTreeHash: serializedVersion: 2 Hash: 2b92e6f111bbb24dabe3a2c56ea02b28 diff --git a/Assets/StreamingAssets/karate/locale.en b/Assets/StreamingAssets/karate/locale.en index 1eb9625b4..e2ee8aa0f 100644 Binary files a/Assets/StreamingAssets/karate/locale.en and b/Assets/StreamingAssets/karate/locale.en differ diff --git a/Assets/StreamingAssets/karate/locale.en.manifest b/Assets/StreamingAssets/karate/locale.en.manifest index 6198f8c26..08e453345 100644 --- a/Assets/StreamingAssets/karate/locale.en.manifest +++ b/Assets/StreamingAssets/karate/locale.en.manifest @@ -1,9 +1,9 @@ ManifestFileVersion: 0 -CRC: 67804883 +CRC: 3583203723 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 12b838a94c79042ad1655edbf842a8f6 + Hash: 590369c115e99f9279a3225b566e911b TypeTreeHash: serializedVersion: 2 Hash: 9a2ca7bdbd1871f7131daf57de908e0c @@ -13,21 +13,21 @@ ClassTypes: Script: {instanceID: 0} SerializeReferenceClassIdentifiers: [] Assets: -- Assets/Resources/Sfx/games/karateman/punchKick4.ogg -- Assets/Resources/Sfx/games/karateman/one.ogg -- Assets/Resources/Sfx/games/karateman/punchy2.ogg -- Assets/Resources/Sfx/games/karateman/threeAlt.wav -- Assets/Resources/Sfx/games/karateman/hitAlt.wav -- Assets/Resources/Sfx/games/karateman/two.ogg -- Assets/Resources/Sfx/games/karateman/punchKick3.ogg -- Assets/Resources/Sfx/games/karateman/four.ogg -- Assets/Resources/Sfx/games/karateman/punchKick1.ogg -- Assets/Resources/Sfx/games/karateman/pow.ogg -- Assets/Resources/Sfx/games/karateman/punchy3.ogg -- Assets/Resources/Sfx/games/karateman/ko.ogg -- Assets/Resources/Sfx/games/karateman/punchy1.ogg -- Assets/Resources/Sfx/games/karateman/punchy4.ogg -- Assets/Resources/Sfx/games/karateman/hit.ogg -- Assets/Resources/Sfx/games/karateman/three.ogg -- Assets/Resources/Sfx/games/karateman/punchKick2.ogg +- Assets/Resources/Sfx/games/karateman/en/punchKick4.ogg +- Assets/Resources/Sfx/games/karateman/en/one.ogg +- Assets/Resources/Sfx/games/karateman/en/punchy2.ogg +- Assets/Resources/Sfx/games/karateman/en/threeAlt.wav +- Assets/Resources/Sfx/games/karateman/en/hitAlt.wav +- Assets/Resources/Sfx/games/karateman/en/two.ogg +- Assets/Resources/Sfx/games/karateman/en/punchKick3.ogg +- Assets/Resources/Sfx/games/karateman/en/four.ogg +- Assets/Resources/Sfx/games/karateman/en/punchKick1.ogg +- Assets/Resources/Sfx/games/karateman/en/pow.ogg +- Assets/Resources/Sfx/games/karateman/en/punchy3.ogg +- Assets/Resources/Sfx/games/karateman/en/ko.ogg +- Assets/Resources/Sfx/games/karateman/en/punchy1.ogg +- Assets/Resources/Sfx/games/karateman/en/punchy4.ogg +- Assets/Resources/Sfx/games/karateman/en/hit.ogg +- Assets/Resources/Sfx/games/karateman/en/three.ogg +- Assets/Resources/Sfx/games/karateman/en/punchKick2.ogg Dependencies: []