Adjust 3D sound and ensure it works everywhere

hackerspace-ntnu · May 31, 2024 · dfd1801 · dfd1801
1 parent 521af43
commit dfd1801
Show file tree

Hide file tree

Showing 37 changed files with 315 additions and 61 deletions.
diff --git a/Assets/Audio/Augments/DDR/DDR1.asset b/Assets/Audio/Augments/DDR/DDR1.asset
@@ -0,0 +1,23 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: aa94d7cf98a253641a478b6ab78a05e3, type: 3}
+  m_Name: DDR1
+  m_EditorClassIdentifier: 
+  sounds:
+  - {fileID: 8300000, guid: 51b872a091093b54f8243e64e01dbe31, type: 3}
+  semitoneRange:
+    min: 0
+    max: 0
+  continuousPitchBend: 0
+  volumeRange:
+    min: 0.9164927
+    max: 1
diff --git a/Assets/Audio/Augments/DDR/DDR1.asset.meta b/Assets/Audio/Augments/DDR/DDR1.asset.meta
diff --git a/Assets/Audio/Augments/DDR/DDR2.asset b/Assets/Audio/Augments/DDR/DDR2.asset
@@ -0,0 +1,23 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: aa94d7cf98a253641a478b6ab78a05e3, type: 3}
+  m_Name: DDR2
+  m_EditorClassIdentifier: 
+  sounds:
+  - {fileID: 8300000, guid: 9f81417eff9ee344f8cc9c8dc9173b9d, type: 3}
+  semitoneRange:
+    min: 0
+    max: 0
+  continuousPitchBend: 0
+  volumeRange:
+    min: 0.95128745
+    max: 1
diff --git a/Assets/Audio/Augments/DDR/DDR2.asset.meta b/Assets/Audio/Augments/DDR/DDR2.asset.meta
diff --git a/Assets/Audio/Augments/DDR/DDR3.asset b/Assets/Audio/Augments/DDR/DDR3.asset
@@ -0,0 +1,23 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: aa94d7cf98a253641a478b6ab78a05e3, type: 3}
+  m_Name: DDR3
+  m_EditorClassIdentifier: 
+  sounds:
+  - {fileID: 8300000, guid: 33dba0147eb1738459b866ba836efc57, type: 3}
+  semitoneRange:
+    min: 0
+    max: 0
+  continuousPitchBend: 0
+  volumeRange:
+    min: 0.95824635
+    max: 1
diff --git a/Assets/Audio/Augments/DDR/DDR3.asset.meta b/Assets/Audio/Augments/DDR/DDR3.asset.meta
diff --git a/Assets/Audio/Augments/Revolver/BonkStrong.asset b/Assets/Audio/Augments/Revolver/BonkStrong.asset
@@ -0,0 +1,23 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: aa94d7cf98a253641a478b6ab78a05e3, type: 3}
+  m_Name: BonkStrong
+  m_EditorClassIdentifier: 
+  sounds:
+  - {fileID: 8300000, guid: df0d1dd1be611d6479e633a92c8f8a91, type: 3}
+  semitoneRange:
+    min: -1
+    max: 0
+  continuousPitchBend: 1
+  volumeRange:
+    min: 0.96033406
+    max: 1
diff --git a/Assets/Audio/Augments/Revolver/BonkStrong.asset.meta b/Assets/Audio/Augments/Revolver/BonkStrong.asset.meta
diff --git a/.../Audio/Augments/Revolver/bank-thud-04.mp3 → ...ts/Audio/Augments/Revolver/BonkStrong.mp3 b/.../Audio/Augments/Revolver/bank-thud-04.mp3 → ...ts/Audio/Augments/Revolver/BonkStrong.mp3
diff --git a/...o/Augments/Revolver/bank-thud-04.mp3.meta → ...dio/Augments/Revolver/BonkStrong.mp3.meta b/...o/Augments/Revolver/bank-thud-04.mp3.meta → ...dio/Augments/Revolver/BonkStrong.mp3.meta
diff --git a/Assets/Audio/Augments/Revolver/BonkWeak.asset b/Assets/Audio/Augments/Revolver/BonkWeak.asset
@@ -0,0 +1,23 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: aa94d7cf98a253641a478b6ab78a05e3, type: 3}
+  m_Name: BonkWeak
+  m_EditorClassIdentifier: 
+  sounds:
+  - {fileID: 8300000, guid: 4abfc03670db1b1478a1286f3b46099d, type: 3}
+  semitoneRange:
+    min: -1
+    max: 0
+  continuousPitchBend: 1
+  volumeRange:
+    min: 0.96033406
+    max: 1
diff --git a/Assets/Audio/Augments/Revolver/BonkWeak.asset.meta b/Assets/Audio/Augments/Revolver/BonkWeak.asset.meta
diff --git a/.../Audio/Augments/Revolver/bank-thud-05.mp3 → Assets/Audio/Augments/Revolver/BonkWeak.mp3 b/.../Audio/Augments/Revolver/bank-thud-05.mp3 → Assets/Audio/Augments/Revolver/BonkWeak.mp3
diff --git a/...o/Augments/Revolver/bank-thud-05.mp3.meta → ...Audio/Augments/Revolver/BonkWeak.mp3.meta b/...o/Augments/Revolver/bank-thud-05.mp3.meta → ...Audio/Augments/Revolver/BonkWeak.mp3.meta
diff --git a/Assets/Audio/Augments/Revolver/BulletsClinking.asset b/Assets/Audio/Augments/Revolver/BulletsClinking.asset
@@ -0,0 +1,23 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: aa94d7cf98a253641a478b6ab78a05e3, type: 3}
+  m_Name: BulletsClinking
+  m_EditorClassIdentifier: 
+  sounds:
+  - {fileID: 8300000, guid: 25d0c1347ce7114499a06bb027d4b96e, type: 3}
+  semitoneRange:
+    min: -1
+    max: 1
+  continuousPitchBend: 1
+  volumeRange:
+    min: 0.96033406
+    max: 1
diff --git a/Assets/Audio/Augments/Revolver/BulletsClinking.asset.meta b/Assets/Audio/Augments/Revolver/BulletsClinking.asset.meta
diff --git a/...Augments/Revolver/Bullets klinking-10.mp3 → ...dio/Augments/Revolver/BulletsClinking.mp3 b/...Augments/Revolver/Bullets klinking-10.mp3 → ...dio/Augments/Revolver/BulletsClinking.mp3
diff --git a/...nts/Revolver/Bullets klinking-10.mp3.meta → ...ugments/Revolver/BulletsClinking.mp3.meta b/...nts/Revolver/Bullets klinking-10.mp3.meta → ...ugments/Revolver/BulletsClinking.mp3.meta
diff --git a/Assets/Prefabs/ArenaCamera.prefab b/Assets/Prefabs/ArenaCamera.prefab
@@ -10,7 +10,6 @@ GameObject:
   m_Component:
   - component: {fileID: 4560627545820911483}
   - component: {fileID: 4560627545820911482}
