Download as
Browse Code »

Commit 2d76cd70bf3d69884afbfa9ae8dc693b87e87f7c

Authored by Mateus Lustosa
1 parent b175a846
Exists in master and in 6 other branches Export, ExportVideo, IosBuild, development, dict, region

Correções gerais

Showing 33 changed files with 1225 additions and 620 deletions   Show diff stats
Assets/Plugins/Android/AndroidManifest.xml
  Diff comments   View file @2d76cd7
@@ -4,9 +4,14 @@ @@ -4,9 +4,14 @@
4 android:versionCode="1" 4 android:versionCode="1"
5 android:versionName="1.0"> 5 android:versionName="1.0">
6 <uses-sdk android:minSdkVersion="14" /> 6 <uses-sdk android:minSdkVersion="14" />
7 - <application android:icon="@drawable/app_icon" android:label="@string/app_name"> 7 + <application
  8 + android:icon="@drawable/app_icon"
  9 + android:label="@string/app_name"
  10 + android:screenOrientation="portrait">
8 <activity android:name=".MainActivity" 11 <activity android:name=".MainActivity"
9 - android:label="@string/app_name"> 12 + android:label="@string/app_name"
  13 + android:screenOrientation="portrait"
  14 + android:configChanges="orientation">
10 <intent-filter> 15 <intent-filter>
11 <action android:name="android.intent.action.MAIN" /> 16 <action android:name="android.intent.action.MAIN" />
12 <category android:name="android.intent.category.LAUNCHER" /> 17 <category android:name="android.intent.category.LAUNCHER" />
Assets/Scenes/Main.unity
  Diff comments   View file @2d76cd7
@@ -118,8 +118,8 @@ RectTransform: @@ -118,8 +118,8 @@ RectTransform:
118 m_RootOrder: 0 118 m_RootOrder: 0
119 m_AnchorMin: {x: 0, y: 1} 119 m_AnchorMin: {x: 0, y: 1}
120 m_AnchorMax: {x: 0, y: 1} 120 m_AnchorMax: {x: 0, y: 1}
121 - m_AnchoredPosition: {x: 39.2, y: -24}  
122 - m_SizeDelta: {x: 18.4, y: 38} 121 + m_AnchoredPosition: {x: 45.8, y: -29.657143}
  122 + m_SizeDelta: {x: 31.599998, y: 49.314285}
123 m_Pivot: {x: 0.5, y: 0.5} 123 m_Pivot: {x: 0.5, y: 0.5}
124 --- !u!114 &45157147 124 --- !u!114 &45157147
125 MonoBehaviour: 125 MonoBehaviour:
@@ -499,7 +499,7 @@ MonoBehaviour: @@ -499,7 +499,7 @@ MonoBehaviour:
499 m_HorizontalOverflow: 0 499 m_HorizontalOverflow: 0
500 m_VerticalOverflow: 0 500 m_VerticalOverflow: 0
501 m_LineSpacing: 0.88 501 m_LineSpacing: 0.88
502 - m_Text: "Verifique sua conex\xE3o com a internet e tente novamente." 502 + m_Text: "N\xE3o h\xE1 acesso a internet. Usaremos portugu\xEAs sinalizado e datilologia."
503 --- !u!222 &163763092 503 --- !u!222 &163763092
504 CanvasRenderer: 504 CanvasRenderer:
505 m_ObjectHideFlags: 0 505 m_ObjectHideFlags: 0
@@ -615,7 +615,7 @@ MonoBehaviour: @@ -615,7 +615,7 @@ MonoBehaviour:
615 type: 2} 615 type: 2}
616 m_PrefabInternal: {fileID: 0} 616 m_PrefabInternal: {fileID: 0}
617 m_GameObject: {fileID: 191800645} 617 m_GameObject: {fileID: 191800645}
618 - m_Enabled: 1 618 + m_Enabled: 0
619 m_EditorHideFlags: 0 619 m_EditorHideFlags: 0
620 m_Script: {fileID: 1573420865, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} 620 m_Script: {fileID: 1573420865, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
621 m_Name: 621 m_Name:
@@ -663,7 +663,7 @@ MonoBehaviour: @@ -663,7 +663,7 @@ MonoBehaviour:
663 m_OnClick: 663 m_OnClick:
664 m_PersistentCalls: 664 m_PersistentCalls:
665 m_Calls: 665 m_Calls:
666 - - m_Target: {fileID: 2131993092} 666 + - m_Target: {fileID: 2131993094}
667 m_MethodName: hideScreen 667 m_MethodName: hideScreen
668 m_Mode: 1 668 m_Mode: 1
669 m_Arguments: 669 m_Arguments:
@@ -899,7 +899,7 @@ MonoBehaviour: @@ -899,7 +899,7 @@ MonoBehaviour:
899 m_Script: {fileID: 11500000, guid: 76b77d949fd9e294bb95149436284217, type: 3} 899 m_Script: {fileID: 11500000, guid: 76b77d949fd9e294bb95149436284217, type: 3}
900 m_Name: 900 m_Name:
901 m_EditorClassIdentifier: 901 m_EditorClassIdentifier:
902 - screenManager: {fileID: 2131993092} 902 + screenManager: {fileID: 2131993094}
903 description: {fileID: 2010584311} 903 description: {fileID: 2010584311}
904 translateImage: {fileID: 45157148} 904 translateImage: {fileID: 45157148}
905 micImage: {fileID: 510126320} 905 micImage: {fileID: 510126320}
@@ -922,7 +922,7 @@ MonoBehaviour: @@ -922,7 +922,7 @@ MonoBehaviour:
922 m_Name: 922 m_Name:
923 m_EditorClassIdentifier: 923 m_EditorClassIdentifier:
924 m_Material: {fileID: 0} 924 m_Material: {fileID: 0}
925 - m_Color: {r: 1, g: 1, b: 1, a: 0.84313726} 925 + m_Color: {r: 1, g: 1, b: 1, a: 0.92156863}
926 m_RaycastTarget: 1 926 m_RaycastTarget: 1
927 m_OnCullStateChanged: 927 m_OnCullStateChanged:
928 m_PersistentCalls: 928 m_PersistentCalls:
@@ -1255,7 +1255,7 @@ MonoBehaviour: @@ -1255,7 +1255,7 @@ MonoBehaviour:
1255 m_OnClick: 1255 m_OnClick:
1256 m_PersistentCalls: 1256 m_PersistentCalls:
1257 m_Calls: 1257 m_Calls:
1258 - - m_Target: {fileID: 2131993092} 1258 + - m_Target: {fileID: 2131993094}
1259 m_MethodName: hideScreen 1259 m_MethodName: hideScreen
1260 m_Mode: 1 1260 m_Mode: 1
1261 m_Arguments: 1261 m_Arguments:
@@ -1390,7 +1390,7 @@ MonoBehaviour: @@ -1390,7 +1390,7 @@ MonoBehaviour:
1390 m_StringArgument: 1390 m_StringArgument:
1391 m_BoolArgument: 0 1391 m_BoolArgument: 0
1392 m_CallState: 2 1392 m_CallState: 2
1393 - - m_Target: {fileID: 2131993092} 1393 + - m_Target: {fileID: 0}
1394 m_MethodName: setRepeatLayerState 1394 m_MethodName: setRepeatLayerState
1395 m_Mode: 6 1395 m_Mode: 6
1396 m_Arguments: 1396 m_Arguments:
@@ -1562,7 +1562,7 @@ RectTransform: @@ -1562,7 +1562,7 @@ RectTransform:
1562 m_AnchorMin: {x: 0, y: 0} 1562 m_AnchorMin: {x: 0, y: 0}
1563 m_AnchorMax: {x: 1, y: 0} 1563 m_AnchorMax: {x: 1, y: 0}
1564 m_AnchoredPosition: {x: 0, y: 0} 1564 m_AnchoredPosition: {x: 0, y: 0}
1565 - m_SizeDelta: {x: 0, y: 80} 1565 + m_SizeDelta: {x: 0, y: 98.85714}
1566 m_Pivot: {x: 1, y: 0} 1566 m_Pivot: {x: 1, y: 0}
1567 --- !u!114 &389535984 1567 --- !u!114 &389535984
1568 MonoBehaviour: 1568 MonoBehaviour:
@@ -1618,8 +1618,8 @@ RectTransform: @@ -1618,8 +1618,8 @@ RectTransform:
1618 m_RootOrder: 2 1618 m_RootOrder: 2
1619 m_AnchorMin: {x: 0, y: 1} 1619 m_AnchorMin: {x: 0, y: 1}
1620 m_AnchorMax: {x: 0, y: 1} 1620 m_AnchorMax: {x: 0, y: 1}
1621 - m_AnchoredPosition: {x: 140, y: -24}  
1622 - m_SizeDelta: {x: 18.4, y: 38} 1621 + m_AnchoredPosition: {x: 173, y: -29.657143}
  1622 + m_SizeDelta: {x: 31.599998, y: 49.314285}
1623 m_Pivot: {x: 0.5, y: 0.5} 1623 m_Pivot: {x: 0.5, y: 0.5}
1624 --- !u!114 &395548683 1624 --- !u!114 &395548683
1625 MonoBehaviour: 1625 MonoBehaviour:
@@ -1814,7 +1814,7 @@ MonoBehaviour: @@ -1814,7 +1814,7 @@ MonoBehaviour:
1814 m_StringArgument: 1814 m_StringArgument:
1815 m_BoolArgument: 1 1815 m_BoolArgument: 1
1816 m_CallState: 2 1816 m_CallState: 2
1817 - - m_Target: {fileID: 2131993092} 1817 + - m_Target: {fileID: 2131993094}
1818 m_MethodName: setPauseMenuState 1818 m_MethodName: setPauseMenuState
1819 m_Mode: 6 1819 m_Mode: 6
1820 m_Arguments: 1820 m_Arguments:
@@ -1872,6 +1872,7 @@ GameObject: @@ -1872,6 +1872,7 @@ GameObject:
1872 - 224: {fileID: 486636722} 1872 - 224: {fileID: 486636722}
1873 - 222: {fileID: 486636724} 1873 - 222: {fileID: 486636724}
1874 - 114: {fileID: 486636723} 1874 - 114: {fileID: 486636723}
  1875 + - 114: {fileID: 486636725}
1875 m_Layer: 5 1876 m_Layer: 5
1876 m_Name: Handle 1877 m_Name: Handle
1877 m_TagString: Untagged 1878 m_TagString: Untagged
@@ -1892,10 +1893,10 @@ RectTransform: @@ -1892,10 +1893,10 @@ RectTransform:
1892 m_Children: [] 1893 m_Children: []
1893 m_Father: {fileID: 1315164544} 1894 m_Father: {fileID: 1315164544}
1894 m_RootOrder: 0 1895 m_RootOrder: 0
1895 - m_AnchorMin: {x: 0, y: 0}  
1896 - m_AnchorMax: {x: 0, y: 0} 1896 + m_AnchorMin: {x: 0.5, y: 0}
  1897 + m_AnchorMax: {x: 0.5, y: 1}
1897 m_AnchoredPosition: {x: 0, y: 0} 1898 m_AnchoredPosition: {x: 0, y: 0}
1898 - m_SizeDelta: {x: 30, y: 0} 1899 + m_SizeDelta: {x: 0, y: 0}
1899 m_Pivot: {x: 0.5, y: 0.5} 1900 m_Pivot: {x: 0.5, y: 0.5}
1900 --- !u!114 &486636723 1901 --- !u!114 &486636723
1901 MonoBehaviour: 1902 MonoBehaviour:
@@ -1932,6 +1933,19 @@ CanvasRenderer: @@ -1932,6 +1933,19 @@ CanvasRenderer:
1932 type: 2} 1933 type: 2}
1933 m_PrefabInternal: {fileID: 0} 1934 m_PrefabInternal: {fileID: 0}
1934 m_GameObject: {fileID: 486636721} 1935 m_GameObject: {fileID: 486636721}
  1936 +--- !u!114 &486636725
  1937 +MonoBehaviour:
  1938 + m_ObjectHideFlags: 0
  1939 + m_PrefabParentObject: {fileID: 0}
  1940 + m_PrefabInternal: {fileID: 0}
  1941 + m_GameObject: {fileID: 486636721}
  1942 + m_Enabled: 1
  1943 + m_EditorHideFlags: 0
  1944 + m_Script: {fileID: -1254083943, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
  1945 + m_Name:
  1946 + m_EditorClassIdentifier:
  1947 + m_AspectMode: 2
  1948 + m_AspectRatio: 0.95
1935 --- !u!1 &490251389 1949 --- !u!1 &490251389
1936 GameObject: 1950 GameObject:
1937 m_ObjectHideFlags: 0 1951 m_ObjectHideFlags: 0
@@ -2100,8 +2114,8 @@ RectTransform: @@ -2100,8 +2114,8 @@ RectTransform:
2100 m_RootOrder: 1 2114 m_RootOrder: 1
2101 m_AnchorMin: {x: 0, y: 1} 2115 m_AnchorMin: {x: 0, y: 1}
2102 m_AnchorMax: {x: 0, y: 1} 2116 m_AnchorMax: {x: 0, y: 1}
2103 - m_AnchoredPosition: {x: 89.6, y: -24}  
2104 - m_SizeDelta: {x: 18.4, y: 38} 2117 + m_AnchoredPosition: {x: 109.399994, y: -29.657143}
  2118 + m_SizeDelta: {x: 31.599998, y: 49.314285}
2105 m_Pivot: {x: 0.5, y: 0.5} 2119 m_Pivot: {x: 0.5, y: 0.5}
2106 --- !u!114 &510126320 2120 --- !u!114 &510126320
2107 MonoBehaviour: 2121 MonoBehaviour:
@@ -2516,7 +2530,7 @@ MonoBehaviour: @@ -2516,7 +2530,7 @@ MonoBehaviour:
2516 textButton: {fileID: 930426942} 2530 textButton: {fileID: 930426942}
2517 pauseButton: {fileID: 440527253} 2531 pauseButton: {fileID: 440527253}
2518 pauseMenu: {fileID: 1024302431} 2532 pauseMenu: {fileID: 1024302431}
2519 - screenManager: {fileID: 2131993092} 2533 + screenManager: {fileID: 2131993094}
2520 debugText: {fileID: 0} 2534 debugText: {fileID: 0}
2521 --- !u!114 &578311383 2535 --- !u!114 &578311383
2522 MonoBehaviour: 2536 MonoBehaviour:
@@ -2642,7 +2656,7 @@ MonoBehaviour: @@ -2642,7 +2656,7 @@ MonoBehaviour:
2642 m_OnClick: 2656 m_OnClick:
2643 m_PersistentCalls: 2657 m_PersistentCalls:
2644 m_Calls: 2658 m_Calls:
2645 - - m_Target: {fileID: 2131993092} 2659 + - m_Target: {fileID: 2131993094}
2646 m_MethodName: switchScreen 2660 m_MethodName: switchScreen
2647 m_Mode: 2 2661 m_Mode: 2
2648 m_Arguments: 2662 m_Arguments:
@@ -2732,17 +2746,15 @@ CanvasRenderer: @@ -2732,17 +2746,15 @@ CanvasRenderer:
2732 type: 2} 2746 type: 2}
2733 m_PrefabInternal: {fileID: 0} 2747 m_PrefabInternal: {fileID: 0}
2734 m_GameObject: {fileID: 600160454} 2748 m_GameObject: {fileID: 600160454}
2735 ---- !u!1 &615209559 2749 +--- !u!1 &613136920
2736 GameObject: 2750 GameObject:
2737 m_ObjectHideFlags: 0 2751 m_ObjectHideFlags: 0
2738 - m_PrefabParentObject: {fileID: 194984, guid: 5ccb0ba277304a14b9bb8d4e34161675, type: 2} 2752 + m_PrefabParentObject: {fileID: 0}
2739 m_PrefabInternal: {fileID: 0} 2753 m_PrefabInternal: {fileID: 0}
2740 serializedVersion: 4 2754 serializedVersion: 4
2741 m_Component: 2755 m_Component:
2742 - - 224: {fileID: 615209560}  
2743 - - 222: {fileID: 615209563}  
2744 - - 114: {fileID: 615209562}  
2745 - - 114: {fileID: 615209561} 2756 + - 224: {fileID: 613136921}
  2757 + - 114: {fileID: 613136922}
2746 m_Layer: 5 2758 m_Layer: 5
2747 m_Name: tutorial 2759 m_Name: tutorial
2748 m_TagString: Untagged 2760 m_TagString: Untagged
@@ -2750,112 +2762,37 @@ GameObject: @@ -2750,112 +2762,37 @@ GameObject:
2750 m_NavMeshLayer: 0 2762 m_NavMeshLayer: 0
2751 m_StaticEditorFlags: 0 2763 m_StaticEditorFlags: 0
2752 m_IsActive: 1 2764 m_IsActive: 1
2753 ---- !u!224 &615209560 2765 +--- !u!224 &613136921
2754 RectTransform: 2766 RectTransform:
2755 m_ObjectHideFlags: 0 2767 m_ObjectHideFlags: 0
2756 - m_PrefabParentObject: {fileID: 22421046, guid: 5ccb0ba277304a14b9bb8d4e34161675,  
2757 - type: 2} 2768 + m_PrefabParentObject: {fileID: 0}
2758 m_PrefabInternal: {fileID: 0} 2769 m_PrefabInternal: {fileID: 0}
2759 - m_GameObject: {fileID: 615209559} 2770 + m_GameObject: {fileID: 613136920}
2760 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} 2771 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
2761 m_LocalPosition: {x: 0, y: 0, z: 0} 2772 m_LocalPosition: {x: 0, y: 0, z: 0}
2762 m_LocalScale: {x: 1, y: 1, z: 1} 2773 m_LocalScale: {x: 1, y: 1, z: 1}
2763 - m_Children: [] 2774 + m_Children:
  2775 + - {fileID: 1157915785}
2764 m_Father: {fileID: 1874017187} 2776 m_Father: {fileID: 1874017187}
2765 m_RootOrder: 0 2777 m_RootOrder: 0
2766 - m_AnchorMin: {x: 0.35, y: 0.5}  
2767 - m_AnchorMax: {x: 0.65, y: 1} 2778 + m_AnchorMin: {x: 0.1, y: 0.5}
  2779 + m_AnchorMax: {x: 0.5, y: 1}
2768 m_AnchoredPosition: {x: 0, y: 0} 2780 m_AnchoredPosition: {x: 0, y: 0}
2769 - m_SizeDelta: {x: 0, y: 0} 2781 + m_SizeDelta: {x: 0, y: -31.450012}
2770 m_Pivot: {x: 0.5, y: 1} 2782 m_Pivot: {x: 0.5, y: 1}
2771 ---- !u!114 &615209561  
2772 -MonoBehaviour:  
2773 - m_ObjectHideFlags: 0  
2774 - m_PrefabParentObject: {fileID: 11403440, guid: 5ccb0ba277304a14b9bb8d4e34161675,  
2775 - type: 2}  
2776 - m_PrefabInternal: {fileID: 0}  
2777 - m_GameObject: {fileID: 615209559}  
2778 - m_Enabled: 1  
2779 - m_EditorHideFlags: 0  
2780 - m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}  
2781 - m_Name:  
2782 - m_EditorClassIdentifier:  
2783 - m_Navigation:  
2784 - m_Mode: 3  
2785 - m_SelectOnUp: {fileID: 0}  
2786 - m_SelectOnDown: {fileID: 0}  
2787 - m_SelectOnLeft: {fileID: 0}  
2788 - m_SelectOnRight: {fileID: 0}  
2789 - m_Transition: 1  
2790 - m_Colors:  
2791 - m_NormalColor: {r: 1, g: 1, b: 1, a: 1}  
2792 - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}  
2793 - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}  
2794 - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}  
2795 - m_ColorMultiplier: 1  
2796 - m_FadeDuration: 0.1  
2797 - m_SpriteState:  
2798 - m_HighlightedSprite: {fileID: 0}  
2799 - m_PressedSprite: {fileID: 0}  
2800 - m_DisabledSprite: {fileID: 0}  
2801 - m_AnimationTriggers:  
2802 - m_NormalTrigger: Normal  
2803 - m_HighlightedTrigger: Highlighted  
2804 - m_PressedTrigger: Pressed  
2805 - m_DisabledTrigger: Disabled  
2806 - m_Interactable: 1  
2807 - m_TargetGraphic: {fileID: 615209562}  
2808 - m_OnClick:  
2809 - m_PersistentCalls:  
2810 - m_Calls:  
2811 - - m_Target: {fileID: 2131993092}  
2812 - m_MethodName: switchScreen  
2813 - m_Mode: 2  
2814 - m_Arguments:  
2815 - m_ObjectArgument: {fileID: 228512393}  
2816 - m_ObjectArgumentAssemblyTypeName: UnityEngine.GameObject, UnityEngine  
2817 - m_IntArgument: 0  
2818 - m_FloatArgument: 0  
2819 - m_StringArgument:  
2820 - m_BoolArgument: 0  
2821 - m_CallState: 2  
2822 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,  
2823 - Culture=neutral, PublicKeyToken=null  
2824 ---- !u!114 &615209562 2783 +--- !u!114 &613136922
2825 MonoBehaviour: 2784 MonoBehaviour:
2826 m_ObjectHideFlags: 0 2785 m_ObjectHideFlags: 0
2827 - m_PrefabParentObject: {fileID: 11434796, guid: 5ccb0ba277304a14b9bb8d4e34161675,  
2828 - type: 2} 2786 + m_PrefabParentObject: {fileID: 0}
2829 m_PrefabInternal: {fileID: 0} 2787 m_PrefabInternal: {fileID: 0}
2830 - m_GameObject: {fileID: 615209559} 2788 + m_GameObject: {fileID: 613136920}
2831 m_Enabled: 1 2789 m_Enabled: 1
2832 m_EditorHideFlags: 0 2790 m_EditorHideFlags: 0
2833 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} 2791 + m_Script: {fileID: -1254083943, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
2834 m_Name: 2792 m_Name:
2835 m_EditorClassIdentifier: 2793 m_EditorClassIdentifier:
2836 - m_Material: {fileID: 0}  
2837 - m_Color: {r: 1, g: 1, b: 1, a: 1}  
2838 - m_RaycastTarget: 1  
2839 - m_OnCullStateChanged:  
2840 - m_PersistentCalls:  
2841 - m_Calls: []  
2842 - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,  
2843 - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null  
2844 - m_Sprite: {fileID: 21300000, guid: 0fbe6c940c9e6534fa64037b96903291, type: 3}  
2845 - m_Type: 0  
2846 - m_PreserveAspect: 1  
2847 - m_FillCenter: 1  
2848 - m_FillMethod: 4  
2849 - m_FillAmount: 1  
2850 - m_FillClockwise: 1  
2851 - m_FillOrigin: 0  
2852 ---- !u!222 &615209563  
2853 -CanvasRenderer:  
2854 - m_ObjectHideFlags: 0  
2855 - m_PrefabParentObject: {fileID: 22275774, guid: 5ccb0ba277304a14b9bb8d4e34161675,  
2856 - type: 2}  
2857 - m_PrefabInternal: {fileID: 0}  
2858 - m_GameObject: {fileID: 615209559} 2794 + m_AspectMode: 1
  2795 + m_AspectRatio: 3.2
2859 --- !u!1 &630366170 2796 --- !u!1 &630366170
2860 GameObject: 2797 GameObject:
2861 m_ObjectHideFlags: 0 2798 m_ObjectHideFlags: 0
@@ -2889,8 +2826,8 @@ RectTransform: @@ -2889,8 +2826,8 @@ RectTransform:
2889 m_RootOrder: 3 2826 m_RootOrder: 3
2890 m_AnchorMin: {x: 0, y: 1} 2827 m_AnchorMin: {x: 0, y: 1}
2891 m_AnchorMax: {x: 0, y: 1} 2828 m_AnchorMax: {x: 0, y: 1}
2892 - m_AnchoredPosition: {x: 190.4, y: -24}  
2893 - m_SizeDelta: {x: 18.4, y: 38} 2829 + m_AnchoredPosition: {x: 236.59999, y: -29.657143}
  2830 + m_SizeDelta: {x: 31.599998, y: 49.314285}
2894 m_Pivot: {x: 0.5, y: 0.5} 2831 m_Pivot: {x: 0.5, y: 0.5}
2895 --- !u!114 &630366172 2832 --- !u!114 &630366172
2896 MonoBehaviour: 2833 MonoBehaviour:
@@ -2980,6 +2917,130 @@ CanvasRenderer: @@ -2980,6 +2917,130 @@ CanvasRenderer:
2980 type: 2} 2917 type: 2}
2981 m_PrefabInternal: {fileID: 0} 2918 m_PrefabInternal: {fileID: 0}
2982 m_GameObject: {fileID: 630366170} 2919 m_GameObject: {fileID: 630366170}
  2920 +--- !u!1 &670462552
  2921 +GameObject:
  2922 + m_ObjectHideFlags: 0
  2923 + m_PrefabParentObject: {fileID: 194984, guid: 5ccb0ba277304a14b9bb8d4e34161675, type: 2}
  2924 + m_PrefabInternal: {fileID: 0}
  2925 + serializedVersion: 4
  2926 + m_Component:
  2927 + - 224: {fileID: 670462553}
  2928 + - 222: {fileID: 670462556}
  2929 + - 114: {fileID: 670462555}
  2930 + - 114: {fileID: 670462554}
  2931 + m_Layer: 5
  2932 + m_Name: backup_tutorial
  2933 + m_TagString: Untagged
  2934 + m_Icon: {fileID: 0}
  2935 + m_NavMeshLayer: 0
  2936 + m_StaticEditorFlags: 0
  2937 + m_IsActive: 0
  2938 +--- !u!224 &670462553
  2939 +RectTransform:
  2940 + m_ObjectHideFlags: 0
  2941 + m_PrefabParentObject: {fileID: 22421046, guid: 5ccb0ba277304a14b9bb8d4e34161675,
  2942 + type: 2}
  2943 + m_PrefabInternal: {fileID: 0}
  2944 + m_GameObject: {fileID: 670462552}
  2945 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  2946 + m_LocalPosition: {x: 0, y: 0, z: 0}
  2947 + m_LocalScale: {x: 1, y: 1, z: 1}
  2948 + m_Children: []
  2949 + m_Father: {fileID: 1874017187}
  2950 + m_RootOrder: 3
  2951 + m_AnchorMin: {x: 0.1, y: 0.5}
  2952 + m_AnchorMax: {x: 0.4, y: 1}
  2953 + m_AnchoredPosition: {x: 0, y: 0}
  2954 + m_SizeDelta: {x: 0, y: 0}
  2955 + m_Pivot: {x: 0.5, y: 1}
  2956 +--- !u!114 &670462554
  2957 +MonoBehaviour:
  2958 + m_ObjectHideFlags: 0
  2959 + m_PrefabParentObject: {fileID: 11403440, guid: 5ccb0ba277304a14b9bb8d4e34161675,
  2960 + type: 2}
  2961 + m_PrefabInternal: {fileID: 0}
  2962 + m_GameObject: {fileID: 670462552}
  2963 + m_Enabled: 1
  2964 + m_EditorHideFlags: 0
  2965 + m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
  2966 + m_Name:
  2967 + m_EditorClassIdentifier:
  2968 + m_Navigation:
  2969 + m_Mode: 3
  2970 + m_SelectOnUp: {fileID: 0}
  2971 + m_SelectOnDown: {fileID: 0}
  2972 + m_SelectOnLeft: {fileID: 0}
  2973 + m_SelectOnRight: {fileID: 0}
  2974 + m_Transition: 1
  2975 + m_Colors:
  2976 + m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
  2977 + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
  2978 + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
  2979 + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
  2980 + m_ColorMultiplier: 1
  2981 + m_FadeDuration: 0.1
  2982 + m_SpriteState:
  2983 + m_HighlightedSprite: {fileID: 0}
  2984 + m_PressedSprite: {fileID: 0}
  2985 + m_DisabledSprite: {fileID: 0}
  2986 + m_AnimationTriggers:
  2987 + m_NormalTrigger: Normal
  2988 + m_HighlightedTrigger: Highlighted
  2989 + m_PressedTrigger: Pressed
  2990 + m_DisabledTrigger: Disabled
  2991 + m_Interactable: 1
  2992 + m_TargetGraphic: {fileID: 670462555}
  2993 + m_OnClick:
  2994 + m_PersistentCalls:
  2995 + m_Calls:
  2996 + - m_Target: {fileID: 2131993094}
  2997 + m_MethodName: switchScreen
  2998 + m_Mode: 2
  2999 + m_Arguments:
  3000 + m_ObjectArgument: {fileID: 228512393}
  3001 + m_ObjectArgumentAssemblyTypeName: UnityEngine.GameObject, UnityEngine
  3002 + m_IntArgument: 0
  3003 + m_FloatArgument: 0
  3004 + m_StringArgument:
  3005 + m_BoolArgument: 0
  3006 + m_CallState: 2
  3007 + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
  3008 + Culture=neutral, PublicKeyToken=null
  3009 +--- !u!114 &670462555
  3010 +MonoBehaviour:
  3011 + m_ObjectHideFlags: 0
  3012 + m_PrefabParentObject: {fileID: 11434796, guid: 5ccb0ba277304a14b9bb8d4e34161675,
  3013 + type: 2}
  3014 + m_PrefabInternal: {fileID: 0}
  3015 + m_GameObject: {fileID: 670462552}
  3016 + m_Enabled: 1
  3017 + m_EditorHideFlags: 0
  3018 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
  3019 + m_Name:
  3020 + m_EditorClassIdentifier:
  3021 + m_Material: {fileID: 0}
  3022 + m_Color: {r: 1, g: 1, b: 1, a: 1}
  3023 + m_RaycastTarget: 1
  3024 + m_OnCullStateChanged:
  3025 + m_PersistentCalls:
  3026 + m_Calls: []
  3027 + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
  3028 + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
  3029 + m_Sprite: {fileID: 21300000, guid: 0fbe6c940c9e6534fa64037b96903291, type: 3}
  3030 + m_Type: 0
  3031 + m_PreserveAspect: 1
  3032 + m_FillCenter: 1
  3033 + m_FillMethod: 4
  3034 + m_FillAmount: 1
  3035 + m_FillClockwise: 1
  3036 + m_FillOrigin: 0
  3037 +--- !u!222 &670462556
  3038 +CanvasRenderer:
  3039 + m_ObjectHideFlags: 0
  3040 + m_PrefabParentObject: {fileID: 22275774, guid: 5ccb0ba277304a14b9bb8d4e34161675,
  3041 + type: 2}
  3042 + m_PrefabInternal: {fileID: 0}
  3043 + m_GameObject: {fileID: 670462552}
2983 --- !u!1 &702185294 3044 --- !u!1 &702185294
2984 GameObject: 3045 GameObject:
2985 m_ObjectHideFlags: 0 3046 m_ObjectHideFlags: 0
@@ -3220,9 +3281,8 @@ GameObject: @@ -3220,9 +3281,8 @@ GameObject:
3220 m_Component: 3281 m_Component:
3221 - 224: {fileID: 815279418} 3282 - 224: {fileID: 815279418}
3222 - 222: {fileID: 815279422} 3283 - 222: {fileID: 815279422}
3223 - - 114: {fileID: 815279421}  
3224 - - 114: {fileID: 815279420}  
3225 - 114: {fileID: 815279419} 3284 - 114: {fileID: 815279419}
  3285 + - 114: {fileID: 815279421}
3226 m_Layer: 5 3286 m_Layer: 5
3227 m_Name: b_close 3287 m_Name: b_close
3228 m_TagString: Untagged 3288 m_TagString: Untagged
@@ -3263,59 +3323,6 @@ MonoBehaviour: @@ -3263,59 +3323,6 @@ MonoBehaviour:
3263 m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} 3323 m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
3264 m_EffectDistance: {x: 1, y: -1} 3324 m_EffectDistance: {x: 1, y: -1}
3265 m_UseGraphicAlpha: 1 3325 m_UseGraphicAlpha: 1
3266 ---- !u!114 &815279420  
3267 -MonoBehaviour:  
3268 - m_ObjectHideFlags: 0  
3269 - m_PrefabParentObject: {fileID: 11464464, guid: 5ccb0ba277304a14b9bb8d4e34161675,  
3270 - type: 2}  
3271 - m_PrefabInternal: {fileID: 0}  
3272 - m_GameObject: {fileID: 815279417}  
3273 - m_Enabled: 1  
3274 - m_EditorHideFlags: 0  
3275 - m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}  
3276 - m_Name:  
3277 - m_EditorClassIdentifier:  
3278 - m_Navigation:  
3279 - m_Mode: 3  
3280 - m_SelectOnUp: {fileID: 0}  
3281 - m_SelectOnDown: {fileID: 0}  
3282 - m_SelectOnLeft: {fileID: 0}  
3283 - m_SelectOnRight: {fileID: 0}  
3284 - m_Transition: 1  
3285 - m_Colors:  
3286 - m_NormalColor: {r: 0, g: 0, b: 0, a: 0.234}  
3287 - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}  
3288 - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}  
3289 - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}  
3290 - m_ColorMultiplier: 1  
3291 - m_FadeDuration: 0.1  
3292 - m_SpriteState:  
3293 - m_HighlightedSprite: {fileID: 0}  
3294 - m_PressedSprite: {fileID: 0}  
3295 - m_DisabledSprite: {fileID: 0}  
3296 - m_AnimationTriggers:  
3297 - m_NormalTrigger: Normal  
3298 - m_HighlightedTrigger: Highlighted  
3299 - m_PressedTrigger: Pressed  
3300 - m_DisabledTrigger: Disabled  
3301 - m_Interactable: 1  
3302 - m_TargetGraphic: {fileID: 815279421}  
3303 - m_OnClick:  
3304 - m_PersistentCalls:  
3305 - m_Calls:  
3306 - - m_Target: {fileID: 2131993092}  
3307 - m_MethodName: hideScreen  
3308 - m_Mode: 1  
3309 - m_Arguments:  
3310 - m_ObjectArgument: {fileID: 0}  
3311 - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine  
3312 - m_IntArgument: 0  
3313 - m_FloatArgument: 0  
3314 - m_StringArgument:  
3315 - m_BoolArgument: 0  
3316 - m_CallState: 2  
3317 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,  
3318 - Culture=neutral, PublicKeyToken=null  
3319 --- !u!114 &815279421 3326 --- !u!114 &815279421
3320 MonoBehaviour: 3327 MonoBehaviour:
3321 m_ObjectHideFlags: 0 3328 m_ObjectHideFlags: 0
@@ -3385,6 +3392,127 @@ RectTransform: @@ -3385,6 +3392,127 @@ RectTransform:
3385 m_AnchoredPosition: {x: -0.0000038146973, y: 0} 3392 m_AnchoredPosition: {x: -0.0000038146973, y: 0}
3386 m_SizeDelta: {x: 30, y: 30} 3393 m_SizeDelta: {x: 30, y: 30}
3387 m_Pivot: {x: 0.5, y: 0.5} 3394 m_Pivot: {x: 0.5, y: 0.5}
  3395 +--- !u!1 &841640088
  3396 +GameObject:
  3397 + m_ObjectHideFlags: 0
  3398 + m_PrefabParentObject: {fileID: 0}
  3399 + m_PrefabInternal: {fileID: 0}
  3400 + serializedVersion: 4
  3401 + m_Component:
  3402 + - 224: {fileID: 841640089}
  3403 + - 222: {fileID: 841640092}
  3404 + - 114: {fileID: 841640091}
  3405 + - 114: {fileID: 841640090}
  3406 + m_Layer: 5
  3407 + m_Name: Button
  3408 + m_TagString: Untagged
  3409 + m_Icon: {fileID: 0}
  3410 + m_NavMeshLayer: 0
  3411 + m_StaticEditorFlags: 0
  3412 + m_IsActive: 1
  3413 +--- !u!224 &841640089
  3414 +RectTransform:
  3415 + m_ObjectHideFlags: 0
  3416 + m_PrefabParentObject: {fileID: 0}
  3417 + m_PrefabInternal: {fileID: 0}
  3418 + m_GameObject: {fileID: 841640088}
  3419 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  3420 + m_LocalPosition: {x: 0, y: 0, z: 0}
  3421 + m_LocalScale: {x: 1, y: 1, z: 1}
  3422 + m_Children:
  3423 + - {fileID: 1237199446}
  3424 + m_Father: {fileID: 1763761724}
  3425 + m_RootOrder: 0
  3426 + m_AnchorMin: {x: 0.1, y: 0}
  3427 + m_AnchorMax: {x: 1, y: 1}
  3428 + m_AnchoredPosition: {x: 0, y: 0}
  3429 + m_SizeDelta: {x: 0, y: 0}
  3430 + m_Pivot: {x: 0.5, y: 1}
  3431 +--- !u!114 &841640090
  3432 +MonoBehaviour:
  3433 + m_ObjectHideFlags: 0
  3434 + m_PrefabParentObject: {fileID: 0}
  3435 + m_PrefabInternal: {fileID: 0}
  3436 + m_GameObject: {fileID: 841640088}
  3437 + m_Enabled: 1
  3438 + m_EditorHideFlags: 0
  3439 + m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
  3440 + m_Name:
  3441 + m_EditorClassIdentifier:
  3442 + m_Navigation:
  3443 + m_Mode: 3
  3444 + m_SelectOnUp: {fileID: 0}
  3445 + m_SelectOnDown: {fileID: 0}
  3446 + m_SelectOnLeft: {fileID: 0}
  3447 + m_SelectOnRight: {fileID: 0}
  3448 + m_Transition: 1
  3449 + m_Colors:
  3450 + m_NormalColor: {r: 0.981, g: 0.9877857, b: 1, a: 0.716}
  3451 + m_HighlightedColor: {r: 0.29411766, g: 0.37254903, b: 0.5254902, a: 0.11372549}
  3452 + m_PressedColor: {r: 0.29411766, g: 0.37254903, b: 0.5254902, a: 0.21960784}
  3453 + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
  3454 + m_ColorMultiplier: 1
  3455 + m_FadeDuration: 0.1
  3456 + m_SpriteState:
  3457 + m_HighlightedSprite: {fileID: 0}
  3458 + m_PressedSprite: {fileID: 0}
  3459 + m_DisabledSprite: {fileID: 0}
  3460 + m_AnimationTriggers:
  3461 + m_NormalTrigger: Normal
  3462 + m_HighlightedTrigger: Highlighted
  3463 + m_PressedTrigger: Pressed
  3464 + m_DisabledTrigger: Disabled
  3465 + m_Interactable: 1
  3466 + m_TargetGraphic: {fileID: 841640091}
  3467 + m_OnClick:
  3468 + m_PersistentCalls:
  3469 + m_Calls:
  3470 + - m_Target: {fileID: 2131993094}
  3471 + m_MethodName: switchScreen
  3472 + m_Mode: 2
  3473 + m_Arguments:
  3474 + m_ObjectArgument: {fileID: 2044204294}
  3475 + m_ObjectArgumentAssemblyTypeName: UnityEngine.GameObject, UnityEngine
  3476 + m_IntArgument: 0
  3477 + m_FloatArgument: 0
  3478 + m_StringArgument:
  3479 + m_BoolArgument: 0
  3480 + m_CallState: 2
  3481 + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
  3482 + Culture=neutral, PublicKeyToken=null
  3483 +--- !u!114 &841640091
  3484 +MonoBehaviour:
  3485 + m_ObjectHideFlags: 0
  3486 + m_PrefabParentObject: {fileID: 0}
  3487 + m_PrefabInternal: {fileID: 0}
  3488 + m_GameObject: {fileID: 841640088}
  3489 + m_Enabled: 1
  3490 + m_EditorHideFlags: 0
  3491 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
  3492 + m_Name:
  3493 + m_EditorClassIdentifier:
  3494 + m_Material: {fileID: 0}
  3495 + m_Color: {r: 1, g: 1, b: 1, a: 1}
  3496 + m_RaycastTarget: 1
  3497 + m_OnCullStateChanged:
  3498 + m_PersistentCalls:
  3499 + m_Calls: []
  3500 + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
  3501 + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
  3502 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
  3503 + m_Type: 1
  3504 + m_PreserveAspect: 0
  3505 + m_FillCenter: 1
  3506 + m_FillMethod: 4
  3507 + m_FillAmount: 1
  3508 + m_FillClockwise: 1
  3509 + m_FillOrigin: 0
  3510 +--- !u!222 &841640092
  3511 +CanvasRenderer:
  3512 + m_ObjectHideFlags: 0
  3513 + m_PrefabParentObject: {fileID: 0}
  3514 + m_PrefabInternal: {fileID: 0}
  3515 + m_GameObject: {fileID: 841640088}
3388 --- !u!1 &842733389 3516 --- !u!1 &842733389
3389 GameObject: 3517 GameObject:
3390 m_ObjectHideFlags: 0 3518 m_ObjectHideFlags: 0
@@ -3900,7 +4028,7 @@ MonoBehaviour: @@ -3900,7 +4028,7 @@ MonoBehaviour:
3900 m_OnClick: 4028 m_OnClick:
3901 m_PersistentCalls: 4029 m_PersistentCalls:
3902 m_Calls: 4030 m_Calls:
3903 - - m_Target: {fileID: 2131993092} 4031 + - m_Target: {fileID: 2131993094}
3904 m_MethodName: switchScreen 4032 m_MethodName: switchScreen
3905 m_Mode: 2 4033 m_Mode: 2
3906 m_Arguments: 4034 m_Arguments:
@@ -3950,7 +4078,7 @@ RectTransform: @@ -3950,7 +4078,7 @@ RectTransform:
3950 m_LocalScale: {x: 1, y: 1, z: 1} 4078 m_LocalScale: {x: 1, y: 1, z: 1}
3951 m_Children: [] 4079 m_Children: []
3952 m_Father: {fileID: 1874017187} 4080 m_Father: {fileID: 1874017187}
3953 - m_RootOrder: 1 4081 + m_RootOrder: 2
3954 m_AnchorMin: {x: 0.1, y: 0} 4082 m_AnchorMin: {x: 0.1, y: 0}
3955 m_AnchorMax: {x: 0.9, y: 0.5} 4083 m_AnchorMax: {x: 0.9, y: 0.5}
3956 m_AnchoredPosition: {x: 0, y: 0} 4084 m_AnchoredPosition: {x: 0, y: 0}
@@ -4289,11 +4417,11 @@ RectTransform: @@ -4289,11 +4417,11 @@ RectTransform:
4289 m_Children: [] 4417 m_Children: []
4290 m_Father: {fileID: 814612177} 4418 m_Father: {fileID: 814612177}
4291 m_RootOrder: 0 4419 m_RootOrder: 0
4292 - m_AnchorMin: {x: 0.82, y: 1}  
4293 - m_AnchorMax: {x: 0.96, y: 1} 4420 + m_AnchorMin: {x: 0.8, y: 1.2}
  4421 + m_AnchorMax: {x: 0.96, y: 2.4}
4294 m_AnchoredPosition: {x: 0, y: 0} 4422 m_AnchoredPosition: {x: 0, y: 0}
4295 - m_SizeDelta: {x: 0, y: 59}  
4296 - m_Pivot: {x: 1, y: -0.36} 4423 + m_SizeDelta: {x: 0, y: 0}
  4424 + m_Pivot: {x: 1, y: 0.5}
4297 --- !u!114 &995712445 4425 --- !u!114 &995712445
4298 MonoBehaviour: 4426 MonoBehaviour:
4299 m_ObjectHideFlags: 0 4427 m_ObjectHideFlags: 0
@@ -4539,7 +4667,7 @@ MonoBehaviour: @@ -4539,7 +4667,7 @@ MonoBehaviour:
4539 m_OnClick: 4667 m_OnClick:
4540 m_PersistentCalls: 4668 m_PersistentCalls:
4541 m_Calls: 4669 m_Calls:
4542 - - m_Target: {fileID: 2131993092} 4670 + - m_Target: {fileID: 2131993094}
4543 m_MethodName: switchScreen 4671 m_MethodName: switchScreen
4544 m_Mode: 2 4672 m_Mode: 2
4545 m_Arguments: 4673 m_Arguments:
@@ -4665,8 +4793,8 @@ RectTransform: @@ -4665,8 +4793,8 @@ RectTransform:
4665 m_RootOrder: 4 4793 m_RootOrder: 4
4666 m_AnchorMin: {x: 0, y: 1} 4794 m_AnchorMin: {x: 0, y: 1}
4667 m_AnchorMax: {x: 0, y: 1} 4795 m_AnchorMax: {x: 0, y: 1}
4668 - m_AnchoredPosition: {x: 240.79999, y: -24}  
4669 - m_SizeDelta: {x: 18.4, y: 38} 4796 + m_AnchoredPosition: {x: 300.19998, y: -29.657143}
  4797 + m_SizeDelta: {x: 31.599998, y: 49.314285}
4670 m_Pivot: {x: 0.5, y: 0.5} 4798 m_Pivot: {x: 0.5, y: 0.5}
4671 --- !u!114 &1048863674 4799 --- !u!114 &1048863674
4672 MonoBehaviour: 4800 MonoBehaviour:
@@ -4859,7 +4987,7 @@ MonoBehaviour: @@ -4859,7 +4987,7 @@ MonoBehaviour:
4859 m_StringArgument: 4987 m_StringArgument:
4860 m_BoolArgument: 0 4988 m_BoolArgument: 0
4861 m_CallState: 2 4989 m_CallState: 2
4862 - - m_Target: {fileID: 2131993092} 4990 + - m_Target: {fileID: 2131993094}
4863 m_MethodName: hideScreen 4991 m_MethodName: hideScreen
4864 m_Mode: 1 4992 m_Mode: 1
4865 m_Arguments: 4993 m_Arguments:
@@ -4979,27 +5107,150 @@ MonoBehaviour: @@ -4979,27 +5107,150 @@ MonoBehaviour:
4979 m_PressedTrigger: Pressed 5107 m_PressedTrigger: Pressed
4980 m_DisabledTrigger: Disabled 5108 m_DisabledTrigger: Disabled
4981 m_Interactable: 1 5109 m_Interactable: 1
4982 - m_TargetGraphic: {fileID: 1152273572} 5110 + m_TargetGraphic: {fileID: 1152273572}
  5111 + m_OnClick:
  5112 + m_PersistentCalls:
  5113 + m_Calls:
  5114 + - m_Target: {fileID: 578311381}
  5115 + m_MethodName: stopAll
  5116 + m_Mode: 1
  5117 + m_Arguments:
  5118 + m_ObjectArgument: {fileID: 0}
  5119 + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
  5120 + m_IntArgument: 0
  5121 + m_FloatArgument: 0
  5122 + m_StringArgument:
  5123 + m_BoolArgument: 0
  5124 + m_CallState: 2
  5125 + - m_Target: {fileID: 1024302431}
  5126 + m_MethodName: SetActive
  5127 + m_Mode: 6
  5128 + m_Arguments:
  5129 + m_ObjectArgument: {fileID: 0}
  5130 + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
  5131 + m_IntArgument: 0
  5132 + m_FloatArgument: 0
  5133 + m_StringArgument:
  5134 + m_BoolArgument: 0
  5135 + m_CallState: 2
  5136 + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
  5137 + Culture=neutral, PublicKeyToken=null
  5138 +--- !u!114 &1152273572
  5139 +MonoBehaviour:
  5140 + m_ObjectHideFlags: 0
  5141 + m_PrefabParentObject: {fileID: 11421606, guid: 5ccb0ba277304a14b9bb8d4e34161675,
  5142 + type: 2}
  5143 + m_PrefabInternal: {fileID: 0}
  5144 + m_GameObject: {fileID: 1152273569}
  5145 + m_Enabled: 1
  5146 + m_EditorHideFlags: 0
  5147 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
  5148 + m_Name:
  5149 + m_EditorClassIdentifier:
  5150 + m_Material: {fileID: 0}
  5151 + m_Color: {r: 1, g: 1, b: 1, a: 1}
  5152 + m_RaycastTarget: 1
  5153 + m_OnCullStateChanged:
  5154 + m_PersistentCalls:
  5155 + m_Calls: []
  5156 + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
  5157 + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
  5158 + m_Sprite: {fileID: 21300000, guid: fbf55ea1f2e12da4799c1ac527f37b6e, type: 3}
  5159 + m_Type: 0
  5160 + m_PreserveAspect: 1
  5161 + m_FillCenter: 1
  5162 + m_FillMethod: 4
  5163 + m_FillAmount: 1
  5164 + m_FillClockwise: 1
  5165 + m_FillOrigin: 0
  5166 +--- !u!222 &1152273573
  5167 +CanvasRenderer:
  5168 + m_ObjectHideFlags: 0
  5169 + m_PrefabParentObject: {fileID: 22200200, guid: 5ccb0ba277304a14b9bb8d4e34161675,
  5170 + type: 2}
  5171 + m_PrefabInternal: {fileID: 0}
  5172 + m_GameObject: {fileID: 1152273569}
  5173 +--- !u!1 &1157915784
  5174 +GameObject:
  5175 + m_ObjectHideFlags: 0
  5176 + m_PrefabParentObject: {fileID: 0}
  5177 + m_PrefabInternal: {fileID: 0}
  5178 + serializedVersion: 4
  5179 + m_Component:
  5180 + - 224: {fileID: 1157915785}
  5181 + - 222: {fileID: 1157915788}
  5182 + - 114: {fileID: 1157915787}
  5183 + - 114: {fileID: 1157915786}
  5184 + m_Layer: 5
  5185 + m_Name: Button
  5186 + m_TagString: Untagged
  5187 + m_Icon: {fileID: 0}
  5188 + m_NavMeshLayer: 0
  5189 + m_StaticEditorFlags: 0
  5190 + m_IsActive: 1
  5191 +--- !u!224 &1157915785
  5192 +RectTransform:
  5193 + m_ObjectHideFlags: 0
  5194 + m_PrefabParentObject: {fileID: 0}
  5195 + m_PrefabInternal: {fileID: 0}
  5196 + m_GameObject: {fileID: 1157915784}
  5197 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  5198 + m_LocalPosition: {x: 0, y: 0, z: 0}
  5199 + m_LocalScale: {x: 1, y: 1, z: 1}
  5200 + m_Children:
  5201 + - {fileID: 2102396406}
  5202 + m_Father: {fileID: 613136921}
  5203 + m_RootOrder: 0
  5204 + m_AnchorMin: {x: 0, y: 0}
  5205 + m_AnchorMax: {x: 0.7, y: 1}
  5206 + m_AnchoredPosition: {x: 0, y: 0}
  5207 + m_SizeDelta: {x: 0, y: 0}
  5208 + m_Pivot: {x: 0.5, y: 1}
  5209 +--- !u!114 &1157915786
  5210 +MonoBehaviour:
  5211 + m_ObjectHideFlags: 0
  5212 + m_PrefabParentObject: {fileID: 0}
  5213 + m_PrefabInternal: {fileID: 0}
  5214 + m_GameObject: {fileID: 1157915784}
  5215 + m_Enabled: 1
  5216 + m_EditorHideFlags: 0
  5217 + m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
  5218 + m_Name:
  5219 + m_EditorClassIdentifier:
  5220 + m_Navigation:
  5221 + m_Mode: 3
  5222 + m_SelectOnUp: {fileID: 0}
  5223 + m_SelectOnDown: {fileID: 0}
  5224 + m_SelectOnLeft: {fileID: 0}
  5225 + m_SelectOnRight: {fileID: 0}
  5226 + m_Transition: 1
  5227 + m_Colors:
  5228 + m_NormalColor: {r: 0.98039216, g: 0.9843137, b: 1, a: 0.7137255}
  5229 + m_HighlightedColor: {r: 0.29411766, g: 0.37254903, b: 0.5254902, a: 0.116}
  5230 + m_PressedColor: {r: 0.29411766, g: 0.37254903, b: 0.5254902, a: 0.222}
  5231 + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
  5232 + m_ColorMultiplier: 1
  5233 + m_FadeDuration: 0.1
  5234 + m_SpriteState:
  5235 + m_HighlightedSprite: {fileID: 0}
  5236 + m_PressedSprite: {fileID: 0}
  5237 + m_DisabledSprite: {fileID: 0}
  5238 + m_AnimationTriggers:
  5239 + m_NormalTrigger: Normal
  5240 + m_HighlightedTrigger: Highlighted
  5241 + m_PressedTrigger: Pressed
  5242 + m_DisabledTrigger: Disabled
  5243 + m_Interactable: 1
  5244 + m_TargetGraphic: {fileID: 1157915787}
