diff --git a/Assets/Scenes/CodeDEV.unity b/Assets/Scenes/CodeDEV.unity index 40eedf3..5b5f9d6 100644 --- a/Assets/Scenes/CodeDEV.unity +++ b/Assets/Scenes/CodeDEV.unity @@ -152,7 +152,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 243359265566762914, guid: efb934a745665924d8c7dd46c0a117ae, type: 2} - m_audioClip: {fileID: 8300000, guid: a90787ea4a183c44699deb2babada64b, type: 3} + m_audioClip: {fileID: 8300000, guid: 2a0cc1bc613a80645b3c91ef12ed3f02, type: 3} m_PlayOnAwake: 0 m_Volume: 1 m_Pitch: 1 @@ -713,7 +713,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 243356048287013750, guid: efb934a745665924d8c7dd46c0a117ae, type: 2} - m_audioClip: {fileID: 8300000, guid: 55610acd4a5540d4db1fe1e3f4a55f4a, type: 3} + m_audioClip: {fileID: 8300000, guid: 4c1bf81eb5198e8478ab6e997feef50d, type: 3} m_PlayOnAwake: 0 m_Volume: 1 m_Pitch: 1 diff --git a/Assets/Scenes/TitleScene.unity b/Assets/Scenes/TitleScene.unity index 36f6841..fa2cd31 100644 --- a/Assets/Scenes/TitleScene.unity +++ b/Assets/Scenes/TitleScene.unity @@ -152,7 +152,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 243359265566762914, guid: efb934a745665924d8c7dd46c0a117ae, type: 2} - m_audioClip: {fileID: 8300000, guid: a90787ea4a183c44699deb2babada64b, type: 3} + m_audioClip: {fileID: 8300000, guid: 2a0cc1bc613a80645b3c91ef12ed3f02, type: 3} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -652,7 +652,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 243356048287013750, guid: efb934a745665924d8c7dd46c0a117ae, type: 2} - m_audioClip: {fileID: 8300000, guid: 55610acd4a5540d4db1fe1e3f4a55f4a, type: 3} + m_audioClip: {fileID: 8300000, guid: 4c1bf81eb5198e8478ab6e997feef50d, type: 3} m_PlayOnAwake: 0 m_Volume: 1 m_Pitch: 1 diff --git a/Assets/Scripts/AudioControl.cs b/Assets/Scripts/AudioControl.cs index 5beb34d..fe6aa5a 100644 --- a/Assets/Scripts/AudioControl.cs +++ b/Assets/Scripts/AudioControl.cs @@ -14,9 +14,8 @@ public class AudioControl : MonoBehaviour public enum Sfx { shoot, explosion, mobattack, door, faster, slower, driving, slowdriving, hitmob, hitplayer }; private const float lvlbgm = 5.725f; - private const float gobgm = 14.406f; + private const float gobgm = 14.157f; private const float loopdelay = 0.025f; - private bool menu; // Use this for initialization void Start() diff --git a/Assets/sound/menuV1.wav b/Assets/sound/MenuV1.2.wav similarity index 60% rename from Assets/sound/menuV1.wav rename to Assets/sound/MenuV1.2.wav index 83ede20..f1e0827 100644 Binary files a/Assets/sound/menuV1.wav and b/Assets/sound/MenuV1.2.wav differ diff --git a/Assets/sound/menuV1.wav.meta b/Assets/sound/MenuV1.2.wav.meta similarity index 91% rename from Assets/sound/menuV1.wav.meta rename to Assets/sound/MenuV1.2.wav.meta index a7ebd32..b8e48e6 100644 --- a/Assets/sound/menuV1.wav.meta +++ b/Assets/sound/MenuV1.2.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a90787ea4a183c44699deb2babada64b +guid: 2a0cc1bc613a80645b3c91ef12ed3f02 AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/sound/game over.wav b/Assets/sound/game overV1.2.wav similarity index 50% rename from Assets/sound/game over.wav rename to Assets/sound/game overV1.2.wav index 66673f8..79a8e32 100644 Binary files a/Assets/sound/game over.wav and b/Assets/sound/game overV1.2.wav differ diff --git a/Assets/sound/game over.wav.meta b/Assets/sound/game overV1.2.wav.meta similarity index 91% rename from Assets/sound/game over.wav.meta rename to Assets/sound/game overV1.2.wav.meta index 1b8ba8f..802bda1 100644 --- a/Assets/sound/game over.wav.meta +++ b/Assets/sound/game overV1.2.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 55610acd4a5540d4db1fe1e3f4a55f4a +guid: 4c1bf81eb5198e8478ab6e997feef50d AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/sound/main(0.5).wav b/Assets/sound/main(0.5).wav deleted file mode 100644 index 390c75c..0000000 Binary files a/Assets/sound/main(0.5).wav and /dev/null differ diff --git a/Assets/sound/main(0.5).wav.meta b/Assets/sound/main(0.5).wav.meta deleted file mode 100644 index f9da932..0000000 --- a/Assets/sound/main(0.5).wav.meta +++ /dev/null @@ -1,22 +0,0 @@ -fileFormatVersion: 2 -guid: c89601ee48d799943a756d1d15cd4954 -AudioImporter: - externalObjects: {} - serializedVersion: 6 - defaultSettings: - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - platformSettingOverrides: {} - forceToMono: 0 - normalize: 1 - preloadAudioData: 1 - loadInBackground: 0 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: - assetBundleVariant: