Merge branch 'main' of https://git.fioruil.ie/cailean/beep-final

Assets/6_Scenes/Beep.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 7710.4307, g: 8946.3955, b: 9699.29, a: 1}
+  m_IndirectSpecularColor: {r: 7710.423, g: 8946.3955, b: 9699.29, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -747,7 +747,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 155411616}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.15844734, y: 0.45239884, z: -0.08203552, w: -0.87378484}
+  m_LocalRotation: {x: -0.15844774, y: 0.45239735, z: -0.082035385, w: -0.87378556}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -2058,12 +2058,12 @@ PrefabInstance:
     - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: -246
+      value: -248
       objectReference: {fileID: 0}
     - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4,
         type: 3}
       propertyPath: m_LocalPosition.y
-      value: 3.4900017
+      value: 4.299999
       objectReference: {fileID: 0}
     - target: {fileID: 3364236482078802793, guid: 263d8cea838224448bdfd0e71bc2dce4,
         type: 3}
@@ -2445,8 +2445,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 470663197}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.04618728, y: 0.950415, z: -0.17234302, w: 0.25470766}
+  m_LocalRotation: {x: 0.04618708, y: 0.9504154, z: -0.17234343, w: 0.25470608}
-  m_LocalPosition: {x: 5.6286316, y: -3.307354, z: 10.080261}
+  m_LocalPosition: {x: 5.628662, y: -3.307354, z: 10.080261}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -2798,7 +2798,7 @@ MonoBehaviour:
     LensShift: {x: 0, y: 0}
     GateFit: 1
     FocusDistance: 10
-    m_SensorSize: {x: 70.41, y: 52.63}
+    m_SensorSize: {x: 1, y: 1}
     Iso: 50
     ShutterSpeed: 0.0005
     Aperture: 2.2
@@ -3002,7 +3002,7 @@ MonoBehaviour:
     LensShift: {x: 0, y: 0}
     GateFit: 1
     FocusDistance: 10
-    m_SensorSize: {x: 70.41, y: 52.63}
+    m_SensorSize: {x: 1, y: 1}
     Iso: 200
     ShutterSpeed: 0.005
     Aperture: 16
@@ -5693,7 +5693,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1178814724}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.15844733, y: 0.45239887, z: -0.08203552, w: -0.87378484}
+  m_LocalRotation: {x: -0.15844774, y: 0.45239738, z: -0.08203539, w: -0.87378556}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -6159,6 +6159,12 @@ MonoBehaviour:
   m_ModelName: Treadmill
   m_Index: 24
   m_Touched: 0
+--- !u!1 &1283640694 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 8896637230412496375, guid: 14d8283abcefffd4a916b8611ccd49fa,
+    type: 3}
+  m_PrefabInstance: {fileID: 8839643052404795280}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1337085230
 GameObject:
   m_ObjectHideFlags: 0
@@ -8217,12 +8223,14 @@ MonoBehaviour:
     - 8422ceff3d07e44418ed269a22c2ced1
     - 03c6fea0afc4d47769fdf69dfe9043b8
     - df2d6414479f099439e2b2e88cc648b8
+    - daf16dca704ef5d438a5c8e0e78813bb
     m_Values:
     - {fileID: 0}
     - {fileID: 982989168}
     - {fileID: 707081198}
     - {fileID: 707081198}
     - {fileID: 707081198}
+    - {fileID: 1283640694}
 --- !u!4 &1916559815
 Transform:
   m_ObjectHideFlags: 1
@@ -8943,7 +8951,7 @@ Transform:
   m_GameObject: {fileID: 2116519614}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -13.1, y: -35.01, z: 58.79}
+  m_LocalPosition: {x: -15.1, y: -34.2, z: 58.79}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -9765,6 +9773,11 @@ PrefabInstance:
       value: 
       objectReference: {fileID: 13400000, guid: d96a42ec539df4c079bb7c84fe1e4eea,
         type: 2}
+    - target: {fileID: 7014208069371886610, guid: 14d8283abcefffd4a916b8611ccd49fa,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.57
+      objectReference: {fileID: 0}
     - target: {fileID: 7103911475574101348, guid: 14d8283abcefffd4a916b8611ccd49fa,
         type: 3}
       propertyPath: m_Material