Merge branch 'main' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-21-22/2C-CC-Repository

# Conflicts: # Unity-Files/Assets/Examples/Defender/Defender.unity
2021-11-10 16:54:10 +00:00 · 2021-11-10 16:54:10 +00:00 · 3a05d9521f
commit 3a05d9521f
parent 0f8aaa9a5b df35e0b55b
29 changed files with 41 additions and 41 deletions
--- a/Build/GAM110_3D_GAMEA_Data/Managed/Assembly-CSharp.dll
+++ b/Build/GAM110_3D_GAMEA_Data/Managed/Assembly-CSharp.dll
--- a/Build/GAM110_3D_GAMEA_Data/Managed/Purchasing.Common.dll
+++ b/Build/GAM110_3D_GAMEA_Data/Managed/Purchasing.Common.dll
--- a/Build/GAM110_3D_GAMEA_Data/Managed/Unity.Addressables.dll
+++ b/Build/GAM110_3D_GAMEA_Data/Managed/Unity.Addressables.dll
--- a/Build/GAM110_3D_GAMEA_Data/Managed/Unity.Analytics.DataPrivacy.dll
+++ b/Build/GAM110_3D_GAMEA_Data/Managed/Unity.Analytics.DataPrivacy.dll
--- a/Build/GAM110_3D_GAMEA_Data/Managed/Unity.ResourceManager.dll
+++ b/Build/GAM110_3D_GAMEA_Data/Managed/Unity.ResourceManager.dll
--- a/Build/GAM110_3D_GAMEA_Data/Managed/Unity.ScriptableBuildPipeline.dll
+++ b/Build/GAM110_3D_GAMEA_Data/Managed/Unity.ScriptableBuildPipeline.dll
--- a/Build/GAM110_3D_GAMEA_Data/Managed/Unity.TextMeshPro.dll
+++ b/Build/GAM110_3D_GAMEA_Data/Managed/Unity.TextMeshPro.dll
--- a/Build/GAM110_3D_GAMEA_Data/Managed/Unity.Timeline.dll
+++ b/Build/GAM110_3D_GAMEA_Data/Managed/Unity.Timeline.dll
--- a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Advertisements.dll
+++ b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Advertisements.dll
--- a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Monetization.dll
+++ b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Monetization.dll
--- a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.AppleCore.dll
+++ b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.AppleCore.dll
--- a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.AppleMacosStub.dll
+++ b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.AppleMacosStub.dll
--- a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.AppleStub.dll
+++ b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.AppleStub.dll
--- a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.Codeless.dll
+++ b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.Codeless.dll
--- a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.SecurityCore.dll
+++ b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.SecurityCore.dll
--- a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.SecurityStub.dll
+++ b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.SecurityStub.dll
--- a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.Stores.dll
+++ b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.Stores.dll
--- a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.WinRTCore.dll
+++ b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.WinRTCore.dll
--- a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.WinRTStub.dll
+++ b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.WinRTStub.dll
--- a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.dll
+++ b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.dll
--- a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.SpatialTracking.dll
+++ b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.SpatialTracking.dll
--- a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.UI.dll
+++ b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.UI.dll
--- a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.XR.LegacyInputHelpers.dll
+++ b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.XR.LegacyInputHelpers.dll
--- a/Build/GAM110_3D_GAMEA_Data/Managed/com.ben-w.erp.dll
+++ b/Build/GAM110_3D_GAMEA_Data/Managed/com.ben-w.erp.dll
--- a/Build/GAM110_3D_GAMEA_Data/Managed/com.unity.multiplayer-hlapi.Runtime.dll
+++ b/Build/GAM110_3D_GAMEA_Data/Managed/com.unity.multiplayer-hlapi.Runtime.dll
--- a/Build/GAM110_3D_GAMEA_Data/globalgamemanagers
+++ b/Build/GAM110_3D_GAMEA_Data/globalgamemanagers
--- a/Build/GAM110_3D_GAMEA_Data/level1
+++ b/Build/GAM110_3D_GAMEA_Data/level1
--- a/Unity-Files/Assets/Examples/Defender/Defender.unity
+++ b/Unity-Files/Assets/Examples/Defender/Defender.unity
@ -387,9 +387,9 @@ RectTransform:
  m_Father: {fileID: 1059183747}
  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 500, y: -175}
  m_SizeDelta: {x: 0, y: 50}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &204554430
@ -514,9 +514,9 @@ RectTransform:
  m_Father: {fileID: 1059183747}
  m_RootOrder: 5
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 500, y: -480}
  m_SizeDelta: {x: 0, y: 80}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &222835919
@ -543,11 +543,11 @@ MonoBehaviour:
    m_Font: {fileID: 12800000, guid: 2fb810d2f9fc27b4eb7693fd3f9f158c, type: 3}
    m_FontSize: 29
    m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
    m_MinSize: 0
    m_MaxSize: 249
    m_Alignment: 3
