Merge branch 'timothee' into axel

Author: Phalcon22Epita

.idea/.idea.year-zero/.idea/workspace.xml

@@ -69,28 +69,28 @@ MonoBehaviour:
     source: {fileID: 0}
   - name: VoixMission1.1
     clip: {fileID: 8300000, guid: 8aea68707b6a5da42954c4b5aadcae7f, type: 3}
-    volume: 2
+    volume: 3
     pitch: 0.9
     isMusic: 0
     isPlaying: 0
     source: {fileID: 0}
   - name: VoixMission1.2
     clip: {fileID: 8300000, guid: 2a74276e07fa8b849aba993fc8209b79, type: 3}
-    volume: 2
+    volume: 3
     pitch: 0.9
     isMusic: 0
     isPlaying: 0
     source: {fileID: 0}
   - name: VoixMission1.3
     clip: {fileID: 8300000, guid: 186b981ca4df0bf43819e68fb2ca1750, type: 3}
-    volume: 2
+    volume: 3
     pitch: 0.9
     isMusic: 0
     isPlaying: 0
     source: {fileID: 0}
   - name: VoixMission1.4
     clip: {fileID: 8300000, guid: 6431bff3b6dced84cb85b2767959043f, type: 3}
-    volume: 2
+    volume: 3
     pitch: 0.9
     isMusic: 0
     isPlaying: 0
@@ -139,28 +139,28 @@ MonoBehaviour:
     source: {fileID: 0}
   - name: VoixMission2.1
     clip: {fileID: 8300000, guid: 2cc2c728dd0c68847a3a72d972726ae3, type: 3}
-    volume: 0.5
+    volume: 3
     pitch: 0.9
     isMusic: 0
     isPlaying: 0
     source: {fileID: 0}
   - name: VoixMission2.2
     clip: {fileID: 8300000, guid: 2b42a19a8d88bfa45b4852328bcebb7a, type: 3}
-    volume: 0.5
+    volume: 3
     pitch: 0.9
     isMusic: 0
     isPlaying: 0
     source: {fileID: 0}
   - name: VoixMission2.3
     clip: {fileID: 8300000, guid: 9d8691daabed9214885e4c61baef590d, type: 3}
-    volume: 0.5
+    volume: 3
     pitch: 0.9
     isMusic: 0
     isPlaying: 0
     source: {fileID: 0}
   - name: VoixMission2.4
     clip: {fileID: 8300000, guid: 32957143c30263f40948876e51906676, type: 3}
-    volume: 0.5
+    volume: 3
     pitch: 0.9
     isMusic: 0
     isPlaying: 0
@@ -321,14 +321,14 @@ MonoBehaviour:
     source: {fileID: 0}
   - name: VoixMission3.1
     clip: {fileID: 8300000, guid: d466b6f124de70245bce27079683c3af, type: 3}
-    volume: 0.5
+    volume: 3
     pitch: 0.9
     isMusic: 0
     isPlaying: 0
     source: {fileID: 0}
   - name: VoixMission3.2
     clip: {fileID: 8300000, guid: b76bdd26cb7baa94da53e73cc78162df, type: 3}
-    volume: 0.5
+    volume: 3
     pitch: 0.9
     isMusic: 0
     isPlaying: 0

Assets/Audio/AudioManagerPrefab.prefab

@@ -167,6 +167,16 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4309190014128226341, guid: 28cf06e1e917f394dad9cf8ba8e2560a,
+        type: 3}
+      propertyPath: ObservedComponents.Array.data[0]
+      value: 
+      objectReference: {fileID: 416454294261193715}
+    - target: {fileID: 563438021248857849, guid: 28cf06e1e917f394dad9cf8ba8e2560a,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 1012317340487716086, guid: 28cf06e1e917f394dad9cf8ba8e2560a,
         type: 3}
       propertyPath: costs.Array.size
@@ -237,16 +247,6 @@ PrefabInstance:
       value: 
       objectReference: {fileID: 1662642892877366467, guid: c3f3f4c1f5af8a145bb51de754148591,
         type: 3}
-    - target: {fileID: 4309190014128226341, guid: 28cf06e1e917f394dad9cf8ba8e2560a,
-        type: 3}
-      propertyPath: ObservedComponents.Array.data[0]
-      value: 
-      objectReference: {fileID: 416454294261193715}
-    - target: {fileID: 563438021248857849, guid: 28cf06e1e917f394dad9cf8ba8e2560a,
-        type: 3}
-      propertyPath: m_Enabled
-      value: 0
-      objectReference: {fileID: 0}
     m_RemovedComponents:
     - {fileID: 3354145167647749936, guid: 28cf06e1e917f394dad9cf8ba8e2560a, type: 3}
     - {fileID: 1012317340487716086, guid: 28cf06e1e917f394dad9cf8ba8e2560a, type: 3}

Assets/Resources/Buildings/Combat Station/Combat Station.prefab

@@ -95,11 +95,6 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4432904553138613038, guid: 636fb200f2cdc914bb060a84a57f4203,
-        type: 3}
-      propertyPath: m_Enabled
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 114909607590321650, guid: 636fb200f2cdc914bb060a84a57f4203,
         type: 3}
       propertyPath: viewIdField
@@ -115,6 +110,11 @@ PrefabInstance:
       propertyPath: ObservedComponents.Array.data[0]
       value: 
       objectReference: {fileID: 5914945105126054897}
+    - target: {fileID: 4432904553138613038, guid: 636fb200f2cdc914bb060a84a57f4203,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 114676342713092854, guid: 636fb200f2cdc914bb060a84a57f4203,
         type: 3}
       propertyPath: costs.Array.size