Merge branch 'master' of https://bitbucket.org/JoshuaReason/major-project-a

Assets/Prefabs/UI/Single_Player Canvas.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 47297317c21fe8a4c91caa79d00cc9a6
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/Scoreboards.unity

@@ -247,7 +247,7 @@ PrefabInstance:
     - target: {fileID: 6715947279418743284, guid: bfffca149e6d42947a4de37af2b35d12,
         type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6715947279418743280, guid: bfffca149e6d42947a4de37af2b35d12,
         type: 3}
@@ -354,6 +354,11 @@ PrefabInstance:
       propertyPath: m_Pivot.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2405198234457668279, guid: bfffca149e6d42947a4de37af2b35d12,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 3341401444955201731, guid: bfffca149e6d42947a4de37af2b35d12,
         type: 3}
       propertyPath: m_havePropertiesChanged
@@ -915,62 +920,62 @@ PrefabInstance:
       propertyPath: m_Pivot.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4166744807162682307, guid: a475835665805f14892abc694728c976,
+    - target: {fileID: 4166744805866922917, guid: a475835665805f14892abc694728c976,
         type: 3}
       propertyPath: m_havePropertiesChanged
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 4166744807162682307, guid: a475835665805f14892abc694728c976,
+    - target: {fileID: 4166744805866922917, guid: a475835665805f14892abc694728c976,
         type: 3}
       propertyPath: m_isInputParsingRequired
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 4166744807162682307, guid: a475835665805f14892abc694728c976,
+    - target: {fileID: 4166744805866922917, guid: a475835665805f14892abc694728c976,
         type: 3}
       propertyPath: m_text
       value: 
       objectReference: {fileID: 0}
-    - target: {fileID: 4166744806700843740, guid: a475835665805f14892abc694728c976,
+    - target: {fileID: 4166744806223885057, guid: a475835665805f14892abc694728c976,
         type: 3}
       propertyPath: m_havePropertiesChanged
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 4166744806700843740, guid: a475835665805f14892abc694728c976,
+    - target: {fileID: 4166744806223885057, guid: a475835665805f14892abc694728c976,
         type: 3}
       propertyPath: m_isInputParsingRequired
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 4166744806700843740, guid: a475835665805f14892abc694728c976,
+    - target: {fileID: 4166744806223885057, guid: a475835665805f14892abc694728c976,
         type: 3}
       propertyPath: m_text
       value: 
       objectReference: {fileID: 0}
-    - target: {fileID: 4166744805866922917, guid: a475835665805f14892abc694728c976,
+    - target: {fileID: 4166744806700843740, guid: a475835665805f14892abc694728c976,
         type: 3}
       propertyPath: m_havePropertiesChanged
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 4166744805866922917, guid: a475835665805f14892abc694728c976,
+    - target: {fileID: 4166744806700843740, guid: a475835665805f14892abc694728c976,
         type: 3}
       propertyPath: m_isInputParsingRequired
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 4166744805866922917, guid: a475835665805f14892abc694728c976,
+    - target: {fileID: 4166744806700843740, guid: a475835665805f14892abc694728c976,
         type: 3}
       propertyPath: m_text
       value: 
       objectReference: {fileID: 0}
-    - target: {fileID: 4166744806223885057, guid: a475835665805f14892abc694728c976,
+    - target: {fileID: 4166744806702247817, guid: a475835665805f14892abc694728c976,
         type: 3}
       propertyPath: m_havePropertiesChanged
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 4166744806223885057, guid: a475835665805f14892abc694728c976,
+    - target: {fileID: 4166744806702247817, guid: a475835665805f14892abc694728c976,
         type: 3}
       propertyPath: m_isInputParsingRequired
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 4166744806223885057, guid: a475835665805f14892abc694728c976,
+    - target: {fileID: 4166744806702247817, guid: a475835665805f14892abc694728c976,
         type: 3}
       propertyPath: m_text
       value: 
@@ -985,62 +990,62 @@ PrefabInstance:
       propertyPath: m_isInputParsingRequired
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 4166744806702247817, guid: a475835665805f14892abc694728c976,
+    - target: {fileID: 4166744807027815185, guid: a475835665805f14892abc694728c976,
         type: 3}
       propertyPath: m_havePropertiesChanged
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 4166744806702247817, guid: a475835665805f14892abc694728c976,
+    - target: {fileID: 4166744807027815185, guid: a475835665805f14892abc694728c976,
         type: 3}
       propertyPath: m_isInputParsingRequired
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 4166744806702247817, guid: a475835665805f14892abc694728c976,
+    - target: {fileID: 4166744807027815185, guid: a475835665805f14892abc694728c976,
         type: 3}
       propertyPath: m_text
       value: 
       objectReference: {fileID: 0}
-    - target: {fileID: 4166744807562529858, guid: a475835665805f14892abc694728c976,
+    - target: {fileID: 4166744807162682307, guid: a475835665805f14892abc694728c976,
         type: 3}
       propertyPath: m_havePropertiesChanged
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 4166744807562529858, guid: a475835665805f14892abc694728c976,
+    - target: {fileID: 4166744807162682307, guid: a475835665805f14892abc694728c976,
         type: 3}
       propertyPath: m_isInputParsingRequired
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 4166744807562529858, guid: a475835665805f14892abc694728c976,
+    - target: {fileID: 4166744807162682307, guid: a475835665805f14892abc694728c976,
         type: 3}
       propertyPath: m_text
       value: 
       objectReference: {fileID: 0}
-    - target: {fileID: 4166744807027815185, guid: a475835665805f14892abc694728c976,
+    - target: {fileID: 4166744807220131704, guid: a475835665805f14892abc694728c976,
         type: 3}
       propertyPath: m_havePropertiesChanged
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 4166744807027815185, guid: a475835665805f14892abc694728c976,
+    - target: {fileID: 4166744807220131704, guid: a475835665805f14892abc694728c976,
         type: 3}
       propertyPath: m_isInputParsingRequired
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 4166744807027815185, guid: a475835665805f14892abc694728c976,
+    - target: {fileID: 4166744807220131704, guid: a475835665805f14892abc694728c976,
         type: 3}
       propertyPath: m_text
       value: 
       objectReference: {fileID: 0}
-    - target: {fileID: 4166744807220131704, guid: a475835665805f14892abc694728c976,
+    - target: {fileID: 4166744807562529858, guid: a475835665805f14892abc694728c976,
         type: 3}
       propertyPath: m_havePropertiesChanged
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 4166744807220131704, guid: a475835665805f14892abc694728c976,
+    - target: {fileID: 4166744807562529858, guid: a475835665805f14892abc694728c976,
         type: 3}
       propertyPath: m_isInputParsingRequired
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 4166744807220131704, guid: a475835665805f14892abc694728c976,
+    - target: {fileID: 4166744807562529858, guid: a475835665805f14892abc694728c976,
         type: 3}
       propertyPath: m_text
       value: 

Assets/Scripts/UI/levelInfoDisplay.cs

@@ -0,0 +1,22 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class levelInfoDisplay : MonoBehaviour
+{
+    public GameObject infoDisplay;
+
+    IEnumerator displayforSeconds(float time)
+    {
+        infoDisplay.SetActive(true);
+        yield return new WaitForSeconds(time);
+        infoDisplay.SetActive(false);
+    }
+
+    // Start is called before the first frame update
+    public void StartCoroutine()
+    {
+        StartCoroutine(displayforSeconds(5.0f));
+    }
+
+}

Assets/Scripts/UI/levelInfoDisplay.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 21da11d689c1a6b4ea0ce1a4b7b9769b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: