From 259393b78c61095e22715ee4cb568ab3105cfb1b Mon Sep 17 00:00:00 2001 From: Mateus Pires Date: Fri, 29 Jan 2016 12:03:10 -0200 Subject: [PATCH] Fullscreen; status bar --- Assets/Plugins/Android/AndroidManifest.xml | 4 +++- Assets/Scenes/Main.unity | 192 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------- Assets/Scripts/PlayerManager.cs | 2 +- ProjectSettings/ProjectSettings.asset | 10 +++++----- 4 files changed, 138 insertions(+), 70 deletions(-) diff --git a/Assets/Plugins/Android/AndroidManifest.xml b/Assets/Plugins/Android/AndroidManifest.xml index 1a5d3f1..f280221 100644 --- a/Assets/Plugins/Android/AndroidManifest.xml +++ b/Assets/Plugins/Android/AndroidManifest.xml @@ -6,7 +6,9 @@ + android:label="@string/app_name" + android:configChanges="orientation" + android:screenOrientation="portrait"> diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 3d3dd58..72c51e2 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -1581,6 +1581,8 @@ GameObject: m_Component: - 224: {fileID: 104686575} - 114: {fileID: 104686576} + - 222: {fileID: 104686578} + - 114: {fileID: 104686577} m_Layer: 5 m_Name: bottom m_TagString: Untagged @@ -1608,8 +1610,8 @@ RectTransform: m_RootOrder: 1 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 20} - m_SizeDelta: {x: 0, y: 40} + m_AnchoredPosition: {x: 0, y: 22.5} + m_SizeDelta: {x: 0, y: 45} m_Pivot: {x: .5, y: .5} --- !u!114 &104686576 MonoBehaviour: @@ -1625,12 +1627,44 @@ MonoBehaviour: m_Padding: m_Left: 30 m_Right: 30 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 0 + m_Top: 5 + m_Bottom: 5 + m_ChildAlignment: 4 m_Spacing: 22 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 +--- !u!114 &104686577 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 104686574} + 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: 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_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &104686578 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 104686574} --- !u!1 &107392525 GameObject: m_ObjectHideFlags: 0 @@ -3833,7 +3867,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &297953351 RectTransform: m_ObjectHideFlags: 0 @@ -3860,7 +3894,7 @@ RectTransform: - {fileID: 679947939} - {fileID: 1800578778} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} @@ -6691,7 +6725,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 491010, guid: 00197fc9877daa14c963e5917de36124, type: 2} propertyPath: m_RootOrder - value: 9 + value: 8 objectReference: {fileID: 0} - target: {fileID: 13795696, guid: 00197fc9877daa14c963e5917de36124, type: 2} propertyPath: m_Materials.Array.data[0] @@ -11838,7 +11872,7 @@ RectTransform: m_Father: {fileID: 1452466470} m_RootOrder: 0 m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: .5, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: .5, y: .5} @@ -11907,8 +11941,8 @@ RectTransform: m_Children: [] m_Father: {fileID: 825699589} m_RootOrder: 0 - m_AnchorMin: {x: .5, y: 0} - m_AnchorMax: {x: .5, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: .5, y: .5} @@ -13874,7 +13908,7 @@ MonoBehaviour: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1136629773} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -98529514, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: @@ -15452,10 +15486,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 104686575} m_RootOrder: 1 - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 91.5999985, y: -20} - m_SizeDelta: {x: 26.3999996, y: 40} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: .5, y: .5} --- !u!114 &1216150521 MonoBehaviour: @@ -15896,7 +15930,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1252650593 RectTransform: m_ObjectHideFlags: 0 @@ -16018,28 +16052,27 @@ RectTransform: m_Children: [] m_Father: {fileID: 104686575} m_RootOrder: 2 - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 140, y: -20} - m_SizeDelta: {x: 26.3999996, y: 40} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: .5, y: .5} --- !u!114 &1261574580 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11486270, guid: 6506218ed7927bf45b508ebbec0c1222, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1261574578} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9c2cb194d4eaf1c478dcb9c43fb5368b, type: 3} + m_Script: {fileID: 11500000, guid: 5ea7adaac15fb3545b8ae42d73c16908, type: 3} m_Name: m_EditorClassIdentifier: - image: {fileID: 1261574582} - isEnabled: 1 - updateReference: {fileID: 1795476617} - enabledImage: {fileID: 21300000, guid: 42732996cdad323488b83b634903c368, type: 3} - disabledImage: {fileID: 21300000, guid: 9fa0d6773e59a894fb4fb3a9efa2e0ec, type: 3} + image: {fileID: 0} + isEnabled: 0 + updateReference: {fileID: 1261574578} + enabledColor: {r: .310000002, g: .75, b: .912999988, a: 1} + disabledColor: {r: .792156875, g: .792156875, b: .792156875, a: 1} --- !u!114 &1261574581 MonoBehaviour: m_ObjectHideFlags: 0 @@ -16091,7 +16124,7 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - - m_Target: {fileID: 1261574580} + - m_Target: {fileID: 0} m_MethodName: switchAttributeByReference m_Mode: 1 m_Arguments: @@ -17286,7 +17319,7 @@ RectTransform: m_Father: {fileID: 2006298219} 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} @@ -19278,7 +19311,7 @@ RectTransform: m_AnchorMin: {x: 0, y: .25} m_AnchorMax: {x: 1, y: .75} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -36, y: -12} + m_SizeDelta: {x: -36, y: -10} m_Pivot: {x: .5, y: .5} --- !u!1 &1457625418 GameObject: @@ -20247,10 +20280,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 104686575} m_RootOrder: 4 - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 236.799988, y: -20} - m_SizeDelta: {x: 26.3999996, y: 40} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: .5, y: .5} --- !u!114 &1527674329 MonoBehaviour: @@ -20565,8 +20598,8 @@ RectTransform: m_Children: [] m_Father: {fileID: 663247958} 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} @@ -21517,28 +21550,27 @@ RectTransform: m_Children: [] m_Father: {fileID: 104686575} m_RootOrder: 3 - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 188.399994, y: -20} - m_SizeDelta: {x: 26.3999996, y: 40} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: .5, y: .5} --- !u!114 &1564250460 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11486270, guid: 6506218ed7927bf45b508ebbec0c1222, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1564250458} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9c2cb194d4eaf1c478dcb9c43fb5368b, type: 3} + m_Script: {fileID: 11500000, guid: 5ea7adaac15fb3545b8ae42d73c16908, type: 3} m_Name: m_EditorClassIdentifier: - image: {fileID: 1564250462} - isEnabled: 1 - updateReference: {fileID: 1795476617} - enabledImage: {fileID: 21300000, guid: 42732996cdad323488b83b634903c368, type: 3} - disabledImage: {fileID: 21300000, guid: 9fa0d6773e59a894fb4fb3a9efa2e0ec, type: 3} + image: {fileID: 0} + isEnabled: 0 + updateReference: {fileID: 1564250458} + enabledColor: {r: .310000002, g: .75, b: .912999988, a: 1} + disabledColor: {r: .792156875, g: .792156875, b: .792156875, a: 1} --- !u!114 &1564250461 MonoBehaviour: m_ObjectHideFlags: 0 @@ -21591,7 +21623,7 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 1564250460} - m_MethodName: switchAttributeByReference + m_MethodName: switchAttribute m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -22668,10 +22700,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 104686575} m_RootOrder: 0 - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 43.2000008, y: -20} - m_SizeDelta: {x: 26.3999996, y: 40} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: .5, y: .5} --- !u!114 &1650401580 MonoBehaviour: @@ -22696,7 +22728,7 @@ MonoBehaviour: m_NormalColor: {r: .792156875, g: .792156875, b: .792156875, a: 1} m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} m_PressedColor: {r: .572549045, g: .752941251, b: .811764777, a: 1} - m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_DisabledColor: {r: .792156875, g: .792156875, b: .792156875, a: 1} m_ColorMultiplier: 1 m_FadeDuration: .100000001 m_SpriteState: @@ -22976,6 +23008,8 @@ GameObject: serializedVersion: 4 m_Component: - 224: {fileID: 1656461647} + - 222: {fileID: 1656461649} + - 114: {fileID: 1656461648} m_Layer: 5 m_Name: top m_TagString: Untagged @@ -22999,9 +23033,41 @@ RectTransform: m_RootOrder: 0 m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -20} - m_SizeDelta: {x: 0, y: 40} - m_Pivot: {x: .5, y: .5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 35} + m_Pivot: {x: .5, y: 1} +--- !u!114 &1656461648 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1656461646} + 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: 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_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &1656461649 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1656461646} --- !u!1 &1658077902 GameObject: m_ObjectHideFlags: 0 @@ -30127,11 +30193,11 @@ RectTransform: - {fileID: 95475790} m_Father: {fileID: 1656461647} m_RootOrder: 0 - m_AnchorMin: {x: .5, y: .5} - m_AnchorMax: {x: .5, y: .5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 200, y: 40} - m_Pivot: {x: .5, y: .5} + m_SizeDelta: {x: -100, y: 30} + m_Pivot: {x: .5, y: 0} --- !u!114 &2108829592 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/PlayerManager.cs b/Assets/Scripts/PlayerManager.cs index af7e7e4..7f073c6 100644 --- a/Assets/Scripts/PlayerManager.cs +++ b/Assets/Scripts/PlayerManager.cs @@ -48,7 +48,7 @@ public class PlayerManager : GenericPlayerManager { Application.ExternalCall("onLoadPlayer");//var onLoadPlayer = function(){} voiceRecognizer = new VoiceRecognition(); - Screen.orientation = ScreenOrientation.Portrait; + Screen.fullScreen = false; } public void catchGlosa(String glosa) diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index d130a53..3a65a96 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -5,7 +5,7 @@ PlayerSettings: m_ObjectHideFlags: 0 serializedVersion: 7 AndroidProfiler: 0 - defaultScreenOrientation: 4 + defaultScreenOrientation: 0 targetDevice: 2 targetResolution: 0 useOnDemandResources: 0 @@ -116,7 +116,7 @@ PlayerSettings: uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 - uIStatusBarHidden: 1 + uIStatusBarHidden: 0 uIExitOnSuspend: 0 uIStatusBarStyle: 0 iPhoneSplashScreen: {fileID: 0} @@ -151,9 +151,9 @@ PlayerSettings: AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} AndroidKeystoreName: C:/Users/mateu/Desktop/keystore.keystore - AndroidKeyaliasName: vlibras - AndroidTVCompatibility: 1 - AndroidIsGame: 1 + AndroidKeyaliasName: + AndroidTVCompatibility: 0 + AndroidIsGame: 0 androidEnableBanner: 1 m_AndroidBanners: - width: 320 -- libgit2 0.21.2