Still working on this fucking garbage.

2025-06-08 22:36:09 -04:00
parent b36965eb43
commit c9313e4a67
14 changed files with 11 additions and 89 deletions
@@ -1,41 +0,0 @@
-fileFormatVersion: 2
-guid: 408c94c3132deb04187b5f2ac79f075d
-AudioImporter:
-  externalObjects: {}
-  serializedVersion: 7
-  defaultSettings:
-    serializedVersion: 2
-    loadType: 0
-    sampleRateSetting: 0
-    sampleRateOverride: 44100
-    compressionFormat: 1
-    quality: 0.84999996
-    conversionMode: 0
-    preloadAudioData: 0
-  platformSettingOverrides:
-    4:
-      serializedVersion: 2
-      loadType: 0
-      sampleRateSetting: 0
-      sampleRateOverride: 44100
-      compressionFormat: 1
-      quality: 0.25
-      conversionMode: 0
-      preloadAudioData: 0
-    7:
-      serializedVersion: 2
-      loadType: 0
-      sampleRateSetting: 0
-      sampleRateOverride: 44100
-      compressionFormat: 1
-      quality: 0.25
-      conversionMode: 0
-      preloadAudioData: 0
-  forceToMono: 1
-  normalize: 1
-  loadInBackground: 1
-  ambisonic: 0
-  3D: 1
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
@@ -1,5 +1,9 @@
 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
@@ -1,41 +0,0 @@
-fileFormatVersion: 2
-guid: d3a32efe2355015408181f263148aa5b
-AudioImporter:
-  externalObjects: {}
-  serializedVersion: 7
-  defaultSettings:
-    serializedVersion: 2
-    loadType: 0
-    sampleRateSetting: 0
-    sampleRateOverride: 44100
-    compressionFormat: 1
-    quality: 0.84999996
-    conversionMode: 0
-    preloadAudioData: 0
-  platformSettingOverrides:
-    4:
-      serializedVersion: 2
-      loadType: 0
-      sampleRateSetting: 0
-      sampleRateOverride: 44100
-      compressionFormat: 1
-      quality: 0.25
-      conversionMode: 0
-      preloadAudioData: 0
-    7:
-      serializedVersion: 2
-      loadType: 0
-      sampleRateSetting: 0
-      sampleRateOverride: 44100
-      compressionFormat: 1
-      quality: 0.25
-      conversionMode: 0
-      preloadAudioData: 0
-  forceToMono: 1
-  normalize: 1
-  loadInBackground: 1
-  ambisonic: 0
-  3D: 1
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: