Download as
Browse Code »

Commit 259393b78c61095e22715ee4cb568ab3105cfb1b

Authored by Mateus Lustosa
1 parent 57d82ee5
Exists in master and in 8 other branches Export, ExportVideo, IosBuild, dev, development, dict, region, ui

Fullscreen; status bar

Showing 4 changed files with 138 additions and 70 deletions   Show diff stats
Assets/Plugins/Android/AndroidManifest.xml
  Diff comments   View file @259393b
... ... @@ -6,7 +6,9 @@
6 6 <uses-sdk android:minSdkVersion="14" />
7 7 <application android:icon="@drawable/app_icon" android:label="@string/app_name">
8 8 <activity android:name=".MainActivity"
9   - android:label="@string/app_name">
  9 + android:label="@string/app_name"
  10 + android:configChanges="orientation"
  11 + android:screenOrientation="portrait">
10 12 <intent-filter>
11 13 <action android:name="android.intent.action.MAIN" />
12 14 <category android:name="android.intent.category.LAUNCHER" />
... ...
Assets/Scenes/Main.unity
  Diff comments   View file @259393b
... ... @@ -1581,6 +1581,8 @@ GameObject:
1581 1581 m_Component:
1582 1582 - 224: {fileID: 104686575}
1583 1583 - 114: {fileID: 104686576}
  1584 + - 222: {fileID: 104686578}
  1585 + - 114: {fileID: 104686577}
1584 1586 m_Layer: 5
1585 1587 m_Name: bottom
1586 1588 m_TagString: Untagged
... ... @@ -1608,8 +1610,8 @@ RectTransform:
1608 1610 m_RootOrder: 1
1609 1611 m_AnchorMin: {x: 0, y: 0}
1610 1612 m_AnchorMax: {x: 1, y: 0}
1611   - m_AnchoredPosition: {x: 0, y: 20}
1612   - m_SizeDelta: {x: 0, y: 40}
  1613 + m_AnchoredPosition: {x: 0, y: 22.5}
  1614 + m_SizeDelta: {x: 0, y: 45}
1613 1615 m_Pivot: {x: .5, y: .5}
1614 1616 --- !u!114 &104686576
1615 1617 MonoBehaviour:
... ... @@ -1625,12 +1627,44 @@ MonoBehaviour:
1625 1627 m_Padding:
1626 1628 m_Left: 30
1627 1629 m_Right: 30
1628   - m_Top: 0
1629   - m_Bottom: 0
1630   - m_ChildAlignment: 0
  1630 + m_Top: 5
  1631 + m_Bottom: 5
  1632 + m_ChildAlignment: 4
1631 1633 m_Spacing: 22
1632 1634 m_ChildForceExpandWidth: 0
1633 1635 m_ChildForceExpandHeight: 0
  1636 +--- !u!114 &104686577
  1637 +MonoBehaviour:
  1638 + m_ObjectHideFlags: 0
  1639 + m_PrefabParentObject: {fileID: 0}
  1640 + m_PrefabInternal: {fileID: 0}
  1641 + m_GameObject: {fileID: 104686574}
  1642 + m_Enabled: 1
  1643 + m_EditorHideFlags: 0
  1644 + m_Script: {fileID: -98529514, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
  1645 + m_Name:
  1646 + m_EditorClassIdentifier:
  1647 + m_Material: {fileID: 0}
  1648 + m_Color: {r: 1, g: 1, b: 1, a: 1}
  1649 + m_RaycastTarget: 1
  1650 + m_OnCullStateChanged:
  1651 + m_PersistentCalls:
  1652 + m_Calls: []
  1653 + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
  1654 + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
  1655 + m_Texture: {fileID: 0}
  1656 + m_UVRect:
  1657 + serializedVersion: 2
  1658 + x: 0
  1659 + y: 0
  1660 + width: 1
  1661 + height: 1
  1662 +--- !u!222 &104686578
  1663 +CanvasRenderer:
  1664 + m_ObjectHideFlags: 0
  1665 + m_PrefabParentObject: {fileID: 0}
  1666 + m_PrefabInternal: {fileID: 0}
  1667 + m_GameObject: {fileID: 104686574}
1634 1668 --- !u!1 &107392525
1635 1669 GameObject:
1636 1670 m_ObjectHideFlags: 0
... ... @@ -3833,7 +3867,7 @@ GameObject:
3833 3867 m_Icon: {fileID: 0}
3834 3868 m_NavMeshLayer: 0
3835 3869 m_StaticEditorFlags: 0
3836   - m_IsActive: 1
  3870 + m_IsActive: 0
3837 3871 --- !u!224 &297953351
3838 3872 RectTransform:
3839 3873 m_ObjectHideFlags: 0
... ... @@ -3860,7 +3894,7 @@ RectTransform:
3860 3894 - {fileID: 679947939}
3861 3895 - {fileID: 1800578778}
3862 3896 m_Father: {fileID: 0}
3863   - m_RootOrder: 4
  3897 + m_RootOrder: 5
3864 3898 m_AnchorMin: {x: 0, y: 0}
3865 3899 m_AnchorMax: {x: 0, y: 0}
3866 3900 m_AnchoredPosition: {x: 0, y: 0}
... ... @@ -6691,7 +6725,7 @@ Prefab:
6691 6725 objectReference: {fileID: 0}
6692 6726 - target: {fileID: 491010, guid: 00197fc9877daa14c963e5917de36124, type: 2}
6693 6727 propertyPath: m_RootOrder
6694   - value: 9
  6728 + value: 8
6695 6729 objectReference: {fileID: 0}
6696 6730 - target: {fileID: 13795696, guid: 00197fc9877daa14c963e5917de36124, type: 2}
6697 6731 propertyPath: m_Materials.Array.data[0]
... ... @@ -11838,7 +11872,7 @@ RectTransform:
11838 11872 m_Father: {fileID: 1452466470}
11839 11873 m_RootOrder: 0
11840 11874 m_AnchorMin: {x: 0, y: 0}
11841   - m_AnchorMax: {x: .5, y: 1}
  11875 + m_AnchorMax: {x: 0, y: 0}
11842 11876 m_AnchoredPosition: {x: 0, y: 0}
11843 11877 m_SizeDelta: {x: 10, y: 0}
11844 11878 m_Pivot: {x: .5, y: .5}
... ... @@ -11907,8 +11941,8 @@ RectTransform:
11907 11941 m_Children: []
11908 11942 m_Father: {fileID: 825699589}
11909 11943 m_RootOrder: 0
11910   - m_AnchorMin: {x: .5, y: 0}
11911   - m_AnchorMax: {x: .5, y: 1}
  11944 + m_AnchorMin: {x: 0, y: 0}
  11945 + m_AnchorMax: {x: 0, y: 0}
11912 11946 m_AnchoredPosition: {x: 0, y: 0}
11913 11947 m_SizeDelta: {x: 0, y: 0}
11914 11948 m_Pivot: {x: .5, y: .5}
... ... @@ -13874,7 +13908,7 @@ MonoBehaviour:
13874 13908 type: 2}
13875 13909 m_PrefabInternal: {fileID: 0}
13876 13910 m_GameObject: {fileID: 1136629773}
13877   - m_Enabled: 1
  13911 + m_Enabled: 0
