diff --git a/Assets/Scripts/Core/GameManager.cs b/Assets/Scripts/Core/GameManager.cs index 6e8fc44..05dab60 100644 --- a/Assets/Scripts/Core/GameManager.cs +++ b/Assets/Scripts/Core/GameManager.cs @@ -21,6 +21,7 @@ public class GameManager : MonoBehaviour public MusicManager musicManager; public Player player; public GameObject[] pickups; + public AudioSource enemyConsumedSfx; [Header("Timing")] public float pickupDelay; @@ -57,6 +58,10 @@ public class GameManager : MonoBehaviour public void StartWave() { + + //increase player speed + player.speed += player.speedIncrease; + if (wave >= waves.Count) { wave = 0; @@ -84,7 +89,10 @@ public class GameManager : MonoBehaviour Vector3 spawnPos = new Vector3(spawnX, player.gameObject.transform.position.y, spawnZ); - GameObject obj = Instantiate(currentWave.enemies[i].gameObject, spawnPos, Quaternion.identity, enemyHolder.transform); + //vector3 to quaternion + Quaternion spawnRot = Quaternion.Euler(90, 0, 0); + + GameObject obj = Instantiate(currentWave.enemies[i].gameObject, spawnPos, spawnRot, enemyHolder.transform); obj.SetActive(true); } } @@ -95,6 +103,8 @@ public class GameManager : MonoBehaviour enemiesConsumed++; IncrementScore(10, multiplier); + //play enemy consumed sound + enemyConsumedSfx.Play(); if (enemiesConsumed == currentWave.enemies.Count) { diff --git a/Assets/Scripts/Core/MusicManager.cs b/Assets/Scripts/Core/MusicManager.cs index 0f1ce5e..1c9f273 100644 --- a/Assets/Scripts/Core/MusicManager.cs +++ b/Assets/Scripts/Core/MusicManager.cs @@ -4,15 +4,34 @@ using UnityEngine; public class MusicManager : MonoBehaviour { + + public AudioClip[] tracks; + public AudioClip highTensionClip; + public int currentTrack = 0; + public Player player; // Start is called before the first frame update void Start() { - + player = GameObject.FindGameObjectWithTag("Player").GetComponent(); } + // Update is called once per frame void Update() { - + //if track is finished play next track + if (!GetComponent().isPlaying) + { + GetComponent().clip = tracks[currentTrack]; + GetComponent().Play(); + currentTrack = (currentTrack + 1) % tracks.Length -1; + } + + if (player.health <= 15 && GetComponent().clip != highTensionClip) + { + GetComponent().clip = highTensionClip; + GetComponent().Play(); + GetComponent().loop = true; + } } } diff --git a/Assets/Sfx.meta b/Assets/Sfx.meta new file mode 100644 index 0000000..53b63b7 --- /dev/null +++ b/Assets/Sfx.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6df23f938a65b474eb02c77256d05ce5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sfx/Music.meta b/Assets/Sfx/Music.meta new file mode 100644 index 0000000..31c7a77 --- /dev/null +++ b/Assets/Sfx/Music.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d106326b060814b42abd9bad3ee96897 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sfx/Music/388101__furbyguy__90-s-game-loop.wav b/Assets/Sfx/Music/388101__furbyguy__90-s-game-loop.wav new file mode 100644 index 0000000..169e952 --- /dev/null +++ b/Assets/Sfx/Music/388101__furbyguy__90-s-game-loop.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:988640ad9fb02aedc9dd11eb18f168007d869909dda9324eae424bf93e81376b +size 1815130 diff --git a/Assets/Sfx/Music/388101__furbyguy__90-s-game-loop.wav.meta b/Assets/Sfx/Music/388101__furbyguy__90-s-game-loop.wav.meta new file mode 100644 index 0000000..81cd267 --- /dev/null +++ b/Assets/Sfx/Music/388101__furbyguy__90-s-game-loop.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 7ed48555d2396e944ad0c62c157c559c +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/Sfx/Music/mezhdunami-flashes-95436.mp3 b/Assets/Sfx/Music/mezhdunami-flashes-95436.mp3 new file mode 100644 index 0000000..d1246d4 --- /dev/null +++ b/Assets/Sfx/Music/mezhdunami-flashes-95436.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:00b65f37044b4d093b750e3524b1367c4c043fce5d4f1f26940805941fc97073 +size 5854772 diff --git a/Assets/Sfx/Music/mezhdunami-flashes-95436.mp3.meta b/Assets/Sfx/Music/mezhdunami-flashes-95436.mp3.meta new file mode 100644 index 0000000..2127ec1 --- /dev/null +++ b/Assets/Sfx/Music/mezhdunami-flashes-95436.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 87bfa63b91a7cd6428d3b6da059e8af7 +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/Sfx/Music/neon-dreams-vice-city-theme--8681.mp3 b/Assets/Sfx/Music/neon-dreams-vice-city-theme--8681.mp3 new file mode 100644 index 0000000..f8c2260 --- /dev/null +++ b/Assets/Sfx/Music/neon-dreams-vice-city-theme--8681.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e3023d766d0c521215e3f4fd086ca87661feae149e8b75b3c50097efd46e080c +size 4392751 diff --git a/Assets/Sfx/Music/neon-dreams-vice-city-theme--8681.mp3.meta b/Assets/Sfx/Music/neon-dreams-vice-city-theme--8681.mp3.meta new file mode 100644 index 0000000..b5ecaa6 --- /dev/null +++ b/Assets/Sfx/Music/neon-dreams-vice-city-theme--8681.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: f171d586b43ad8140912defda8b14bfd +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/Sfx/Powerup7.bfxrsound b/Assets/Sfx/Powerup7.bfxrsound new file mode 100644 index 0000000..09bdefa --- /dev/null +++ b/Assets/Sfx/Powerup7.bfxrsound @@ -0,0 +1 @@ +2,0.5,,0.0974,,0.39,0.3,0.2525,,0.2285,,,,,,,,,,,0.164,,,,,1,,,,,,,masterVolume \ No newline at end of file diff --git a/Assets/Sfx/Powerup7.bfxrsound.meta b/Assets/Sfx/Powerup7.bfxrsound.meta new file mode 100644 index 0000000..83809ab --- /dev/null +++ b/Assets/Sfx/Powerup7.bfxrsound.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3a6449c2206cb1e4488a5dd34ab7ead1 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sfx/Powerup7.wav b/Assets/Sfx/Powerup7.wav new file mode 100644 index 0000000..d3079d6 --- /dev/null +++ b/Assets/Sfx/Powerup7.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6128d258b97c1d8820541563312d52a1349c3c6f31cdfad52fcb53836266cfc8 +size 36396 diff --git a/Assets/Sfx/Powerup7.wav.meta b/Assets/Sfx/Powerup7.wav.meta new file mode 100644 index 0000000..14c35eb --- /dev/null +++ b/Assets/Sfx/Powerup7.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 96df4f90a33ad024faa7e8b26b155604 +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/Sfx/brrrp b/Assets/Sfx/brrrp new file mode 100644 index 0000000..ff40f14 Binary files /dev/null and b/Assets/Sfx/brrrp differ diff --git a/Assets/Sfx/brrrp.meta b/Assets/Sfx/brrrp.meta new file mode 100644 index 0000000..e0fb41f --- /dev/null +++ b/Assets/Sfx/brrrp.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ad3554c84308c394bab105d1474f2d3e +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sfx/pos.wav b/Assets/Sfx/pos.wav new file mode 100644 index 0000000..fe1716d --- /dev/null +++ b/Assets/Sfx/pos.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:820e4707741dfbc4c5445a0bc574fefffa6894412cee6ecb08f40a82e342e2c5 +size 389684 diff --git a/Assets/Sfx/pos.wav.meta b/Assets/Sfx/pos.wav.meta new file mode 100644 index 0000000..7575712 --- /dev/null +++ b/Assets/Sfx/pos.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: ea034a309d81f3241955cb8cc7525dc0 +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: