we poppin
This commit is contained in:
ntr committed
1 parent
336945533b
commit
9f6e615653
88 files changed
+979
-170
No files matched your search
BIN
Binary file not shown.
BIN
Binary file not shown.
Executable
+8
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 5d7a9b3e791f03741b3f274c2dd078a8
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Executable
+8
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d2158f8f18d19cf48a507472c3707172
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Binary file not shown.
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 62a5d2dd32e500a4fbb1d247c09bed24
|
||||
guid: c52fc17ffbb62644c88b20980a6246d7
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 7
|
||||
BIN
Binary file not shown.
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f5e946c296766694b97892f7386e533e
|
||||
guid: fb6b7c1f2ddcfa5419fdf904f58ec1bf
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 7
|
||||
BIN
Binary file not shown.
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4ba402be6dacb3340a1c791560c97b97
|
||||
guid: 3a2e4df8d17fd2b4a83afa676a843344
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 7
|
||||
BIN
Binary file not shown.
Executable
+23
@@ -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:
|
||||
BIN
Binary file not shown.
Executable
+23
@@ -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:
|
||||
BIN
Binary file not shown.
Executable
+23
@@ -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:
|
||||
BIN
Binary file not shown.
Executable
+23
@@ -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:
|
||||
BIN
Binary file not shown.
Executable
+23
@@ -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:
|
||||
BIN
Binary file not shown.
Executable
+23
@@ -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:
|
||||
BIN
Binary file not shown.
Executable
+23
@@ -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:
|
||||
BIN
Binary file not shown.
Executable
+23
@@ -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:
|
||||
BIN
Binary file not shown.
Executable
+23
@@ -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:
|
||||
BIN
Binary file not shown.
Executable
+23
@@ -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:
|
||||
BIN
Binary file not shown.
Executable
+23
@@ -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:
|
||||
Executable
+8
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 7db28024917df8843805d13e839bd7f0
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Binary file not shown.
Executable
+23
@@ -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:
|
||||
Executable
+8
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 00c2ca68da5a0ff499091c78c9d8d844
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
BIN
Binary file not shown.
Executable
+23
@@ -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:
|
||||
BIN
Binary file not shown.
Executable
+23
@@ -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:
|
||||
BIN
Binary file not shown.
Executable
+23
@@ -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:
|
||||
BIN
Binary file not shown.
Executable
+23
@@ -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:
|
||||
BIN
Binary file not shown.
Executable
+23
@@ -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:
|
||||
BIN
Binary file not shown.
Executable
+23
@@ -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:
|
||||
BIN
Binary file not shown.
Executable
+23
@@ -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:
|
||||
BIN
Binary file not shown.
Executable
+23
@@ -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:
|
||||
BIN
Binary file not shown.
Executable
+23
@@ -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:
|
||||
BIN
Binary file not shown.
Executable
+23
@@ -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:
|
||||
BIN
Binary file not shown.
Executable
+23
@@ -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:
|
||||
BIN
Binary file not shown.
Executable
+23
@@ -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:
|
||||
BIN
Binary file not shown.
Executable
+23
@@ -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:
|
||||
BIN
Binary file not shown.
Executable
+23
@@ -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:
|
||||
BIN
Binary file not shown.
Executable
+23
@@ -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:
|
||||
BIN
Binary file not shown.
Executable
+23
@@ -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:
|
||||
BIN
Binary file not shown.
Executable
+23
@@ -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:
|
||||
BIN
Binary file not shown.
Executable
+23
@@ -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:
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Binary file not shown.
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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;
|
||||
|
||||
+49
-101
@@ -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<Sound, AudioClip> 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<ShipControls>();
|
||||
|
||||
srcAccel = gameObject.AddComponent<AudioSource>();
|
||||
srcAccel.clip = sounds[Sound.Accelerate];
|
||||
srcAccel.loop = true;
|
||||
srcAccel.volume = 0f;
|
||||
srcAccel.Play();
|
||||
src = gameObject.AddComponent<AudioSource>();
|
||||
|
||||
srcDecel = gameObject.AddComponent<AudioSource>();
|
||||
srcDecel.clip = sounds[Sound.Decelerate];
|
||||
srcDecel.loop = true;
|
||||
srcDecel.volume = 0f;
|
||||
srcDecel.Play();
|
||||
srcShipAccel = gameObject.AddComponent<AudioSource>();
|
||||
srcShipAccel.clip = sounds[Sound.Accelerate];
|
||||
srcShipAccel.loop = true;
|
||||
srcShipAccel.volume = 0f;
|
||||
srcShipAccel.Play();
|
||||
|
||||
srcStrafe = gameObject.AddComponent<AudioSource>();
|
||||
srcStrafe.clip = sounds[Sound.Strafe];
|
||||
srcStrafe.loop = true;
|
||||
srcStrafe.volume = 0f;
|
||||
srcStrafe.Play();
|
||||
srcShipDecel = gameObject.AddComponent<AudioSource>();
|
||||
srcShipDecel.clip = sounds[Sound.Decelerate];
|
||||
srcShipDecel.loop = true;
|
||||
srcShipDecel.volume = 0f;
|
||||
srcShipDecel.Play();
|
||||
|
||||
srcShipStrafe = gameObject.AddComponent<AudioSource>();
|
||||
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<Vector2>().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();
|
||||
// }
|
||||
}
|
||||
|
||||
@@ -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<Rigidbody>();
|
||||
audio = GetComponentInChildren<ShipAudio>();
|
||||
|
||||
// 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;
|
||||
|
||||
@@ -16,6 +16,9 @@ public class Timing: MonoBehaviour {
|
||||
public List<SectorTime> 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();
|
||||
|
||||
@@ -110,6 +110,7 @@ public class MenuControls : MonoBehaviour {
|
||||
}
|
||||
|
||||
void OnToggleMenu(InputAction.CallbackContext _ctx) {
|
||||
audio.PlayNoise();
|
||||
visible = !visible;
|
||||
|
||||
if (visible) {
|
||||
|
||||
Reference in new issue
Block a user