13878 13912 m_EditorHideFlags: 0
13879 13913 m_Script: {fileID: -98529514, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
13880 13914 m_Name:
... ... @@ -15452,10 +15486,10 @@ RectTransform:
15452 15486 m_Children: []
15453 15487 m_Father: {fileID: 104686575}
15454 15488 m_RootOrder: 1
15455   - m_AnchorMin: {x: 0, y: 1}
15456   - m_AnchorMax: {x: 0, y: 1}
15457   - m_AnchoredPosition: {x: 91.5999985, y: -20}
15458   - m_SizeDelta: {x: 26.3999996, y: 40}
  15489 + m_AnchorMin: {x: 0, y: 0}
  15490 + m_AnchorMax: {x: 0, y: 0}
  15491 + m_AnchoredPosition: {x: 0, y: 0}
  15492 + m_SizeDelta: {x: 0, y: 0}
15459 15493 m_Pivot: {x: .5, y: .5}
15460 15494 --- !u!114 &1216150521
15461 15495 MonoBehaviour:
... ... @@ -15896,7 +15930,7 @@ GameObject:
15896 15930 m_Icon: {fileID: 0}
15897 15931 m_NavMeshLayer: 0
15898 15932 m_StaticEditorFlags: 0
15899   - m_IsActive: 0
  15933 + m_IsActive: 1
15900 15934 --- !u!224 &1252650593
15901 15935 RectTransform:
15902 15936 m_ObjectHideFlags: 0
... ... @@ -16018,28 +16052,27 @@ RectTransform:
16018 16052 m_Children: []
16019 16053 m_Father: {fileID: 104686575}
16020 16054 m_RootOrder: 2
16021   - m_AnchorMin: {x: 0, y: 1}
16022   - m_AnchorMax: {x: 0, y: 1}
16023   - m_AnchoredPosition: {x: 140, y: -20}
16024   - m_SizeDelta: {x: 26.3999996, y: 40}
  16055 + m_AnchorMin: {x: 0, y: 0}
  16056 + m_AnchorMax: {x: 0, y: 0}
  16057 + m_AnchoredPosition: {x: 0, y: 0}
  16058 + m_SizeDelta: {x: 0, y: 0}
16025 16059 m_Pivot: {x: .5, y: .5}
16026 16060 --- !u!114 &1261574580
16027 16061 MonoBehaviour:
16028 16062 m_ObjectHideFlags: 0
16029   - m_PrefabParentObject: {fileID: 11486270, guid: 6506218ed7927bf45b508ebbec0c1222,
16030   - type: 2}
  16063 + m_PrefabParentObject: {fileID: 0}
16031 16064 m_PrefabInternal: {fileID: 0}
16032 16065 m_GameObject: {fileID: 1261574578}
16033 16066 m_Enabled: 1
16034 16067 m_EditorHideFlags: 0
16035   - m_Script: {fileID: 11500000, guid: 9c2cb194d4eaf1c478dcb9c43fb5368b, type: 3}
  16068 + m_Script: {fileID: 11500000, guid: 5ea7adaac15fb3545b8ae42d73c16908, type: 3}
16036 16069 m_Name:
16037 16070 m_EditorClassIdentifier:
16038   - image: {fileID: 1261574582}
16039   - isEnabled: 1
16040   - updateReference: {fileID: 1795476617}
16041   - enabledImage: {fileID: 21300000, guid: 42732996cdad323488b83b634903c368, type: 3}
16042   - disabledImage: {fileID: 21300000, guid: 9fa0d6773e59a894fb4fb3a9efa2e0ec, type: 3}
  16071 + image: {fileID: 0}
  16072 + isEnabled: 0
  16073 + updateReference: {fileID: 1261574578}
  16074 + enabledColor: {r: .310000002, g: .75, b: .912999988, a: 1}
  16075 + disabledColor: {r: .792156875, g: .792156875, b: .792156875, a: 1}
16043 16076 --- !u!114 &1261574581
16044 16077 MonoBehaviour:
16045 16078 m_ObjectHideFlags: 0
... ... @@ -16091,7 +16124,7 @@ MonoBehaviour:
16091 16124 m_StringArgument:
16092 16125 m_BoolArgument: 0
16093 16126 m_CallState: 2
16094   - - m_Target: {fileID: 1261574580}
  16127 + - m_Target: {fileID: 0}
16095 16128 m_MethodName: switchAttributeByReference
16096 16129 m_Mode: 1
16097 16130 m_Arguments:
... ... @@ -17286,7 +17319,7 @@ RectTransform:
17286 17319 m_Father: {fileID: 2006298219}
17287 17320 m_RootOrder: 0
17288 17321 m_AnchorMin: {x: 0, y: 0}
17289   - m_AnchorMax: {x: 0, y: 0}
  17322 + m_AnchorMax: {x: .5, y: 1}
17290 17323 m_AnchoredPosition: {x: 0, y: 0}
17291 17324 m_SizeDelta: {x: 10, y: 0}
17292 17325 m_Pivot: {x: .5, y: .5}
... ... @@ -19278,7 +19311,7 @@ RectTransform:
19278 19311 m_AnchorMin: {x: 0, y: .25}
19279 19312 m_AnchorMax: {x: 1, y: .75}
19280 19313 m_AnchoredPosition: {x: 0, y: 0}
19281   - m_SizeDelta: {x: -36, y: -12}
  19314 + m_SizeDelta: {x: -36, y: -10}
19282 19315 m_Pivot: {x: .5, y: .5}
19283 19316 --- !u!1 &1457625418
19284 19317 GameObject:
... ... @@ -20247,10 +20280,10 @@ RectTransform:
20247 20280 m_Children: []
20248 20281 m_Father: {fileID: 104686575}
20249 20282 m_RootOrder: 4
20250   - m_AnchorMin: {x: 0, y: 1}
20251   - m_AnchorMax: {x: 0, y: 1}
20252   - m_AnchoredPosition: {x: 236.799988, y: -20}
20253   - m_SizeDelta: {x: 26.3999996, y: 40}
  20283 + m_AnchorMin: {x: 0, y: 0}
  20284 + m_AnchorMax: {x: 0, y: 0}
  20285 + m_AnchoredPosition: {x: 0, y: 0}
  20286 + m_SizeDelta: {x: 0, y: 0}
20254 20287 m_Pivot: {x: .5, y: .5}
20255 20288 --- !u!114 &1527674329
20256 20289 MonoBehaviour:
... ... @@ -20565,8 +20598,8 @@ RectTransform:
20565 20598 m_Children: []
20566 20599 m_Father: {fileID: 663247958}
20567 20600 m_RootOrder: 0
20568   - m_AnchorMin: {x: 0, y: 0}
20569   - m_AnchorMax: {x: 0, y: 0}
  20601 + m_AnchorMin: {x: .5, y: 0}
  20602 + m_AnchorMax: {x: .5, y: 1}
20570 20603 m_AnchoredPosition: {x: 0, y: 0}
20571 20604 m_SizeDelta: {x: 84, y: 0}
20572 20605 m_Pivot: {x: .5, y: .5}
... ... @@ -21517,28 +21550,27 @@ RectTransform:
21517 21550 m_Children: []
21518 21551 m_Father: {fileID: 104686575}
21519 21552 m_RootOrder: 3
21520   - m_AnchorMin: {x: 0, y: 1}
21521   - m_AnchorMax: {x: 0, y: 1}
21522   - m_AnchoredPosition: {x: 188.399994, y: -20}
21523   - m_SizeDelta: {x: 26.3999996, y: 40}
  21553 + m_AnchorMin: {x: 0, y: 0}
  21554 + m_AnchorMax: {x: 0, y: 0}
  21555 + m_AnchoredPosition: {x: 0, y: 0}
  21556 + m_SizeDelta: {x: 0, y: 0}
21524 21557 m_Pivot: {x: .5, y: .5}
21525 21558 --- !u!114 &1564250460
21526 21559 MonoBehaviour:
21527 21560 m_ObjectHideFlags: 0
21528   - m_PrefabParentObject: {fileID: 11486270, guid: 6506218ed7927bf45b508ebbec0c1222,
21529   - type: 2}
  21561 + m_PrefabParentObject: {fileID: 0}
21530 21562 m_PrefabInternal: {fileID: 0}
21531 21563 m_GameObject: {fileID: 1564250458}
21532 21564 m_Enabled: 1
21533 21565 m_EditorHideFlags: 0
21534   - m_Script: {fileID: 11500000, guid: 9c2cb194d4eaf1c478dcb9c43fb5368b, type: 3}
  21566 + m_Script: {fileID: 11500000, guid: 5ea7adaac15fb3545b8ae42d73c16908, type: 3}
21535 21567 m_Name:
21536 21568 m_EditorClassIdentifier:
21537   - image: {fileID: 1564250462}
21538   - isEnabled: 1
21539   - updateReference: {fileID: 1795476617}
21540   - enabledImage: {fileID: 21300000, guid: 42732996cdad323488b83b634903c368, type: 3}
21541   - disabledImage: {fileID: 21300000, guid: 9fa0d6773e59a894fb4fb3a9efa2e0ec, type: 3}
  21569 + image: {fileID: 0}
  21570 + isEnabled: 0
  21571 + updateReference: {fileID: 1564250458}
  21572 + enabledColor: {r: .310000002, g: .75, b: .912999988, a: 1}
  21573 + disabledColor: {r: .792156875, g: .792156875, b: .792156875, a: 1}
21542 21574 --- !u!114 &1564250461
21543 21575 MonoBehaviour:
21544 21576 m_ObjectHideFlags: 0
... ... @@ -21591,7 +21623,7 @@ MonoBehaviour:
21591 21623 m_BoolArgument: 0
21592 21624 m_CallState: 2
21593 21625 - m_Target: {fileID: 1564250460}
21594   - m_MethodName: switchAttributeByReference
  21626 + m_MethodName: switchAttribute
21595 21627 m_Mode: 1
21596 21628 m_Arguments:
21597 21629 m_ObjectArgument: {fileID: 0}
... ... @@ -22668,10 +22700,10 @@ RectTransform:
22668 22700 m_Children: []
22669 22701 m_Father: {fileID: 104686575}
22670 22702 m_RootOrder: 0
22671   - m_AnchorMin: {x: 0, y: 1}
22672   - m_AnchorMax: {x: 0, y: 1}
22673   - m_AnchoredPosition: {x: 43.2000008, y: -20}
22674   - m_SizeDelta: {x: 26.3999996, y: 40}
  22703 + m_AnchorMin: {x: 0, y: 0}
  22704 + m_AnchorMax: {x: 0, y: 0}
  22705 + m_AnchoredPosition: {x: 0, y: 0}
  22706 + m_SizeDelta: {x: 0, y: 0}
22675 22707 m_Pivot: {x: .5, y: .5}
22676 22708 --- !u!114 &1650401580
22677 22709 MonoBehaviour:
... ... @@ -22696,7 +22728,7 @@ MonoBehaviour:
22696 22728 m_NormalColor: {r: .792156875, g: .792156875, b: .792156875, a: 1}
22697 22729 m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1}
22698 22730 m_PressedColor: {r: .572549045, g: .752941251, b: .811764777, a: 1}
22699   - m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814}
  22731 + m_DisabledColor: {r: .792156875, g: .792156875, b: .792156875, a: 1}
