From 562006cc07aadff9d10b7c16e659ce75dcb7858b Mon Sep 17 00:00:00 2001 From: Mateus Pires Date: Tue, 6 Oct 2015 14:47:07 -0300 Subject: [PATCH] Ajustes no cscript de resoluçcao da tela de informacoes. --- Assets/Scenes/Main.unity | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------- Assets/Scripts/UIManagers/UIManagerInfo.cs | 41 ++++++++++++++++++++++++++++++----------- ProjectSettings/ProjectSettings.asset | 18 ++---------------- 3 files changed, 104 insertions(+), 38 deletions(-) diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 896a686..2bd974c 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -250,7 +250,7 @@ RectTransform: m_Father: {fileID: 28912434} m_RootOrder: 0 m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: .5, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: .5, y: .5} @@ -1457,7 +1457,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &317863997 RectTransform: m_ObjectHideFlags: 0 @@ -4103,7 +4103,7 @@ RectTransform: m_RootOrder: 2 m_AnchorMin: {x: .5, y: 0} m_AnchorMax: {x: .5, y: 0} - m_AnchoredPosition: {x: 0, y: 850} + m_AnchoredPosition: {x: 0, y: 860} m_SizeDelta: {x: 315.64801, y: 131.328003} m_Pivot: {x: .5, y: .5} --- !u!114 &756283914 @@ -4372,6 +4372,7 @@ RectTransform: - {fileID: 2105787743} - {fileID: 1800578778} - {fileID: 1927199758} + - {fileID: 1646487365} m_Father: {fileID: 0} m_RootOrder: 5 m_AnchorMin: {x: 0, y: 0} @@ -4624,9 +4625,9 @@ MonoBehaviour: m_Color: {r: .992156923, g: .815686345, b: .00392156886, a: 1} m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 20 + m_FontSize: 66 m_FontStyle: 1 - m_BestFit: 1 + m_BestFit: 0 m_MinSize: 30 m_MaxSize: 60 m_Alignment: 4 @@ -5880,8 +5881,8 @@ RectTransform: m_RootOrder: 1 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 32.75} - m_SizeDelta: {x: 0, y: 65.5} + m_AnchoredPosition: {x: 0, y: 300} + m_SizeDelta: {x: -24, y: 300} m_Pivot: {x: .5, y: .5} --- !u!114 &1066268160 MonoBehaviour: @@ -6219,8 +6220,8 @@ RectTransform: m_Children: [] m_Father: {fileID: 836162931} m_RootOrder: 0 - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: .5, y: 0} + m_AnchorMax: {x: .5, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 84, y: 0} m_Pivot: {x: .5, y: .5} @@ -8295,7 +8296,7 @@ MonoBehaviour: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 60 m_FontStyle: 1 - m_BestFit: 1 + m_BestFit: 0 m_MinSize: 10 m_MaxSize: 30 m_Alignment: 7 @@ -9908,6 +9909,66 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1621592085} +--- !u!1 &1646487364 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1646487365} + - 222: {fileID: 1646487367} + - 114: {fileID: 1646487366} + m_Layer: 5 + m_Name: debugLine + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1646487365 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1646487364} + 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: 782282766} + m_RootOrder: 12 + m_AnchorMin: {x: 0, y: .5} + m_AnchorMax: {x: 1, y: .5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 1} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1646487366 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1646487364} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -98529514, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0, b: 0, a: 1} + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &1646487367 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1646487364} --- !u!1 &1665948602 GameObject: m_ObjectHideFlags: 0 @@ -10506,7 +10567,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1740734479 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/UIManagers/UIManagerInfo.cs b/Assets/Scripts/UIManagers/UIManagerInfo.cs index 18ed23e..d0f0426 100644 --- a/Assets/Scripts/UIManagers/UIManagerInfo.cs +++ b/Assets/Scripts/UIManagers/UIManagerInfo.cs @@ -10,43 +10,62 @@ public class UIManagerInfo : UIManager { public Button tutorial; public Image info; + + private float getTranslatedY(float y, float scale) + { + return Screen.height - ((Screen.height - y) * scale); + } + protected override void rebuild(float scale) { + Vector3 scaleVector = new Vector3(scale, scale, 1); + // bar { - bar.transform.localScale = new Vector3(scale, scale, 1); - bar.transform.position -= new Vector3(0, 165 * (1F - scale), 0); + bar.transform.localScale = scaleVector; + + Vector3 position = bar.transform.position; + position.y *= scale; + bar.transform.position = position; } // logo { - logo.transform.localScale = new Vector3(scale, scale, 1); - logo.transform.position -= new Vector3(0, -160 * (1F - scale), 0); + logo.transform.localScale = scaleVector; + + Vector3 position = logo.transform.position; + position.y = getTranslatedY(position.y, scale); + logo.transform.position = position; } // back { - float dist = 100 * (1F - scale); + back.transform.localScale = scaleVector; - back.transform.localScale = new Vector3(scale, scale, 1); - back.transform.position -= new Vector3(dist, -dist, 0); + Vector3 position = back.transform.position; + position.x *= scale; + position.y = getTranslatedY(position.y, scale); + back.transform.position = position; } // facebook { - facebook.transform.localScale = new Vector3(scale, scale, 1); - facebook.transform.position -= new Vector3(0, 500 * (1F - scale), 0); + facebook.transform.localScale = scaleVector; + + Vector3 position = facebook.transform.position; + position.y *= scale; + facebook.transform.position = position; } // tutorial { - tutorial.transform.localScale = new Vector3(scale, scale, 1); + tutorial.transform.localScale = scaleVector; tutorial.transform.position -= new Vector3(0, 900 * (1F - scale), 0); } // info { - info.transform.localScale = new Vector3(scale, scale, 1); + info.transform.localScale = scaleVector; } } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 6d41080..55faca2 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -129,28 +129,14 @@ PlayerSettings: m_AndroidBanners: - width: 320 height: 180 - banner: {fileID: 0} + banner: {fileID: 2800000, guid: 919bd8c190f26ec48b930878bec99f3e, type: 3} androidGamepadSupportLevel: 0 resolutionDialogBanner: {fileID: 0} m_BuildTargetIcons: - m_BuildTarget: m_Icons: - - m_Icon: {fileID: 0} + - m_Icon: {fileID: 2800000, guid: 919bd8c190f26ec48b930878bec99f3e, type: 3} m_Size: 128 - - m_BuildTarget: Android - m_Icons: - - m_Icon: {fileID: 2800000, guid: 0b4ceb8147fae5749b337e10f5295aad, type: 3} - m_Size: 192 - - m_Icon: {fileID: 0} - m_Size: 144 - - m_Icon: {fileID: 0} - m_Size: 96 - - m_Icon: {fileID: 0} - m_Size: 72 - - m_Icon: {fileID: 0} - m_Size: 48 - - m_Icon: {fileID: 0} - m_Size: 36 m_BuildTargetBatching: [] m_BuildTargetGraphicsAPIs: [] webPlayerTemplate: APPLICATION:Default -- libgit2 0.21.2