-  - component: {fileID: 4560627545820911485}
   - component: {fileID: 4560627545820911480}
   m_Layer: 0
   m_Name: ArenaCamera
@@ -85,14 +84,6 @@ Camera:
   m_OcclusionCulling: 1
   m_StereoConvergence: 10
   m_StereoSeparation: 0.022
---- !u!81 &4560627545820911485
-AudioListener:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4560627545820911484}
-  m_Enabled: 1
 --- !u!114 &4560627545820911480
 MonoBehaviour:
   m_ObjectHideFlags: 0

diff --git a/Assets/Prefabs/GunParts/BulletBarrel.prefab b/Assets/Prefabs/GunParts/BulletBarrel.prefab
@@ -650,6 +650,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0798da53ce119cf4cba859cb8e9ca69a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  syncDirection: 0
+  syncMode: 0
+  syncInterval: 0
   statModifiers:
   - name: ProjectileDamage
     addition: 20
@@ -677,7 +680,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 67e1c2fae3becca4d88288bfa7bb3395, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  syncDirection: 0
+  syncMode: 0
+  syncInterval: 0
   projectileOutput: {fileID: 5765902433490691002}
+  actualPosition: {x: 0, y: 0, z: 0}
+  actualDirection: {x: 0, y: 0, z: 0}
   projectileRotation: {x: 0, y: 0, z: 0, w: 1}
   stats: {fileID: 0}
   player: {fileID: 0}
@@ -721,8 +729,8 @@ AudioSource:
   SpatializePostEffects: 0
   Priority: 128
   DopplerLevel: 1
-  MinDistance: 1
-  MaxDistance: 500
+  MinDistance: 30
+  MaxDistance: 1000
   Pan2D: 0
   rolloffMode: 0
   BypassEffects: 0