22700 22732 m_ColorMultiplier: 1
22701 22733 m_FadeDuration: .100000001
22702 22734 m_SpriteState:
... ... @@ -22976,6 +23008,8 @@ GameObject:
22976 23008 serializedVersion: 4
22977 23009 m_Component:
22978 23010 - 224: {fileID: 1656461647}
  23011 + - 222: {fileID: 1656461649}
  23012 + - 114: {fileID: 1656461648}
22979 23013 m_Layer: 5
22980 23014 m_Name: top
22981 23015 m_TagString: Untagged
... ... @@ -22999,9 +23033,41 @@ RectTransform:
22999 23033 m_RootOrder: 0
23000 23034 m_AnchorMin: {x: 0, y: 1}
23001 23035 m_AnchorMax: {x: 1, y: 1}
23002   - m_AnchoredPosition: {x: 0, y: -20}
23003   - m_SizeDelta: {x: 0, y: 40}
23004   - m_Pivot: {x: .5, y: .5}
  23036 + m_AnchoredPosition: {x: 0, y: 0}
  23037 + m_SizeDelta: {x: 0, y: 35}
  23038 + m_Pivot: {x: .5, y: 1}
  23039 +--- !u!114 &1656461648
  23040 +MonoBehaviour:
  23041 + m_ObjectHideFlags: 0
  23042 + m_PrefabParentObject: {fileID: 0}
  23043 + m_PrefabInternal: {fileID: 0}
  23044 + m_GameObject: {fileID: 1656461646}
  23045 + m_Enabled: 1
  23046 + m_EditorHideFlags: 0
  23047 + m_Script: {fileID: -98529514, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
  23048 + m_Name:
  23049 + m_EditorClassIdentifier:
  23050 + m_Material: {fileID: 0}
  23051 + m_Color: {r: 1, g: 1, b: 1, a: 1}
  23052 + m_RaycastTarget: 1
  23053 + m_OnCullStateChanged:
  23054 + m_PersistentCalls:
  23055 + m_Calls: []
  23056 + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
  23057 + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
  23058 + m_Texture: {fileID: 0}
  23059 + m_UVRect:
  23060 + serializedVersion: 2
  23061 + x: 0
  23062 + y: 0
  23063 + width: 1
  23064 + height: 1
  23065 +--- !u!222 &1656461649
  23066 +CanvasRenderer:
  23067 + m_ObjectHideFlags: 0
  23068 + m_PrefabParentObject: {fileID: 0}
  23069 + m_PrefabInternal: {fileID: 0}
  23070 + m_GameObject: {fileID: 1656461646}
23005 23071 --- !u!1 &1658077902
23006 23072 GameObject:
23007 23073 m_ObjectHideFlags: 0
... ... @@ -30127,11 +30193,11 @@ RectTransform:
30127 30193 - {fileID: 95475790}
30128 30194 m_Father: {fileID: 1656461647}
30129 30195 m_RootOrder: 0
30130   - m_AnchorMin: {x: .5, y: .5}
30131   - m_AnchorMax: {x: .5, y: .5}
  30196 + m_AnchorMin: {x: 0, y: 0}
  30197 + m_AnchorMax: {x: 1, y: 0}
30132 30198 m_AnchoredPosition: {x: 0, y: 0}
30133   - m_SizeDelta: {x: 200, y: 40}
30134   - m_Pivot: {x: .5, y: .5}
  30199 + m_SizeDelta: {x: -100, y: 30}
  30200 + m_Pivot: {x: .5, y: 0}
30135 30201 --- !u!114 &2108829592
30136 30202 MonoBehaviour:
30137 30203 m_ObjectHideFlags: 0
... ...
Assets/Scripts/PlayerManager.cs
  Diff comments   View file @259393b
... ... @@ -48,7 +48,7 @@ public class PlayerManager : GenericPlayerManager {
48 48  
49 49 Application.ExternalCall("onLoadPlayer");//var onLoadPlayer = function(){}
50 50 voiceRecognizer = new VoiceRecognition();
51   - Screen.orientation = ScreenOrientation.Portrait;
  51 + Screen.fullScreen = false;
52 52 }
53 53  
54 54 public void catchGlosa(String glosa)
... ...
ProjectSettings/ProjectSettings.asset
  Diff comments   View file @259393b
... ... @@ -5,7 +5,7 @@ PlayerSettings:
5 5 m_ObjectHideFlags: 0
6 6 serializedVersion: 7
7 7 AndroidProfiler: 0
8   - defaultScreenOrientation: 4
  8 + defaultScreenOrientation: 0
9 9 targetDevice: 2
10 10 targetResolution: 0
11 11 useOnDemandResources: 0
... ... @@ -116,7 +116,7 @@ PlayerSettings:
116 116 uIPrerenderedIcon: 0
117 117 uIRequiresPersistentWiFi: 0
118 118 uIRequiresFullScreen: 1
119   - uIStatusBarHidden: 1
  119 + uIStatusBarHidden: 0
120 120 uIExitOnSuspend: 0
121 121 uIStatusBarStyle: 0
122 122 iPhoneSplashScreen: {fileID: 0}
... ... @@ -151,9 +151,9 @@ PlayerSettings:
151 151 AndroidSplashScreenScale: 0
152 152 androidSplashScreen: {fileID: 0}
153 153 AndroidKeystoreName: C:/Users/mateu/Desktop/keystore.keystore
154   - AndroidKeyaliasName: vlibras
155   - AndroidTVCompatibility: 1
156   - AndroidIsGame: 1
  154 + AndroidKeyaliasName:
  155 + AndroidTVCompatibility: 0
  156 + AndroidIsGame: 0
157 157 androidEnableBanner: 1
158 158 m_AndroidBanners:
159 159 - width: 320
... ...