diff --git a/Assets/Resources/Sfx/games/tunnel.meta b/Assets/Resources/Sfx/games/tunnel.meta new file mode 100644 index 00000000..558ca6a5 --- /dev/null +++ b/Assets/Resources/Sfx/games/tunnel.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1daa974ec8d342f44a194f1e34d37302 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/tunnel/en.meta b/Assets/Resources/Sfx/games/tunnel/en.meta new file mode 100644 index 00000000..151132d4 --- /dev/null +++ b/Assets/Resources/Sfx/games/tunnel/en.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0e4264e228ae6224e88e4a2e6bdad16c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/tunnel/en/one.ogg b/Assets/Resources/Sfx/games/tunnel/en/one.ogg new file mode 100644 index 00000000..d6e94ae6 Binary files /dev/null and b/Assets/Resources/Sfx/games/tunnel/en/one.ogg differ diff --git a/Assets/Resources/Sfx/games/tunnel/en/one.ogg.meta b/Assets/Resources/Sfx/games/tunnel/en/one.ogg.meta new file mode 100644 index 00000000..5a07c049 --- /dev/null +++ b/Assets/Resources/Sfx/games/tunnel/en/one.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: e0be43dd44a584c4a8e9bd7491ebf4cb +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/Resources/Sfx/games/tunnel/en/two.ogg b/Assets/Resources/Sfx/games/tunnel/en/two.ogg new file mode 100644 index 00000000..5318fbbd Binary files /dev/null and b/Assets/Resources/Sfx/games/tunnel/en/two.ogg differ diff --git a/Assets/Resources/Sfx/games/tunnel/en/two.ogg.meta b/Assets/Resources/Sfx/games/tunnel/en/two.ogg.meta new file mode 100644 index 00000000..49aa00c6 --- /dev/null +++ b/Assets/Resources/Sfx/games/tunnel/en/two.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: a8472e0311bad6d46a721bdb660dc0bf +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/Tunnel/Tunnel.cs b/Assets/Scripts/Games/Tunnel/Tunnel.cs index 18f6b5f1..4e3ab3de 100644 --- a/Assets/Scripts/Games/Tunnel/Tunnel.cs +++ b/Assets/Scripts/Games/Tunnel/Tunnel.cs @@ -21,7 +21,9 @@ namespace HeavenStudio.Games.Loaders new Param("toggle", false, "Driver can stop", "Lets the driver stop if the player makes too many mistakes"), }), - + new GameAction("Count In", delegate { Tunnel.instance.CountIn(eventCaller.currentEntity.beat, eventCaller.currentEntity.length); }, 1f, true), + + } //new List() {"ntr", "aim"}, //"ntrcoin", "en", @@ -124,7 +126,7 @@ namespace HeavenStudio.Games cowbellAnimator.Play("Shake",-1,0); } - public void StartCowbell(float beat, bool audienceReacting, float length) + public void StartCowbell(float beat, bool driverStops, float length) { started = true; @@ -167,8 +169,26 @@ namespace HeavenStudio.Games + public void CountIn(float beat, float length) + { + for (int i = 0; i <= length; i++) + { + if(i % 2 == 0) + { + Jukebox.PlayOneShotGame("tunnel/en/one", beat+i); + print("cueing one at " + (beat + i)); + } + else + { + Jukebox.PlayOneShotGame("tunnel/en/two", beat+i); + print("cueing two at " + (beat + i)); + } + + } + + } + - } }