4983 m_OnClick: 5245 m_OnClick:
4984 m_PersistentCalls: 5246 m_PersistentCalls:
4985 m_Calls: 5247 m_Calls:
4986 - - m_Target: {fileID: 578311381}  
4987 - m_MethodName: stopAll  
4988 - m_Mode: 1  
4989 - m_Arguments:  
4990 - m_ObjectArgument: {fileID: 0}  
4991 - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine  
4992 - m_IntArgument: 0  
4993 - m_FloatArgument: 0  
4994 - m_StringArgument:  
4995 - m_BoolArgument: 0  
4996 - m_CallState: 2  
4997 - - m_Target: {fileID: 1024302431}  
4998 - m_MethodName: SetActive  
4999 - m_Mode: 6 5248 + - m_Target: {fileID: 2131993094}
  5249 + m_MethodName: switchScreen
  5250 + m_Mode: 2
5000 m_Arguments: 5251 m_Arguments:
5001 - m_ObjectArgument: {fileID: 0}  
5002 - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine 5252 + m_ObjectArgument: {fileID: 228512393}
  5253 + m_ObjectArgumentAssemblyTypeName: UnityEngine.GameObject, UnityEngine
5003 m_IntArgument: 0 5254 m_IntArgument: 0
5004 m_FloatArgument: 0 5255 m_FloatArgument: 0
5005 m_StringArgument: 5256 m_StringArgument:
@@ -5007,13 +5258,12 @@ MonoBehaviour: @@ -5007,13 +5258,12 @@ MonoBehaviour:
5007 m_CallState: 2 5258 m_CallState: 2
5008 m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, 5259 m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
5009 Culture=neutral, PublicKeyToken=null 5260 Culture=neutral, PublicKeyToken=null
5010 ---- !u!114 &1152273572 5261 +--- !u!114 &1157915787
5011 MonoBehaviour: 5262 MonoBehaviour:
5012 m_ObjectHideFlags: 0 5263 m_ObjectHideFlags: 0
5013 - m_PrefabParentObject: {fileID: 11421606, guid: 5ccb0ba277304a14b9bb8d4e34161675,  
5014 - type: 2} 5264 + m_PrefabParentObject: {fileID: 0}
5015 m_PrefabInternal: {fileID: 0} 5265 m_PrefabInternal: {fileID: 0}
5016 - m_GameObject: {fileID: 1152273569} 5266 + m_GameObject: {fileID: 1157915784}
5017 m_Enabled: 1 5267 m_Enabled: 1
5018 m_EditorHideFlags: 0 5268 m_EditorHideFlags: 0
5019 m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} 5269 m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
@@ -5027,21 +5277,20 @@ MonoBehaviour: @@ -5027,21 +5277,20 @@ MonoBehaviour:
5027 m_Calls: [] 5277 m_Calls: []
5028 m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, 5278 m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
5029 Version=1.0.0.0, Culture=neutral, PublicKeyToken=null 5279 Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
5030 - m_Sprite: {fileID: 21300000, guid: fbf55ea1f2e12da4799c1ac527f37b6e, type: 3}  
5031 - m_Type: 0  
5032 - m_PreserveAspect: 1 5280 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
  5281 + m_Type: 1
  5282 + m_PreserveAspect: 0
5033 m_FillCenter: 1 5283 m_FillCenter: 1
5034 m_FillMethod: 4 5284 m_FillMethod: 4
5035 m_FillAmount: 1 5285 m_FillAmount: 1
5036 m_FillClockwise: 1 5286 m_FillClockwise: 1
5037 m_FillOrigin: 0 5287 m_FillOrigin: 0
5038 ---- !u!222 &1152273573 5288 +--- !u!222 &1157915788
5039 CanvasRenderer: 5289 CanvasRenderer:
5040 m_ObjectHideFlags: 0 5290 m_ObjectHideFlags: 0
5041 - m_PrefabParentObject: {fileID: 22200200, guid: 5ccb0ba277304a14b9bb8d4e34161675,  
5042 - type: 2} 5291 + m_PrefabParentObject: {fileID: 0}
5043 m_PrefabInternal: {fileID: 0} 5292 m_PrefabInternal: {fileID: 0}
5044 - m_GameObject: {fileID: 1152273569} 5293 + m_GameObject: {fileID: 1157915784}
5045 --- !u!1 &1164416485 5294 --- !u!1 &1164416485
5046 GameObject: 5295 GameObject:
5047 m_ObjectHideFlags: 0 5296 m_ObjectHideFlags: 0
@@ -5150,6 +5399,7 @@ GameObject: @@ -5150,6 +5399,7 @@ GameObject:
5150 - 222: {fileID: 1175405164} 5399 - 222: {fileID: 1175405164}
5151 - 114: {fileID: 1175405163} 5400 - 114: {fileID: 1175405163}
5152 - 114: {fileID: 1175405162} 5401 - 114: {fileID: 1175405162}
  5402 + - 114: {fileID: 1175405165}
5153 m_Layer: 5 5403 m_Layer: 5
5154 m_Name: b_translate 5404 m_Name: b_translate
5155 m_TagString: Untagged 5405 m_TagString: Untagged
@@ -5170,11 +5420,11 @@ RectTransform: @@ -5170,11 +5420,11 @@ RectTransform:
5170 m_Children: [] 5420 m_Children: []
5171 m_Father: {fileID: 1935189154} 5421 m_Father: {fileID: 1935189154}
5172 m_RootOrder: 5 5422 m_RootOrder: 5
5173 - m_AnchorMin: {x: 0.3, y: 0.2}  
5174 - m_AnchorMax: {x: 0.7, y: 0.28} 5423 + m_AnchorMin: {x: 0, y: 0.2}
  5424 + m_AnchorMax: {x: 1, y: 0.28}
5175 m_AnchoredPosition: {x: 0, y: 0} 5425 m_AnchoredPosition: {x: 0, y: 0}
5176 - m_SizeDelta: {x: 0, y: 0}  
5177 - m_Pivot: {x: 0.5, y: 0.5} 5426 + m_SizeDelta: {x: 0, y: -4.5955544}
  5427 + m_Pivot: {x: 0.5, y: 1}