-    m_AlignByGeometry: 1
+    m_AlignByGeometry: 0
    m_RichText: 1
    m_HorizontalOverflow: 0
    m_VerticalOverflow: 0
@ -775,9 +775,9 @@ RectTransform:
  m_Father: {fileID: 1059183747}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 500, y: -100}
  m_SizeDelta: {x: 0, y: 100}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &289906080
@ -854,9 +854,9 @@ RectTransform:
  m_Father: {fileID: 1059183747}
  m_RootOrder: 6
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 500, y: -560}
  m_SizeDelta: {x: 0, y: 80}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &303121901
@ -883,11 +883,11 @@ MonoBehaviour:
    m_Font: {fileID: 12800000, guid: 2fb810d2f9fc27b4eb7693fd3f9f158c, type: 3}
    m_FontSize: 29
    m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
    m_MinSize: 0
    m_MaxSize: 249
    m_Alignment: 3
-    m_AlignByGeometry: 1
+    m_AlignByGeometry: 0
    m_RichText: 1
    m_HorizontalOverflow: 0
    m_VerticalOverflow: 0
@ -1544,9 +1544,9 @@ RectTransform:
  m_Father: {fileID: 1059183747}
  m_RootOrder: 4
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 500, y: -400}
  m_SizeDelta: {x: 0, y: 80}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &615826098
@ -1573,11 +1573,11 @@ MonoBehaviour:
    m_Font: {fileID: 12800000, guid: 2fb810d2f9fc27b4eb7693fd3f9f158c, type: 3}
    m_FontSize: 29
    m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
    m_MinSize: 0
    m_MaxSize: 249
    m_Alignment: 3
-    m_AlignByGeometry: 1
+    m_AlignByGeometry: 0
    m_RichText: 1
    m_HorizontalOverflow: 0
    m_VerticalOverflow: 0
@ -2593,7 +2593,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1066252772
 RectTransform:
  m_ObjectHideFlags: 0
@ -2609,10 +2609,10 @@ RectTransform:
  m_Father: {fileID: 1059183747}
  m_RootOrder: 7
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 86.8201}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 500, y: -600}
+  m_SizeDelta: {x: 260, y: 86.8201}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!95 &1066252773
 Animator:
@ -2948,9 +2948,9 @@ RectTransform:
  m_Father: {fileID: 1059183747}
  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 500, y: -240}
  m_SizeDelta: {x: 0, y: 80}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1433312461
@ -2977,11 +2977,11 @@ MonoBehaviour:
    m_Font: {fileID: 12800000, guid: 2fb810d2f9fc27b4eb7693fd3f9f158c, type: 3}
    m_FontSize: 29
    m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
    m_MinSize: 0
    m_MaxSize: 249
    m_Alignment: 3
-    m_AlignByGeometry: 1
+    m_AlignByGeometry: 0
    m_RichText: 1
    m_HorizontalOverflow: 0
    m_VerticalOverflow: 0
@ -4151,7 +4151,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!210 &1891273396
 SortingGroup:
  m_ObjectHideFlags: 0
@ -4668,9 +4668,9 @@ RectTransform:
  m_Father: {fileID: 1059183747}
  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 500, y: -320}
  m_SizeDelta: {x: 0, y: 80}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2084735052
@ -4697,11 +4697,11 @@ MonoBehaviour:
    m_Font: {fileID: 12800000, guid: 2fb810d2f9fc27b4eb7693fd3f9f158c, type: 3}
    m_FontSize: 29
    m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
    m_MinSize: 0
    m_MaxSize: 249
    m_Alignment: 3
-    m_AlignByGeometry: 1
+    m_AlignByGeometry: 0
    m_RichText: 1
    m_HorizontalOverflow: 0
    m_VerticalOverflow: 0
--- a/Unity-Files/Assets/Examples/Defender/Main
+++ b/Unity-Files/Assets/Examples/Defender/Main
@ -430,7 +430,7 @@ RectTransform:
  m_Children:
  - {fileID: 1015652469}
  m_Father: {fileID: 2067754506}
-  m_RootOrder: 1
+  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
@ -1051,7 +1051,7 @@ RectTransform:
  m_Children:
  - {fileID: 1190983639}
  m_Father: {fileID: 2067754506}
-  m_RootOrder: 2
+  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
@ -1232,7 +1232,7 @@ MonoBehaviour:
    m_Font: {fileID: 12800000, guid: 2fb810d2f9fc27b4eb7693fd3f9f158c, type: 3}
    m_FontSize: 28
    m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
    m_MinSize: 2
    m_MaxSize: 40
    m_Alignment: 4
@ -1837,8 +1837,8 @@ RectTransform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 1775893497}
-  - {fileID: 631058861}
  - {fileID: 1051586296}
+  - {fileID: 631058861}
  m_Father: {fileID: 271190044}
  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}