From cae22cb713eb2e94186104681b8b1a14c2c6d5f6 Mon Sep 17 00:00:00 2001 From: darrelmarek Date: Tue, 28 Nov 2017 15:30:48 -0600 Subject: [PATCH] made everything exo --- .../Assets/Scenes/Launcher.unity | 215 +++++------------- Project Undercover/Assets/Scenes/Lobby.unity | 194 +++------------- .../Assets/Scenes/MainMenu.unity | 22 +- .../ProjectSettings/EditorBuildSettings.asset | 11 +- 4 files changed, 98 insertions(+), 344 deletions(-) diff --git a/Project Undercover/Assets/Scenes/Launcher.unity b/Project Undercover/Assets/Scenes/Launcher.unity index 87a41bd..2426aaf 100644 --- a/Project Undercover/Assets/Scenes/Launcher.unity +++ b/Project Undercover/Assets/Scenes/Launcher.unity @@ -205,75 +205,6 @@ MonoBehaviour: m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 m_ChildControlHeight: 0 ---- !u!1 &28888850 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 28888851} - - component: {fileID: 28888853} - - component: {fileID: 28888852} - m_Layer: 9 - m_Name: Project - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &28888851 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 28888850} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -142.5, y: 208.5, z: 0} - m_LocalScale: {x: 6, y: 1.5, z: 1} - m_Children: - - {fileID: 1645643756} - m_Father: {fileID: 1638683431} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 335, y: -108} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &28888852 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 28888850} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, 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_Sprite: {fileID: 21300000, guid: 74829d48d22a9564a8e3e0aae58d4025, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!222 &28888853 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 28888850} --- !u!1 &32780178 GameObject: m_ObjectHideFlags: 0 @@ -681,6 +612,33 @@ Prefab: propertyPath: m_Pivot.y value: 1 objectReference: {fileID: 0} + - target: {fileID: 114647180428938562, guid: 4d20a5c7076577d4099f0f1589e474aa, + type: 2} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 86499a4a05368424fa17fc7f098d46a9, + type: 3} + - target: {fileID: 114418020196636122, guid: 4d20a5c7076577d4099f0f1589e474aa, + type: 2} + propertyPath: m_FontData.m_Font + value: + objectReference: {fileID: 12800000, guid: 86499a4a05368424fa17fc7f098d46a9, + type: 3} + - target: {fileID: 114647180428938562, guid: 4d20a5c7076577d4099f0f1589e474aa, + type: 2} + propertyPath: m_Color.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114647180428938562, guid: 4d20a5c7076577d4099f0f1589e474aa, + type: 2} + propertyPath: m_Color.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 114647180428938562, guid: 4d20a5c7076577d4099f0f1589e474aa, + type: 2} + propertyPath: m_Color.b + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 4d20a5c7076577d4099f0f1589e474aa, type: 2} m_IsPrefabParent: 0 @@ -897,7 +855,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 0.5} + m_Color: {r: 0, g: 0, b: 0, a: 0.5} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -905,7 +863,7 @@ MonoBehaviour: 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_Font: {fileID: 12800000, guid: 86499a4a05368424fa17fc7f098d46a9, type: 3} m_FontSize: 14 m_FontStyle: 2 m_BestFit: 0 @@ -1006,7 +964,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 871952079} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 477.5, y: 316.5, z: 0} + m_LocalPosition: {x: 524, y: 163, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 64553954} @@ -1046,7 +1004,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1009736658} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -290, z: 0} + m_LocalPosition: {x: 0.000045776367, y: -288.263, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1139586349} @@ -1055,8 +1013,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 10} - m_SizeDelta: {x: 200, y: 30} + m_AnchoredPosition: {x: 0.000045776003, y: 11.7369995} + m_SizeDelta: {x: 203.58, y: 38.2} m_Pivot: {x: 0.5, y: 0} --- !u!114 &1009736660 MonoBehaviour: @@ -1129,8 +1087,8 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 418318f18f2df704582c2d2d8de3b6f6, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1255,7 +1213,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1263,7 +1221,7 @@ MonoBehaviour: 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_Font: {fileID: 12800000, guid: 86499a4a05368424fa17fc7f098d46a9, type: 3} m_FontSize: 40 m_FontStyle: 0 m_BestFit: 0 @@ -1306,7 +1264,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1139586348} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 15, z: 0} + m_LocalPosition: {x: 0, y: 19.1, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1009736659} @@ -1329,7 +1287,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1337,7 +1295,7 @@ MonoBehaviour: 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_Font: {fileID: 12800000, guid: 86499a4a05368424fa17fc7f098d46a9, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -1571,7 +1529,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1174787943} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -230, z: 0} + m_LocalPosition: {x: 0.000022888184, y: -250.063, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1365427910} @@ -1580,8 +1538,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 70} - m_SizeDelta: {x: 120, y: 30} + m_AnchoredPosition: {x: 0.000024796, y: 49.937} + m_SizeDelta: {x: 152.3, y: 38.1} m_Pivot: {x: 0.5, y: 0} --- !u!114 &1174787945 MonoBehaviour: @@ -1654,8 +1612,8 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 418318f18f2df704582c2d2d8de3b6f6, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1842,7 +1800,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1365427909} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 15, z: 0} + m_LocalPosition: {x: 0, y: 19.05, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1174787944} @@ -1865,7 +1823,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1873,7 +1831,7 @@ MonoBehaviour: 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_Font: {fileID: 12800000, guid: 86499a4a05368424fa17fc7f098d46a9, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -1939,7 +1897,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1947,7 +1905,7 @@ MonoBehaviour: 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_Font: {fileID: 12800000, guid: 86499a4a05368424fa17fc7f098d46a9, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -2134,10 +2092,9 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1638683426} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 477.5, y: 316.5, z: 0} + m_LocalPosition: {x: 524, y: 163, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 28888851} + m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2146,71 +2103,3 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1645643755 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 1645643756} - - component: {fileID: 1645643758} - - component: {fileID: 1645643757} - m_Layer: 9 - m_Name: Undercover - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1645643756 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1645643755} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 22.4, y: -72.2, z: 0} - m_LocalScale: {x: 0.8333334, y: 0.33333334, z: 1} - m_Children: [] - m_Father: {fileID: 28888851} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 22.4, y: -72.2} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1645643757 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1645643755} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, 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_Sprite: {fileID: 21300000, guid: b4ee627381054b0408a00ef5169d770f, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!222 &1645643758 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1645643755} diff --git a/Project Undercover/Assets/Scenes/Lobby.unity b/Project Undercover/Assets/Scenes/Lobby.unity index feae93f..eaf8281 100644 --- a/Project Undercover/Assets/Scenes/Lobby.unity +++ b/Project Undercover/Assets/Scenes/Lobby.unity @@ -231,7 +231,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -239,7 +239,7 @@ MonoBehaviour: 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_Font: {fileID: 12800000, guid: 86499a4a05368424fa17fc7f098d46a9, type: 3} m_FontSize: 14 m_FontStyle: 1 m_BestFit: 0 @@ -283,17 +283,17 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 399083357} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.0000076293945, y: -147, z: 0} + m_LocalPosition: {x: 2.550003, y: -136, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1286088441} m_Father: {fileID: 1619536836} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.000005722, y: -147} - m_SizeDelta: {x: 202.8, y: 38.021} + m_AnchoredPosition: {x: 2.55, y: -136} + m_SizeDelta: {x: 217.6, y: 40.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &399083359 MonoBehaviour: @@ -404,7 +404,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 516105858} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -15, z: 0} + m_LocalPosition: {x: 0, y: -19.6, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1311584182} @@ -427,7 +427,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -435,11 +435,11 @@ MonoBehaviour: 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: 14 + m_Font: {fileID: 12800000, guid: 86499a4a05368424fa17fc7f098d46a9, type: 3} + m_FontSize: 18 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 1 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -484,7 +484,7 @@ RectTransform: m_Children: - {fileID: 2067358599} m_Father: {fileID: 1619536836} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -892,7 +892,7 @@ RectTransform: m_Children: - {fileID: 233897633} m_Father: {fileID: 1619536836} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1171,17 +1171,17 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1311584181} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 316.5, z: 0} + m_LocalPosition: {x: 2.550003, y: 155, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 516105859} m_Father: {fileID: 1619536836} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 2.55, y: -8} + m_SizeDelta: {x: 208.86, y: 39.2} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1311584183 MonoBehaviour: @@ -1254,8 +1254,8 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 418318f18f2df704582c2d2d8de3b6f6, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1268,75 +1268,6 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1311584181} ---- !u!1 &1357108016 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 1357108017} - - component: {fileID: 1357108019} - - component: {fileID: 1357108018} - m_Layer: 5 - m_Name: Project - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1357108017 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1357108016} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -142.5, y: 208.5, z: 0} - m_LocalScale: {x: 6, y: 1.5, z: 1} - m_Children: - - {fileID: 1900440563} - m_Father: {fileID: 1619536836} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 335, y: -108} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1357108018 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1357108016} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, 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_Sprite: {fileID: 21300000, guid: 74829d48d22a9564a8e3e0aae58d4025, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!222 &1357108019 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1357108016} --- !u!1 &1477022901 GameObject: m_ObjectHideFlags: 0 @@ -1384,7 +1315,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1392,7 +1323,7 @@ MonoBehaviour: 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_Font: {fileID: 12800000, guid: 86499a4a05368424fa17fc7f098d46a9, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -1441,7 +1372,7 @@ RectTransform: - {fileID: 1727026637} - {fileID: 1687808034} m_Father: {fileID: 1619536836} - 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} @@ -1563,11 +1494,10 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1619536832} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 477.5, y: 316.5, z: 0} + m_LocalPosition: {x: 524, y: 163, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1050448014} - - {fileID: 1357108017} - {fileID: 1509060437} - {fileID: 2146513244} - {fileID: 528310363} @@ -1720,7 +1650,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1728,7 +1658,7 @@ MonoBehaviour: 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_Font: {fileID: 12800000, guid: 86499a4a05368424fa17fc7f098d46a9, type: 3} m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 @@ -1747,74 +1677,6 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1727026636} ---- !u!1 &1900440562 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 1900440563} - - component: {fileID: 1900440565} - - component: {fileID: 1900440564} - m_Layer: 5 - m_Name: Undercover - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1900440563 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1900440562} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 22.4, y: -72.2, z: 0} - m_LocalScale: {x: 0.8333334, y: 0.33333334, z: 1} - m_Children: [] - m_Father: {fileID: 1357108017} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 22.4, y: -72.2} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1900440564 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1900440562} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, 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_Sprite: {fileID: 21300000, guid: b4ee627381054b0408a00ef5169d770f, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!222 &1900440565 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1900440562} --- !u!1 &2067358598 GameObject: m_ObjectHideFlags: 0 @@ -1862,7 +1724,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1870,7 +1732,7 @@ MonoBehaviour: 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_Font: {fileID: 12800000, guid: 86499a4a05368424fa17fc7f098d46a9, type: 3} m_FontSize: 14 m_FontStyle: 1 m_BestFit: 0 @@ -1919,7 +1781,7 @@ RectTransform: - {fileID: 1477022902} - {fileID: 1137219695} m_Father: {fileID: 1619536836} - m_RootOrder: 3 + 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} diff --git a/Project Undercover/Assets/Scenes/MainMenu.unity b/Project Undercover/Assets/Scenes/MainMenu.unity index 7ccd033..bf1243d 100644 --- a/Project Undercover/Assets/Scenes/MainMenu.unity +++ b/Project Undercover/Assets/Scenes/MainMenu.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} + m_IndirectSpecularColor: {r: 0.44657868, g: 0.49641263, b: 0.57481706, a: 1} --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 @@ -344,7 +344,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 354694118} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -213.45003, y: 32.25, z: 0} + m_LocalPosition: {x: -259.95, y: 9, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 21242708} @@ -353,7 +353,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 264.05, y: 32.25} + m_AnchoredPosition: {x: 264.05, y: 9} m_SizeDelta: {x: 241.9, y: 64.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &354694120 @@ -466,7 +466,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 412709800} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -213.45003, y: -161.25, z: 0} + m_LocalPosition: {x: -259.95, y: -184.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1351649978} @@ -475,7 +475,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 264.05, y: -161.25} + m_AnchoredPosition: {x: 264.05, y: -184.5} m_SizeDelta: {x: 241.9, y: 64.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &412709802 @@ -786,7 +786,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 978696437} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -213.45003, y: -96.75, z: 0} + m_LocalPosition: {x: -259.95, y: -120, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1162748024} @@ -795,7 +795,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 264.05, y: -96.75} + m_AnchoredPosition: {x: 264.05, y: -120} m_SizeDelta: {x: 241.9, y: 64.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &978696439 @@ -897,7 +897,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1033044487} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -213.45003, y: -32.25, z: 0} + m_LocalPosition: {x: -259.95, y: -55.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1858353221} @@ -906,7 +906,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 264.05, y: -32.25} + m_AnchoredPosition: {x: 264.05, y: -55.5} m_SizeDelta: {x: 241.9, y: 64.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1033044489 @@ -1081,7 +1081,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1265937153} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -142.5, y: 208.5, z: 0} + m_LocalPosition: {x: -189, y: 55, z: 0} m_LocalScale: {x: 6, y: 1.5, z: 1} m_Children: - {fileID: 18095996} @@ -1365,7 +1365,7 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1658932715} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 477.5, y: 316.5, z: 0} + m_LocalPosition: {x: 524, y: 163, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 756434826} diff --git a/Project Undercover/ProjectSettings/EditorBuildSettings.asset b/Project Undercover/ProjectSettings/EditorBuildSettings.asset index c9aa2c3..db54edc 100755 --- a/Project Undercover/ProjectSettings/EditorBuildSettings.asset +++ b/Project Undercover/ProjectSettings/EditorBuildSettings.asset @@ -5,6 +5,9 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: + - enabled: 1 + path: Assets/Scenes/MainMenu.unity + guid: 90e4e81f379e2bb46b670a647ffe0200 - enabled: 1 path: Assets/Scenes/Launcher.unity guid: 915b937f0bf8c1a40bdc9f49e93cedb0 @@ -13,16 +16,16 @@ EditorBuildSettings: guid: 9d65756f3d12ef647aea0782245fc241 - enabled: 0 path: - guid: b679f50ae448b0642b9887e440a00e0f + guid: 00000000000000000000000000000000 - enabled: 0 path: - guid: 89e17cc55d8d66942862d86930906b5f + guid: 00000000000000000000000000000000 - enabled: 0 path: - guid: e6ffeb27a9cb4a244bc7c814c7346df2 + guid: 00000000000000000000000000000000 - enabled: 0 path: - guid: 0697173d1a88eb54898d2cf63ceb7c5b + guid: 00000000000000000000000000000000 - enabled: 1 path: Assets/Scenes/GameScene.unity guid: c9dc36444a5e1c64bb9a06e825c23fc5