Merge remote-tracking branch 'origin/master'

Assets/Scenes/CodeDEV.unity

@@ -1502,6 +1502,31 @@ Prefab:
       propertyPath: m_Color.b
       value: 0.2233001
       objectReference: {fileID: 0}
+    - target: {fileID: 114516921110256910, guid: 460d856ea4eb14cedb5fecde1fe6d743,
+        type: 2}
+      propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+      value: 
+      objectReference: {fileID: 881384373}
+    - target: {fileID: 114516921110256910, guid: 460d856ea4eb14cedb5fecde1fe6d743,
+        type: 2}
+      propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+      value: SetMasterVolume
+      objectReference: {fileID: 0}
+    - target: {fileID: 114516921110256910, guid: 460d856ea4eb14cedb5fecde1fe6d743,
+        type: 2}
+      propertyPath: m_MinValue
+      value: -80
+      objectReference: {fileID: 0}
+    - target: {fileID: 114516921110256910, guid: 460d856ea4eb14cedb5fecde1fe6d743,
+        type: 2}
+      propertyPath: m_MaxValue
+      value: 20
+      objectReference: {fileID: 0}
+    - target: {fileID: 114516921110256910, guid: 460d856ea4eb14cedb5fecde1fe6d743,
+        type: 2}
+      propertyPath: m_Value
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 460d856ea4eb14cedb5fecde1fe6d743, type: 2}
   m_IsPrefabParent: 0

Assets/Scripts/AudioControl.cs

@@ -20,7 +20,7 @@ public class AudioControl : MonoBehaviour
     // Use this for initialization
     void Start()
     {
-        
+        Debug.Log(mixer.name);
         maintheme.loop = true;
         menutheme.loop = true;
         gameovers.loop = true;

Assets/sound/AudioMixer.mixer

@@ -15,7 +15,9 @@ AudioMixerController:
   m_SuspendThreshold: -80
   m_EnableSuspend: 1
   m_UpdateMode: 0
-  m_ExposedParameters: []
+  m_ExposedParameters:
+  - guid: 43685e8fb476ee342aecf379591bcac4
+    name: masterVolume
   m_AudioMixerGroupViews:
   - guids:
     - d902279d5cca5304381939ffef6d4beb