From 0a1cf805bab1187c9b7c000156f68ca64dd914a8 Mon Sep 17 00:00:00 2001 From: Steven Leal Date: Thu, 30 Nov 2017 14:29:45 -0600 Subject: [PATCH] fixed splash background --- .../Assets/Scenes/GameScene.unity | 12 +-- Project Undercover/Assets/Scenes/Splash.unity | 88 ++++++++++++++++--- 2 files changed, 84 insertions(+), 16 deletions(-) diff --git a/Project Undercover/Assets/Scenes/GameScene.unity b/Project Undercover/Assets/Scenes/GameScene.unity index 78bc0e4..b8911e9 100755 --- a/Project Undercover/Assets/Scenes/GameScene.unity +++ b/Project Undercover/Assets/Scenes/GameScene.unity @@ -1326,12 +1326,12 @@ Prefab: - target: {fileID: 224003334026830312, guid: c67fa24334c0f364cad8798522e92116, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -35 objectReference: {fileID: 0} - target: {fileID: 224003334026830312, guid: c67fa24334c0f364cad8798522e92116, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 70 objectReference: {fileID: 0} - target: {fileID: 224003334026830312, guid: c67fa24334c0f364cad8798522e92116, type: 2} @@ -5080,12 +5080,12 @@ Prefab: - target: {fileID: 224003334026830312, guid: c67fa24334c0f364cad8798522e92116, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -35 objectReference: {fileID: 0} - target: {fileID: 224003334026830312, guid: c67fa24334c0f364cad8798522e92116, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 70 objectReference: {fileID: 0} - target: {fileID: 224003334026830312, guid: c67fa24334c0f364cad8798522e92116, type: 2} @@ -6597,12 +6597,12 @@ Prefab: - target: {fileID: 224003334026830312, guid: c67fa24334c0f364cad8798522e92116, type: 2} propertyPath: m_AnchoredPosition.y - value: 0 + value: -35 objectReference: {fileID: 0} - target: {fileID: 224003334026830312, guid: c67fa24334c0f364cad8798522e92116, type: 2} propertyPath: m_SizeDelta.y - value: 0 + value: 70 objectReference: {fileID: 0} - target: {fileID: 224003334026830312, guid: c67fa24334c0f364cad8798522e92116, type: 2} diff --git a/Project Undercover/Assets/Scenes/Splash.unity b/Project Undercover/Assets/Scenes/Splash.unity index 7d97b67..3521540 100644 --- a/Project Undercover/Assets/Scenes/Splash.unity +++ b/Project Undercover/Assets/Scenes/Splash.unity @@ -109,8 +109,6 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 - debug: - m_Flags: 0 m_NavMeshData: {fileID: 0} --- !u!1 &18029027 GameObject: @@ -241,6 +239,7 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 + m_StereoMirrorMode: 0 --- !u!4 &289628376 Transform: m_ObjectHideFlags: 0 @@ -283,7 +282,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1108133786} - 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} @@ -416,19 +415,20 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1108133782} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 512, y: 384, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} m_Children: + - {fileID: 1888639737} - {fileID: 1531749743} - {fileID: 854366558} m_Father: {fileID: 0} 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} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} --- !u!1 &1369552457 GameObject: m_ObjectHideFlags: 0 @@ -522,7 +522,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1108133786} - m_RootOrder: 0 + 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} @@ -562,3 +562,71 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1531749742} +--- !u!1 &1888639736 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1888639737} + - component: {fileID: 1888639739} + - component: {fileID: 1888639738} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1888639737 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1888639736} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1108133786} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1888639738 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1888639736} + 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: 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_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1888639739 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1888639736}