diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/Assembly-CSharp.dll b/Build/GAM110_3D_GAMEA_Data/Managed/Assembly-CSharp.dll index 437cba4..a251c5c 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/Assembly-CSharp.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/Assembly-CSharp.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/Purchasing.Common.dll b/Build/GAM110_3D_GAMEA_Data/Managed/Purchasing.Common.dll index 72918d5..f6920f5 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/Purchasing.Common.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/Purchasing.Common.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/Unity.Addressables.dll b/Build/GAM110_3D_GAMEA_Data/Managed/Unity.Addressables.dll index cae44b9..e2b0b75 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/Unity.Addressables.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/Unity.Addressables.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/Unity.Analytics.DataPrivacy.dll b/Build/GAM110_3D_GAMEA_Data/Managed/Unity.Analytics.DataPrivacy.dll index a1bf51f..943152e 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/Unity.Analytics.DataPrivacy.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/Unity.Analytics.DataPrivacy.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/Unity.ResourceManager.dll b/Build/GAM110_3D_GAMEA_Data/Managed/Unity.ResourceManager.dll index 21490d9..5ec0f53 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/Unity.ResourceManager.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/Unity.ResourceManager.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/Unity.ScriptableBuildPipeline.dll b/Build/GAM110_3D_GAMEA_Data/Managed/Unity.ScriptableBuildPipeline.dll index 4ebda6e..d963ea5 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/Unity.ScriptableBuildPipeline.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/Unity.ScriptableBuildPipeline.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/Unity.TextMeshPro.dll b/Build/GAM110_3D_GAMEA_Data/Managed/Unity.TextMeshPro.dll index 9e2d182..c9be0e2 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/Unity.TextMeshPro.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/Unity.TextMeshPro.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/Unity.Timeline.dll b/Build/GAM110_3D_GAMEA_Data/Managed/Unity.Timeline.dll index f18806d..2df2aea 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/Unity.Timeline.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/Unity.Timeline.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Advertisements.dll b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Advertisements.dll index 2ef6fe4..500f906 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Advertisements.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Advertisements.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Monetization.dll b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Monetization.dll index d78d347..b4f30ba 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Monetization.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Monetization.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.AppleCore.dll b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.AppleCore.dll index 59a65ca..e34db6a 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.AppleCore.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.AppleCore.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.AppleMacosStub.dll b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.AppleMacosStub.dll index bdc96d4..cfffec1 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.AppleMacosStub.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.AppleMacosStub.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.AppleStub.dll b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.AppleStub.dll index ce18a30..d07776c 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.AppleStub.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.AppleStub.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.Codeless.dll b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.Codeless.dll index b52768a..934e7d1 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.Codeless.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.Codeless.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.SecurityCore.dll b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.SecurityCore.dll index 3f4d94c..d822125 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.SecurityCore.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.SecurityCore.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.SecurityStub.dll b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.SecurityStub.dll index 630b6d9..1acf8b6 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.SecurityStub.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.SecurityStub.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.Stores.dll b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.Stores.dll index b12a7dc..3dbe284 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.Stores.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.Stores.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.WinRTCore.dll b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.WinRTCore.dll index 9423657..eab6fae 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.WinRTCore.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.WinRTCore.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.WinRTStub.dll b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.WinRTStub.dll index d94e018..31a0af2 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.WinRTStub.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.WinRTStub.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.dll b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.dll index 7409be6..43b0889 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.Purchasing.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.SpatialTracking.dll b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.SpatialTracking.dll index 59ab0ec..a463325 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.SpatialTracking.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.SpatialTracking.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.UI.dll b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.UI.dll index 80f3678..44fd600 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.UI.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.UI.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.XR.LegacyInputHelpers.dll b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.XR.LegacyInputHelpers.dll index 2f3fa53..00ed29d 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.XR.LegacyInputHelpers.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/UnityEngine.XR.LegacyInputHelpers.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/Managed/com.ben-w.erp.dll b/Build/GAM110_3D_GAMEA_Data/Managed/com.ben-w.erp.dll index 20e80a7..af2a255 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/com.ben-w.erp.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/com.ben-w.erp.dll differ diff --git 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 index 7f77b46..27ae236 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/Managed/com.unity.multiplayer-hlapi.Runtime.dll and b/Build/GAM110_3D_GAMEA_Data/Managed/com.unity.multiplayer-hlapi.Runtime.dll differ diff --git a/Build/GAM110_3D_GAMEA_Data/globalgamemanagers b/Build/GAM110_3D_GAMEA_Data/globalgamemanagers index 51011bd..0423b18 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/globalgamemanagers and b/Build/GAM110_3D_GAMEA_Data/globalgamemanagers differ diff --git a/Build/GAM110_3D_GAMEA_Data/level1 b/Build/GAM110_3D_GAMEA_Data/level1 index c47f6b7..c1f6bcc 100644 Binary files a/Build/GAM110_3D_GAMEA_Data/level1 and b/Build/GAM110_3D_GAMEA_Data/level1 differ diff --git a/Unity-Files/Assets/Examples/Defender/Defender.unity b/Unity-Files/Assets/Examples/Defender/Defender.unity index 7af63f5..203f2ea 100644 --- 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 diff --git a/Unity-Files/Assets/Examples/Defender/Main Menu.unity b/Unity-Files/Assets/Examples/Defender/Main Menu.unity index 7627b00..c373c8b 100644 --- a/Unity-Files/Assets/Examples/Defender/Main Menu.unity +++ b/Unity-Files/Assets/Examples/Defender/Main Menu.unity @@ -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}