5178 --- !u!114 &1175405162 5428 --- !u!114 &1175405162
5179 MonoBehaviour: 5429 MonoBehaviour:
5180 m_ObjectHideFlags: 0 5430 m_ObjectHideFlags: 0
@@ -5215,7 +5465,7 @@ MonoBehaviour: @@ -5215,7 +5465,7 @@ MonoBehaviour:
5215 m_OnClick: 5465 m_OnClick:
5216 m_PersistentCalls: 5466 m_PersistentCalls:
5217 m_Calls: 5467 m_Calls:
5218 - - m_Target: {fileID: 2131993092} 5468 + - m_Target: {fileID: 2131993094}
5219 m_MethodName: hideScreen 5469 m_MethodName: hideScreen
5220 m_Mode: 1 5470 m_Mode: 1
5221 m_Arguments: 5471 m_Arguments:
@@ -5274,6 +5524,19 @@ CanvasRenderer: @@ -5274,6 +5524,19 @@ CanvasRenderer:
5274 type: 2} 5524 type: 2}
5275 m_PrefabInternal: {fileID: 0} 5525 m_PrefabInternal: {fileID: 0}
5276 m_GameObject: {fileID: 1175405160} 5526 m_GameObject: {fileID: 1175405160}
  5527 +--- !u!114 &1175405165
  5528 +MonoBehaviour:
  5529 + m_ObjectHideFlags: 0
  5530 + m_PrefabParentObject: {fileID: 0}
  5531 + m_PrefabInternal: {fileID: 0}
  5532 + m_GameObject: {fileID: 1175405160}
  5533 + m_Enabled: 1
  5534 + m_EditorHideFlags: 0
  5535 + m_Script: {fileID: -1254083943, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
  5536 + m_Name:
  5537 + m_EditorClassIdentifier:
  5538 + m_AspectMode: 1
  5539 + m_AspectRatio: 9
5277 --- !u!1 &1183073262 5540 --- !u!1 &1183073262
5278 GameObject: 5541 GameObject:
5279 m_ObjectHideFlags: 0 5542 m_ObjectHideFlags: 0
@@ -5433,7 +5696,7 @@ MonoBehaviour: @@ -5433,7 +5696,7 @@ MonoBehaviour:
5433 m_Name: 5696 m_Name:
5434 m_EditorClassIdentifier: 5697 m_EditorClassIdentifier:
5435 m_Navigation: 5698 m_Navigation:
5436 - m_Mode: 3 5699 + m_Mode: 2
5437 m_SelectOnUp: {fileID: 0} 5700 m_SelectOnUp: {fileID: 0}
5438 m_SelectOnDown: {fileID: 0} 5701 m_SelectOnDown: {fileID: 0}
5439 m_SelectOnLeft: {fileID: 0} 5702 m_SelectOnLeft: {fileID: 0}
@@ -5518,6 +5781,91 @@ RectTransform: @@ -5518,6 +5781,91 @@ RectTransform:
5518 m_AnchoredPosition: {x: 0, y: 0} 5781 m_AnchoredPosition: {x: 0, y: 0}
5519 m_SizeDelta: {x: 0, y: 0} 5782 m_SizeDelta: {x: 0, y: 0}
5520 m_Pivot: {x: 0.5, y: 0.5} 5783 m_Pivot: {x: 0.5, y: 0.5}
  5784 +--- !u!1 &1237199445
  5785 +GameObject:
  5786 + m_ObjectHideFlags: 0
  5787 + m_PrefabParentObject: {fileID: 0}
  5788 + m_PrefabInternal: {fileID: 0}
  5789 + serializedVersion: 4
  5790 + m_Component:
  5791 + - 224: {fileID: 1237199446}
  5792 + - 222: {fileID: 1237199449}
  5793 + - 114: {fileID: 1237199448}
  5794 + - 114: {fileID: 1237199447}
  5795 + m_Layer: 5
  5796 + m_Name: Text
  5797 + m_TagString: Untagged
  5798 + m_Icon: {fileID: 0}
  5799 + m_NavMeshLayer: 0
  5800 + m_StaticEditorFlags: 0
  5801 + m_IsActive: 1
  5802 +--- !u!224 &1237199446
  5803 +RectTransform:
  5804 + m_ObjectHideFlags: 0
  5805 + m_PrefabParentObject: {fileID: 0}
  5806 + m_PrefabInternal: {fileID: 0}
  5807 + m_GameObject: {fileID: 1237199445}
  5808 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  5809 + m_LocalPosition: {x: 0, y: 0, z: 0}
  5810 + m_LocalScale: {x: 1, y: 1, z: 1}
  5811 + m_Children: []
  5812 + m_Father: {fileID: 841640089}
  5813 + m_RootOrder: 0
  5814 + m_AnchorMin: {x: 0.1, y: 0.1}
  5815 + m_AnchorMax: {x: 0.9, y: 0.9}
  5816 + m_AnchoredPosition: {x: 0, y: 0}
  5817 + m_SizeDelta: {x: 0, y: 0}
  5818 + m_Pivot: {x: 0.5, y: 0.5}
  5819 +--- !u!114 &1237199447
  5820 +MonoBehaviour:
  5821 + m_ObjectHideFlags: 0
  5822 + m_PrefabParentObject: {fileID: 0}
  5823 + m_PrefabInternal: {fileID: 0}
  5824 + m_GameObject: {fileID: 1237199445}
  5825 + m_Enabled: 1
  5826 + m_EditorHideFlags: 0
  5827 + m_Script: {fileID: 11500000, guid: b91836587db7b494bb8206257fd5818f, type: 3}
  5828 + m_Name:
  5829 + m_EditorClassIdentifier:
  5830 +--- !u!114 &1237199448
  5831 +MonoBehaviour:
  5832 + m_ObjectHideFlags: 0
  5833 + m_PrefabParentObject: {fileID: 0}
  5834 + m_PrefabInternal: {fileID: 0}
  5835 + m_GameObject: {fileID: 1237199445}
  5836 + m_Enabled: 1
  5837 + m_EditorHideFlags: 0
  5838 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
  5839 + m_Name:
  5840 + m_EditorClassIdentifier:
  5841 + m_Material: {fileID: 0}
  5842 + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
  5843 + m_RaycastTarget: 1
  5844 + m_OnCullStateChanged:
  5845 + m_PersistentCalls:
  5846 + m_Calls: []
  5847 + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
  5848 + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
  5849 + m_FontData:
  5850 + m_Font: {fileID: 12800000, guid: 195abaf1001bde54db32dfcefbcc33e8, type: 3}
  5851 + m_FontSize: 14
  5852 + m_FontStyle: 0
  5853 + m_BestFit: 0
  5854 + m_MinSize: 10
  5855 + m_MaxSize: 40
  5856 + m_Alignment: 4
  5857 + m_AlignByGeometry: 0
  5858 + m_RichText: 1
  5859 + m_HorizontalOverflow: 0
  5860 + m_VerticalOverflow: 0
  5861 + m_LineSpacing: 1
  5862 + m_Text: Realizadores
  5863 +--- !u!222 &1237199449
  5864 +CanvasRenderer:
  5865 + m_ObjectHideFlags: 0
  5866 + m_PrefabParentObject: {fileID: 0}
  5867 + m_PrefabInternal: {fileID: 0}
  5868 + m_GameObject: {fileID: 1237199445}
5521 --- !u!1 &1265043069 5869 --- !u!1 &1265043069
5522 GameObject: 5870 GameObject:
5523 m_ObjectHideFlags: 0 5871 m_ObjectHideFlags: 0
@@ -5798,7 +6146,7 @@ MonoBehaviour: @@ -5798,7 +6146,7 @@ MonoBehaviour:
5798 m_OnClick: 6146 m_OnClick:
5799 m_PersistentCalls: 6147 m_PersistentCalls:
5800 m_Calls: 6148 m_Calls:
5801 - - m_Target: {fileID: 1164416485} 6149 + - m_Target: {fileID: 848083142}
5802 m_MethodName: SetActive 6150 m_MethodName: SetActive
5803 m_Mode: 6 6151 m_Mode: 6
5804 m_Arguments: 6152 m_Arguments:
@@ -5820,6 +6168,17 @@ MonoBehaviour: @@ -5820,6 +6168,17 @@ MonoBehaviour:
5820 m_StringArgument: 6168 m_StringArgument:
5821 m_BoolArgument: 0 6169 m_BoolArgument: 0
5822 m_CallState: 2 6170 m_CallState: 2
  6171 + - m_Target: {fileID: 2111966982}
  6172 + m_MethodName: unlockFor
  6173 + m_Mode: 5
  6174 + m_Arguments:
  6175 + m_ObjectArgument: {fileID: 0}
  6176 + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
  6177 + m_IntArgument: 0
  6178 + m_FloatArgument: 0
  6179 + m_StringArgument: '"translate"'
  6180 + m_BoolArgument: 0
  6181 + m_CallState: 2
5823 m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, 6182 m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
5824 Culture=neutral, PublicKeyToken=null 6183 Culture=neutral, PublicKeyToken=null
5825 --- !u!114 &1266698455 6184 --- !u!114 &1266698455
@@ -6198,7 +6557,7 @@ MonoBehaviour: @@ -6198,7 +6557,7 @@ MonoBehaviour:
6198 m_OnClick: 6557 m_OnClick:
6199 m_PersistentCalls: 6558 m_PersistentCalls:
6200 m_Calls: 6559 m_Calls:
6201 - - m_Target: {fileID: 2131993092} 6560 + - m_Target: {fileID: 2131993094}
6202 m_MethodName: hideScreen 6561 m_MethodName: hideScreen
6203 m_Mode: 1 6562 m_Mode: 1
6204 m_Arguments: 6563 m_Arguments:
@@ -7008,7 +7367,7 @@ MonoBehaviour: @@ -7008,7 +7367,7 @@ MonoBehaviour:
7008 m_OnClick: 7367 m_OnClick:
7009 m_PersistentCalls: 7368 m_PersistentCalls:
7010 m_Calls: 7369 m_Calls:
7011 - - m_Target: {fileID: 2131993092} 7370 + - m_Target: {fileID: 2131993094}
7012 m_MethodName: hideScreen 7371 m_MethodName: hideScreen
7013 m_Mode: 1 7372 m_Mode: 1
7014 m_Arguments: 7373 m_Arguments:
@@ -8039,6 +8398,53 @@ CanvasRenderer: @@ -8039,6 +8398,53 @@ CanvasRenderer:
8039 type: 2} 8398 type: 2}
8040 m_PrefabInternal: {fileID: 0} 8399 m_PrefabInternal: {fileID: 0}
8041 m_GameObject: {fileID: 1731945570} 8400 m_GameObject: {fileID: 1731945570}
  8401 +--- !u!1 &1763761723
  8402 +GameObject:
  8403 + m_ObjectHideFlags: 0
  8404 + m_PrefabParentObject: {fileID: 0}
  8405 + m_PrefabInternal: {fileID: 0}
  8406 + serializedVersion: 4
  8407 + m_Component:
  8408 + - 224: {fileID: 1763761724}
  8409 + - 114: {fileID: 1763761725}
  8410 + m_Layer: 5
  8411 + m_Name: makers
  8412 + m_TagString: Untagged
  8413 + m_Icon: {fileID: 0}
  8414 + m_NavMeshLayer: 0
  8415 + m_StaticEditorFlags: 0
  8416 + m_IsActive: 1
  8417 +--- !u!224 &1763761724
  8418 +RectTransform:
  8419 + m_ObjectHideFlags: 0
  8420 + m_PrefabParentObject: {fileID: 0}
  8421 + m_PrefabInternal: {fileID: 0}
  8422 + m_GameObject: {fileID: 1763761723}
  8423 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  8424 + m_LocalPosition: {x: 0, y: 0, z: 0}
  8425 + m_LocalScale: {x: 1, y: 1, z: 1}
  8426 + m_Children:
  8427 + - {fileID: 841640089}
  8428 + m_Father: {fileID: 1874017187}
  8429 + m_RootOrder: 1
  8430 + m_AnchorMin: {x: 0.5, y: 0.5}
  8431 + m_AnchorMax: {x: 0.9, y: 1}
  8432 + m_AnchoredPosition: {x: 0, y: 0}
  8433 + m_SizeDelta: {x: 0, y: -31.450016}
  8434 + m_Pivot: {x: 0.5, y: 1}
  8435 +--- !u!114 &1763761725
  8436 +MonoBehaviour:
  8437 + m_ObjectHideFlags: 0
  8438 + m_PrefabParentObject: {fileID: 0}
  8439 + m_PrefabInternal: {fileID: 0}
  8440 + m_GameObject: {fileID: 1763761723}
  8441 + m_Enabled: 1
  8442 + m_EditorHideFlags: 0
  8443 + m_Script: {fileID: -1254083943, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
  8444 + m_Name:
  8445 + m_EditorClassIdentifier:
  8446 + m_AspectMode: 1
  8447 + m_AspectRatio: 3.2
8042 --- !u!1 &1772891847 8448 --- !u!1 &1772891847
8043 GameObject: 8449 GameObject:
8044 m_ObjectHideFlags: 0 8450 m_ObjectHideFlags: 0
@@ -8340,8 +8746,10 @@ RectTransform: @@ -8340,8 +8746,10 @@ RectTransform:
8340 m_LocalPosition: {x: 0, y: 0, z: 0} 8746 m_LocalPosition: {x: 0, y: 0, z: 0}
8341 m_LocalScale: {x: 1, y: 1, z: 1} 8747 m_LocalScale: {x: 1, y: 1, z: 1}
8342 m_Children: 8748 m_Children:
8343 - - {fileID: 615209560} 8749 + - {fileID: 613136921}
  8750 + - {fileID: 1763761724}
8344 - {fileID: 948041468} 8751 - {fileID: 948041468}
  8752 + - {fileID: 670462553}
8345 m_Father: {fileID: 263018772} 8753 m_Father: {fileID: 263018772}
8346 m_RootOrder: 3 8754 m_RootOrder: 3
8347 m_AnchorMin: {x: 0, y: 0.1} 8755 m_AnchorMin: {x: 0, y: 0.1}
@@ -9493,7 +9901,7 @@ MonoBehaviour: @@ -9493,7 +9901,7 @@ MonoBehaviour:
9493 m_OnClick: 9901 m_OnClick:
9494 m_PersistentCalls: 9902 m_PersistentCalls:
9495 m_Calls: 9903 m_Calls:
9496 - - m_Target: {fileID: 2131993092} 9904 + - m_Target: {fileID: 2131993094}
9497 m_MethodName: hideScreen 9905 m_MethodName: hideScreen
9498 m_Mode: 1 9906 m_Mode: 1
9499 m_Arguments: 9907 m_Arguments:
@@ -10069,6 +10477,91 @@ CanvasRenderer: @@ -10069,6 +10477,91 @@ CanvasRenderer:
10069 type: 2} 10477 type: 2}
10070 m_PrefabInternal: {fileID: 0} 10478 m_PrefabInternal: {fileID: 0}
10071 m_GameObject: {fileID: 2099411278} 10479 m_GameObject: {fileID: 2099411278}
  10480 +--- !u!1 &2102396405
  10481 +GameObject:
  10482 + m_ObjectHideFlags: 0
  10483 + m_PrefabParentObject: {fileID: 0}
  10484 + m_PrefabInternal: {fileID: 0}
  10485 + serializedVersion: 4
  10486 + m_Component:
  10487 + - 224: {fileID: 2102396406}
  10488 + - 222: {fileID: 2102396409}
  10489 + - 114: {fileID: 2102396408}
  10490 + - 114: {fileID: 2102396407}
  10491 + m_Layer: 5
  10492 + m_Name: Text
  10493 + m_TagString: Untagged
  10494 + m_Icon: {fileID: 0}
  10495 + m_NavMeshLayer: 0
  10496 + m_StaticEditorFlags: 0
  10497 + m_IsActive: 1
  10498 +--- !u!224 &2102396406
  10499 +RectTransform:
  10500 + m_ObjectHideFlags: 0
  10501 + m_PrefabParentObject: {fileID: 0}
  10502 + m_PrefabInternal: {fileID: 0}
  10503 + m_GameObject: {fileID: 2102396405}
  10504 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  10505 + m_LocalPosition: {x: 0, y: 0, z: 0}
  10506 + m_LocalScale: {x: 1, y: 1, z: 1}
  10507 + m_Children: []
  10508 + m_Father: {fileID: 1157915785}
  10509 + m_RootOrder: 0
  10510 + m_AnchorMin: {x: 0.1, y: 0.1}
  10511 + m_AnchorMax: {x: 0.9, y: 0.9}
  10512 + m_AnchoredPosition: {x: 0, y: 0}
  10513 + m_SizeDelta: {x: 0, y: 0}
  10514 + m_Pivot: {x: 0.5, y: 0.5}
  10515 +--- !u!114 &2102396407
  10516 +MonoBehaviour:
  10517 + m_ObjectHideFlags: 0
  10518 + m_PrefabParentObject: {fileID: 0}
  10519 + m_PrefabInternal: {fileID: 0}
  10520 + m_GameObject: {fileID: 2102396405}
  10521 + m_Enabled: 1
  10522 + m_EditorHideFlags: 0
  10523 + m_Script: {fileID: 11500000, guid: b91836587db7b494bb8206257fd5818f, type: 3}
  10524 + m_Name:
  10525 + m_EditorClassIdentifier:
  10526 +--- !u!114 &2102396408
  10527 +MonoBehaviour:
  10528 + m_ObjectHideFlags: 0
  10529 + m_PrefabParentObject: {fileID: 0}
  10530 + m_PrefabInternal: {fileID: 0}
  10531 + m_GameObject: {fileID: 2102396405}
  10532 + m_Enabled: 1
  10533 + m_EditorHideFlags: 0
  10534 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
  10535 + m_Name:
  10536 + m_EditorClassIdentifier:
  10537 + m_Material: {fileID: 0}
  10538 + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
  10539 + m_RaycastTarget: 1
  10540 + m_OnCullStateChanged:
  10541 + m_PersistentCalls:
  10542 + m_Calls: []
  10543 + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
  10544 + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
  10545 + m_FontData:
  10546 + m_Font: {fileID: 12800000, guid: 195abaf1001bde54db32dfcefbcc33e8, type: 3}
  10547 + m_FontSize: 14
  10548 + m_FontStyle: 0
  10549 + m_BestFit: 0
  10550 + m_MinSize: 10
  10551 + m_MaxSize: 40
  10552 + m_Alignment: 4
  10553 + m_AlignByGeometry: 0
  10554 + m_RichText: 1
  10555 + m_HorizontalOverflow: 0
  10556 + m_VerticalOverflow: 0
  10557 + m_LineSpacing: 1
  10558 + m_Text: Tutorial
  10559 +--- !u!222 &2102396409
  10560 +CanvasRenderer:
  10561 + m_ObjectHideFlags: 0
  10562 + m_PrefabParentObject: {fileID: 0}
  10563 + m_PrefabInternal: {fileID: 0}
  10564 + m_GameObject: {fileID: 2102396405}
10072 --- !u!1 &2105857204 10565 --- !u!1 &2105857204
10073 GameObject: 10566 GameObject:
10074 m_ObjectHideFlags: 0 10567 m_ObjectHideFlags: 0
@@ -10182,8 +10675,8 @@ MonoBehaviour: @@ -10182,8 +10675,8 @@ MonoBehaviour:
10182 m_Name: 10675 m_Name:
10183 m_EditorClassIdentifier: 10676 m_EditorClassIdentifier:
10184 playerManager: {fileID: 578311381} 10677 playerManager: {fileID: 578311381}
10185 - time: 4  
10186 - probability: 0.7 10678 + time: 12
  10679 + probability: 0.8
10187 --- !u!4 &2111966983 10680 --- !u!4 &2111966983
10188 Transform: 10681 Transform:
10189 m_ObjectHideFlags: 0 10682 m_ObjectHideFlags: 0
@@ -10354,7 +10847,7 @@ GameObject: @@ -10354,7 +10847,7 @@ GameObject:
10354 serializedVersion: 4 10847 serializedVersion: 4
10355 m_Component: 10848 m_Component:
10356 - 4: {fileID: 2131993093} 10849 - 4: {fileID: 2131993093}
10357 - - 114: {fileID: 2131993092} 10850 + - 114: {fileID: 2131993094}
10358 m_Layer: 5 10851 m_Layer: 5
10359 m_Name: ScreenManager 10852 m_Name: ScreenManager
10360 m_TagString: ScreenManager 10853 m_TagString: ScreenManager
@@ -10362,7 +10855,19 @@ GameObject: @@ -10362,7 +10855,19 @@ GameObject:
10362 m_NavMeshLayer: 0 10855 m_NavMeshLayer: 0
10363 m_StaticEditorFlags: 0 10856 m_StaticEditorFlags: 0
10364 m_IsActive: 1 10857 m_IsActive: 1
10365 ---- !u!114 &2131993092 10858 +--- !u!4 &2131993093
  10859 +Transform:
  10860 + m_ObjectHideFlags: 0
  10861 + m_PrefabParentObject: {fileID: 0}
  10862 + m_PrefabInternal: {fileID: 0}
  10863 + m_GameObject: {fileID: 2131993091}
  10864 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  10865 + m_LocalPosition: {x: 0, y: 0, z: 0}
  10866 + m_LocalScale: {x: 1, y: 1, z: 1}
  10867 + m_Children: []
  10868 + m_Father: {fileID: 0}
  10869 + m_RootOrder: 3
  10870 +--- !u!114 &2131993094
10366 MonoBehaviour: 10871 MonoBehaviour:
10367 m_ObjectHideFlags: 0 10872 m_ObjectHideFlags: 0
10368 m_PrefabParentObject: {fileID: 0} 10873 m_PrefabParentObject: {fileID: 0}
@@ -10370,7 +10875,7 @@ MonoBehaviour: @@ -10370,7 +10875,7 @@ MonoBehaviour:
10370 m_GameObject: {fileID: 2131993091} 10875 m_GameObject: {fileID: 2131993091}
10371 m_Enabled: 1 10876 m_Enabled: 1
10372 m_EditorHideFlags: 0 10877 m_EditorHideFlags: 0
10373 - m_Script: {fileID: 11500000, guid: 4f95c6932d08d1f46b103865c5570ecb, type: 3} 10878 + m_Script: {fileID: 11500000, guid: 77bfb0925228ff742a1d5987ce782af8, type: 3}
10374 m_Name: 10879 m_Name:
10375 m_EditorClassIdentifier: 10880 m_EditorClassIdentifier:
10376 playerManager: {fileID: 578311381} 10881 playerManager: {fileID: 578311381}
@@ -10388,15 +10893,3 @@ MonoBehaviour: @@ -10388,15 +10893,3 @@ MonoBehaviour:
10388 pauseMenu: {fileID: 1024302431} 10893 pauseMenu: {fileID: 1024302431}
10389 repeatLayer: {fileID: 861767964} 10894 repeatLayer: {fileID: 861767964}
10390 avatarCollider: {fileID: 535548073} 10895 avatarCollider: {fileID: 535548073}
10391 ---- !u!4 &2131993093  
10392 -Transform:  
10393 - m_ObjectHideFlags: 0  
10394 - m_PrefabParentObject: {fileID: 0}  
10395 - m_PrefabInternal: {fileID: 0}  
10396 - m_GameObject: {fileID: 2131993091}  
10397 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}  
10398 - m_LocalPosition: {x: 0, y: 0, z: 0}  
10399 - m_LocalScale: {x: 1, y: 1, z: 1}  
10400 - m_Children: []  
10401 - m_Father: {fileID: 0}  
10402 - m_RootOrder: 3  
Assets/Scripts/Animation List/ListManager.cs
  Diff comments   View file @2d76cd7
