From 9c8d8e35cf3d6bca6fe84c3035a68b8784314526 Mon Sep 17 00:00:00 2001 From: Jamie Greunbaum Date: Sun, 8 Jun 2025 23:13:31 -0400 Subject: [PATCH] Once again fixed the bug that made risk cards not work right. It came back at some point during the hundreds of useless fucking merge conflicts that had to be resolved. Fuck Linus Torvalds. --- Assets/Audio/Music Mixer.mixer | 12 +++++++++++- Assets/Audio/Music/I Feel Good.wav.meta | 10 +++------- Assets/Audio/Music/Opening.wav.meta | 10 +++------- Assets/Audio/Music/The Chase.wav.meta | 10 +++------- Assets/Audio/Music/Think About It.wav.meta | 10 +++------- ... World Is Carmen Sandiego - Theme Edited.wav.meta | 10 +++------- 6 files changed, 26 insertions(+), 36 deletions(-) diff --git a/Assets/Audio/Music Mixer.mixer b/Assets/Audio/Music Mixer.mixer index 298088a..5a6532e 100644 --- a/Assets/Audio/Music Mixer.mixer +++ b/Assets/Audio/Music Mixer.mixer @@ -64,5 +64,15 @@ AudioMixerSnapshotController: m_Name: Snapshot m_AudioMixer: {fileID: 24100000} m_SnapshotID: 9441c5c904d98c54da4849f5fd02c0ad - m_FloatValues: {} + m_FloatValues: + 6cdb4d927097dc842806989b97493b0d: 4.46 + 41a1a7a20265fee4989de0fcf78d5726: 0.447 + 16011503c3c522c48b2e344b4f6c4bd3: 0 + 48bd6b0a838d41f4690c386ea44185d3: 0 + 6717727af817cf049b7f84f1d14054ee: 1048 + 468053cc634e4a446bd004ea9dc02b1b: 7 + 0e41224d8c9e7f24986a7ca8141bb105: 400 + b36febcd2a768a04fbea3a42be8278df: 0.773 + 1a52ac4ecb6b25e4a902488e80374143: 4000 + 5c59578fcc9f8294aad7ef85c6768a7f: 1.095 m_TransitionOverrides: {} diff --git a/Assets/Audio/Music/I Feel Good.wav.meta b/Assets/Audio/Music/I Feel Good.wav.meta index 480e948..38a27dd 100644 --- a/Assets/Audio/Music/I Feel Good.wav.meta +++ b/Assets/Audio/Music/I Feel Good.wav.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<<< HEAD:Assets/Audio/Music/The Chase.ogg.meta guid: 408c94c3132deb04187b5f2ac79f075d -======== -guid: ada408cff3af7d64088105703fc32e60 ->>>>>>>> cc2647a (- Added Think About It music, and final round buzzer sounds.):Assets/Audio/Music/Think About It.ogg.meta AudioImporter: externalObjects: {} serializedVersion: 7 @@ -11,7 +7,7 @@ AudioImporter: serializedVersion: 2 loadType: 0 sampleRateSetting: 0 - sampleRateOverride: 44100 + sampleRateOverride: 0 compressionFormat: 1 quality: 0.84999996 conversionMode: 0 @@ -21,7 +17,7 @@ AudioImporter: serializedVersion: 2 loadType: 0 sampleRateSetting: 0 - sampleRateOverride: 44100 + sampleRateOverride: 0 compressionFormat: 1 quality: 0.25 conversionMode: 0 @@ -30,7 +26,7 @@ AudioImporter: serializedVersion: 2 loadType: 0 sampleRateSetting: 0 - sampleRateOverride: 44100 + sampleRateOverride: 0 compressionFormat: 1 quality: 0.25 conversionMode: 0 diff --git a/Assets/Audio/Music/Opening.wav.meta b/Assets/Audio/Music/Opening.wav.meta index 2ae6930..89b9e50 100644 --- a/Assets/Audio/Music/Opening.wav.meta +++ b/Assets/Audio/Music/Opening.wav.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<<< HEAD:Assets/Audio/Music/Opening.wav.meta guid: 3706c5fb6f7901a429b0066b315e7a71 -======== -guid: ada408cff3af7d64088105703fc32e60 ->>>>>>>> cc2647a (- Added Think About It music, and final round buzzer sounds.):Assets/Audio/Music/Think About It.ogg.meta AudioImporter: externalObjects: {} serializedVersion: 7 @@ -11,7 +7,7 @@ AudioImporter: serializedVersion: 2 loadType: 0 sampleRateSetting: 0 - sampleRateOverride: 44100 + sampleRateOverride: 0 compressionFormat: 1 quality: 0.84999996 conversionMode: 0 @@ -21,7 +17,7 @@ AudioImporter: serializedVersion: 2 loadType: 0 sampleRateSetting: 0 - sampleRateOverride: 44100 + sampleRateOverride: 0 compressionFormat: 1 quality: 0.25 conversionMode: 0 @@ -30,7 +26,7 @@ AudioImporter: serializedVersion: 2 loadType: 0 sampleRateSetting: 0 - sampleRateOverride: 44100 + sampleRateOverride: 0 compressionFormat: 1 quality: 0.25 conversionMode: 0 diff --git a/Assets/Audio/Music/The Chase.wav.meta b/Assets/Audio/Music/The Chase.wav.meta index b571ecd..df54c35 100644 --- a/Assets/Audio/Music/The Chase.wav.meta +++ b/Assets/Audio/Music/The Chase.wav.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<<< HEAD:Assets/Audio/Music/The Chase.wav.meta guid: ebb0e1809180b8e4b8ae4c4fe1671ae7 -======== -guid: 680142b640a682d4a92c9935828c2311 ->>>>>>>> d6b6ce7 (Updated lots of music stuff:):Assets/Audio/Music/I Feel Good.wav.meta AudioImporter: externalObjects: {} serializedVersion: 7 @@ -11,7 +7,7 @@ AudioImporter: serializedVersion: 2 loadType: 0 sampleRateSetting: 0 - sampleRateOverride: 44100 + sampleRateOverride: 0 compressionFormat: 1 quality: 0.84999996 conversionMode: 0 @@ -21,7 +17,7 @@ AudioImporter: serializedVersion: 2 loadType: 0 sampleRateSetting: 0 - sampleRateOverride: 44100 + sampleRateOverride: 0 compressionFormat: 1 quality: 0.25 conversionMode: 0 @@ -30,7 +26,7 @@ AudioImporter: serializedVersion: 2 loadType: 0 sampleRateSetting: 0 - sampleRateOverride: 44100 + sampleRateOverride: 0 compressionFormat: 1 quality: 0.25 conversionMode: 0 diff --git a/Assets/Audio/Music/Think About It.wav.meta b/Assets/Audio/Music/Think About It.wav.meta index d0e5ccb..cbf5263 100644 --- a/Assets/Audio/Music/Think About It.wav.meta +++ b/Assets/Audio/Music/Think About It.wav.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<<< HEAD:Assets/Audio/Music/Think About It.wav.meta guid: fd2e7d68447011640a244f302d442395 -======== -guid: ada408cff3af7d64088105703fc32e60 ->>>>>>>> cc2647a (- Added Think About It music, and final round buzzer sounds.):Assets/Audio/Music/Think About It.ogg.meta AudioImporter: externalObjects: {} serializedVersion: 7 @@ -11,7 +7,7 @@ AudioImporter: serializedVersion: 2 loadType: 0 sampleRateSetting: 0 - sampleRateOverride: 44100 + sampleRateOverride: 0 compressionFormat: 1 quality: 0.84999996 conversionMode: 0 @@ -21,7 +17,7 @@ AudioImporter: serializedVersion: 2 loadType: 0 sampleRateSetting: 0 - sampleRateOverride: 44100 + sampleRateOverride: 0 compressionFormat: 1 quality: 0.25 conversionMode: 0 @@ -30,7 +26,7 @@ AudioImporter: serializedVersion: 2 loadType: 0 sampleRateSetting: 0 - sampleRateOverride: 44100 + sampleRateOverride: 0 compressionFormat: 1 quality: 0.25 conversionMode: 0 diff --git a/Assets/Audio/Music/Where in The World Is Carmen Sandiego - Theme Edited.wav.meta b/Assets/Audio/Music/Where in The World Is Carmen Sandiego - Theme Edited.wav.meta index 81cda1c..b6c8e56 100644 --- a/Assets/Audio/Music/Where in The World Is Carmen Sandiego - Theme Edited.wav.meta +++ b/Assets/Audio/Music/Where in The World Is Carmen Sandiego - Theme Edited.wav.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<<< HEAD:Assets/Audio/Music/Where in The World Is Carmen Sandiego - Theme Edited.wav.meta guid: f464650920c273d4fb42a86c4acaf05f -======== -guid: 680142b640a682d4a92c9935828c2311 ->>>>>>>> d6b6ce7 (Updated lots of music stuff:):Assets/Audio/Music/I Feel Good.wav.meta AudioImporter: externalObjects: {} serializedVersion: 7 @@ -11,7 +7,7 @@ AudioImporter: serializedVersion: 2 loadType: 0 sampleRateSetting: 0 - sampleRateOverride: 44100 + sampleRateOverride: 0 compressionFormat: 1 quality: 0.84999996 conversionMode: 0 @@ -21,7 +17,7 @@ AudioImporter: serializedVersion: 2 loadType: 0 sampleRateSetting: 0 - sampleRateOverride: 44100 + sampleRateOverride: 0 compressionFormat: 1 quality: 0.25 conversionMode: 0 @@ -30,7 +26,7 @@ AudioImporter: serializedVersion: 2 loadType: 0 sampleRateSetting: 0 - sampleRateOverride: 44100 + sampleRateOverride: 0 compressionFormat: 1 quality: 0.25 conversionMode: 0