diff --git a/Assets/Prefabs/GunParts/Bullets/CannonExplosion.prefab b/Assets/Prefabs/GunParts/Bullets/CannonExplosion.prefab
@@ -227,8 +227,8 @@ AudioSource:
   SpatializePostEffects: 0
   Priority: 128
   DopplerLevel: 1
-  MinDistance: 1
-  MaxDistance: 500
+  MinDistance: 30
+  MaxDistance: 1000
   Pan2D: 0
   rolloffMode: 0
   BypassEffects: 0

diff --git a/Assets/Prefabs/GunParts/Bullets/TrashUplink/FallingRock.prefab b/Assets/Prefabs/GunParts/Bullets/TrashUplink/FallingRock.prefab
@@ -49,7 +49,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   audibleVelocityThreshold: 20
   initialFallVelocity: 50
-  gravity: 9.81
   spherecastRadius: 1.46
   spherecastMask:
     serializedVersion: 2
@@ -103,8 +102,8 @@ AudioSource:
   SpatializePostEffects: 0
   Priority: 128
   DopplerLevel: 1
-  MinDistance: 1
-  MaxDistance: 500
+  MinDistance: 20
+  MaxDistance: 1000
   Pan2D: 0
   rolloffMode: 0
   BypassEffects: 0

diff --git a/Assets/Prefabs/GunParts/Bullets/TrashUplink/ImpactExplosion.prefab b/Assets/Prefabs/GunParts/Bullets/TrashUplink/ImpactExplosion.prefab
@@ -33,7 +33,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 1
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &2954352013874095910
 MonoBehaviour:
@@ -227,8 +227,8 @@ AudioSource:
   SpatializePostEffects: 0
   Priority: 128
   DopplerLevel: 1
-  MinDistance: 1
-  MaxDistance: 500
+  MinDistance: 30
+  MaxDistance: 1000
   Pan2D: 0
   rolloffMode: 0
   BypassEffects: 0

diff --git a/Assets/Prefabs/GunParts/CannonBarrel.prefab b/Assets/Prefabs/GunParts/CannonBarrel.prefab
@@ -235,6 +235,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0798da53ce119cf4cba859cb8e9ca69a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  syncDirection: 0
+  syncMode: 0
+  syncInterval: 0
   statModifiers:
   - name: ProjectileDamage
     addition: 40
@@ -266,7 +269,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: de5ab80858d9d8a40b4f1524fac3b820, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  syncDirection: 0
+  syncMode: 0
+  syncInterval: 0
   projectileOutput: {fileID: 0}
+  actualPosition: {x: 0, y: 0, z: 0}
+  actualDirection: {x: 0, y: 0, z: 0}
   projectileRotation: {x: 0, y: 0, z: 0, w: 1}
   stats: {fileID: 0}
   player: {fileID: 0}
@@ -340,8 +348,8 @@ AudioSource:
   SpatializePostEffects: 0
   Priority: 128
   DopplerLevel: 1
-  MinDistance: 1
-  MaxDistance: 500
+  MinDistance: 30
+  MaxDistance: 1000
   Pan2D: 0
   rolloffMode: 0
   BypassEffects: 0

diff --git a/Assets/Prefabs/GunParts/CoilBarrel.prefab b/Assets/Prefabs/GunParts/CoilBarrel.prefab
@@ -391,6 +391,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0798da53ce119cf4cba859cb8e9ca69a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  syncDirection: 0
+  syncMode: 0
+  syncInterval: 0
   statModifiers:
   - name: ProjectileDamage
     addition: 25
@@ -422,7 +425,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 67e1c2fae3becca4d88288bfa7bb3395, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  syncDirection: 0
+  syncMode: 0
+  syncInterval: 0
   projectileOutput: {fileID: 0}
+  actualPosition: {x: 0, y: 0, z: 0}
+  actualDirection: {x: 0, y: 0, z: 0}
   projectileRotation: {x: 0, y: 0, z: 0, w: 1}
   stats: {fileID: 0}
   player: {fileID: 0}
@@ -445,6 +453,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a8a5ed8580116e36d976d061ef0db232, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  syncDirection: 0
+  syncMode: 0
+  syncInterval: 0
   interval: 0.15
   radius: 0.25
 --- !u!114 &7327065496144923300
@@ -480,8 +491,8 @@ AudioSource:
   SpatializePostEffects: 0
   Priority: 128
   DopplerLevel: 1
-  MinDistance: 1
-  MaxDistance: 500
+  MinDistance: 30
+  MaxDistance: 1000
   Pan2D: 0
   rolloffMode: 0
   BypassEffects: 0