Merge branch 'master' of https://altitude.otago.ac.nz/gstuitje/ringmaster

RingMaster/RingMaster/Assets/Scenes/MimeMimeTutorial.unity

@@ -233,7 +233,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   ComputerCheck: 0
-  songFile: {fileID: 4900000, guid: 2947ed3ae503f4710a5dfdd89633a90c, type: 3}
+  songFile: {fileID: 4900000, guid: 2e8db8bb98880c14d945d985f97ce0c9, type: 3}
   Q: {fileID: 1454089066838800, guid: 7c9d4c7ce0894e842b903da1b51bd667, type: 2}
   W: {fileID: 1420096474736596, guid: ddb405a62d214054baf706c375a9ed2e, type: 2}
   E: {fileID: 1110090660017558, guid: c1bec4cfb8c9c7e48bc68b3cbea99fcd, type: 2}
@@ -265,7 +265,7 @@ AudioSource:
   rolloffMode: 0
   BypassEffects: 0
   BypassListenerEffects: 1
-  BypassReverbZones: 0
+  BypassReverbZones: 1
   rolloffCustomCurve:
     serializedVersion: 2
     m_Curve:
@@ -361,10 +361,12 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   dialogueBox: {fileID: 1109535829}
   faceCam: {fileID: 1251441225}
-  SilasText: {fileID: 1970210785}
+  SilasText: {fileID: 81232772}
   silas: {fileID: 1243567175}
   speech: {fileID: 1243567178}
   button: {fileID: 175737868}
+  spawner: {fileID: 89139956}
+  music: {fileID: 89139957}
 --- !u!1 &154548823
 GameObject:
   m_ObjectHideFlags: 0
@@ -511,7 +513,7 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 0}
+      - m_Target: {fileID: 89139959}
         m_MethodName: ButtonPress
         m_Mode: 1
         m_Arguments:
@@ -2008,10 +2010,10 @@ RectTransform:
   m_Father: {fileID: 1542602636}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 51.82666, y: -80}
-  m_SizeDelta: {x: -147, y: 173.57}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 51.82666, y: 73}
+  m_SizeDelta: {x: 653, y: 173.57}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1109535831
 MonoBehaviour:
@@ -2263,7 +2265,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!114 &1241441965
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -3095,7 +3097,7 @@ Canvas:
   m_OverridePixelPerfect: 0
   m_SortingBucketNormalizedSize: 0
   m_AdditionalShaderChannelsFlag: 0
-  m_SortingLayerID: 0
+  m_SortingLayerID: -1020251125
   m_SortingOrder: 0
   m_TargetDisplay: 0
 --- !u!224 &1542602636
@@ -3110,7 +3112,6 @@ RectTransform:
   m_Children:
   - {fileID: 333498656}
   - {fileID: 1109535830}
-  - {fileID: 1970210784}
   m_Father: {fileID: 0}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -3673,79 +3674,3 @@ CanvasRenderer:
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 1828139994}
   m_CullTransparentMesh: 0
---- !u!1 &1970210783
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1970210784}
-  - component: {fileID: 1970210786}
-  - component: {fileID: 1970210785}
-  m_Layer: 0
-  m_Name: CharacterSpeechBox
-  m_TagString: CharacterSpeech
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &1970210784
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1970210783}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -3616.5134}
-  m_LocalScale: {x: 0.50005496, y: 0.50005496, z: 1.0001099}
-  m_Children: []
-  m_Father: {fileID: 1542602636}
-  m_RootOrder: 2
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 79.32617, y: -81.39252}
-  m_SizeDelta: {x: -277, y: 150}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1970210785
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1970210783}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 1}
-  m_RaycastTarget: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 29
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 10
-    m_MaxSize: 40
-    m_Alignment: 0
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: such text much wow.such text much wow.such text much wow.such text much
-    wow.
---- !u!222 &1970210786
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1970210783}
-  m_CullTransparentMesh: 0