From 9f6e615653ee76159c11061b2e7d66467c9b78ed Mon Sep 17 00:00:00 2001 From: ntr Date: Wed, 27 Sep 2023 01:34:36 +1000 Subject: [PATCH] we poppin --- Assets/Audio/Boost-1.wav | 3 - Assets/Audio/Boost-2.wav | 3 - Assets/Audio/Noise.meta | 8 + Assets/Audio/Noise/01.meta | 8 + Assets/Audio/Noise/01/1.BIG.wav | 3 + .../01/1.BIG.wav.meta} | 2 +- Assets/Audio/Noise/01/10.wav | 3 + .../01/10.wav.meta} | 2 +- Assets/Audio/Noise/01/11.wav | 3 + .../01/11.wav.meta} | 2 +- Assets/Audio/Noise/01/12.wav | 3 + Assets/Audio/Noise/01/12.wav.meta | 23 +++ Assets/Audio/Noise/01/13.wav | 3 + Assets/Audio/Noise/01/13.wav.meta | 23 +++ Assets/Audio/Noise/01/14.wav | 3 + Assets/Audio/Noise/01/14.wav.meta | 23 +++ Assets/Audio/Noise/01/2.wav | 3 + Assets/Audio/Noise/01/2.wav.meta | 23 +++ Assets/Audio/Noise/01/3.wav | 3 + Assets/Audio/Noise/01/3.wav.meta | 23 +++ Assets/Audio/Noise/01/4.wav | 3 + Assets/Audio/Noise/01/4.wav.meta | 23 +++ Assets/Audio/Noise/01/5.wav | 3 + Assets/Audio/Noise/01/5.wav.meta | 23 +++ Assets/Audio/Noise/01/6.wav | 3 + Assets/Audio/Noise/01/6.wav.meta | 23 +++ Assets/Audio/Noise/01/7.wav | 3 + Assets/Audio/Noise/01/7.wav.meta | 23 +++ Assets/Audio/Noise/01/8.wav | 3 + Assets/Audio/Noise/01/8.wav.meta | 23 +++ Assets/Audio/Noise/01/9.wav | 3 + Assets/Audio/Noise/01/9.wav.meta | 23 +++ Assets/Audio/Noise/02.meta | 8 + Assets/Audio/Noise/02/16.wav | 3 + Assets/Audio/Noise/02/16.wav.meta | 23 +++ Assets/Audio/Noise/07.meta | 8 + Assets/Audio/Noise/07/0.wav | 3 + Assets/Audio/Noise/07/0.wav.meta | 23 +++ Assets/Audio/Noise/07/1.wav | 3 + Assets/Audio/Noise/07/1.wav.meta | 23 +++ Assets/Audio/Noise/07/10.wav | 3 + Assets/Audio/Noise/07/10.wav.meta | 23 +++ Assets/Audio/Noise/07/11.wav | 3 + Assets/Audio/Noise/07/11.wav.meta | 23 +++ Assets/Audio/Noise/07/12.wav | 3 + Assets/Audio/Noise/07/12.wav.meta | 23 +++ Assets/Audio/Noise/07/13.wav | 3 + Assets/Audio/Noise/07/13.wav.meta | 23 +++ Assets/Audio/Noise/07/14.wav | 3 + Assets/Audio/Noise/07/14.wav.meta | 23 +++ Assets/Audio/Noise/07/15.wav | 3 + Assets/Audio/Noise/07/15.wav.meta | 23 +++ Assets/Audio/Noise/07/16.wav | 3 + Assets/Audio/Noise/07/16.wav.meta | 23 +++ Assets/Audio/Noise/07/17.wav | 3 + Assets/Audio/Noise/07/17.wav.meta | 23 +++ Assets/Audio/Noise/07/2.wav | 3 + Assets/Audio/Noise/07/2.wav.meta | 23 +++ Assets/Audio/Noise/07/3.wav | 3 + Assets/Audio/Noise/07/3.wav.meta | 23 +++ Assets/Audio/Noise/07/4.wav | 3 + Assets/Audio/Noise/07/4.wav.meta | 23 +++ Assets/Audio/Noise/07/5.wav | 3 + Assets/Audio/Noise/07/5.wav.meta | 23 +++ Assets/Audio/Noise/07/6.wav | 3 + Assets/Audio/Noise/07/6.wav.meta | 23 +++ Assets/Audio/Noise/07/7.wav | 3 + Assets/Audio/Noise/07/7.wav.meta | 23 +++ Assets/Audio/Noise/07/8.wav | 3 + Assets/Audio/Noise/07/8.wav.meta | 23 +++ Assets/Audio/Noise/07/9.wav | 3 + Assets/Audio/Noise/07/9.wav.meta | 23 +++ ...ccelerate.wav => PowerUnit.Accelerate.wav} | 0 ...wav.meta => PowerUnit.Accelerate.wav.meta} | 0 ...ecelerate.wav => PowerUnit.Decelerate.wav} | 0 ...wav.meta => PowerUnit.Decelerate.wav.meta} | 0 .../{Strafe.wav => PowerUnit.Strafe.wav} | 0 ...afe.wav.meta => PowerUnit.Strafe.wav.meta} | 0 Assets/Audio/ZTCT_Clap_24 R.wav | 3 - Assets/Prefabs/Ship/Ship.prefab | 53 +++++-- Assets/Scenes/sr_pascal.unity | 21 ++- Assets/Scenes/sr_silverstorage.unity | 35 ++-- Assets/Src/PowerUnit.cs | 11 +- Assets/Src/ShipAudio.cs | 150 ++++++------------ Assets/Src/ShipControls.cs | 17 +- Assets/Src/Timing.cs | 7 + Assets/Src/UI/MenuControls.cs | 1 + TODO.md | 18 ++- 88 files changed, 979 insertions(+), 170 deletions(-) delete mode 100755 Assets/Audio/Boost-1.wav delete mode 100755 Assets/Audio/Boost-2.wav create mode 100755 Assets/Audio/Noise.meta create mode 100755 Assets/Audio/Noise/01.meta create mode 100755 Assets/Audio/Noise/01/1.BIG.wav rename Assets/Audio/{ZTCT_Clap_24 R.wav.meta => Noise/01/1.BIG.wav.meta} (91%) create mode 100755 Assets/Audio/Noise/01/10.wav rename Assets/Audio/{Boost-1.wav.meta => Noise/01/10.wav.meta} (91%) create mode 100755 Assets/Audio/Noise/01/11.wav rename Assets/Audio/{Boost-2.wav.meta => Noise/01/11.wav.meta} (91%) create mode 100755 Assets/Audio/Noise/01/12.wav create mode 100755 Assets/Audio/Noise/01/12.wav.meta create mode 100755 Assets/Audio/Noise/01/13.wav create mode 100755 Assets/Audio/Noise/01/13.wav.meta create mode 100755 Assets/Audio/Noise/01/14.wav create mode 100755 Assets/Audio/Noise/01/14.wav.meta create mode 100755 Assets/Audio/Noise/01/2.wav create mode 100755 Assets/Audio/Noise/01/2.wav.meta create mode 100755 Assets/Audio/Noise/01/3.wav create mode 100755 Assets/Audio/Noise/01/3.wav.meta create mode 100755 Assets/Audio/Noise/01/4.wav create mode 100755 Assets/Audio/Noise/01/4.wav.meta create mode 100755 Assets/Audio/Noise/01/5.wav create mode 100755 Assets/Audio/Noise/01/5.wav.meta create mode 100755 Assets/Audio/Noise/01/6.wav create mode 100755 Assets/Audio/Noise/01/6.wav.meta create mode 100755 Assets/Audio/Noise/01/7.wav create mode 100755 Assets/Audio/Noise/01/7.wav.meta create mode 100755 Assets/Audio/Noise/01/8.wav create mode 100755 Assets/Audio/Noise/01/8.wav.meta create mode 100755 Assets/Audio/Noise/01/9.wav create mode 100755 Assets/Audio/Noise/01/9.wav.meta create mode 100755 Assets/Audio/Noise/02.meta create mode 100755 Assets/Audio/Noise/02/16.wav create mode 100755 Assets/Audio/Noise/02/16.wav.meta create mode 100755 Assets/Audio/Noise/07.meta create mode 100755 Assets/Audio/Noise/07/0.wav create mode 100755 Assets/Audio/Noise/07/0.wav.meta create mode 100755 Assets/Audio/Noise/07/1.wav create mode 100755 Assets/Audio/Noise/07/1.wav.meta create mode 100755 Assets/Audio/Noise/07/10.wav create mode 100755 Assets/Audio/Noise/07/10.wav.meta create mode 100755 Assets/Audio/Noise/07/11.wav create mode 100755 Assets/Audio/Noise/07/11.wav.meta create mode 100755 Assets/Audio/Noise/07/12.wav create mode 100755 Assets/Audio/Noise/07/12.wav.meta create mode 100755 Assets/Audio/Noise/07/13.wav create mode 100755 Assets/Audio/Noise/07/13.wav.meta create mode 100755 Assets/Audio/Noise/07/14.wav create mode 100755 Assets/Audio/Noise/07/14.wav.meta create mode 100755 Assets/Audio/Noise/07/15.wav create mode 100755 Assets/Audio/Noise/07/15.wav.meta create mode 100755 Assets/Audio/Noise/07/16.wav create mode 100755 Assets/Audio/Noise/07/16.wav.meta create mode 100755 Assets/Audio/Noise/07/17.wav create mode 100755 Assets/Audio/Noise/07/17.wav.meta create mode 100755 Assets/Audio/Noise/07/2.wav create mode 100755 Assets/Audio/Noise/07/2.wav.meta create mode 100755 Assets/Audio/Noise/07/3.wav create mode 100755 Assets/Audio/Noise/07/3.wav.meta create mode 100755 Assets/Audio/Noise/07/4.wav create mode 100755 Assets/Audio/Noise/07/4.wav.meta create mode 100755 Assets/Audio/Noise/07/5.wav create mode 100755 Assets/Audio/Noise/07/5.wav.meta create mode 100755 Assets/Audio/Noise/07/6.wav create mode 100755 Assets/Audio/Noise/07/6.wav.meta create mode 100755 Assets/Audio/Noise/07/7.wav create mode 100755 Assets/Audio/Noise/07/7.wav.meta create mode 100755 Assets/Audio/Noise/07/8.wav create mode 100755 Assets/Audio/Noise/07/8.wav.meta create mode 100755 Assets/Audio/Noise/07/9.wav create mode 100755 Assets/Audio/Noise/07/9.wav.meta rename Assets/Audio/{Accelerate.wav => PowerUnit.Accelerate.wav} (100%) rename Assets/Audio/{Accelerate.wav.meta => PowerUnit.Accelerate.wav.meta} (100%) rename Assets/Audio/{Decelerate.wav => PowerUnit.Decelerate.wav} (100%) rename Assets/Audio/{Decelerate.wav.meta => PowerUnit.Decelerate.wav.meta} (100%) rename Assets/Audio/{Strafe.wav => PowerUnit.Strafe.wav} (100%) rename Assets/Audio/{Strafe.wav.meta => PowerUnit.Strafe.wav.meta} (100%) delete mode 100755 Assets/Audio/ZTCT_Clap_24 R.wav diff --git a/Assets/Audio/Boost-1.wav b/Assets/Audio/Boost-1.wav deleted file mode 100755 index af4d2d5..0000000 --- a/Assets/Audio/Boost-1.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:17663071d7867c318e6f2d1494094b798436399e7e2b7443264030ad893e1dfb -size 1411244 diff --git a/Assets/Audio/Boost-2.wav b/Assets/Audio/Boost-2.wav deleted file mode 100755 index 1a535ac..0000000 --- a/Assets/Audio/Boost-2.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d7659663580bba8c49e12f2193626a34f8d40864249a51fc0539c74edfb44c66 -size 1411244 diff --git a/Assets/Audio/Noise.meta b/Assets/Audio/Noise.meta new file mode 100755 index 0000000..cd05cb5 --- /dev/null +++ b/Assets/Audio/Noise.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5d7a9b3e791f03741b3f274c2dd078a8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/01.meta b/Assets/Audio/Noise/01.meta new file mode 100755 index 0000000..ace773c --- /dev/null +++ b/Assets/Audio/Noise/01.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d2158f8f18d19cf48a507472c3707172 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/01/1.BIG.wav b/Assets/Audio/Noise/01/1.BIG.wav new file mode 100755 index 0000000..7c33eb8 --- /dev/null +++ b/Assets/Audio/Noise/01/1.BIG.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:624b259643a9d67b3de386440812427e06ab31ae7389f62d9a08d5a74a266b8e +size 705644 diff --git a/Assets/Audio/ZTCT_Clap_24 R.wav.meta b/Assets/Audio/Noise/01/1.BIG.wav.meta similarity index 91% rename from Assets/Audio/ZTCT_Clap_24 R.wav.meta rename to Assets/Audio/Noise/01/1.BIG.wav.meta index 17c0cb9..a661a27 100755 --- a/Assets/Audio/ZTCT_Clap_24 R.wav.meta +++ b/Assets/Audio/Noise/01/1.BIG.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 62a5d2dd32e500a4fbb1d247c09bed24 +guid: c52fc17ffbb62644c88b20980a6246d7 AudioImporter: externalObjects: {} serializedVersion: 7 diff --git a/Assets/Audio/Noise/01/10.wav b/Assets/Audio/Noise/01/10.wav new file mode 100755 index 0000000..8ad3e62 --- /dev/null +++ b/Assets/Audio/Noise/01/10.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:425cb7383ed9a476695cfe5d6d585a67d275c159657c32128d46c0f1bb62d444 +size 705644 diff --git a/Assets/Audio/Boost-1.wav.meta b/Assets/Audio/Noise/01/10.wav.meta similarity index 91% rename from Assets/Audio/Boost-1.wav.meta rename to Assets/Audio/Noise/01/10.wav.meta index 44b9deb..270f15b 100755 --- a/Assets/Audio/Boost-1.wav.meta +++ b/Assets/Audio/Noise/01/10.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f5e946c296766694b97892f7386e533e +guid: fb6b7c1f2ddcfa5419fdf904f58ec1bf AudioImporter: externalObjects: {} serializedVersion: 7 diff --git a/Assets/Audio/Noise/01/11.wav b/Assets/Audio/Noise/01/11.wav new file mode 100755 index 0000000..152e653 --- /dev/null +++ b/Assets/Audio/Noise/01/11.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ab4e84e7da12b78e2a6a4378bdbe11410b286052ad6c94a28255bfe3f3cbf246 +size 705644 diff --git a/Assets/Audio/Boost-2.wav.meta b/Assets/Audio/Noise/01/11.wav.meta similarity index 91% rename from Assets/Audio/Boost-2.wav.meta rename to Assets/Audio/Noise/01/11.wav.meta index 5c77e7d..23547e8 100755 --- a/Assets/Audio/Boost-2.wav.meta +++ b/Assets/Audio/Noise/01/11.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4ba402be6dacb3340a1c791560c97b97 +guid: 3a2e4df8d17fd2b4a83afa676a843344 AudioImporter: externalObjects: {} serializedVersion: 7 diff --git a/Assets/Audio/Noise/01/12.wav b/Assets/Audio/Noise/01/12.wav new file mode 100755 index 0000000..9acb125 --- /dev/null +++ b/Assets/Audio/Noise/01/12.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:75d6f8d072471908c433f8b82a94ac1ece41e69838d3d55fb57d3037b5edafae +size 705644 diff --git a/Assets/Audio/Noise/01/12.wav.meta b/Assets/Audio/Noise/01/12.wav.meta new file mode 100755 index 0000000..a38fae0 --- /dev/null +++ b/Assets/Audio/Noise/01/12.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: f583924dc9b327e4cae85a01bcac9fbb +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/01/13.wav b/Assets/Audio/Noise/01/13.wav new file mode 100755 index 0000000..4b1fc35 --- /dev/null +++ b/Assets/Audio/Noise/01/13.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:67b6694ac2c11df52e9655882d6d5f0c829fc6688950237f8446151117c352cb +size 705644 diff --git a/Assets/Audio/Noise/01/13.wav.meta b/Assets/Audio/Noise/01/13.wav.meta new file mode 100755 index 0000000..d2b694a --- /dev/null +++ b/Assets/Audio/Noise/01/13.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 52c705ef6868d2f428af01b1cba8b467 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/01/14.wav b/Assets/Audio/Noise/01/14.wav new file mode 100755 index 0000000..503ee52 --- /dev/null +++ b/Assets/Audio/Noise/01/14.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7897b1500869cd349f21de9460a2f74393d85d8c05bbdd69f08a5179aad9053e +size 705644 diff --git a/Assets/Audio/Noise/01/14.wav.meta b/Assets/Audio/Noise/01/14.wav.meta new file mode 100755 index 0000000..307fb95 --- /dev/null +++ b/Assets/Audio/Noise/01/14.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 4e3236145e30dfc408fb66aad5be6784 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/01/2.wav b/Assets/Audio/Noise/01/2.wav new file mode 100755 index 0000000..ee65967 --- /dev/null +++ b/Assets/Audio/Noise/01/2.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d6c3a42095820e4331d6de53a84703e55f5a699197100b8bb2cf894ccc586058 +size 705644 diff --git a/Assets/Audio/Noise/01/2.wav.meta b/Assets/Audio/Noise/01/2.wav.meta new file mode 100755 index 0000000..687c92d --- /dev/null +++ b/Assets/Audio/Noise/01/2.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 0ed6ecab922275046bd752b40dd51ef3 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/01/3.wav b/Assets/Audio/Noise/01/3.wav new file mode 100755 index 0000000..0ac47f4 --- /dev/null +++ b/Assets/Audio/Noise/01/3.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:80cc6e0c3ad127ddeae4f348e3c8b7533fc4ea20431218e561e95fa93a2c5667 +size 705644 diff --git a/Assets/Audio/Noise/01/3.wav.meta b/Assets/Audio/Noise/01/3.wav.meta new file mode 100755 index 0000000..47a5bc8 --- /dev/null +++ b/Assets/Audio/Noise/01/3.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 45f55665bcea07d4390cd6b59f8ca6fa +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/01/4.wav b/Assets/Audio/Noise/01/4.wav new file mode 100755 index 0000000..97d5a67 --- /dev/null +++ b/Assets/Audio/Noise/01/4.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:086742cf73b29c44590b6179acbe8296f4e879b6bcb2473d5f77a2eceee1d4a6 +size 705644 diff --git a/Assets/Audio/Noise/01/4.wav.meta b/Assets/Audio/Noise/01/4.wav.meta new file mode 100755 index 0000000..6abbb82 --- /dev/null +++ b/Assets/Audio/Noise/01/4.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 63478e3e2acdf794ea501d3eab9bb7a2 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/01/5.wav b/Assets/Audio/Noise/01/5.wav new file mode 100755 index 0000000..04946d9 --- /dev/null +++ b/Assets/Audio/Noise/01/5.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fcbb5dbcc428a462a5e77e7f0f6c82cfc8a8e8b312ae835b8f987984b68a6b1f +size 705644 diff --git a/Assets/Audio/Noise/01/5.wav.meta b/Assets/Audio/Noise/01/5.wav.meta new file mode 100755 index 0000000..9f11627 --- /dev/null +++ b/Assets/Audio/Noise/01/5.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: d2ea8fc23ab87bc4cb3789939efcf439 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/01/6.wav b/Assets/Audio/Noise/01/6.wav new file mode 100755 index 0000000..c12c57d --- /dev/null +++ b/Assets/Audio/Noise/01/6.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1b6e505426b8043b52f0c4ddbeb7fdf54f34d986dfeb4f0714161f025f6476c4 +size 705644 diff --git a/Assets/Audio/Noise/01/6.wav.meta b/Assets/Audio/Noise/01/6.wav.meta new file mode 100755 index 0000000..39ca119 --- /dev/null +++ b/Assets/Audio/Noise/01/6.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 4545f08003ebef14f8734a8872612e21 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/01/7.wav b/Assets/Audio/Noise/01/7.wav new file mode 100755 index 0000000..87a48c8 --- /dev/null +++ b/Assets/Audio/Noise/01/7.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ccb683ca86496de33d7b12c52a8632a5e2eb80e1a2117e6b09931a79a8d42f64 +size 705644 diff --git a/Assets/Audio/Noise/01/7.wav.meta b/Assets/Audio/Noise/01/7.wav.meta new file mode 100755 index 0000000..2d3e34d --- /dev/null +++ b/Assets/Audio/Noise/01/7.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: a38b77da486de4e40b024459b4a92a8a +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/01/8.wav b/Assets/Audio/Noise/01/8.wav new file mode 100755 index 0000000..5c8d590 --- /dev/null +++ b/Assets/Audio/Noise/01/8.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:977693f34bd61bb0f943901b95799d5304c4ac61d8e152835063b296663ed539 +size 705644 diff --git a/Assets/Audio/Noise/01/8.wav.meta b/Assets/Audio/Noise/01/8.wav.meta new file mode 100755 index 0000000..8c73be4 --- /dev/null +++ b/Assets/Audio/Noise/01/8.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 32199418c77542547b4b46a7fcc6f218 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/01/9.wav b/Assets/Audio/Noise/01/9.wav new file mode 100755 index 0000000..7affa86 --- /dev/null +++ b/Assets/Audio/Noise/01/9.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a4fed348af693d6de90cfa82b8723cb4f4d2c3d7ba8e42ba9bb347976aa3b906 +size 705644 diff --git a/Assets/Audio/Noise/01/9.wav.meta b/Assets/Audio/Noise/01/9.wav.meta new file mode 100755 index 0000000..b26f6f4 --- /dev/null +++ b/Assets/Audio/Noise/01/9.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: e66117d9890e0804b95f62379c8d53bf +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/02.meta b/Assets/Audio/Noise/02.meta new file mode 100755 index 0000000..d2a3749 --- /dev/null +++ b/Assets/Audio/Noise/02.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7db28024917df8843805d13e839bd7f0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/02/16.wav b/Assets/Audio/Noise/02/16.wav new file mode 100755 index 0000000..08b5ee0 --- /dev/null +++ b/Assets/Audio/Noise/02/16.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c7b658307096818dd916f35c0b74fc791098795bb9fb13c4d8dd8fa54e540a9 +size 705644 diff --git a/Assets/Audio/Noise/02/16.wav.meta b/Assets/Audio/Noise/02/16.wav.meta new file mode 100755 index 0000000..d4c90c9 --- /dev/null +++ b/Assets/Audio/Noise/02/16.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 71d125ff384d86a4fb44b6942b74306d +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/07.meta b/Assets/Audio/Noise/07.meta new file mode 100755 index 0000000..ba63168 --- /dev/null +++ b/Assets/Audio/Noise/07.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 00c2ca68da5a0ff499091c78c9d8d844 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/07/0.wav b/Assets/Audio/Noise/07/0.wav new file mode 100755 index 0000000..7e4d647 --- /dev/null +++ b/Assets/Audio/Noise/07/0.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2563808b5ad1f93d684a9bb817e800f679684dc6beb6da865c843259a0185287 +size 705644 diff --git a/Assets/Audio/Noise/07/0.wav.meta b/Assets/Audio/Noise/07/0.wav.meta new file mode 100755 index 0000000..96ab20f --- /dev/null +++ b/Assets/Audio/Noise/07/0.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 95082891fb63e274abda1ad451ffe39f +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/07/1.wav b/Assets/Audio/Noise/07/1.wav new file mode 100755 index 0000000..55705d7 --- /dev/null +++ b/Assets/Audio/Noise/07/1.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8fb33c91bb8572f12ac7f2e0bad5fa889b96b6f062468d07103c66f5db3538f0 +size 705644 diff --git a/Assets/Audio/Noise/07/1.wav.meta b/Assets/Audio/Noise/07/1.wav.meta new file mode 100755 index 0000000..e72bdcc --- /dev/null +++ b/Assets/Audio/Noise/07/1.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: d6ffb0204d35fb04daa131fb572a72cb +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/07/10.wav b/Assets/Audio/Noise/07/10.wav new file mode 100755 index 0000000..063bbc4 --- /dev/null +++ b/Assets/Audio/Noise/07/10.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d95c26eaf0b68a62eaeab758b838646bcf3a0be701f03b24b8d48f7d1c95acdc +size 705644 diff --git a/Assets/Audio/Noise/07/10.wav.meta b/Assets/Audio/Noise/07/10.wav.meta new file mode 100755 index 0000000..22d967b --- /dev/null +++ b/Assets/Audio/Noise/07/10.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: fc5640ccfc4aab24b83ff89a7ab4348e +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/07/11.wav b/Assets/Audio/Noise/07/11.wav new file mode 100755 index 0000000..a39b93a --- /dev/null +++ b/Assets/Audio/Noise/07/11.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5696336aae456156ffde9154f682796d8fd43c9fdd92803d22f3288acf1139da +size 705644 diff --git a/Assets/Audio/Noise/07/11.wav.meta b/Assets/Audio/Noise/07/11.wav.meta new file mode 100755 index 0000000..6124ffe --- /dev/null +++ b/Assets/Audio/Noise/07/11.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: c0bedc4d9738b4a4ab6459177c080265 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/07/12.wav b/Assets/Audio/Noise/07/12.wav new file mode 100755 index 0000000..21b90d3 --- /dev/null +++ b/Assets/Audio/Noise/07/12.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0050060f880b18cedaa30895ea69a4b0eb701a9fa79a070ebcf1b81bfeffb174 +size 705644 diff --git a/Assets/Audio/Noise/07/12.wav.meta b/Assets/Audio/Noise/07/12.wav.meta new file mode 100755 index 0000000..f9f76f6 --- /dev/null +++ b/Assets/Audio/Noise/07/12.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: b9e6166ef51af684daaecef0a60f1a7d +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/07/13.wav b/Assets/Audio/Noise/07/13.wav new file mode 100755 index 0000000..ed55bcc --- /dev/null +++ b/Assets/Audio/Noise/07/13.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4b9a97183c3f3f57b145bcf99808f1be2bf3a824fd23e3481c5dfc1b101ec9b +size 705644 diff --git a/Assets/Audio/Noise/07/13.wav.meta b/Assets/Audio/Noise/07/13.wav.meta new file mode 100755 index 0000000..32f2578 --- /dev/null +++ b/Assets/Audio/Noise/07/13.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: e03e3e2d19a1c944b96467bdca7c5229 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/07/14.wav b/Assets/Audio/Noise/07/14.wav new file mode 100755 index 0000000..d8ddf66 --- /dev/null +++ b/Assets/Audio/Noise/07/14.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ff53c0ee94e6f109a74120cd54743ab9302ffe5b10c1c8f66a459518dd563e0 +size 705644 diff --git a/Assets/Audio/Noise/07/14.wav.meta b/Assets/Audio/Noise/07/14.wav.meta new file mode 100755 index 0000000..c0a2688 --- /dev/null +++ b/Assets/Audio/Noise/07/14.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: f3b05da298ab5184ea638320bafc3e7d +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/07/15.wav b/Assets/Audio/Noise/07/15.wav new file mode 100755 index 0000000..946e483 --- /dev/null +++ b/Assets/Audio/Noise/07/15.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:02ba5368aa6961436308c1ef1077b20669764e51f916c7ed34b9f69bcaedd25e +size 705644 diff --git a/Assets/Audio/Noise/07/15.wav.meta b/Assets/Audio/Noise/07/15.wav.meta new file mode 100755 index 0000000..7833da0 --- /dev/null +++ b/Assets/Audio/Noise/07/15.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 3b48017148865ce4f913ff5538760f68 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/07/16.wav b/Assets/Audio/Noise/07/16.wav new file mode 100755 index 0000000..0afe9e3 --- /dev/null +++ b/Assets/Audio/Noise/07/16.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fb3d409290e823280a17fa4180b5ba47eb32eb32c3d5bbcaab24e283f2d7f900 +size 705644 diff --git a/Assets/Audio/Noise/07/16.wav.meta b/Assets/Audio/Noise/07/16.wav.meta new file mode 100755 index 0000000..34b61cf --- /dev/null +++ b/Assets/Audio/Noise/07/16.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: f5b1a57155bed7a45b2f35c4be2b5219 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/07/17.wav b/Assets/Audio/Noise/07/17.wav new file mode 100755 index 0000000..f40b2c4 --- /dev/null +++ b/Assets/Audio/Noise/07/17.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e1cf2e8d3d456bd13876d8188ef0c14ad88463418de8b3295cc3068a7a4afd96 +size 705644 diff --git a/Assets/Audio/Noise/07/17.wav.meta b/Assets/Audio/Noise/07/17.wav.meta new file mode 100755 index 0000000..ae4746e --- /dev/null +++ b/Assets/Audio/Noise/07/17.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: b1543c3d498188c4b8dabd083d1943f1 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/07/2.wav b/Assets/Audio/Noise/07/2.wav new file mode 100755 index 0000000..8107390 --- /dev/null +++ b/Assets/Audio/Noise/07/2.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c04715a76c5c627e029a1f0d6b3c18249c32cc8e727036624ac61abec791d33 +size 705644 diff --git a/Assets/Audio/Noise/07/2.wav.meta b/Assets/Audio/Noise/07/2.wav.meta new file mode 100755 index 0000000..4a9994e --- /dev/null +++ b/Assets/Audio/Noise/07/2.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 28f5a0ee7f0629f4ab87f4b57c992f79 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/07/3.wav b/Assets/Audio/Noise/07/3.wav new file mode 100755 index 0000000..a1611cb --- /dev/null +++ b/Assets/Audio/Noise/07/3.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e10810fa0962071fe6954d9663b210af9a2684e61261bde9081267c9ae73e28f +size 705644 diff --git a/Assets/Audio/Noise/07/3.wav.meta b/Assets/Audio/Noise/07/3.wav.meta new file mode 100755 index 0000000..77bfea7 --- /dev/null +++ b/Assets/Audio/Noise/07/3.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 2b849e93bc97aaf4da970fc6d59495ef +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/07/4.wav b/Assets/Audio/Noise/07/4.wav new file mode 100755 index 0000000..3c2373b --- /dev/null +++ b/Assets/Audio/Noise/07/4.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:58089d87b605f3b9e65eddf5d76e1c7362ccf52c95a42be26be6d2f390ba42c8 +size 705644 diff --git a/Assets/Audio/Noise/07/4.wav.meta b/Assets/Audio/Noise/07/4.wav.meta new file mode 100755 index 0000000..94eb27c --- /dev/null +++ b/Assets/Audio/Noise/07/4.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 25d81a68c24e55544a2187d435d99047 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/07/5.wav b/Assets/Audio/Noise/07/5.wav new file mode 100755 index 0000000..5756205 --- /dev/null +++ b/Assets/Audio/Noise/07/5.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f303ebe8a1b0d0793e8aca5c3df6aef7aae8c7bc3c4a70d242a3e37df8546741 +size 705644 diff --git a/Assets/Audio/Noise/07/5.wav.meta b/Assets/Audio/Noise/07/5.wav.meta new file mode 100755 index 0000000..c02abbf --- /dev/null +++ b/Assets/Audio/Noise/07/5.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: b11037c5d5643be4b8ba075972eceb13 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/07/6.wav b/Assets/Audio/Noise/07/6.wav new file mode 100755 index 0000000..d3163f3 --- /dev/null +++ b/Assets/Audio/Noise/07/6.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c6b260c5cb8699d91a21babfa8028ff6c19c06a1821e22a5abe62705e67f7510 +size 705644 diff --git a/Assets/Audio/Noise/07/6.wav.meta b/Assets/Audio/Noise/07/6.wav.meta new file mode 100755 index 0000000..16192d3 --- /dev/null +++ b/Assets/Audio/Noise/07/6.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 9a1266476578fad489d533b3ee050e33 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/07/7.wav b/Assets/Audio/Noise/07/7.wav new file mode 100755 index 0000000..1b32080 --- /dev/null +++ b/Assets/Audio/Noise/07/7.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d20e26a89e4c0ed0a00f12cda8554f67c2884e37a05aad4187cb3a17bb600c0 +size 705644 diff --git a/Assets/Audio/Noise/07/7.wav.meta b/Assets/Audio/Noise/07/7.wav.meta new file mode 100755 index 0000000..55c9b7c --- /dev/null +++ b/Assets/Audio/Noise/07/7.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: a8152d2c983b4e04baf801f14660818a +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/07/8.wav b/Assets/Audio/Noise/07/8.wav new file mode 100755 index 0000000..71dea01 --- /dev/null +++ b/Assets/Audio/Noise/07/8.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d3d25e6e05b65a60315dff0462eb823fd4179d14e9db2d58b0cd8d3df151b57d +size 705644 diff --git a/Assets/Audio/Noise/07/8.wav.meta b/Assets/Audio/Noise/07/8.wav.meta new file mode 100755 index 0000000..da7c73d --- /dev/null +++ b/Assets/Audio/Noise/07/8.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 4591aa6320e8be6429df59d5d46a0a4c +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Noise/07/9.wav b/Assets/Audio/Noise/07/9.wav new file mode 100755 index 0000000..b7b4c8a --- /dev/null +++ b/Assets/Audio/Noise/07/9.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c1fe455609c0e66b69cec9d1a89fdf89797be481138ba7268b3f03b90218f374 +size 705644 diff --git a/Assets/Audio/Noise/07/9.wav.meta b/Assets/Audio/Noise/07/9.wav.meta new file mode 100755 index 0000000..20a8d9d --- /dev/null +++ b/Assets/Audio/Noise/07/9.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 1229af9bd596d1f49bf5343790b2cda1 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Accelerate.wav b/Assets/Audio/PowerUnit.Accelerate.wav similarity index 100% rename from Assets/Audio/Accelerate.wav rename to Assets/Audio/PowerUnit.Accelerate.wav diff --git a/Assets/Audio/Accelerate.wav.meta b/Assets/Audio/PowerUnit.Accelerate.wav.meta similarity index 100% rename from Assets/Audio/Accelerate.wav.meta rename to Assets/Audio/PowerUnit.Accelerate.wav.meta diff --git a/Assets/Audio/Decelerate.wav b/Assets/Audio/PowerUnit.Decelerate.wav similarity index 100% rename from Assets/Audio/Decelerate.wav rename to Assets/Audio/PowerUnit.Decelerate.wav diff --git a/Assets/Audio/Decelerate.wav.meta b/Assets/Audio/PowerUnit.Decelerate.wav.meta similarity index 100% rename from Assets/Audio/Decelerate.wav.meta rename to Assets/Audio/PowerUnit.Decelerate.wav.meta diff --git a/Assets/Audio/Strafe.wav b/Assets/Audio/PowerUnit.Strafe.wav similarity index 100% rename from Assets/Audio/Strafe.wav rename to Assets/Audio/PowerUnit.Strafe.wav diff --git a/Assets/Audio/Strafe.wav.meta b/Assets/Audio/PowerUnit.Strafe.wav.meta similarity index 100% rename from Assets/Audio/Strafe.wav.meta rename to Assets/Audio/PowerUnit.Strafe.wav.meta diff --git a/Assets/Audio/ZTCT_Clap_24 R.wav b/Assets/Audio/ZTCT_Clap_24 R.wav deleted file mode 100755 index 2965fc8..0000000 --- a/Assets/Audio/ZTCT_Clap_24 R.wav +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ae8ae85123f665e87ba137d8c4bb3fdb13413202f0a9b5d65d6cc8cb36773a19 -size 252044 diff --git a/Assets/Prefabs/Ship/Ship.prefab b/Assets/Prefabs/Ship/Ship.prefab index e3d6668..98d56c1 100755 --- a/Assets/Prefabs/Ship/Ship.prefab +++ b/Assets/Prefabs/Ship/Ship.prefab @@ -229,8 +229,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7603488991399315273} - - component: {fileID: 2362953346451262734} - - component: {fileID: 6156246831092198731} + - component: {fileID: 2140192433735284883} m_Layer: 10 m_Name: Audio m_TagString: Untagged @@ -253,7 +252,7 @@ Transform: m_Children: [] m_Father: {fileID: 3589635702276405719} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2362953346451262734 +--- !u!114 &2140192433735284883 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -262,22 +261,48 @@ MonoBehaviour: m_GameObject: {fileID: 4508084525431060037} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9bcaa1cfcea9cae4bb92bdc96cfbb4d2, type: 3} + m_Script: {fileID: 11500000, guid: 566ffe93221add0489d9a9a01670b93a, type: 3} m_Name: m_EditorClassIdentifier: - soundNames: 020000000300000004000000 - clips: + powerUnitSounds: 020000000300000004000000 + powerUnitClips: - {fileID: 8300000, guid: 613e0b85af271854f9d89cb48db1445b, type: 3} - {fileID: 8300000, guid: 0384b39259118674781276c265b83dec, type: 3} - {fileID: 8300000, guid: b34b1ec00bb1ba643afcdc88ea960e06, type: 3} ---- !u!81 &6156246831092198731 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4508084525431060037} - m_Enabled: 1 + noiseClips: + - {fileID: 8300000, guid: c52fc17ffbb62644c88b20980a6246d7, type: 3} + - {fileID: 8300000, guid: 0ed6ecab922275046bd752b40dd51ef3, type: 3} + - {fileID: 8300000, guid: 45f55665bcea07d4390cd6b59f8ca6fa, type: 3} + - {fileID: 8300000, guid: 63478e3e2acdf794ea501d3eab9bb7a2, type: 3} + - {fileID: 8300000, guid: d2ea8fc23ab87bc4cb3789939efcf439, type: 3} + - {fileID: 8300000, guid: 4545f08003ebef14f8734a8872612e21, type: 3} + - {fileID: 8300000, guid: a38b77da486de4e40b024459b4a92a8a, type: 3} + - {fileID: 8300000, guid: 32199418c77542547b4b46a7fcc6f218, type: 3} + - {fileID: 8300000, guid: e66117d9890e0804b95f62379c8d53bf, type: 3} + - {fileID: 8300000, guid: fb6b7c1f2ddcfa5419fdf904f58ec1bf, type: 3} + - {fileID: 8300000, guid: 3a2e4df8d17fd2b4a83afa676a843344, type: 3} + - {fileID: 8300000, guid: f583924dc9b327e4cae85a01bcac9fbb, type: 3} + - {fileID: 8300000, guid: 52c705ef6868d2f428af01b1cba8b467, type: 3} + - {fileID: 8300000, guid: 4e3236145e30dfc408fb66aad5be6784, type: 3} + - {fileID: 8300000, guid: 95082891fb63e274abda1ad451ffe39f, type: 3} + - {fileID: 8300000, guid: d6ffb0204d35fb04daa131fb572a72cb, type: 3} + - {fileID: 8300000, guid: 28f5a0ee7f0629f4ab87f4b57c992f79, type: 3} + - {fileID: 8300000, guid: 2b849e93bc97aaf4da970fc6d59495ef, type: 3} + - {fileID: 8300000, guid: 25d81a68c24e55544a2187d435d99047, type: 3} + - {fileID: 8300000, guid: b11037c5d5643be4b8ba075972eceb13, type: 3} + - {fileID: 8300000, guid: 9a1266476578fad489d533b3ee050e33, type: 3} + - {fileID: 8300000, guid: a8152d2c983b4e04baf801f14660818a, type: 3} + - {fileID: 8300000, guid: 4591aa6320e8be6429df59d5d46a0a4c, type: 3} + - {fileID: 8300000, guid: 1229af9bd596d1f49bf5343790b2cda1, type: 3} + - {fileID: 8300000, guid: fc5640ccfc4aab24b83ff89a7ab4348e, type: 3} + - {fileID: 8300000, guid: c0bedc4d9738b4a4ab6459177c080265, type: 3} + - {fileID: 8300000, guid: b9e6166ef51af684daaecef0a60f1a7d, type: 3} + - {fileID: 8300000, guid: e03e3e2d19a1c944b96467bdca7c5229, type: 3} + - {fileID: 8300000, guid: f3b05da298ab5184ea638320bafc3e7d, type: 3} + - {fileID: 8300000, guid: 3b48017148865ce4f913ff5538760f68, type: 3} + - {fileID: 8300000, guid: f5b1a57155bed7a45b2f35c4be2b5219, type: 3} + - {fileID: 8300000, guid: b1543c3d498188c4b8dabd083d1943f1, type: 3} + bigNoiseClips: [] --- !u!1 &5535911989893287240 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/sr_pascal.unity b/Assets/Scenes/sr_pascal.unity index 86be359..fa7acca 100755 --- a/Assets/Scenes/sr_pascal.unity +++ b/Assets/Scenes/sr_pascal.unity @@ -801,6 +801,10 @@ PrefabInstance: propertyPath: ship value: objectReference: {fileID: 1972710421} + - target: {fileID: 8438506523596255020, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} + propertyPath: audio + value: + objectReference: {fileID: 5198188376350273128} m_RemovedComponents: [] m_RemovedGameObjects: - {fileID: 968610525847117003, guid: 50250db5eab455f70a577dbe84484ee1, type: 3} @@ -1280,10 +1284,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9bcaa1cfcea9cae4bb92bdc96cfbb4d2, type: 3} m_Name: m_EditorClassIdentifier: - soundNames: 0000000001000000 - clips: - - {fileID: 8300000, guid: 1cdd6e27104267647b16db497f41744f, type: 3} - - {fileID: 8300000, guid: 10a4e1180cb3be54da0d7d98dd327c8c, type: 3} --- !u!82 &1800093234 AudioSource: m_ObjectHideFlags: 0 @@ -1457,7 +1457,7 @@ PrefabInstance: - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} propertyPath: audio value: - objectReference: {fileID: 1800093233} + objectReference: {fileID: 5198188376350273128} - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} propertyPath: shipUi value: @@ -1638,6 +1638,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8401c141ee093632d847505914412cee, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &5198188376350273128 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2140192433735284883, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} + m_PrefabInstance: {fileID: 5198188376350273124} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 566ffe93221add0489d9a9a01670b93a, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/sr_silverstorage.unity b/Assets/Scenes/sr_silverstorage.unity index efe04c9..a5e8414 100755 --- a/Assets/Scenes/sr_silverstorage.unity +++ b/Assets/Scenes/sr_silverstorage.unity @@ -464,6 +464,10 @@ PrefabInstance: propertyPath: ship value: objectReference: {fileID: 1972710421} + - target: {fileID: 8438506523596255020, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3} + propertyPath: audio + value: + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: - {fileID: 968610525847117003, guid: 50250db5eab455f70a577dbe84484ee1, type: 3} @@ -556,28 +560,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 385acf04d40a396a9a95f738b7353198, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1359172646 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4508084525431060037, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} - m_PrefabInstance: {fileID: 5198188376350273124} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1359172648 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1359172646} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 566ffe93221add0489d9a9a01670b93a, type: 3} - m_Name: - m_EditorClassIdentifier: - soundNames: 020000000300000004000000 - clips: - - {fileID: 8300000, guid: 613e0b85af271854f9d89cb48db1445b, type: 3} - - {fileID: 8300000, guid: 0384b39259118674781276c265b83dec, type: 3} - - {fileID: 8300000, guid: b34b1ec00bb1ba643afcdc88ea960e06, type: 3} --- !u!1001 &1556238046 PrefabInstance: m_ObjectHideFlags: 0 @@ -923,6 +905,10 @@ PrefabInstance: propertyPath: m_Name value: Menu objectReference: {fileID: 0} + - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} + propertyPath: audio + value: + objectReference: {fileID: 0} - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} propertyPath: shipUi value: @@ -1184,10 +1170,7 @@ PrefabInstance: - {fileID: 6156246831092198731, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 4508084525431060037, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} - insertIndex: -1 - addedObject: {fileID: 1359172648} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 217f9c8f922f2d41cac52c3699bde478, type: 3} --- !u!114 &5198188376350273125 stripped MonoBehaviour: diff --git a/Assets/Src/PowerUnit.cs b/Assets/Src/PowerUnit.cs index 6fa1dbf..10e45f8 100644 --- a/Assets/Src/PowerUnit.cs +++ b/Assets/Src/PowerUnit.cs @@ -54,6 +54,7 @@ public class PowerUnit { public List<(Output output, double expiresAt)> BoostActive = new(); public double BoostProgress => boostProgress / boostMax; public int BoostCharges => (int)(boostMax / boostDurationSeconds); + public int BoostChargesAvailable => (int)(boostAvailable / boostDurationSeconds); public float Acceleration => acceleration + BoostActive.Count(b => b.output == Output.Acceleration) * baseOutput; @@ -78,12 +79,13 @@ public class PowerUnit { shieldCurrent = initialShieldMax; } - public void Deploy(Output output) { - if (boostAvailable < boostDurationSeconds) return; + public bool Deploy(Output output) { + if (boostAvailable < boostDurationSeconds) return false; BoostActive.Add((output, Time.timeAsDouble + boostDurationSeconds)); boostAvailable -= boostDurationSeconds; if (output == Output.Shield) ShieldsBoost(); + return true; } public void Tick() { @@ -99,11 +101,6 @@ public class PowerUnit { int count => count * Time.fixedDeltaTime * -1f, }; - // boost available gets dragged up by the clock - // when the delta is positive - // which can only happen when there are no active boosts - // check it vvvv - // Debug.Log($"Progress={boostProgress} actualAvailability={boostAvailable}"); double next = Math.Min(boostProgress + delta, boostMax); boostProgress = Math.Max(0f, next); if (delta > 0f) boostAvailable = boostProgress; diff --git a/Assets/Src/ShipAudio.cs b/Assets/Src/ShipAudio.cs index bfc567e..67982ee 100755 --- a/Assets/Src/ShipAudio.cs +++ b/Assets/Src/ShipAudio.cs @@ -13,11 +13,11 @@ public enum Sound { Decelerate, Strafe, - Damage, - Respawn, + Damage, // noise pop + Respawn, // noise pop - BoostAcceleration, - BoostDeceleration, + BoostAccelerate, + BoostDecelerate, BoostStrafe, BoostShield, @@ -30,55 +30,64 @@ public enum Sound { public class ShipAudio : MonoBehaviour { // Match these two up [SerializeField] - Sound[] soundNames; + Sound[] powerUnitSounds; [SerializeField] - AudioClip[] clips; + AudioClip[] powerUnitClips; + + [SerializeField] + AudioClip[] noiseClips; + [SerializeField] + AudioClip[] bigNoiseClips; Dictionary sounds = new(); - AudioSource srcAccel; - AudioSource srcDecel; - AudioSource srcStrafe; + AudioSource srcShipAccel; + AudioSource srcShipDecel; + AudioSource srcShipStrafe; + + AudioSource src; SpaceRaceInput input; ShipControls ship; void Awake() { - for (int i = 0; i < clips.Length; i++) { - sounds.Add(soundNames[i], clips[i]); + for (int i = 0; i < powerUnitClips.Length; i++) { + sounds.Add(powerUnitSounds[i], powerUnitClips[i]); } ship = GetComponentInParent(); - srcAccel = gameObject.AddComponent(); - srcAccel.clip = sounds[Sound.Accelerate]; - srcAccel.loop = true; - srcAccel.volume = 0f; - srcAccel.Play(); + src = gameObject.AddComponent(); - srcDecel = gameObject.AddComponent(); - srcDecel.clip = sounds[Sound.Decelerate]; - srcDecel.loop = true; - srcDecel.volume = 0f; - srcDecel.Play(); + srcShipAccel = gameObject.AddComponent(); + srcShipAccel.clip = sounds[Sound.Accelerate]; + srcShipAccel.loop = true; + srcShipAccel.volume = 0f; + srcShipAccel.Play(); - srcStrafe = gameObject.AddComponent(); - srcStrafe.clip = sounds[Sound.Strafe]; - srcStrafe.loop = true; - srcStrafe.volume = 0f; - srcStrafe.Play(); + srcShipDecel = gameObject.AddComponent(); + srcShipDecel.clip = sounds[Sound.Decelerate]; + srcShipDecel.loop = true; + srcShipDecel.volume = 0f; + srcShipDecel.Play(); + + srcShipStrafe = gameObject.AddComponent(); + srcShipStrafe.clip = sounds[Sound.Strafe]; + srcShipStrafe.loop = true; + srcShipStrafe.volume = 0f; + srcShipStrafe.Play(); RegisterEvents(); } void Update() { - srcAccel.pitch = Math.Min(1f, (1f / 500f) * ship.Speed); - srcDecel.pitch = Math.Min(1f, (1f / 500f) * ship.Speed); - srcStrafe.pitch = Math.Min(1f, (1f / 500f) * ship.Speed); + srcShipAccel.pitch = Math.Min(1f, (1f / 500f) * ship.Speed); + srcShipDecel.pitch = Math.Min(1f, (1f / 500f) * ship.Speed); + srcShipStrafe.pitch = Math.Min(1f, (1f / 500f) * ship.Speed); // Super fucking annoying - // stops all the clicks and pops of starting / stopping the clips + // stops all the clicks and pops of starting / stopping the powerUnitClips // 0.125s to get max volume // == 8x per second... float volumeDelta = Time.deltaTime * 8; @@ -89,96 +98,35 @@ public class ShipAudio : MonoBehaviour { bool strafing = input.ship.strafe.ReadValue().magnitude > 0; if (accelerating) { - srcAccel.volume = Math.Min(1f, srcAccel.volume + volumeDelta); + srcShipAccel.volume = Math.Min(1f, srcShipAccel.volume + volumeDelta); } else { - srcAccel.volume = Math.Max(0f, srcAccel.volume - decelDelta); + srcShipAccel.volume = Math.Max(0f, srcShipAccel.volume - decelDelta); } if (decelerating) { - srcDecel.volume = Math.Min(1f, srcDecel.volume + volumeDelta); + srcShipDecel.volume = Math.Min(1f, srcShipDecel.volume + volumeDelta); } else { - srcDecel.volume = Math.Max(0f, srcDecel.volume - decelDelta); + srcShipDecel.volume = Math.Max(0f, srcShipDecel.volume - decelDelta); } if (strafing) { - srcStrafe.volume = Math.Min(1f, srcStrafe.volume + volumeDelta); + srcShipStrafe.volume = Math.Min(1f, srcShipStrafe.volume + volumeDelta); } else { - srcStrafe.volume = Math.Max(0f, srcStrafe.volume - decelDelta); + srcShipStrafe.volume = Math.Max(0f, srcShipStrafe.volume - decelDelta); } } - // public void PlaySound(Sound s) { - // AudioSource src = sounds[s]; - // src.Play(0); - // } + public void PlayNoise() { + int noiseIndex = UnityEngine.Random.Range(0, noiseClips.Length); + src.PlayOneShot(noiseClips[noiseIndex]); + } void RegisterEvents() { if (input == null) input = new SpaceRaceInput(); input.ship.Enable(); - - // input.ship.accelerate.started += OnAccelerateStart; - // input.ship.accelerate.canceled += OnAccelerateCancel; - // input.ship.decelerate.started += OnDecelerateStart; - // input.ship.decelerate.canceled += OnDecelerateCancel; - // input.ship.strafe.started += OnStrafeStart; - // input.ship.strafe.canceled += OnStrafeCancel; - - // these we only care about the initial press - // input.ship.respawn.started += OnRespawn; - // input.ship.quit.started += OnQuit; - // input.ship.powerUnit1.started += OnPowerUnit1; - // input.ship.powerUnit2.started += OnPowerUnit2; - // input.ship.powerUnit3.started += OnPowerUnit3; - // input.ship.powerUnit4.started += OnPowerUnit4; } - - // void OnDestroy() { - // input.ship.accelerate.started -= OnAccelerateStart; - // input.ship.accelerate.canceled -= OnAccelerateCancel; - // input.ship.decelerate.started -= OnDecelerateStart; - // input.ship.decelerate.canceled -= OnDecelerateCancel; - // input.ship.strafe.started -= OnStrafeStart; - // input.ship.strafe.canceled -= OnStrafeCancel; - - - // // these we only care about the initial press - // input.ship.respawn.started -= OnRespawn; - // input.ship.quit.started -= OnQuit; - // input.ship.powerUnit1.started -= OnPowerUnit1; - // input.ship.powerUnit2.started -= OnPowerUnit2; - // input.ship.powerUnit3.started -= OnPowerUnit3; - // input.ship.powerUnit4.started -= OnPowerUnit4; - // } - - // void OnAcceleratePerformed(InputAction.CallbackContext _ctx) { - // Debug.Log(_ctx.duration); - // } - - // void OnAccelerateStart(InputAction.CallbackContext _ctx) { - // srcAccel.Play(); - // } - - // void OnAccelerateCancel(InputAction.CallbackContext _ctx) { - // srcAccel.Stop(); - // } - - // void OnDecelerateStart(InputAction.CallbackContext _ctx) { - // srcDecel.Play(); - // } - - // void OnDecelerateCancel(InputAction.CallbackContext _ctx) { - // srcDecel.Stop(); - // } - - // void OnStrafeStart(InputAction.CallbackContext _ctx) { - // srcStrafe.Play(); - // } - - // void OnStrafeCancel(InputAction.CallbackContext _ctx) { - // srcStrafe.Stop(); - // } } diff --git a/Assets/Src/ShipControls.cs b/Assets/Src/ShipControls.cs index 619e271..de96e79 100755 --- a/Assets/Src/ShipControls.cs +++ b/Assets/Src/ShipControls.cs @@ -9,6 +9,7 @@ public class ShipControls : MonoBehaviour { public Camera aim; public Timing timing; + ShipAudio audio; SpaceRaceInput input; Rigidbody rigidBody; @@ -54,6 +55,7 @@ public class ShipControls : MonoBehaviour { void Start() { Cursor.lockState = CursorLockMode.Locked; rigidBody = GetComponent(); + audio = GetComponentInChildren(); // just stop the body from being affected by rotation for now // until the 3p camera is in to explain why @@ -115,7 +117,10 @@ public class ShipControls : MonoBehaviour { rigidBody.rotation = Quaternion.RotateTowards(transform.rotation, aim.transform.rotation, step); if (timing.timerEnabled) { + int boostBefore = powerUnit.BoostChargesAvailable; powerUnit.Tick(); + + if (powerUnit.BoostChargesAvailable > boostBefore) OnBoostCharge(); } } @@ -160,6 +165,7 @@ public class ShipControls : MonoBehaviour { } public void Respawn() { + audio.PlayNoise(); // IMPORTANT // stop the timer before we move the ship or anything // otherwise it might generate a checkpoint time @@ -188,15 +194,19 @@ public class ShipControls : MonoBehaviour { public void Damage(float amt, string src) { Debug.Log($"Damage {amt} from {src}"); + audio.PlayNoise(); + bool destroyed = powerUnit.ShieldReduce(amt); if (destroyed) { Debug.Log($"Ddddestroyed by {src}"); + // play big noise! Respawn(); } } void Deploy(Output output) { - powerUnit.Deploy(output); + bool deployed = powerUnit.Deploy(output); + if (deployed) audio.PlayNoise(); } // I prefer doing it this way than registering the callbacks etc @@ -250,6 +260,11 @@ public class ShipControls : MonoBehaviour { void OnPowerUnit3(InputAction.CallbackContext ctx) => Deploy(Output.Strafing); void OnPowerUnit4(InputAction.CallbackContext ctx) => Deploy(Output.Shield); + void OnBoostCharge() { + // audio.PlayNoise(); + // do some ui fx whatever + } + void OnDrawGizmosSelected() { if (Application.isPlaying == false) return; diff --git a/Assets/Src/Timing.cs b/Assets/Src/Timing.cs index ad035fe..4d5af90 100644 --- a/Assets/Src/Timing.cs +++ b/Assets/Src/Timing.cs @@ -16,6 +16,9 @@ public class Timing: MonoBehaviour { public List sectorTimes; public bool timerEnabled; + [SerializeField] + ShipAudio audio; + public string mapName; public double sectorTime; public double lapTime; @@ -106,9 +109,13 @@ public class Timing: MonoBehaviour { sectorTimes.Add(s); Debug.Log($"{sectorTimes.Count} / {sectors.Length}"); + // play a sound :) + if (audio != null) audio.PlayNoise(); + // restart the timer for the next sector sectorStart = Time.timeAsDouble; + // they finished a lap! if (sectorTimes.Count == sectors.Length) { EndLap(); diff --git a/Assets/Src/UI/MenuControls.cs b/Assets/Src/UI/MenuControls.cs index 5d86d34..44ad8ca 100644 --- a/Assets/Src/UI/MenuControls.cs +++ b/Assets/Src/UI/MenuControls.cs @@ -110,6 +110,7 @@ public class MenuControls : MonoBehaviour { } void OnToggleMenu(InputAction.CallbackContext _ctx) { + audio.PlayNoise(); visible = !visible; if (visible) { diff --git a/TODO.md b/TODO.md index f3b704d..901c58c 100644 --- a/TODO.md +++ b/TODO.md @@ -1,11 +1,23 @@ ## TODO +- git lfs + - its time + +- fix up dependency chain + - applications - steam - improve descriptions - - add icons for A D T S + - talk about sound + - minimal soundtrack + - pops clicks noise, asmr + - win store + - make public cause it's fked -- sound + +- audio + - add more noises + - menu disable - murals - flames at end of red corner in junglism2 @@ -19,8 +31,6 @@ - try to post - if fail store the lap in userdata -- git lfs - - minimap - really want this? - would make map source obvious