@@ -43,7 +43,7 @@ public class ListManager : MonoBehaviour { @@ -43,7 +43,7 @@ public class ListManager : MonoBehaviour {
43 void Start() 43 void Start()
44 { 44 {
45 this.scrollView.onValueChanged.AddListener(checkScrollPosition); 45 this.scrollView.onValueChanged.AddListener(checkScrollPosition);
46 - this.input.onValueChange.AddListener(inputChanged); 46 + this.input.onValueChanged.AddListener(inputChanged);
47 47
48 // Load TrieST 48 // Load TrieST
49 { 49 {
@@ -59,23 +59,13 @@ public class ListManager : MonoBehaviour { @@ -59,23 +59,13 @@ public class ListManager : MonoBehaviour {
59 if ( ! String.IsNullOrEmpty(word)) 59 if ( ! String.IsNullOrEmpty(word))
60 this.trie.put(word, word); 60 this.trie.put(word, word);
61 } 61 }
62 -  
63 - /*StreamReader s = new StreamReader(Application.dataPath + "/sinais.txt");  
64 -  
65 - if (!s.EndOfStream) s.ReadLine();  
66 -  
67 - while (!s.EndOfStream)  
68 - {  
69 - string word = s.ReadLine();  
70 - this.trie.put(word, word);  
71 - }*/  
72 } 62 }
73 63
74 this.itemList = getNamesByPrefix(""); 64 this.itemList = getNamesByPrefix("");
75 this.index = 0; 65 this.index = 0;
76 this.size = itemList.Length; 66 this.size = itemList.Length;
77 67
78 - this.loadingItem = Instantiate (sampleLoadingItemObject) as GameObject; 68 + //this.loadingItem = Instantiate (sampleLoadingItemObject) as GameObject;
79 69
80 if (Screen.dpi < 140) 70 if (Screen.dpi < 140)
81 this.itemHeight = 36; 71 this.itemHeight = 36;
@@ -84,20 +74,20 @@ public class ListManager : MonoBehaviour { @@ -84,20 +74,20 @@ public class ListManager : MonoBehaviour {
84 this.itemHeight = 50; 74 this.itemHeight = 50;
85 75
86 else if (Screen.dpi < 400) 76 else if (Screen.dpi < 400)
87 - this.itemHeight = 74; 77 + this.itemHeight = 90;
88 78
89 else if (Screen.dpi < 500) 79 else if (Screen.dpi < 500)
90 - this.itemHeight = 100; 80 + this.itemHeight = 120;
91 81
92 else 82 else
93 - this.itemHeight = 74; 83 + this.itemHeight = 90;
94 84
95 StartCoroutine("populateList"); 85 StartCoroutine("populateList");
96 } 86 }
97 87
98 public void checkScrollPosition(Vector2 scrollPosition) 88 public void checkScrollPosition(Vector2 scrollPosition)
99 { 89 {
100 - if (scrollPosition.y <= 0F && ! this.isLoading) 90 + if (scrollPosition.y <= 0.05F && ! this.isLoading)
101 StartCoroutine("populateList"); 91 StartCoroutine("populateList");
102 } 92 }
103 93
@@ -160,14 +150,14 @@ public class ListManager : MonoBehaviour { @@ -160,14 +150,14 @@ public class ListManager : MonoBehaviour {
160 150
161 private void changeLoadingState(bool active) 151 private void changeLoadingState(bool active)
162 { 152 {
163 - if (isLoading != active) 153 + /*if (isLoading != active)
164 { 154 {
165 this.loadingItem.transform.SetParent(active ? contentPanel : null); 155 this.loadingItem.transform.SetParent(active ? contentPanel : null);
166 this.isLoading = active; 156 this.isLoading = active;
167 157
168 if ( ! active && contentPanel.childCount > 0) 158 if ( ! active && contentPanel.childCount > 0)
169 contentPanel.GetChild(0).GetChild(1).gameObject.SetActive(false); 159 contentPanel.GetChild(0).GetChild(1).gameObject.SetActive(false);
170 - } 160 + }*/
171 } 161 }
172 162
173 } 163 }
Assets/Scripts/Player Manager/GenericPlayerManager.cs
  Diff comments   View file @2d76cd7
@@ -75,6 +75,18 @@ public abstract class GenericPlayerManager : MonoBehaviour { @@ -75,6 +75,18 @@ public abstract class GenericPlayerManager : MonoBehaviour {
75 foreach (string flag in flags) 75 foreach (string flag in flags)
76 this.flags.Add(flag); 76 this.flags.Add(flag);
77 77
  78 + string[] toDuplicate = new string[] {
  79 + "A", "B", "C", "D", "E", "F", "G", "H", "I",
  80 + "J", "K", "L", "M", "N", "O", "P", "Q", "R",
  81 + "S", "T", "U", "V", "W", "X", "Y", "Z",
  82 + "0", "1", "2", "3", "4",
  83 + "5", "6", "7", "8", "9",
  84 + ","
  85 + };
  86 +
  87 + foreach (string anim in toDuplicate)
  88 + COMPONENT_ANIMATION.AddClip(COMPONENT_ANIMATION[anim].clip, "d_" + anim);
  89 +
78 // Sinal default é tratado como animação de intervalo: não sinaliza reprodução na UI 90 // Sinal default é tratado como animação de intervalo: não sinaliza reprodução na UI
79 this.intervalAnimations.Add(DEFAULT_ANIMATION); 91 this.intervalAnimations.Add(DEFAULT_ANIMATION);
80 } 92 }
@@ -279,7 +291,7 @@ public abstract class GenericPlayerManager : MonoBehaviour { @@ -279,7 +291,7 @@ public abstract class GenericPlayerManager : MonoBehaviour {
279 * 291 *
280 * @return last animation's subtitle. 292 * @return last animation's subtitle.
281 */ 293 */
282 - private string spellWord(string word) 294 + private string spellWord(Queue<ToPlay> toPlayQueue, string word)
283 { 295 {
284 string lastAnimationSubtitle = ""; 296 string lastAnimationSubtitle = "";
285 bool defaultPlayed = false; 297 bool defaultPlayed = false;
@@ -287,23 +299,29 @@ public abstract class GenericPlayerManager : MonoBehaviour { @@ -287,23 +299,29 @@ public abstract class GenericPlayerManager : MonoBehaviour {
287 // A reprodução da primeira letra deve ser longa para não ser cortada no fade 299 // A reprodução da primeira letra deve ser longa para não ser cortada no fade
288 this.subtitles.updateLetterSpeed(); 300 this.subtitles.updateLetterSpeed();
289 301
  302 + string lastAnim = "";
  303 +
290 for (int i = 0; i < word.Length; i++) 304 for (int i = 0; i < word.Length; i++)
291 { 305 {
292 - char second = word[i];  
293 lastAnimationSubtitle = Subtitle.highlight(word, i); 306 lastAnimationSubtitle = Subtitle.highlight(word, i);
294 307
  308 + string anim = word[i].ToString();
  309 + lastAnim = anim.Equals(lastAnim) ? "d_" + anim : anim;
  310 +
  311 + short type;
  312 +
295 // Se for uma letra 313 // Se for uma letra
296 - if (second >= 65 && second <= 90)  
297 - playAnimation(Subtitle.TYPE_LETTER, second.ToString(), lastAnimationSubtitle, subtitles.LetterSpeed); 314 + if (word[i] >= 65 && word[i] <= 90)
  315 + type = Subtitle.TYPE_LETTER;
298 316
299 // Se for um número 317 // Se for um número
300 - else if (second >= 48 && second <= 57)  
301 - playAnimation(Subtitle.TYPE_NUMBER, second.ToString(), lastAnimationSubtitle, subtitles.NumberSpeed);  
302 - 318 + else if (word[i] >= 48 && word[i] <= 57)
  319 + type = Subtitle.TYPE_NUMBER;
  320 +
303 // Se for uma vírgula 321 // Se for uma vírgula
304 - else if (second == 44)  
305 - playAnimation(Subtitle.TYPE_WORD, second.ToString(), lastAnimationSubtitle);  
306 - 322 + else if (word[i] == 44)
  323 + type = Subtitle.TYPE_WORD;
  324 +
307 // Não há animação 325 // Não há animação
308 else 326 else
309 { 327 {
@@ -311,23 +329,53 @@ public abstract class GenericPlayerManager : MonoBehaviour { @@ -311,23 +329,53 @@ public abstract class GenericPlayerManager : MonoBehaviour {
311 if ( ! defaultPlayed) 329 if ( ! defaultPlayed)
312 { 330 {
313 defaultPlayed = true; 331 defaultPlayed = true;
314 - playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, lastAnimationSubtitle); 332 + //playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, lastAnimationSubtitle);
  333 + toPlayQueue.Enqueue(new ToPlay(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, lastAnimationSubtitle, this));
315 334
316 // A reprodução da próxima letra deve ser longa para não ser cortada no fade 335 // A reprodução da próxima letra deve ser longa para não ser cortada no fade
317 - subtitles.updateLetterSpeed(); 336 + this.subtitles.updateLetterSpeed();
318 } 337 }
319 338
320 - UnityEngine.Debug.Log("Animação \"" + second + "\" inexistente."); 339 + UnityEngine.Debug.Log("Animação \"" + word[i] + "\" inexistente.");
321 continue; 340 continue;
322 } 341 }
  342 +
  343 + //playAnimation(type, lastAnim, lastAnimationSubtitle);
  344 + toPlayQueue.Enqueue(new ToPlay(type, lastAnim, lastAnimationSubtitle, this));
323 345
324 defaultPlayed = false; 346 defaultPlayed = false;
325 - subtitles.updateLetterSpeed(); 347 + this.subtitles.updateLetterSpeed();
326 } 348 }
327 349
328 return lastAnimationSubtitle; 350 return lastAnimationSubtitle;
329 } 351 }
330 352
  353 + private struct ToPlay
  354 + {
  355 + private short type;
  356 + private string name;
  357 + private string subtitle;
  358 + private float speed;
  359 +
  360 + public ToPlay(short type, string name, string subtitle, float speed)
  361 + {
  362 + this.type = type;
  363 + this.name = name;
  364 + this.subtitle = subtitle;
  365 + this.speed = speed;
  366 + }
  367 + public ToPlay(short type, string name, string subtitle, GenericPlayerManager context)
  368 + : this(type, name, subtitle, 0F) {
  369 + this.speed = context.getSpeedByType(type);
  370 + }
  371 + public ToPlay(short type, string name, GenericPlayerManager context)
  372 + : this(type, name, name, context) { }
  373 +
  374 + public void play(GenericPlayerManager context) {
  375 + context.playAnimation(this.type, this.name, this.subtitle, this.speed);
  376 + }
  377 + }
  378 +
331 private System.Object loadingLocker = new System.Object(); 379 private System.Object loadingLocker = new System.Object();
332 380
333 private IEnumerator loadAndPlay(string gloss) 381 private IEnumerator loadAndPlay(string gloss)
@@ -341,16 +389,20 @@ public abstract class GenericPlayerManager : MonoBehaviour { @@ -341,16 +389,20 @@ public abstract class GenericPlayerManager : MonoBehaviour {
341 string lastAnimationSubtitle = ""; 389 string lastAnimationSubtitle = "";
342 bool spelled = false; 390 bool spelled = false;
343 391
344 - // Default  
345 - playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, "", 2F);  
346 -  
347 if ( ! this.playing) 392 if ( ! this.playing)
348 StartCoroutine("handleStates"); 393 StartCoroutine("handleStates");
349 394
350 stringPos = gloss.Split(' '); 395 stringPos = gloss.Split(' ');
351 396
  397 + Queue<ToPlay> toPlayQueue = new Queue<ToPlay>();
  398 + int wordsCount = 0;
  399 + // playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, "", 2F);
  400 + toPlayQueue.Enqueue(new ToPlay(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, "", this));
  401 +
352 foreach (string aniName in stringPos) 402 foreach (string aniName in stringPos)
353 { 403 {
  404 + wordsCount++;
  405 +
354 try { 406 try {
355 if (String.IsNullOrEmpty(aniName)) continue; 407 if (String.IsNullOrEmpty(aniName)) continue;
356 } catch (Exception e) { 408 } catch (Exception e) {
@@ -397,19 +449,22 @@ public abstract class GenericPlayerManager : MonoBehaviour { @@ -397,19 +449,22 @@ public abstract class GenericPlayerManager : MonoBehaviour {
397 if (spelled) 449 if (spelled)
398 { 450 {
399 // Default 451 // Default
400 - playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, lastAnimationSubtitle); 452 + //playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, lastAnimationSubtitle);
  453 + toPlayQueue.Enqueue(new ToPlay(Subtitle.TYPE_NONE, lastAnimationSubtitle, this));
401 spelled = false; 454 spelled = false;
402 } 455 }
403 456
404 if (this.flags.Contains(aniName) || this.intervalAnimations.Contains(aniName)) 457 if (this.flags.Contains(aniName) || this.intervalAnimations.Contains(aniName))
405 { 458 {
406 lastAnimationSubtitle = ""; 459 lastAnimationSubtitle = "";
407 - playAnimation(Subtitle.TYPE_WORD, aniName, ""); 460 + //playAnimation(Subtitle.TYPE_WORD, aniName, "");
  461 + toPlayQueue.Enqueue(new ToPlay(Subtitle.TYPE_WORD, aniName, "", this));
408 } 462 }
409 else 463 else
410 { 464 {
411 lastAnimationSubtitle = aniName; 465 lastAnimationSubtitle = aniName;
412 - playAnimation(Subtitle.TYPE_WORD, aniName); 466 + //playAnimation(Subtitle.TYPE_WORD, aniName);
  467 + toPlayQueue.Enqueue(new ToPlay(Subtitle.TYPE_WORD, aniName, this));
413 } 468 }
414 } 469 }
415 470
@@ -425,18 +480,24 @@ public abstract class GenericPlayerManager : MonoBehaviour { @@ -425,18 +480,24 @@ public abstract class GenericPlayerManager : MonoBehaviour {
425 480
426 if (this.flags.Contains(aniName) || this.intervalAnimations.Contains(aniName)) 481 if (this.flags.Contains(aniName) || this.intervalAnimations.Contains(aniName))
427 { 482 {
428 - playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, "", 1.6F); 483 + //playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, "", 1.6F);
  484 + toPlayQueue.Enqueue(new ToPlay(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, "", 1.6F));
429 continue; 485 continue;
430 } 486 }
431 487
432 // Se já houve o soletramento de alguma palavra, reproduz animação default 488 // Se já houve o soletramento de alguma palavra, reproduz animação default
433 if (spelled) 489 if (spelled)
434 - playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, lastAnimationSubtitle, 1.6F); 490 + //playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, lastAnimationSubtitle, 1.6F);
  491 + toPlayQueue.Enqueue(new ToPlay(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, lastAnimationSubtitle, 1.6F));
435 else 492 else
436 spelled = true; 493 spelled = true;
437 494
438 - lastAnimationSubtitle = spellWord(aniName); 495 + lastAnimationSubtitle = spellWord(toPlayQueue, aniName);
439 } 496 }
  497 +
  498 + if (toPlayQueue.Count > 4 || wordsCount == stringPos.Length)
  499 + while (toPlayQueue.Count > 0)
  500 + toPlayQueue.Dequeue().play(this);
440 } 501 }
441 502
442 // Default 503 // Default
Assets/Scripts/Player Manager/Subtitle.cs
  Diff comments   View file @2d76cd7
@@ -119,28 +119,16 @@ public class Subtitle { @@ -119,28 +119,16 @@ public class Subtitle {
119 public static string highlight(string word, int index) 119 public static string highlight(string word, int index)
120 { 120 {
121 string subtitle = ""; 121 string subtitle = "";
122 - int last = 0;  
123 122
124 - if (index == 0)  
125 - subtitle += "<b><color=white>" + word[0] + "</color></b>";  
126 - else  
127 - subtitle += word[0];  
128 -  
129 - for (int i = 1; i < word.Length; i++) 123 + for (int i = 0; i < word.Length; i++)
130 { 124 {
131 - if ((word[i] >= 65 && word[i] <= 90) || (word[i] >= 48 && word[i] <= 57)) 125 + if (i > 0 && ((word[i] >= 65 && word[i] <= 90) || (word[i] >= 48 && word[i] <= 57)))
132 subtitle += "-"; 126 subtitle += "-";
133 127
134 - if (i == index || (last == index && word[i] == word[last]))  
135 - { 128 + if (i == index)
136 subtitle += "<b><color=white>" + word[i] + "</color></b>"; 129 subtitle += "<b><color=white>" + word[i] + "</color></b>";
137 - if (i == index) last = i;  
138 - }  
139 else 130 else
140 - {  
141 subtitle += word[i]; 131 subtitle += word[i];
142 - last = i;  
143 - }  
144 } 132 }
145 133
146 return subtitle; 134 return subtitle;
Assets/Scripts/PlayerManager.cs
  Diff comments   View file @2d76cd7
@@ -145,12 +145,9 @@ public class PlayerManager : GenericPlayerManager { @@ -145,12 +145,9 @@ public class PlayerManager : GenericPlayerManager {
145 // Called from microphone icon at main interface 145 // Called from microphone icon at main interface
146 public void callVoiceRecognizer() 146 public void callVoiceRecognizer()
147 { 147 {
148 - string gloss = voiceRecognizer.callRecognition();  
149 //voiceRecognizerScreenConfirm.SetActive(true); 148 //voiceRecognizerScreenConfirm.SetActive(true);
150 149
151 - InputField inp = GameObject.FindGameObjectWithTag("field_text_entry").GetComponent<InputField>() as InputField;  
152 - inp.text = gloss;  
153 - 150 + this.translateScreenText.text = voiceRecognizer.callRecognition();
154 this.screenManager.switchScreen("translate"); 151 this.screenManager.switchScreen("translate");
155 } 152 }
156 153
@@ -193,7 +190,7 @@ public class PlayerManager : GenericPlayerManager { @@ -193,7 +190,7 @@ public class PlayerManager : GenericPlayerManager {
193 190
194 this.screenManager.setLoadingSnippetState(false); 191 this.screenManager.setLoadingSnippetState(false);
195 this.screenManager.showConnectionErrorDialog(); 192 this.screenManager.showConnectionErrorDialog();
196 - base.randomAnimations.unlockFor("translate"); 193 + //base.randomAnimations.unlockFor("translate");
197 } 194 }
198 } 195 }
199 196
Assets/Scripts/TutorialManager.cs 0 → 100644
  Diff comments   View file @2d76cd7
@@ -0,0 +1,104 @@ @@ -0,0 +1,104 @@
  1 +using UnityEngine;
  2 +using UnityEngine.UI;
  3 +
  4 +public class TutorialManager : MonoBehaviour {
  5 +
  6 + public ScreenManager screenManager;
  7 +
  8 + public Text description;
  9 + public Image translateImage;
  10 + public Image micImage;
  11 + public Image dictionaryImage;
  12 + public Image subtitlesImage;
  13 + public Image infoImage;
  14 + public GameObject sliderShadow;
  15 +
  16 + public Color enabledColor;
  17 + public Color disabledColor;
  18 +
  19 + private int index = 0;
  20 + private string[] descriptions = new string[] {
  21 + "Tradução de Texto\n\nNessa opção você pode entrar com um texto para ser traduzido!",
  22 + "Tradução de Fala\n\nNessa opção, o que você falar será traduzido para LIBRAS",
  23 + "Dicionário\n\nNessa opção você pode ver e reproduzir todos os sinais disponíveis no VLibras",
  24 + "Legendas\n\nNessa opção você pode ativar e desativar as legendas enquanto o sinal é traduzido",
  25 + "Sobre o VLibras\n\nNessa opção você tem acesso a informações adicionais sobre nossa aplicação",
  26 + "Barra de velocidade\n\nNa barra você pode escolher a velocidade que deseja visualizar o sinal",
  27 + };
  28 +
  29 + protected void Start ()
  30 + {
  31 + if (Screen.dpi < 140)
  32 + {
  33 + this.description.fontSize = 14;
  34 + }
  35 +
  36 + // 240
  37 + else if (Screen.dpi < 280)
  38 + {
  39 + this.description.fontSize = 20;
  40 + }
  41 +
  42 + // 320
  43 + else if (Screen.dpi < 400)
  44 + {
  45 + this.description.fontSize = 30;
  46 + }
  47 +
  48 + // 480
  49 + else if (Screen.dpi < 500)
  50 + {
  51 + this.description.fontSize = 44;
  52 + }
  53 +
  54 + else
  55 + {
  56 + this.description.fontSize = 14;
  57 + }
  58 + }
  59 +
  60 + private Image getButton()
  61 + {
  62 + switch (this.index)
  63 + {
  64 + case 0: return this.translateImage;
  65 + case 1: return this.micImage;
  66 + case 2: return this.dictionaryImage;
  67 + case 3: return this.subtitlesImage;
  68 + case 4: return this.infoImage;
  69 + default: return null;
  70 + }
  71 + }
  72 +
  73 + public void next()
  74 + {
  75 + if (index == 5)
  76 + {
  77 + this.screenManager.hideScreen();
  78 + select(0);
  79 + }
  80 + else select(this.index + 1);
  81 + }
  82 +
  83 + public void select(int index)
  84 + {
  85 + if (this.index <= 4)
  86 + getButton().color = disabledColor;
  87 + else
  88 + this.sliderShadow.SetActive(true);
  89 +
  90 + this.index = index;
  91 +
  92 + if (this.index <= 4)
  93 + {
  94 + getButton().color = enabledColor;
  95 + this.description.text = this.descriptions[index];
  96 + }
  97 + else
  98 + {
  99 + this.sliderShadow.SetActive(false);
  100 + this.description.text = this.descriptions[index];
  101 + }
  102 + }
  103 +
  104 +}
0 \ No newline at end of file 105 \ No newline at end of file
Assets/Scripts/TutorialManager.cs.meta 0 → 100644
  Diff comments   View file @2d76cd7
@@ -0,0 +1,12 @@ @@ -0,0 +1,12 @@
  1 +fileFormatVersion: 2
  2 +guid: 76b77d949fd9e294bb95149436284217
  3 +timeCreated: 1454423997
  4 +licenseType: Pro
  5 +MonoImporter:
  6 + serializedVersion: 2
  7 + defaultReferences: []
  8 + executionOrder: 0
  9 + icon: {instanceID: 0}
  10 + userData:
  11 + assetBundleName:
  12 + assetBundleVariant:
Assets/Scripts/UI/BarResizer.cs
View file @b175a84
@@ -1,39 +0,0 @@ @@ -1,39 +0,0 @@
1 -using UnityEngine;  
2 -using UnityEngine.UI;  
3 -  
4 -public class BarResizer : MonoBehaviour {  
5 -  
6 - protected void Start ()  
7 - {  
8 - HorizontalLayoutGroup barBottomLayout = gameObject.GetComponent<HorizontalLayoutGroup>();  
9 -  
10 - if (Screen.dpi < 140)  
11 - {  
12 - barBottomLayout.spacing = 22;  
13 - }  
14 -  
15 - // 240  
16 - else if (Screen.dpi < 280)  
17 - {  
18 - barBottomLayout.spacing = 44;  
19 - }  
20 -  
21 - // 320  
22 - else if (Screen.dpi < 400)  
23 - {  
24 - barBottomLayout.spacing = 80;  
25 - }  
26 -  
27 - // 480  
28 - else if (Screen.dpi < 500)  
29 - {  
30 - barBottomLayout.spacing = 92;  
31 - }  
32 -  
33 - else  
34 - {  
35 - barBottomLayout.spacing = 80;  
36 - }  
37 - }  
38 -  
39 -}  
Assets/Scripts/UI/BarResizer.cs.meta
View file @b175a84
@@ -1,12 +0,0 @@ @@ -1,12 +0,0 @@
1 -fileFormatVersion: 2  
2 -guid: cc684fd2c599912419e723a09bee71eb  
3 -timeCreated: 1455229603  
4 -licenseType: Pro  
5 -MonoImporter:  
6 - serializedVersion: 2  
7 - defaultReferences: []  
8 - executionOrder: 0  
9 - icon: {instanceID: 0}  
10 - userData:  
11 - assetBundleName:  
12 - assetBundleVariant:  
Assets/Scripts/UI/MakersScreenTextResizer.cs
View file @b175a84
@@ -1,29 +0,0 @@ @@ -1,29 +0,0 @@
1 -using UnityEngine;  
2 -using UnityEngine.UI;  
3 -  
4 -public class MakersScreenTextResizer : MonoBehaviour {  
5 -  
6 - protected void Start ()  
7 - {  
8 - Text text = gameObject.GetComponent<Text>();  
9 -  
10 - if (Screen.dpi < 140)  
11 - text.fontSize = 22;  
12 -  
13 - // 240  
14 - else if (Screen.dpi < 280)  
15 - text.fontSize = 30;  
16 -  
17 - // 320  
18 - else if (Screen.dpi < 400)  
19 - text.fontSize = 38;  
20 -  
21 - // 480  
22 - else if (Screen.dpi < 500)  
23 - text.fontSize = 46;  
24 -  
25 - else  
26 - text.fontSize = 54;  
27 - }  
28 -  
29 -}  
Assets/Scripts/UI/MakersScreenTextResizer.cs.meta
View file @b175a84
@@ -1,12 +0,0 @@ @@ -1,12 +0,0 @@
1 -fileFormatVersion: 2  
2 -guid: a7be422a80edfef4f8e4e8a6aca4378e  
3 -timeCreated: 1456251341  
4 -licenseType: Pro  
5 -MonoImporter:  
6 - serializedVersion: 2  
7 - defaultReferences: []  
8 - executionOrder: 0  
9 - icon: {instanceID: 0}  
10 - userData:  
11 - assetBundleName:  
12 - assetBundleVariant:  
Assets/Scripts/UI/Resizers.meta 0 → 100644
  Diff comments   View file @2d76cd7
@@ -0,0 +1,9 @@ @@ -0,0 +1,9 @@
  1 +fileFormatVersion: 2
  2 +guid: ce96d47f2ecec7448abb4b341315d1bd
  3 +folderAsset: yes
  4 +timeCreated: 1457032134
  5 +licenseType: Pro
  6 +DefaultImporter:
  7 + userData:
  8 + assetBundleName:
  9 + assetBundleVariant:
Assets/Scripts/UI/Resizers/BarResizer.cs 0 → 100644
  Diff comments   View file @2d76cd7
@@ -0,0 +1,39 @@ @@ -0,0 +1,39 @@
  1 +using UnityEngine;
  2 +using UnityEngine.UI;
  3 +
  4 +public class BarResizer : MonoBehaviour {
  5 +
  6 + protected void Start ()
  7 + {
  8 + HorizontalLayoutGroup barBottomLayout = gameObject.GetComponent<HorizontalLayoutGroup>();
  9 +
  10 + if (Screen.dpi < 140)
  11 + {
  12 + barBottomLayout.spacing = 22;
  13 + }
  14 +
  15 + // 240
  16 + else if (Screen.dpi < 280)
  17 + {
  18 + barBottomLayout.spacing = 44;
  19 + }
  20 +
  21 + // 320
  22 + else if (Screen.dpi < 400)
  23 + {
  24 + barBottomLayout.spacing = 80;
  25 + }
  26 +
  27 + // 480
  28 + else if (Screen.dpi < 500)
  29 + {
  30 + barBottomLayout.spacing = 92;
  31 + }
  32 +
  33 + else
  34 + {
  35 + barBottomLayout.spacing = 80;
  36 + }
  37 + }
  38 +
  39 +}
Assets/Scripts/UI/Resizers/BarResizer.cs.meta 0 → 100644
  Diff comments   View file @2d76cd7
@@ -0,0 +1,12 @@ @@ -0,0 +1,12 @@
  1 +fileFormatVersion: 2
  2 +guid: cc684fd2c599912419e723a09bee71eb
  3 +timeCreated: 1455229603
  4 +licenseType: Pro
  5 +MonoImporter:
  6 + serializedVersion: 2
  7 + defaultReferences: []
  8 + executionOrder: 0
  9 + icon: {instanceID: 0}
  10 + userData:
  11 + assetBundleName:
  12 + assetBundleVariant:
Assets/Scripts/UI/Resizers/InfoButtonsResizer.cs 0 → 100644
  Diff comments   View file @2d76cd7
@@ -0,0 +1,28 @@ @@ -0,0 +1,28 @@
  1 +using UnityEngine;
  2 +using UnityEngine.UI;
  3 +
  4 +public class InfoButtonsResizer : MonoBehaviour {
  5 +
  6 + void Start()
  7 + {
  8 + Text text = gameObject.GetComponent<Text>();
  9 +
  10 + if (Screen.dpi < 140)
  11 + text.fontSize = 14;
  12 +
  13 + // 240
  14 + else if (Screen.dpi < 280)
  15 + text.fontSize = 22;
  16 +
  17 + // 320
  18 + else if (Screen.dpi < 400)
  19 + text.fontSize = 35;
  20 +
  21 + // 480
  22 + else if (Screen.dpi < 500)
  23 + text.fontSize = 48;
  24 +
  25 + else
  26 + text.fontSize = 35;
  27 + }
  28 +}
Assets/Scripts/UI/Resizers/InfoButtonsResizer.cs.meta 0 → 100644
  Diff comments   View file @2d76cd7
@@ -0,0 +1,12 @@ @@ -0,0 +1,12 @@
  1 +fileFormatVersion: 2
  2 +guid: b91836587db7b494bb8206257fd5818f
  3 +timeCreated: 1457030145
  4 +licenseType: Pro
  5 +MonoImporter:
  6 + serializedVersion: 2
  7 + defaultReferences: []
  8 + executionOrder: 0
  9 + icon: {instanceID: 0}
  10 + userData:
  11 + assetBundleName:
  12 + assetBundleVariant:
Assets/Scripts/UI/Resizers/MakersScreenTextResizer.cs 0 → 100644
  Diff comments   View file @2d76cd7
@@ -0,0 +1,29 @@ @@ -0,0 +1,29 @@
  1 +using UnityEngine;
  2 +using UnityEngine.UI;
  3 +
  4 +public class MakersScreenTextResizer : MonoBehaviour {
  5 +
  6 + protected void Start ()
  7 + {
  8 + Text text = gameObject.GetComponent<Text>();
  9 +
  10 + if (Screen.dpi < 140)
  11 + text.fontSize = 22;
  12 +
  13 + // 240
  14 + else if (Screen.dpi < 280)
  15 + text.fontSize = 30;
  16 +
  17 + // 320
  18 + else if (Screen.dpi < 400)
  19 + text.fontSize = 38;
  20 +
  21 + // 480
  22 + else if (Screen.dpi < 500)
  23 + text.fontSize = 46;
  24 +
  25 + else
  26 + text.fontSize = 54;
  27 + }
  28 +
  29 +}
Assets/Scripts/UI/Resizers/MakersScreenTextResizer.cs.meta 0 → 100644
  Diff comments   View file @2d76cd7
@@ -0,0 +1,12 @@ @@ -0,0 +1,12 @@
  1 +fileFormatVersion: 2
  2 +guid: a7be422a80edfef4f8e4e8a6aca4378e
  3 +timeCreated: 1456251341
  4 +licenseType: Pro
  5 +MonoImporter:
  6 + serializedVersion: 2
  7 + defaultReferences: []
  8 + executionOrder: 0
  9 + icon: {instanceID: 0}
  10 + userData:
  11 + assetBundleName:
  12 + assetBundleVariant:
Assets/Scripts/UI/Resizers/SliderHandleResizer.cs 0 → 100644
  Diff comments   View file @2d76cd7
@@ -0,0 +1,29 @@ @@ -0,0 +1,29 @@
  1 +using UnityEngine;
  2 +using UnityEngine.UI;
  3 +
  4 +public class SliderHandlerResizer : MonoBehaviour {
  5 +
  6 + protected void Start ()
  7 + {
  8 + Text text = gameObject.GetComponent<Text>();
  9 +
  10 + if (Screen.dpi < 140)
  11 + text.fontSize = 22;
  12 +
  13 + // 240
  14 + else if (Screen.dpi < 280)
  15 + text.fontSize = 30;
  16 +
  17 + // 320
  18 + else if (Screen.dpi < 400)
  19 + text.fontSize = 38;
  20 +
  21 + // 480
  22 + else if (Screen.dpi < 500)
  23 + text.fontSize = 46;
  24 +
  25 + else
  26 + text.fontSize = 54;
  27 + }
  28 +
  29 +}
Assets/Scripts/UI/Resizers/SliderHandleResizer.cs.meta 0 → 100644
  Diff comments   View file @2d76cd7
@@ -0,0 +1,12 @@ @@ -0,0 +1,12 @@
  1 +fileFormatVersion: 2
  2 +guid: f8ddca5505d51db4fbe6293aa36f2101
  3 +timeCreated: 1456251713
  4 +licenseType: Pro
  5 +MonoImporter:
  6 + serializedVersion: 2
  7 + defaultReferences: []
  8 + executionOrder: 0
  9 + icon: {instanceID: 0}
  10 + userData:
  11 + assetBundleName:
  12 + assetBundleVariant:
Assets/Scripts/UI/Resizers/SubtitleResizer.cs 0 → 100644
  Diff comments   View file @2d76cd7
@@ -0,0 +1,40 @@ @@ -0,0 +1,40 @@
  1 +using System;
  2 +using UnityEngine;
  3 +using UnityEngine.UI;
  4 +
  5 +public class SubtitleResizer : MonoBehaviour {
  6 +
  7 + protected void Start ()
  8 + {
  9 + Text text = gameObject.GetComponent<Text>();
  10 +
  11 + if (Screen.dpi < 140)
  12 + {
  13 + text.fontSize = 20;
  14 + }
  15 +
  16 + // 240
  17 + else if (Screen.dpi < 280)
  18 + {
  19 + text.fontSize = 38;
  20 + }
  21 +
  22 + // 320
  23 + else if (Screen.dpi < 400)
  24 + {
  25 + text.fontSize = 56;
  26 + }
  27 +
  28 + // 480
  29 + else if (Screen.dpi < 500)
  30 + {
  31 + text.fontSize = 76;
  32 + }
  33 +
  34 + else
  35 + {
  36 + text.fontSize = 56;
  37 + }
  38 + }
  39 +
  40 +}
Assets/Scripts/UI/Resizers/SubtitleResizer.cs.meta 0 → 100644
  Diff comments   View file @2d76cd7
@@ -0,0 +1,12 @@ @@ -0,0 +1,12 @@
  1 +fileFormatVersion: 2
  2 +guid: 7ae93996e3a628449b075046fbc9ae89
  3 +timeCreated: 1455830841
  4 +licenseType: Pro
  5 +MonoImporter:
  6 + serializedVersion: 2
  7 + defaultReferences: []
  8 + executionOrder: 0
  9 + icon: {instanceID: 0}
  10 + userData:
  11 + assetBundleName:
  12 + assetBundleVariant:
Assets/Scripts/UI/ScreenManager.cs
  Diff comments   View file @2d76cd7
@@ -50,6 +50,10 @@ public class ScreenManager : MonoBehaviour { @@ -50,6 +50,10 @@ public class ScreenManager : MonoBehaviour {
50 { 50 {
51 tutorialScreen.SetActive(false); 51 tutorialScreen.SetActive(false);
52 } 52 }
  53 + else if (tutorialScreen.activeSelf)
  54 + {
  55 + makersScreen.SetActive(false);
  56 + }
53 else 57 else
54 { 58 {
55 if (exit) Application.Quit(); 59 if (exit) Application.Quit();
Assets/Scripts/UI/ScreenManager.cs.meta
  Diff comments   View file @2d76cd7
1 fileFormatVersion: 2 1 fileFormatVersion: 2
2 -guid: 4f95c6932d08d1f46b103865c5570ecb 2 +guid: 77bfb0925228ff742a1d5987ce782af8
3 timeCreated: 1455655051 3 timeCreated: 1455655051
4 licenseType: Pro 4 licenseType: Pro
5 MonoImporter: 5 MonoImporter:
Assets/Scripts/UI/SliderHandleResizer.cs
View file @b175a84
@@ -1,29 +0,0 @@ @@ -1,29 +0,0 @@
1 -using UnityEngine;  
2 -using UnityEngine.UI;  
3 -  
4 -public class SliderHandlerResizer : MonoBehaviour {  
5 -  
6 - protected void Start ()  
7 - {  
8 - Text text = gameObject.GetComponent<Text>();  
9 -  
10 - if (Screen.dpi < 140)  
11 - text.fontSize = 22;  
12 -  
13 - // 240  
14 - else if (Screen.dpi < 280)  
15 - text.fontSize = 30;  
16 -  
17 - // 320  
18 - else if (Screen.dpi < 400)  
19 - text.fontSize = 38;  
20 -  
21 - // 480  
22 - else if (Screen.dpi < 500)  
23 - text.fontSize = 46;  
24 -  
25 - else  
26 - text.fontSize = 54;  
27 - }  
28 -  
29 -}  
Assets/Scripts/UI/SliderHandleResizer.cs.meta
View file @b175a84
@@ -1,12 +0,0 @@ @@ -1,12 +0,0 @@
1 -fileFormatVersion: 2  
2 -guid: f8ddca5505d51db4fbe6293aa36f2101  
3 -timeCreated: 1456251713  
4 -licenseType: Pro  
5 -MonoImporter:  
6 - serializedVersion: 2  
7 - defaultReferences: []  
8 - executionOrder: 0  
9 - icon: {instanceID: 0}  
10 - userData:  
11 - assetBundleName:  
12 - assetBundleVariant:  
Assets/Scripts/UI/SubtitleResizer.cs
View file @b175a84
@@ -1,40 +0,0 @@ @@ -1,40 +0,0 @@
1 -using System;  
2 -using UnityEngine;  
3 -using UnityEngine.UI;  
4 -  
5 -public class SubtitleResizer : MonoBehaviour {  
6 -  
7 - protected void Start ()  
8 - {  
9 - Text text = gameObject.GetComponent<Text>();  
10 -  
11 - if (Screen.dpi < 140)  
12 - {  
13 - text.fontSize = 20;  
14 - }  
15 -  
16 - // 240  
17 - else if (Screen.dpi < 280)  
18 - {  
19 - text.fontSize = 38;  
20 - }  
21 -  
22 - // 320  
23 - else if (Screen.dpi < 400)  
24 - {  
25 - text.fontSize = 56;  
26 - }  
27 -  
28 - // 480  
29 - else if (Screen.dpi < 500)  
30 - {  
31 - text.fontSize = 76;  
32 - }  
33 -  
34 - else  
35 - {  
36 - text.fontSize = 56;  
37 - }  
38 - }  
39 -  
40 -}  
Assets/Scripts/UI/SubtitleResizer.cs.meta
View file @b175a84
@@ -1,12 +0,0 @@ @@ -1,12 +0,0 @@
1 -fileFormatVersion: 2  
2 -guid: 7ae93996e3a628449b075046fbc9ae89  
3 -timeCreated: 1455830841  
4 -licenseType: Pro  
5 -MonoImporter:  
6 - serializedVersion: 2  
7 - defaultReferences: []  
8 - executionOrder: 0  
9 - icon: {instanceID: 0}  
10 - userData:  
11 - assetBundleName:  
12 - assetBundleVariant:  
Assets/Scripts/UI/TutorialManager.cs
View file @b175a84
@@ -1,106 +0,0 @@ @@ -1,106 +0,0 @@
1 -using UnityEngine;  
2 -using UnityEngine.UI;  
3 -  
4 -public class TutorialManager : MonoBehaviour {  
5 -  
6 - public ScreenManager screenManager;  
7 -  
8 - public Text description;  
9 - public Image translateImage;  
10 - public Image micImage;  
11 - public Image dictionaryImage;  
12 - public Image subtitlesImage;  
13 - public Image infoImage;  
14 - public GameObject sliderShadow;  
15 -  
16 - public Color enabledColor;  
17 - public Color disabledColor;  
18 -  
19 - private int index = 0;  
20 - private string[] descriptions = new string[] {  
21 - "Tradução de Texto\n\nNessa opção você pode entrar com um texto para ser traduzido!",  
22 - "Tradução de Fala\n\nNessa opção, o que você falar será traduzido para LIBRAS",  
23 - "Dicionário\n\nNessa opção você pode ver e reproduzir todos os sinais disponíveis no VLibras",  
24 - "Legendas\n\nNessa opção você pode ativar e desativar as legendas enquanto o sinal é traduzido",  
25 - "Sobre o VLibras\n\nNessa opção você tem acesso a informações adicionais sobre nossa aplicação",  
26 - "Barra de velocidade\n\nNa barra você pode escolher a velocidade que deseja visualizar o sinal",  
27 - };  
28 -  
29 - protected void Start ()  
30 - {  
31 - if (Screen.dpi < 140)  
32 - {  
33 - this.description.fontSize = 14;  
34 - }  
35 -  
36 - // 240  
37 - else if (Screen.dpi < 280)  
38 - {  
39 - this.description.fontSize = 20;  
40 - }  
41 -  
42 - // 320  
43 - else if (Screen.dpi < 400)  
44 - {  
45 - this.description.fontSize = 30;  
46 - }  
47 -  
48 - // 480  
49 - else if (Screen.dpi < 500)  
50 - {  
51 - this.description.fontSize = 44;  
52 - }  
53 -  
54 - else  
55 - {  
56 - this.description.fontSize = 14;  
57 - }  
58 - }  
59 -  
60 - private Image getButton()  
61 - {  
62 - switch (this.index)  
63 - {  
64 - case 0: return this.translateImage;  
65 - case 1: return this.micImage;  
66 - case 2: return this.dictionaryImage;  
67 - case 3: return this.subtitlesImage;  
68 - case 4: return this.infoImage;  
69 - default: return null;  
70 - }  
71 - }  
72 -  
73 - public void next()  
74 - {  
75 - if (index == 5)  
76 - {  
77 - //this.gameObject.SetActive(false);  
78 - this.screenManager.switchScreen("makers");  
79 -  
80 - select(0);  
81 - }  
82 - else select(this.index + 1);  
83 - }  
84 -  
85 - public void select(int index)  
86 - {  
87 - if (this.index <= 4)  
88 - getButton().color = disabledColor;  
89 - else  
90 - this.sliderShadow.SetActive(true);  
91 -  
92 - this.index = index;  
93 -  
94 - if (this.index <= 4)  
95 - {  
96 - getButton().color = enabledColor;  
97 - this.description.text = this.descriptions[index];  
98 - }  
99 - else  
100 - {  
101 - this.sliderShadow.SetActive(false);  
102 - this.description.text = this.descriptions[index];  
103 - }  
104 - }  
105 -  
106 -}  
107 \ No newline at end of file 0 \ No newline at end of file
Assets/Scripts/UI/TutorialManager.cs.meta
View file @b175a84
@@ -1,12 +0,0 @@ @@ -1,12 +0,0 @@
1 -fileFormatVersion: 2  
2 -guid: 76b77d949fd9e294bb95149436284217  
3 -timeCreated: 1454423997  
4 -licenseType: Pro  
5 -MonoImporter:  
6 - serializedVersion: 2  
7 - defaultReferences: []  
8 - executionOrder: 0  
9 - icon: {instanceID: 0}  
10 - userData:  
11 - assetBundleName:  
12 - assetBundleVariant:  
ProjectSettings/EditorSettings.asset
  Diff comments   View file @2d76cd7
@@ -11,3 +11,5 @@ EditorSettings: @@ -11,3 +11,5 @@ EditorSettings:
11 m_DefaultBehaviorMode: 1 11 m_DefaultBehaviorMode: 1
12 m_SpritePackerMode: 2 12 m_SpritePackerMode: 2
13 m_SpritePackerPaddingPower: 1 13 m_SpritePackerPaddingPower: 1
  14 + m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd
  15 + m_ProjectGenerationRootNamespace:
ProjectSettings/QualitySettings.asset
  Diff comments   View file @2d76cd7
@@ -14,8 +14,9 @@ QualitySettings: @@ -14,8 +14,9 @@ QualitySettings:
14 shadowProjection: 1 14 shadowProjection: 1
15 shadowCascades: 1 15 shadowCascades: 1
16 shadowDistance: 15 16 shadowDistance: 15
17 - shadowCascade2Split: .333333343  
18 - shadowCascade4Split: {x: .0666666701, y: .200000003, z: .466666669} 17 + shadowNearPlaneOffset: 2
  18 + shadowCascade2Split: 0.33333334
  19 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
19 blendWeights: 1 20 blendWeights: 1
20 textureQuality: 1 21 textureQuality: 1
21 anisotropicTextures: 0 22 anisotropicTextures: 0
@@ -25,9 +26,11 @@ QualitySettings: @@ -25,9 +26,11 @@ QualitySettings:
25 realtimeReflectionProbes: 0 26 realtimeReflectionProbes: 0
26 billboardsFaceCameraPosition: 0 27 billboardsFaceCameraPosition: 0
27 vSyncCount: 0 28 vSyncCount: 0
28 - lodBias: .300000012 29 + lodBias: 0.3
29 maximumLODLevel: 0 30 maximumLODLevel: 0
30 particleRaycastBudget: 4 31 particleRaycastBudget: 4
  32 + asyncUploadTimeSlice: 2
  33 + asyncUploadBufferSize: 4
31 excludedTargetPlatforms: [] 34 excludedTargetPlatforms: []
32 - serializedVersion: 2 35 - serializedVersion: 2
33 name: Fast 36 name: Fast
@@ -37,8 +40,9 @@ QualitySettings: @@ -37,8 +40,9 @@ QualitySettings:
37 shadowProjection: 1 40 shadowProjection: 1
38 shadowCascades: 1 41 shadowCascades: 1
39 shadowDistance: 20 42 shadowDistance: 20
40 - shadowCascade2Split: .333333343  
41 - shadowCascade4Split: {x: .0666666701, y: .200000003, z: .466666669} 43 + shadowNearPlaneOffset: 2
  44 + shadowCascade2Split: 0.33333334
  45 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
42 blendWeights: 2 46 blendWeights: 2
43 textureQuality: 0 47 textureQuality: 0
44 anisotropicTextures: 0 48 anisotropicTextures: 0
@@ -48,9 +52,11 @@ QualitySettings: @@ -48,9 +52,11 @@ QualitySettings:
48 realtimeReflectionProbes: 0 52 realtimeReflectionProbes: 0
49 billboardsFaceCameraPosition: 0 53 billboardsFaceCameraPosition: 0
50 vSyncCount: 0 54 vSyncCount: 0
51 - lodBias: .400000006 55 + lodBias: 0.4
52 maximumLODLevel: 0 56 maximumLODLevel: 0
53 particleRaycastBudget: 16 57 particleRaycastBudget: 16
  58 + asyncUploadTimeSlice: 2
  59 + asyncUploadBufferSize: 4
54 excludedTargetPlatforms: [] 60 excludedTargetPlatforms: []
55 - serializedVersion: 2 61 - serializedVersion: 2
56 name: Simple 62 name: Simple
@@ -60,8 +66,9 @@ QualitySettings: @@ -60,8 +66,9 @@ QualitySettings:
60 shadowProjection: 1 66 shadowProjection: 1
61 shadowCascades: 1 67 shadowCascades: 1
62 shadowDistance: 20 68 shadowDistance: 20
63 - shadowCascade2Split: .333333343  
64 - shadowCascade4Split: {x: .0666666701, y: .200000003, z: .466666669} 69 + shadowNearPlaneOffset: 2
  70 + shadowCascade2Split: 0.33333334
  71 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
65 blendWeights: 2 72 blendWeights: 2
66 textureQuality: 0 73 textureQuality: 0
67 anisotropicTextures: 1 74 anisotropicTextures: 1
@@ -71,9 +78,11 @@ QualitySettings: @@ -71,9 +78,11 @@ QualitySettings:
71 realtimeReflectionProbes: 0 78 realtimeReflectionProbes: 0
72 billboardsFaceCameraPosition: 0 79 billboardsFaceCameraPosition: 0
73 vSyncCount: 0 80 vSyncCount: 0
74 - lodBias: .699999988 81 + lodBias: 0.7
75 maximumLODLevel: 0 82 maximumLODLevel: 0
76 particleRaycastBudget: 64 83 particleRaycastBudget: 64
  84 + asyncUploadTimeSlice: 2
  85 + asyncUploadBufferSize: 4
77 excludedTargetPlatforms: [] 86 excludedTargetPlatforms: []
78 - serializedVersion: 2 87 - serializedVersion: 2
79 name: Good 88 name: Good
@@ -83,8 +92,9 @@ QualitySettings: @@ -83,8 +92,9 @@ QualitySettings:
83 shadowProjection: 1 92 shadowProjection: 1
84 shadowCascades: 2 93 shadowCascades: 2
85 shadowDistance: 40 94 shadowDistance: 40
86 - shadowCascade2Split: .333333343  
87 - shadowCascade4Split: {x: .0666666701, y: .200000003, z: .466666669} 95 + shadowNearPlaneOffset: 2
  96 + shadowCascade2Split: 0.33333334
  97 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
88 blendWeights: 2 98 blendWeights: 2
89 textureQuality: 0 99 textureQuality: 0
90 anisotropicTextures: 1 100 anisotropicTextures: 1
@@ -97,6 +107,8 @@ QualitySettings: @@ -97,6 +107,8 @@ QualitySettings:
97 lodBias: 1 107 lodBias: 1
98 maximumLODLevel: 0 108 maximumLODLevel: 0
99 particleRaycastBudget: 256 109 particleRaycastBudget: 256
  110 + asyncUploadTimeSlice: 2
  111 + asyncUploadBufferSize: 4
100 excludedTargetPlatforms: [] 112 excludedTargetPlatforms: []
101 - serializedVersion: 2 113 - serializedVersion: 2
102 name: Beautiful 114 name: Beautiful
@@ -106,8 +118,9 @@ QualitySettings: @@ -106,8 +118,9 @@ QualitySettings:
106 shadowProjection: 1 118 shadowProjection: 1
107 shadowCascades: 2 119 shadowCascades: 2
108 shadowDistance: 70 120 shadowDistance: 70
109 - shadowCascade2Split: .333333343  
110 - shadowCascade4Split: {x: .0666666701, y: .200000003, z: .466666669} 121 + shadowNearPlaneOffset: 2
  122 + shadowCascade2Split: 0.33333334
  123 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
111 blendWeights: 4 124 blendWeights: 4
112 textureQuality: 0 125 textureQuality: 0
113 anisotropicTextures: 2 126 anisotropicTextures: 2
@@ -120,6 +133,8 @@ QualitySettings: @@ -120,6 +133,8 @@ QualitySettings:
120 lodBias: 1.5 133 lodBias: 1.5
121 maximumLODLevel: 0 134 maximumLODLevel: 0
122 particleRaycastBudget: 1024 135 particleRaycastBudget: 1024
  136 + asyncUploadTimeSlice: 2
  137 + asyncUploadBufferSize: 4
123 excludedTargetPlatforms: [] 138 excludedTargetPlatforms: []
124 - serializedVersion: 2 139 - serializedVersion: 2
125 name: Fantastic 140 name: Fantastic
@@ -129,8 +144,9 @@ QualitySettings: @@ -129,8 +144,9 @@ QualitySettings:
129 shadowProjection: 1 144 shadowProjection: 1
130 shadowCascades: 4 145 shadowCascades: 4
131 shadowDistance: 150 146 shadowDistance: 150
132 - shadowCascade2Split: .333333343  
133 - shadowCascade4Split: {x: .0666666701, y: .200000003, z: .466666669} 147 + shadowNearPlaneOffset: 2
  148 + shadowCascade2Split: 0.33333334
  149 + shadowCascade4Split: {x: 0.06666667, y: 0.19999999, z: 0.46666664}
134 blendWeights: 4 150 blendWeights: 4
135 textureQuality: 0 151 textureQuality: 0
136 anisotropicTextures: 2 152 anisotropicTextures: 2
@@ -143,6 +159,8 @@ QualitySettings: @@ -143,6 +159,8 @@ QualitySettings:
143 lodBias: 2 159 lodBias: 2
144 maximumLODLevel: 0 160 maximumLODLevel: 0
145 particleRaycastBudget: 4096 161 particleRaycastBudget: 4096
  162 + asyncUploadTimeSlice: 2
  163 + asyncUploadBufferSize: 4
146 excludedTargetPlatforms: [] 164 excludedTargetPlatforms: []
147 m_PerPlatformDefaultQuality: 165 m_PerPlatformDefaultQuality:
148 Android: 2 166 Android: 2