Merge remote-tracking branch 'origin/Over' into Syntriax

Assets/Audio/Audio Mixer.mixer

@@ -189,8 +189,8 @@ AudioMixerSnapshotController:
   m_SnapshotID: 7b03920a55d36f54bac08488dc018422
   m_FloatValues:
     a1af4b69dd3ea7f45ae1c3192eb02717: -8.481223
-    9675209fe2317fa4cb02bced339e8d4b: -13.63726
-    a449b5dff9f05be428c783227ba1ebfb: -18.592384
+    9675209fe2317fa4cb02bced339e8d4b: -9.833291
+    a449b5dff9f05be428c783227ba1ebfb: -15.421314
   m_TransitionOverrides: {}
 --- !u!244 &1458683330471287751
 AudioMixerEffectController:

Assets/Scenes/SyntriaxDevScene.unity

@@ -180,7 +180,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 1da5e227ed55bcd4b943e0ceef78aefb, type: 3}
---- !u!1 &548551711
+--- !u!1 &503016982
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -188,8 +188,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 548551713}
-  - component: {fileID: 548551712}
+  - component: {fileID: 503016984}
+  - component: {fileID: 503016983}
   m_Layer: 0
   m_Name: Music
   m_TagString: Untagged
@@ -197,13 +197,13 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!82 &548551712
+--- !u!82 &503016983
 AudioSource:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 548551711}
+  m_GameObject: {fileID: 503016982}
   m_Enabled: 1
   serializedVersion: 4
   OutputAudioMixerGroup: {fileID: 8913006207396984383, guid: 55dad93ba7816e44c83798006fa0a277, type: 2}
@@ -211,7 +211,7 @@ AudioSource:
   m_PlayOnAwake: 1
   m_Volume: 1
   m_Pitch: 1
-  Loop: 1
+  Loop: 0
   Mute: 0
   Spatialize: 0
   SpatializePostEffects: 0
@@ -293,13 +293,13 @@ AudioSource:
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 4
---- !u!4 &548551713
+--- !u!4 &503016984
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 548551711}
+  m_GameObject: {fileID: 503016982}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 1004.1356, y: 528.1812, z: -17.455448}
   m_LocalScale: {x: 1, y: 1, z: 1}