diff --git a/Assets/Plugins/Android/AndroidManifest.xml b/Assets/Plugins/Android/AndroidManifest.xml index 1a5d3f1..ff99e7d 100644 --- a/Assets/Plugins/Android/AndroidManifest.xml +++ b/Assets/Plugins/Android/AndroidManifest.xml @@ -4,9 +4,14 @@ android:versionCode="1" android:versionName="1.0"> - + + android:label="@string/app_name" + android:screenOrientation="portrait" + android:configChanges="orientation"> diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index a5dfdcc..7a4e26e 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -118,8 +118,8 @@ RectTransform: m_RootOrder: 0 m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 39.2, y: -24} - m_SizeDelta: {x: 18.4, y: 38} + m_AnchoredPosition: {x: 45.8, y: -29.657143} + m_SizeDelta: {x: 31.599998, y: 49.314285} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &45157147 MonoBehaviour: @@ -499,7 +499,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 0.88 - m_Text: "Verifique sua conex\xE3o com a internet e tente novamente." + m_Text: "N\xE3o h\xE1 acesso a internet. Usaremos portugu\xEAs sinalizado e datilologia." --- !u!222 &163763092 CanvasRenderer: m_ObjectHideFlags: 0 @@ -615,7 +615,7 @@ MonoBehaviour: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 191800645} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 1573420865, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: @@ -663,7 +663,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 2131993092} + - m_Target: {fileID: 2131993094} m_MethodName: hideScreen m_Mode: 1 m_Arguments: @@ -899,7 +899,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 76b77d949fd9e294bb95149436284217, type: 3} m_Name: m_EditorClassIdentifier: - screenManager: {fileID: 2131993092} + screenManager: {fileID: 2131993094} description: {fileID: 2010584311} translateImage: {fileID: 45157148} micImage: {fileID: 510126320} @@ -922,7 +922,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.84313726} + m_Color: {r: 1, g: 1, b: 1, a: 0.92156863} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1255,7 +1255,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 2131993092} + - m_Target: {fileID: 2131993094} m_MethodName: hideScreen m_Mode: 1 m_Arguments: @@ -1390,7 +1390,7 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - - m_Target: {fileID: 2131993092} + - m_Target: {fileID: 0} m_MethodName: setRepeatLayerState m_Mode: 6 m_Arguments: @@ -1562,7 +1562,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 80} + m_SizeDelta: {x: 0, y: 98.85714} m_Pivot: {x: 1, y: 0} --- !u!114 &389535984 MonoBehaviour: @@ -1618,8 +1618,8 @@ RectTransform: m_RootOrder: 2 m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 140, y: -24} - m_SizeDelta: {x: 18.4, y: 38} + m_AnchoredPosition: {x: 173, y: -29.657143} + m_SizeDelta: {x: 31.599998, y: 49.314285} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &395548683 MonoBehaviour: @@ -1814,7 +1814,7 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 1 m_CallState: 2 - - m_Target: {fileID: 2131993092} + - m_Target: {fileID: 2131993094} m_MethodName: setPauseMenuState m_Mode: 6 m_Arguments: @@ -1872,6 +1872,7 @@ GameObject: - 224: {fileID: 486636722} - 222: {fileID: 486636724} - 114: {fileID: 486636723} + - 114: {fileID: 486636725} m_Layer: 5 m_Name: Handle m_TagString: Untagged @@ -1892,10 +1893,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1315164544} m_RootOrder: 0 - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 30, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &486636723 MonoBehaviour: @@ -1932,6 +1933,19 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 486636721} +--- !u!114 &486636725 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 486636721} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1254083943, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AspectMode: 2 + m_AspectRatio: 0.95 --- !u!1 &490251389 GameObject: m_ObjectHideFlags: 0 @@ -2100,8 +2114,8 @@ RectTransform: m_RootOrder: 1 m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 89.6, y: -24} - m_SizeDelta: {x: 18.4, y: 38} + m_AnchoredPosition: {x: 109.399994, y: -29.657143} + m_SizeDelta: {x: 31.599998, y: 49.314285} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &510126320 MonoBehaviour: @@ -2516,7 +2530,7 @@ MonoBehaviour: textButton: {fileID: 930426942} pauseButton: {fileID: 440527253} pauseMenu: {fileID: 1024302431} - screenManager: {fileID: 2131993092} + screenManager: {fileID: 2131993094} debugText: {fileID: 0} --- !u!114 &578311383 MonoBehaviour: @@ -2642,7 +2656,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 2131993092} + - m_Target: {fileID: 2131993094} m_MethodName: switchScreen m_Mode: 2 m_Arguments: @@ -2732,17 +2746,15 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 600160454} ---- !u!1 &615209559 +--- !u!1 &613136920 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 194984, guid: 5ccb0ba277304a14b9bb8d4e34161675, type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 4 m_Component: - - 224: {fileID: 615209560} - - 222: {fileID: 615209563} - - 114: {fileID: 615209562} - - 114: {fileID: 615209561} + - 224: {fileID: 613136921} + - 114: {fileID: 613136922} m_Layer: 5 m_Name: tutorial m_TagString: Untagged @@ -2750,112 +2762,37 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &615209560 +--- !u!224 &613136921 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22421046, guid: 5ccb0ba277304a14b9bb8d4e34161675, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 615209559} + m_GameObject: {fileID: 613136920} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 1157915785} m_Father: {fileID: 1874017187} m_RootOrder: 0 - m_AnchorMin: {x: 0.35, y: 0.5} - m_AnchorMax: {x: 0.65, y: 1} + m_AnchorMin: {x: 0.1, y: 0.5} + m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: -31.450012} m_Pivot: {x: 0.5, y: 1} ---- !u!114 &615209561 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11403440, guid: 5ccb0ba277304a14b9bb8d4e34161675, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 615209559} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 615209562} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 2131993092} - m_MethodName: switchScreen - m_Mode: 2 - m_Arguments: - m_ObjectArgument: {fileID: 228512393} - m_ObjectArgumentAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!114 &615209562 +--- !u!114 &613136922 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11434796, guid: 5ccb0ba277304a14b9bb8d4e34161675, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 615209559} + m_GameObject: {fileID: 613136920} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: -1254083943, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 0fbe6c940c9e6534fa64037b96903291, type: 3} - m_Type: 0 - m_PreserveAspect: 1 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!222 &615209563 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22275774, guid: 5ccb0ba277304a14b9bb8d4e34161675, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 615209559} + m_AspectMode: 1 + m_AspectRatio: 3.2 --- !u!1 &630366170 GameObject: m_ObjectHideFlags: 0 @@ -2889,8 +2826,8 @@ RectTransform: m_RootOrder: 3 m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 190.4, y: -24} - m_SizeDelta: {x: 18.4, y: 38} + m_AnchoredPosition: {x: 236.59999, y: -29.657143} + m_SizeDelta: {x: 31.599998, y: 49.314285} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &630366172 MonoBehaviour: @@ -2980,6 +2917,130 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 630366170} +--- !u!1 &670462552 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 194984, guid: 5ccb0ba277304a14b9bb8d4e34161675, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 670462553} + - 222: {fileID: 670462556} + - 114: {fileID: 670462555} + - 114: {fileID: 670462554} + m_Layer: 5 + m_Name: backup_tutorial + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &670462553 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22421046, guid: 5ccb0ba277304a14b9bb8d4e34161675, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 670462552} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1874017187} + m_RootOrder: 3 + m_AnchorMin: {x: 0.1, y: 0.5} + m_AnchorMax: {x: 0.4, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &670462554 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11403440, guid: 5ccb0ba277304a14b9bb8d4e34161675, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 670462552} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 670462555} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2131993094} + m_MethodName: switchScreen + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 228512393} + m_ObjectArgumentAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &670462555 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11434796, guid: 5ccb0ba277304a14b9bb8d4e34161675, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 670462552} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 0fbe6c940c9e6534fa64037b96903291, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &670462556 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22275774, guid: 5ccb0ba277304a14b9bb8d4e34161675, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 670462552} --- !u!1 &702185294 GameObject: m_ObjectHideFlags: 0 @@ -3220,9 +3281,8 @@ GameObject: m_Component: - 224: {fileID: 815279418} - 222: {fileID: 815279422} - - 114: {fileID: 815279421} - - 114: {fileID: 815279420} - 114: {fileID: 815279419} + - 114: {fileID: 815279421} m_Layer: 5 m_Name: b_close m_TagString: Untagged @@ -3263,59 +3323,6 @@ MonoBehaviour: m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} m_EffectDistance: {x: 1, y: -1} m_UseGraphicAlpha: 1 ---- !u!114 &815279420 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11464464, guid: 5ccb0ba277304a14b9bb8d4e34161675, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 815279417} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 0, g: 0, b: 0, a: 0.234} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 815279421} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 2131993092} - m_MethodName: hideScreen - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!114 &815279421 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3385,6 +3392,127 @@ RectTransform: m_AnchoredPosition: {x: -0.0000038146973, y: 0} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &841640088 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 841640089} + - 222: {fileID: 841640092} + - 114: {fileID: 841640091} + - 114: {fileID: 841640090} + m_Layer: 5 + m_Name: Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &841640089 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 841640088} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1237199446} + m_Father: {fileID: 1763761724} + m_RootOrder: 0 + m_AnchorMin: {x: 0.1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &841640090 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 841640088} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 0.981, g: 0.9877857, b: 1, a: 0.716} + m_HighlightedColor: {r: 0.29411766, g: 0.37254903, b: 0.5254902, a: 0.11372549} + m_PressedColor: {r: 0.29411766, g: 0.37254903, b: 0.5254902, a: 0.21960784} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 841640091} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2131993094} + m_MethodName: switchScreen + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 2044204294} + m_ObjectArgumentAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &841640091 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 841640088} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &841640092 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 841640088} --- !u!1 &842733389 GameObject: m_ObjectHideFlags: 0 @@ -3900,7 +4028,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 2131993092} + - m_Target: {fileID: 2131993094} m_MethodName: switchScreen m_Mode: 2 m_Arguments: @@ -3950,7 +4078,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1874017187} - m_RootOrder: 1 + m_RootOrder: 2 m_AnchorMin: {x: 0.1, y: 0} m_AnchorMax: {x: 0.9, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} @@ -4289,11 +4417,11 @@ RectTransform: m_Children: [] m_Father: {fileID: 814612177} m_RootOrder: 0 - m_AnchorMin: {x: 0.82, y: 1} - m_AnchorMax: {x: 0.96, y: 1} + m_AnchorMin: {x: 0.8, y: 1.2} + m_AnchorMax: {x: 0.96, y: 2.4} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 59} - m_Pivot: {x: 1, y: -0.36} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 1, y: 0.5} --- !u!114 &995712445 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4539,7 +4667,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 2131993092} + - m_Target: {fileID: 2131993094} m_MethodName: switchScreen m_Mode: 2 m_Arguments: @@ -4665,8 +4793,8 @@ RectTransform: m_RootOrder: 4 m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 240.79999, y: -24} - m_SizeDelta: {x: 18.4, y: 38} + m_AnchoredPosition: {x: 300.19998, y: -29.657143} + m_SizeDelta: {x: 31.599998, y: 49.314285} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1048863674 MonoBehaviour: @@ -4859,7 +4987,7 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - - m_Target: {fileID: 2131993092} + - m_Target: {fileID: 2131993094} m_MethodName: hideScreen m_Mode: 1 m_Arguments: @@ -4979,27 +5107,150 @@ MonoBehaviour: m_PressedTrigger: Pressed m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 1152273572} + m_TargetGraphic: {fileID: 1152273572} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 578311381} + m_MethodName: stopAll + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1024302431} + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &1152273572 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11421606, guid: 5ccb0ba277304a14b9bb8d4e34161675, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1152273569} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: fbf55ea1f2e12da4799c1ac527f37b6e, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1152273573 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22200200, guid: 5ccb0ba277304a14b9bb8d4e34161675, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1152273569} +--- !u!1 &1157915784 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1157915785} + - 222: {fileID: 1157915788} + - 114: {fileID: 1157915787} + - 114: {fileID: 1157915786} + m_Layer: 5 + m_Name: Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1157915785 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1157915784} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2102396406} + m_Father: {fileID: 613136921} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0.7, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &1157915786 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1157915784} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 0.98039216, g: 0.9843137, b: 1, a: 0.7137255} + m_HighlightedColor: {r: 0.29411766, g: 0.37254903, b: 0.5254902, a: 0.116} + m_PressedColor: {r: 0.29411766, g: 0.37254903, b: 0.5254902, a: 0.222} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1157915787} m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 578311381} - m_MethodName: stopAll - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - - m_Target: {fileID: 1024302431} - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 2131993094} + m_MethodName: switchScreen + m_Mode: 2 m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_ObjectArgument: {fileID: 228512393} + m_ObjectArgumentAssemblyTypeName: UnityEngine.GameObject, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 m_StringArgument: @@ -5007,13 +5258,12 @@ MonoBehaviour: m_CallState: 2 m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null ---- !u!114 &1152273572 +--- !u!114 &1157915787 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11421606, guid: 5ccb0ba277304a14b9bb8d4e34161675, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1152273569} + m_GameObject: {fileID: 1157915784} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} @@ -5027,21 +5277,20 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: fbf55ea1f2e12da4799c1ac527f37b6e, type: 3} - m_Type: 0 - m_PreserveAspect: 1 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 ---- !u!222 &1152273573 +--- !u!222 &1157915788 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22200200, guid: 5ccb0ba277304a14b9bb8d4e34161675, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1152273569} + m_GameObject: {fileID: 1157915784} --- !u!1 &1164416485 GameObject: m_ObjectHideFlags: 0 @@ -5150,6 +5399,7 @@ GameObject: - 222: {fileID: 1175405164} - 114: {fileID: 1175405163} - 114: {fileID: 1175405162} + - 114: {fileID: 1175405165} m_Layer: 5 m_Name: b_translate m_TagString: Untagged @@ -5170,11 +5420,11 @@ RectTransform: m_Children: [] m_Father: {fileID: 1935189154} m_RootOrder: 5 - m_AnchorMin: {x: 0.3, y: 0.2} - m_AnchorMax: {x: 0.7, y: 0.28} + m_AnchorMin: {x: 0, y: 0.2} + m_AnchorMax: {x: 1, y: 0.28} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} + m_SizeDelta: {x: 0, y: -4.5955544} + m_Pivot: {x: 0.5, y: 1} --- !u!114 &1175405162 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5215,7 +5465,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 2131993092} + - m_Target: {fileID: 2131993094} m_MethodName: hideScreen m_Mode: 1 m_Arguments: @@ -5274,6 +5524,19 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1175405160} +--- !u!114 &1175405165 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1175405160} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1254083943, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AspectMode: 1 + m_AspectRatio: 9 --- !u!1 &1183073262 GameObject: m_ObjectHideFlags: 0 @@ -5433,7 +5696,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 2 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -5518,6 +5781,91 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1237199445 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1237199446} + - 222: {fileID: 1237199449} + - 114: {fileID: 1237199448} + - 114: {fileID: 1237199447} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1237199446 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1237199445} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 841640089} + m_RootOrder: 0 + m_AnchorMin: {x: 0.1, y: 0.1} + m_AnchorMax: {x: 0.9, y: 0.9} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1237199447 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1237199445} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b91836587db7b494bb8206257fd5818f, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1237199448 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1237199445} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 195abaf1001bde54db32dfcefbcc33e8, type: 3} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Realizadores +--- !u!222 &1237199449 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1237199445} --- !u!1 &1265043069 GameObject: m_ObjectHideFlags: 0 @@ -5798,7 +6146,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1164416485} + - m_Target: {fileID: 848083142} m_MethodName: SetActive m_Mode: 6 m_Arguments: @@ -5820,6 +6168,17 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 2111966982} + m_MethodName: unlockFor + m_Mode: 5 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: '"translate"' + m_BoolArgument: 0 + m_CallState: 2 m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null --- !u!114 &1266698455 @@ -6198,7 +6557,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 2131993092} + - m_Target: {fileID: 2131993094} m_MethodName: hideScreen m_Mode: 1 m_Arguments: @@ -7008,7 +7367,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 2131993092} + - m_Target: {fileID: 2131993094} m_MethodName: hideScreen m_Mode: 1 m_Arguments: @@ -8039,6 +8398,53 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1731945570} +--- !u!1 &1763761723 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1763761724} + - 114: {fileID: 1763761725} + m_Layer: 5 + m_Name: makers + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1763761724 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1763761723} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 841640089} + m_Father: {fileID: 1874017187} + m_RootOrder: 1 + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.9, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: -31.450016} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &1763761725 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1763761723} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1254083943, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AspectMode: 1 + m_AspectRatio: 3.2 --- !u!1 &1772891847 GameObject: m_ObjectHideFlags: 0 @@ -8340,8 +8746,10 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 615209560} + - {fileID: 613136921} + - {fileID: 1763761724} - {fileID: 948041468} + - {fileID: 670462553} m_Father: {fileID: 263018772} m_RootOrder: 3 m_AnchorMin: {x: 0, y: 0.1} @@ -9493,7 +9901,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 2131993092} + - m_Target: {fileID: 2131993094} m_MethodName: hideScreen m_Mode: 1 m_Arguments: @@ -10069,6 +10477,91 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2099411278} +--- !u!1 &2102396405 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 2102396406} + - 222: {fileID: 2102396409} + - 114: {fileID: 2102396408} + - 114: {fileID: 2102396407} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2102396406 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2102396405} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1157915785} + m_RootOrder: 0 + m_AnchorMin: {x: 0.1, y: 0.1} + m_AnchorMax: {x: 0.9, y: 0.9} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2102396407 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2102396405} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b91836587db7b494bb8206257fd5818f, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &2102396408 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2102396405} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 195abaf1001bde54db32dfcefbcc33e8, type: 3} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Tutorial +--- !u!222 &2102396409 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2102396405} --- !u!1 &2105857204 GameObject: m_ObjectHideFlags: 0 @@ -10182,8 +10675,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: playerManager: {fileID: 578311381} - time: 4 - probability: 0.7 + time: 12 + probability: 0.8 --- !u!4 &2111966983 Transform: m_ObjectHideFlags: 0 @@ -10354,7 +10847,7 @@ GameObject: serializedVersion: 4 m_Component: - 4: {fileID: 2131993093} - - 114: {fileID: 2131993092} + - 114: {fileID: 2131993094} m_Layer: 5 m_Name: ScreenManager m_TagString: ScreenManager @@ -10362,7 +10855,19 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &2131993092 +--- !u!4 &2131993093 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2131993091} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 3 +--- !u!114 &2131993094 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} @@ -10370,7 +10875,7 @@ MonoBehaviour: m_GameObject: {fileID: 2131993091} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f95c6932d08d1f46b103865c5570ecb, type: 3} + m_Script: {fileID: 11500000, guid: 77bfb0925228ff742a1d5987ce782af8, type: 3} m_Name: m_EditorClassIdentifier: playerManager: {fileID: 578311381} @@ -10388,15 +10893,3 @@ MonoBehaviour: pauseMenu: {fileID: 1024302431} repeatLayer: {fileID: 861767964} avatarCollider: {fileID: 535548073} ---- !u!4 &2131993093 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2131993091} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 3 diff --git a/Assets/Scripts/Animation List/ListManager.cs b/Assets/Scripts/Animation List/ListManager.cs index d9222bd..7cc7ad9 100644 --- a/Assets/Scripts/Animation List/ListManager.cs +++ b/Assets/Scripts/Animation List/ListManager.cs @@ -43,7 +43,7 @@ public class ListManager : MonoBehaviour { void Start() { this.scrollView.onValueChanged.AddListener(checkScrollPosition); - this.input.onValueChange.AddListener(inputChanged); + this.input.onValueChanged.AddListener(inputChanged); // Load TrieST { @@ -59,23 +59,13 @@ public class ListManager : MonoBehaviour { if ( ! String.IsNullOrEmpty(word)) this.trie.put(word, word); } - - /*StreamReader s = new StreamReader(Application.dataPath + "/sinais.txt"); - - if (!s.EndOfStream) s.ReadLine(); - - while (!s.EndOfStream) - { - string word = s.ReadLine(); - this.trie.put(word, word); - }*/ } this.itemList = getNamesByPrefix(""); this.index = 0; this.size = itemList.Length; - this.loadingItem = Instantiate (sampleLoadingItemObject) as GameObject; + //this.loadingItem = Instantiate (sampleLoadingItemObject) as GameObject; if (Screen.dpi < 140) this.itemHeight = 36; @@ -84,20 +74,20 @@ public class ListManager : MonoBehaviour { this.itemHeight = 50; else if (Screen.dpi < 400) - this.itemHeight = 74; + this.itemHeight = 90; else if (Screen.dpi < 500) - this.itemHeight = 100; + this.itemHeight = 120; else - this.itemHeight = 74; + this.itemHeight = 90; StartCoroutine("populateList"); } public void checkScrollPosition(Vector2 scrollPosition) { - if (scrollPosition.y <= 0F && ! this.isLoading) + if (scrollPosition.y <= 0.05F && ! this.isLoading) StartCoroutine("populateList"); } @@ -160,14 +150,14 @@ public class ListManager : MonoBehaviour { private void changeLoadingState(bool active) { - if (isLoading != active) + /*if (isLoading != active) { this.loadingItem.transform.SetParent(active ? contentPanel : null); this.isLoading = active; if ( ! active && contentPanel.childCount > 0) contentPanel.GetChild(0).GetChild(1).gameObject.SetActive(false); - } + }*/ } } diff --git a/Assets/Scripts/Player Manager/GenericPlayerManager.cs b/Assets/Scripts/Player Manager/GenericPlayerManager.cs index bac707b..52c8ace 100644 --- a/Assets/Scripts/Player Manager/GenericPlayerManager.cs +++ b/Assets/Scripts/Player Manager/GenericPlayerManager.cs @@ -75,6 +75,18 @@ public abstract class GenericPlayerManager : MonoBehaviour { foreach (string flag in flags) this.flags.Add(flag); + string[] toDuplicate = new string[] { + "A", "B", "C", "D", "E", "F", "G", "H", "I", + "J", "K", "L", "M", "N", "O", "P", "Q", "R", + "S", "T", "U", "V", "W", "X", "Y", "Z", + "0", "1", "2", "3", "4", + "5", "6", "7", "8", "9", + "," + }; + + foreach (string anim in toDuplicate) + COMPONENT_ANIMATION.AddClip(COMPONENT_ANIMATION[anim].clip, "d_" + anim); + // Sinal default é tratado como animação de intervalo: não sinaliza reprodução na UI this.intervalAnimations.Add(DEFAULT_ANIMATION); } @@ -279,7 +291,7 @@ public abstract class GenericPlayerManager : MonoBehaviour { * * @return last animation's subtitle. */ - private string spellWord(string word) + private string spellWord(Queue toPlayQueue, string word) { string lastAnimationSubtitle = ""; bool defaultPlayed = false; @@ -287,23 +299,29 @@ public abstract class GenericPlayerManager : MonoBehaviour { // A reprodução da primeira letra deve ser longa para não ser cortada no fade this.subtitles.updateLetterSpeed(); + string lastAnim = ""; + for (int i = 0; i < word.Length; i++) { - char second = word[i]; lastAnimationSubtitle = Subtitle.highlight(word, i); + string anim = word[i].ToString(); + lastAnim = anim.Equals(lastAnim) ? "d_" + anim : anim; + + short type; + // Se for uma letra - if (second >= 65 && second <= 90) - playAnimation(Subtitle.TYPE_LETTER, second.ToString(), lastAnimationSubtitle, subtitles.LetterSpeed); + if (word[i] >= 65 && word[i] <= 90) + type = Subtitle.TYPE_LETTER; // Se for um número - else if (second >= 48 && second <= 57) - playAnimation(Subtitle.TYPE_NUMBER, second.ToString(), lastAnimationSubtitle, subtitles.NumberSpeed); - + else if (word[i] >= 48 && word[i] <= 57) + type = Subtitle.TYPE_NUMBER; + // Se for uma vírgula - else if (second == 44) - playAnimation(Subtitle.TYPE_WORD, second.ToString(), lastAnimationSubtitle); - + else if (word[i] == 44) + type = Subtitle.TYPE_WORD; + // Não há animação else { @@ -311,23 +329,53 @@ public abstract class GenericPlayerManager : MonoBehaviour { if ( ! defaultPlayed) { defaultPlayed = true; - playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, lastAnimationSubtitle); + //playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, lastAnimationSubtitle); + toPlayQueue.Enqueue(new ToPlay(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, lastAnimationSubtitle, this)); // A reprodução da próxima letra deve ser longa para não ser cortada no fade - subtitles.updateLetterSpeed(); + this.subtitles.updateLetterSpeed(); } - UnityEngine.Debug.Log("Animação \"" + second + "\" inexistente."); + UnityEngine.Debug.Log("Animação \"" + word[i] + "\" inexistente."); continue; } + + //playAnimation(type, lastAnim, lastAnimationSubtitle); + toPlayQueue.Enqueue(new ToPlay(type, lastAnim, lastAnimationSubtitle, this)); defaultPlayed = false; - subtitles.updateLetterSpeed(); + this.subtitles.updateLetterSpeed(); } return lastAnimationSubtitle; } + private struct ToPlay + { + private short type; + private string name; + private string subtitle; + private float speed; + + public ToPlay(short type, string name, string subtitle, float speed) + { + this.type = type; + this.name = name; + this.subtitle = subtitle; + this.speed = speed; + } + public ToPlay(short type, string name, string subtitle, GenericPlayerManager context) + : this(type, name, subtitle, 0F) { + this.speed = context.getSpeedByType(type); + } + public ToPlay(short type, string name, GenericPlayerManager context) + : this(type, name, name, context) { } + + public void play(GenericPlayerManager context) { + context.playAnimation(this.type, this.name, this.subtitle, this.speed); + } + } + private System.Object loadingLocker = new System.Object(); private IEnumerator loadAndPlay(string gloss) @@ -341,16 +389,20 @@ public abstract class GenericPlayerManager : MonoBehaviour { string lastAnimationSubtitle = ""; bool spelled = false; - // Default - playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, "", 2F); - if ( ! this.playing) StartCoroutine("handleStates"); stringPos = gloss.Split(' '); + Queue toPlayQueue = new Queue(); + int wordsCount = 0; + // playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, "", 2F); + toPlayQueue.Enqueue(new ToPlay(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, "", this)); + foreach (string aniName in stringPos) { + wordsCount++; + try { if (String.IsNullOrEmpty(aniName)) continue; } catch (Exception e) { @@ -397,19 +449,22 @@ public abstract class GenericPlayerManager : MonoBehaviour { if (spelled) { // Default - playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, lastAnimationSubtitle); + //playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, lastAnimationSubtitle); + toPlayQueue.Enqueue(new ToPlay(Subtitle.TYPE_NONE, lastAnimationSubtitle, this)); spelled = false; } if (this.flags.Contains(aniName) || this.intervalAnimations.Contains(aniName)) { lastAnimationSubtitle = ""; - playAnimation(Subtitle.TYPE_WORD, aniName, ""); + //playAnimation(Subtitle.TYPE_WORD, aniName, ""); + toPlayQueue.Enqueue(new ToPlay(Subtitle.TYPE_WORD, aniName, "", this)); } else { lastAnimationSubtitle = aniName; - playAnimation(Subtitle.TYPE_WORD, aniName); + //playAnimation(Subtitle.TYPE_WORD, aniName); + toPlayQueue.Enqueue(new ToPlay(Subtitle.TYPE_WORD, aniName, this)); } } @@ -425,18 +480,24 @@ public abstract class GenericPlayerManager : MonoBehaviour { if (this.flags.Contains(aniName) || this.intervalAnimations.Contains(aniName)) { - playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, "", 1.6F); + //playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, "", 1.6F); + toPlayQueue.Enqueue(new ToPlay(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, "", 1.6F)); continue; } // Se já houve o soletramento de alguma palavra, reproduz animação default if (spelled) - playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, lastAnimationSubtitle, 1.6F); + //playAnimation(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, lastAnimationSubtitle, 1.6F); + toPlayQueue.Enqueue(new ToPlay(Subtitle.TYPE_NONE, DEFAULT_ANIMATION, lastAnimationSubtitle, 1.6F)); else spelled = true; - lastAnimationSubtitle = spellWord(aniName); + lastAnimationSubtitle = spellWord(toPlayQueue, aniName); } + + if (toPlayQueue.Count > 4 || wordsCount == stringPos.Length) + while (toPlayQueue.Count > 0) + toPlayQueue.Dequeue().play(this); } // Default diff --git a/Assets/Scripts/Player Manager/Subtitle.cs b/Assets/Scripts/Player Manager/Subtitle.cs index 75db5bc..81b6773 100644 --- a/Assets/Scripts/Player Manager/Subtitle.cs +++ b/Assets/Scripts/Player Manager/Subtitle.cs @@ -119,28 +119,16 @@ public class Subtitle { public static string highlight(string word, int index) { string subtitle = ""; - int last = 0; - if (index == 0) - subtitle += "" + word[0] + ""; - else - subtitle += word[0]; - - for (int i = 1; i < word.Length; i++) + for (int i = 0; i < word.Length; i++) { - if ((word[i] >= 65 && word[i] <= 90) || (word[i] >= 48 && word[i] <= 57)) + if (i > 0 && ((word[i] >= 65 && word[i] <= 90) || (word[i] >= 48 && word[i] <= 57))) subtitle += "-"; - if (i == index || (last == index && word[i] == word[last])) - { + if (i == index) subtitle += "" + word[i] + ""; - if (i == index) last = i; - } else - { subtitle += word[i]; - last = i; - } } return subtitle; diff --git a/Assets/Scripts/PlayerManager.cs b/Assets/Scripts/PlayerManager.cs index 898576f..713c047 100644 --- a/Assets/Scripts/PlayerManager.cs +++ b/Assets/Scripts/PlayerManager.cs @@ -145,12 +145,9 @@ public class PlayerManager : GenericPlayerManager { // Called from microphone icon at main interface public void callVoiceRecognizer() { - string gloss = voiceRecognizer.callRecognition(); //voiceRecognizerScreenConfirm.SetActive(true); - InputField inp = GameObject.FindGameObjectWithTag("field_text_entry").GetComponent() as InputField; - inp.text = gloss; - + this.translateScreenText.text = voiceRecognizer.callRecognition(); this.screenManager.switchScreen("translate"); } @@ -193,7 +190,7 @@ public class PlayerManager : GenericPlayerManager { this.screenManager.setLoadingSnippetState(false); this.screenManager.showConnectionErrorDialog(); - base.randomAnimations.unlockFor("translate"); + //base.randomAnimations.unlockFor("translate"); } } diff --git a/Assets/Scripts/TutorialManager.cs b/Assets/Scripts/TutorialManager.cs new file mode 100644 index 0000000..2223389 --- /dev/null +++ b/Assets/Scripts/TutorialManager.cs @@ -0,0 +1,104 @@ +using UnityEngine; +using UnityEngine.UI; + +public class TutorialManager : MonoBehaviour { + + public ScreenManager screenManager; + + public Text description; + public Image translateImage; + public Image micImage; + public Image dictionaryImage; + public Image subtitlesImage; + public Image infoImage; + public GameObject sliderShadow; + + public Color enabledColor; + public Color disabledColor; + + private int index = 0; + private string[] descriptions = new string[] { + "Tradução de Texto\n\nNessa opção você pode entrar com um texto para ser traduzido!", + "Tradução de Fala\n\nNessa opção, o que você falar será traduzido para LIBRAS", + "Dicionário\n\nNessa opção você pode ver e reproduzir todos os sinais disponíveis no VLibras", + "Legendas\n\nNessa opção você pode ativar e desativar as legendas enquanto o sinal é traduzido", + "Sobre o VLibras\n\nNessa opção você tem acesso a informações adicionais sobre nossa aplicação", + "Barra de velocidade\n\nNa barra você pode escolher a velocidade que deseja visualizar o sinal", + }; + + protected void Start () + { + if (Screen.dpi < 140) + { + this.description.fontSize = 14; + } + + // 240 + else if (Screen.dpi < 280) + { + this.description.fontSize = 20; + } + + // 320 + else if (Screen.dpi < 400) + { + this.description.fontSize = 30; + } + + // 480 + else if (Screen.dpi < 500) + { + this.description.fontSize = 44; + } + + else + { + this.description.fontSize = 14; + } + } + + private Image getButton() + { + switch (this.index) + { + case 0: return this.translateImage; + case 1: return this.micImage; + case 2: return this.dictionaryImage; + case 3: return this.subtitlesImage; + case 4: return this.infoImage; + default: return null; + } + } + + public void next() + { + if (index == 5) + { + this.screenManager.hideScreen(); + select(0); + } + else select(this.index + 1); + } + + public void select(int index) + { + if (this.index <= 4) + getButton().color = disabledColor; + else + this.sliderShadow.SetActive(true); + + this.index = index; + + if (this.index <= 4) + { + getButton().color = enabledColor; + this.description.text = this.descriptions[index]; + } + else + { + this.sliderShadow.SetActive(false); + this.description.text = this.descriptions[index]; + } + } + +} \ No newline at end of file diff --git a/Assets/Scripts/TutorialManager.cs.meta b/Assets/Scripts/TutorialManager.cs.meta new file mode 100644 index 0000000..5862c8d --- /dev/null +++ b/Assets/Scripts/TutorialManager.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 76b77d949fd9e294bb95149436284217 +timeCreated: 1454423997 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/BarResizer.cs b/Assets/Scripts/UI/BarResizer.cs deleted file mode 100644 index 68fdecb..0000000 --- a/Assets/Scripts/UI/BarResizer.cs +++ /dev/null @@ -1,39 +0,0 @@ -using UnityEngine; -using UnityEngine.UI; - -public class BarResizer : MonoBehaviour { - - protected void Start () - { - HorizontalLayoutGroup barBottomLayout = gameObject.GetComponent(); - - if (Screen.dpi < 140) - { - barBottomLayout.spacing = 22; - } - - // 240 - else if (Screen.dpi < 280) - { - barBottomLayout.spacing = 44; - } - - // 320 - else if (Screen.dpi < 400) - { - barBottomLayout.spacing = 80; - } - - // 480 - else if (Screen.dpi < 500) - { - barBottomLayout.spacing = 92; - } - - else - { - barBottomLayout.spacing = 80; - } - } - -} diff --git a/Assets/Scripts/UI/BarResizer.cs.meta b/Assets/Scripts/UI/BarResizer.cs.meta deleted file mode 100644 index ce7ea2c..0000000 --- a/Assets/Scripts/UI/BarResizer.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: cc684fd2c599912419e723a09bee71eb -timeCreated: 1455229603 -licenseType: Pro -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/UI/MakersScreenTextResizer.cs b/Assets/Scripts/UI/MakersScreenTextResizer.cs deleted file mode 100644 index 1bd3c38..0000000 --- a/Assets/Scripts/UI/MakersScreenTextResizer.cs +++ /dev/null @@ -1,29 +0,0 @@ -using UnityEngine; -using UnityEngine.UI; - -public class MakersScreenTextResizer : MonoBehaviour { - - protected void Start () - { - Text text = gameObject.GetComponent(); - - if (Screen.dpi < 140) - text.fontSize = 22; - - // 240 - else if (Screen.dpi < 280) - text.fontSize = 30; - - // 320 - else if (Screen.dpi < 400) - text.fontSize = 38; - - // 480 - else if (Screen.dpi < 500) - text.fontSize = 46; - - else - text.fontSize = 54; - } - -} diff --git a/Assets/Scripts/UI/MakersScreenTextResizer.cs.meta b/Assets/Scripts/UI/MakersScreenTextResizer.cs.meta deleted file mode 100644 index 5b0ee4e..0000000 --- a/Assets/Scripts/UI/MakersScreenTextResizer.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: a7be422a80edfef4f8e4e8a6aca4378e -timeCreated: 1456251341 -licenseType: Pro -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/UI/Resizers.meta b/Assets/Scripts/UI/Resizers.meta new file mode 100644 index 0000000..7175e3d --- /dev/null +++ b/Assets/Scripts/UI/Resizers.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: ce96d47f2ecec7448abb4b341315d1bd +folderAsset: yes +timeCreated: 1457032134 +licenseType: Pro +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/Resizers/BarResizer.cs b/Assets/Scripts/UI/Resizers/BarResizer.cs new file mode 100644 index 0000000..68fdecb --- /dev/null +++ b/Assets/Scripts/UI/Resizers/BarResizer.cs @@ -0,0 +1,39 @@ +using UnityEngine; +using UnityEngine.UI; + +public class BarResizer : MonoBehaviour { + + protected void Start () + { + HorizontalLayoutGroup barBottomLayout = gameObject.GetComponent(); + + if (Screen.dpi < 140) + { + barBottomLayout.spacing = 22; + } + + // 240 + else if (Screen.dpi < 280) + { + barBottomLayout.spacing = 44; + } + + // 320 + else if (Screen.dpi < 400) + { + barBottomLayout.spacing = 80; + } + + // 480 + else if (Screen.dpi < 500) + { + barBottomLayout.spacing = 92; + } + + else + { + barBottomLayout.spacing = 80; + } + } + +} diff --git a/Assets/Scripts/UI/Resizers/BarResizer.cs.meta b/Assets/Scripts/UI/Resizers/BarResizer.cs.meta new file mode 100644 index 0000000..ce7ea2c --- /dev/null +++ b/Assets/Scripts/UI/Resizers/BarResizer.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: cc684fd2c599912419e723a09bee71eb +timeCreated: 1455229603 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/Resizers/InfoButtonsResizer.cs b/Assets/Scripts/UI/Resizers/InfoButtonsResizer.cs new file mode 100644 index 0000000..42337a8 --- /dev/null +++ b/Assets/Scripts/UI/Resizers/InfoButtonsResizer.cs @@ -0,0 +1,28 @@ +using UnityEngine; +using UnityEngine.UI; + +public class InfoButtonsResizer : MonoBehaviour { + + void Start() + { + Text text = gameObject.GetComponent(); + + if (Screen.dpi < 140) + text.fontSize = 14; + + // 240 + else if (Screen.dpi < 280) + text.fontSize = 22; + + // 320 + else if (Screen.dpi < 400) + text.fontSize = 35; + + // 480 + else if (Screen.dpi < 500) + text.fontSize = 48; + + else + text.fontSize = 35; + } +} diff --git a/Assets/Scripts/UI/Resizers/InfoButtonsResizer.cs.meta b/Assets/Scripts/UI/Resizers/InfoButtonsResizer.cs.meta new file mode 100644 index 0000000..acc1f15 --- /dev/null +++ b/Assets/Scripts/UI/Resizers/InfoButtonsResizer.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: b91836587db7b494bb8206257fd5818f +timeCreated: 1457030145 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/Resizers/MakersScreenTextResizer.cs b/Assets/Scripts/UI/Resizers/MakersScreenTextResizer.cs new file mode 100644 index 0000000..1bd3c38 --- /dev/null +++ b/Assets/Scripts/UI/Resizers/MakersScreenTextResizer.cs @@ -0,0 +1,29 @@ +using UnityEngine; +using UnityEngine.UI; + +public class MakersScreenTextResizer : MonoBehaviour { + + protected void Start () + { + Text text = gameObject.GetComponent(); + + if (Screen.dpi < 140) + text.fontSize = 22; + + // 240 + else if (Screen.dpi < 280) + text.fontSize = 30; + + // 320 + else if (Screen.dpi < 400) + text.fontSize = 38; + + // 480 + else if (Screen.dpi < 500) + text.fontSize = 46; + + else + text.fontSize = 54; + } + +} diff --git a/Assets/Scripts/UI/Resizers/MakersScreenTextResizer.cs.meta b/Assets/Scripts/UI/Resizers/MakersScreenTextResizer.cs.meta new file mode 100644 index 0000000..5b0ee4e --- /dev/null +++ b/Assets/Scripts/UI/Resizers/MakersScreenTextResizer.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: a7be422a80edfef4f8e4e8a6aca4378e +timeCreated: 1456251341 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/Resizers/SliderHandleResizer.cs b/Assets/Scripts/UI/Resizers/SliderHandleResizer.cs new file mode 100644 index 0000000..4783edd --- /dev/null +++ b/Assets/Scripts/UI/Resizers/SliderHandleResizer.cs @@ -0,0 +1,29 @@ +using UnityEngine; +using UnityEngine.UI; + +public class SliderHandlerResizer : MonoBehaviour { + + protected void Start () + { + Text text = gameObject.GetComponent(); + + if (Screen.dpi < 140) + text.fontSize = 22; + + // 240 + else if (Screen.dpi < 280) + text.fontSize = 30; + + // 320 + else if (Screen.dpi < 400) + text.fontSize = 38; + + // 480 + else if (Screen.dpi < 500) + text.fontSize = 46; + + else + text.fontSize = 54; + } + +} diff --git a/Assets/Scripts/UI/Resizers/SliderHandleResizer.cs.meta b/Assets/Scripts/UI/Resizers/SliderHandleResizer.cs.meta new file mode 100644 index 0000000..cfc01d8 --- /dev/null +++ b/Assets/Scripts/UI/Resizers/SliderHandleResizer.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: f8ddca5505d51db4fbe6293aa36f2101 +timeCreated: 1456251713 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/Resizers/SubtitleResizer.cs b/Assets/Scripts/UI/Resizers/SubtitleResizer.cs new file mode 100644 index 0000000..c061353 --- /dev/null +++ b/Assets/Scripts/UI/Resizers/SubtitleResizer.cs @@ -0,0 +1,40 @@ +using System; +using UnityEngine; +using UnityEngine.UI; + +public class SubtitleResizer : MonoBehaviour { + + protected void Start () + { + Text text = gameObject.GetComponent(); + + if (Screen.dpi < 140) + { + text.fontSize = 20; + } + + // 240 + else if (Screen.dpi < 280) + { + text.fontSize = 38; + } + + // 320 + else if (Screen.dpi < 400) + { + text.fontSize = 56; + } + + // 480 + else if (Screen.dpi < 500) + { + text.fontSize = 76; + } + + else + { + text.fontSize = 56; + } + } + +} diff --git a/Assets/Scripts/UI/Resizers/SubtitleResizer.cs.meta b/Assets/Scripts/UI/Resizers/SubtitleResizer.cs.meta new file mode 100644 index 0000000..95fe39a --- /dev/null +++ b/Assets/Scripts/UI/Resizers/SubtitleResizer.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 7ae93996e3a628449b075046fbc9ae89 +timeCreated: 1455830841 +licenseType: Pro +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/ScreenManager.cs b/Assets/Scripts/UI/ScreenManager.cs index df2225d..88ef1ca 100644 --- a/Assets/Scripts/UI/ScreenManager.cs +++ b/Assets/Scripts/UI/ScreenManager.cs @@ -50,6 +50,10 @@ public class ScreenManager : MonoBehaviour { { tutorialScreen.SetActive(false); } + else if (tutorialScreen.activeSelf) + { + makersScreen.SetActive(false); + } else { if (exit) Application.Quit(); diff --git a/Assets/Scripts/UI/ScreenManager.cs.meta b/Assets/Scripts/UI/ScreenManager.cs.meta index 83f66db..15f4995 100644 --- a/Assets/Scripts/UI/ScreenManager.cs.meta +++ b/Assets/Scripts/UI/ScreenManager.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4f95c6932d08d1f46b103865c5570ecb +guid: 77bfb0925228ff742a1d5987ce782af8 timeCreated: 1455655051 licenseType: Pro MonoImporter: diff --git a/Assets/Scripts/UI/SliderHandleResizer.cs b/Assets/Scripts/UI/SliderHandleResizer.cs deleted file mode 100644 index 4783edd..0000000 --- a/Assets/Scripts/UI/SliderHandleResizer.cs +++ /dev/null @@ -1,29 +0,0 @@ -using UnityEngine; -using UnityEngine.UI; - -public class SliderHandlerResizer : MonoBehaviour { - - protected void Start () - { - Text text = gameObject.GetComponent(); - - if (Screen.dpi < 140) - text.fontSize = 22; - - // 240 - else if (Screen.dpi < 280) - text.fontSize = 30; - - // 320 - else if (Screen.dpi < 400) - text.fontSize = 38; - - // 480 - else if (Screen.dpi < 500) - text.fontSize = 46; - - else - text.fontSize = 54; - } - -} diff --git a/Assets/Scripts/UI/SliderHandleResizer.cs.meta b/Assets/Scripts/UI/SliderHandleResizer.cs.meta deleted file mode 100644 index cfc01d8..0000000 --- a/Assets/Scripts/UI/SliderHandleResizer.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: f8ddca5505d51db4fbe6293aa36f2101 -timeCreated: 1456251713 -licenseType: Pro -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/UI/SubtitleResizer.cs b/Assets/Scripts/UI/SubtitleResizer.cs deleted file mode 100644 index c061353..0000000 --- a/Assets/Scripts/UI/SubtitleResizer.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System; -using UnityEngine; -using UnityEngine.UI; - -public class SubtitleResizer : MonoBehaviour { - - protected void Start () - { - Text text = gameObject.GetComponent(); - - if (Screen.dpi < 140) - { - text.fontSize = 20; - } - - // 240 - else if (Screen.dpi < 280) - { - text.fontSize = 38; - } - - // 320 - else if (Screen.dpi < 400) - { - text.fontSize = 56; - } - - // 480 - else if (Screen.dpi < 500) - { - text.fontSize = 76; - } - - else - { - text.fontSize = 56; - } - } - -} diff --git a/Assets/Scripts/UI/SubtitleResizer.cs.meta b/Assets/Scripts/UI/SubtitleResizer.cs.meta deleted file mode 100644 index 95fe39a..0000000 --- a/Assets/Scripts/UI/SubtitleResizer.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 7ae93996e3a628449b075046fbc9ae89 -timeCreated: 1455830841 -licenseType: Pro -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/UI/TutorialManager.cs b/Assets/Scripts/UI/TutorialManager.cs deleted file mode 100644 index c00627f..0000000 --- a/Assets/Scripts/UI/TutorialManager.cs +++ /dev/null @@ -1,106 +0,0 @@ -using UnityEngine; -using UnityEngine.UI; - -public class TutorialManager : MonoBehaviour { - - public ScreenManager screenManager; - - public Text description; - public Image translateImage; - public Image micImage; - public Image dictionaryImage; - public Image subtitlesImage; - public Image infoImage; - public GameObject sliderShadow; - - public Color enabledColor; - public Color disabledColor; - - private int index = 0; - private string[] descriptions = new string[] { - "Tradução de Texto\n\nNessa opção você pode entrar com um texto para ser traduzido!", - "Tradução de Fala\n\nNessa opção, o que você falar será traduzido para LIBRAS", - "Dicionário\n\nNessa opção você pode ver e reproduzir todos os sinais disponíveis no VLibras", - "Legendas\n\nNessa opção você pode ativar e desativar as legendas enquanto o sinal é traduzido", - "Sobre o VLibras\n\nNessa opção você tem acesso a informações adicionais sobre nossa aplicação", - "Barra de velocidade\n\nNa barra você pode escolher a velocidade que deseja visualizar o sinal", - }; - - protected void Start () - { - if (Screen.dpi < 140) - { - this.description.fontSize = 14; - } - - // 240 - else if (Screen.dpi < 280) - { - this.description.fontSize = 20; - } - - // 320 - else if (Screen.dpi < 400) - { - this.description.fontSize = 30; - } - - // 480 - else if (Screen.dpi < 500) - { - this.description.fontSize = 44; - } - - else - { - this.description.fontSize = 14; - } - } - - private Image getButton() - { - switch (this.index) - { - case 0: return this.translateImage; - case 1: return this.micImage; - case 2: return this.dictionaryImage; - case 3: return this.subtitlesImage; - case 4: return this.infoImage; - default: return null; - } - } - - public void next() - { - if (index == 5) - { - //this.gameObject.SetActive(false); - this.screenManager.switchScreen("makers"); - - select(0); - } - else select(this.index + 1); - } - - public void select(int index) - { - if (this.index <= 4) - getButton().color = disabledColor; - else - this.sliderShadow.SetActive(true); - - this.index = index; - - if (this.index <= 4) - { - getButton().color = enabledColor; - this.description.text = this.descriptions[index]; - } - else - { - this.sliderShadow.SetActive(false); - this.description.text = this.descriptions[index]; - } - } - -} \ No newline at end of file diff --git a/Assets/Scripts/UI/TutorialManager.cs.meta b/Assets/Scripts/UI/TutorialManager.cs.meta deleted file mode 100644 index 5862c8d..0000000 --- a/Assets/Scripts/UI/TutorialManager.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 76b77d949fd9e294bb95149436284217 -timeCreated: 1454423997 -licenseType: Pro -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/ProjectSettings/EditorSettings.asset b/ProjectSettings/EditorSettings.asset index 9fa1780..444646b 100644 --- a/ProjectSettings/EditorSettings.asset +++ b/ProjectSettings/EditorSettings.asset @@ -11,3 +11,5 @@ EditorSettings: m_DefaultBehaviorMode: 1 m_SpritePackerMode: 2 m_SpritePackerPaddingPower: 1 + m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd + m_ProjectGenerationRootNamespace: diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 60b0053..6f41c93 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -14,8 +14,9 @@ QualitySettings: shadowProjection: 1 shadowCascades: 1 shadowDistance: 15 - shadowCascade2Split: .333333343 - shadowCascade4Split: {x: .0666666701, y: .200000003, z: .466666669} + shadowNearPlaneOffset: 2 + shadowCascade2Split: 0.33333334 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} blendWeights: 1 textureQuality: 1 anisotropicTextures: 0 @@ -25,9 +26,11 @@ QualitySettings: realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 0 vSyncCount: 0 - lodBias: .300000012 + lodBias: 0.3 maximumLODLevel: 0 particleRaycastBudget: 4 + asyncUploadTimeSlice: 2 + asyncUploadBufferSize: 4 excludedTargetPlatforms: [] - serializedVersion: 2 name: Fast @@ -37,8 +40,9 @@ QualitySettings: shadowProjection: 1 shadowCascades: 1 shadowDistance: 20 - shadowCascade2Split: .333333343 - shadowCascade4Split: {x: .0666666701, y: .200000003, z: .466666669} + shadowNearPlaneOffset: 2 + shadowCascade2Split: 0.33333334 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} blendWeights: 2 textureQuality: 0 anisotropicTextures: 0 @@ -48,9 +52,11 @@ QualitySettings: realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 0 vSyncCount: 0 - lodBias: .400000006 + lodBias: 0.4 maximumLODLevel: 0 particleRaycastBudget: 16 + asyncUploadTimeSlice: 2 + asyncUploadBufferSize: 4 excludedTargetPlatforms: [] - serializedVersion: 2 name: Simple @@ -60,8 +66,9 @@ QualitySettings: shadowProjection: 1 shadowCascades: 1 shadowDistance: 20 - shadowCascade2Split: .333333343 - shadowCascade4Split: {x: .0666666701, y: .200000003, z: .466666669} + shadowNearPlaneOffset: 2 + shadowCascade2Split: 0.33333334 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} blendWeights: 2 textureQuality: 0 anisotropicTextures: 1 @@ -71,9 +78,11 @@ QualitySettings: realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 0 vSyncCount: 0 - lodBias: .699999988 + lodBias: 0.7 maximumLODLevel: 0 particleRaycastBudget: 64 + asyncUploadTimeSlice: 2 + asyncUploadBufferSize: 4 excludedTargetPlatforms: [] - serializedVersion: 2 name: Good @@ -83,8 +92,9 @@ QualitySettings: shadowProjection: 1 shadowCascades: 2 shadowDistance: 40 - shadowCascade2Split: .333333343 - shadowCascade4Split: {x: .0666666701, y: .200000003, z: .466666669} + shadowNearPlaneOffset: 2 + shadowCascade2Split: 0.33333334 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} blendWeights: 2 textureQuality: 0 anisotropicTextures: 1 @@ -97,6 +107,8 @@ QualitySettings: lodBias: 1 maximumLODLevel: 0 particleRaycastBudget: 256 + asyncUploadTimeSlice: 2 + asyncUploadBufferSize: 4 excludedTargetPlatforms: [] - serializedVersion: 2 name: Beautiful @@ -106,8 +118,9 @@ QualitySettings: shadowProjection: 1 shadowCascades: 2 shadowDistance: 70 - shadowCascade2Split: .333333343 - shadowCascade4Split: {x: .0666666701, y: .200000003, z: .466666669} + shadowNearPlaneOffset: 2 + shadowCascade2Split: 0.33333334 + shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} blendWeights: 4 textureQuality: 0 anisotropicTextures: 2 @@ -120,6 +133,8 @@ QualitySettings: lodBias: 1.5 maximumLODLevel: 0 particleRaycastBudget: 1024 + asyncUploadTimeSlice: 2 + asyncUploadBufferSize: 4 excludedTargetPlatforms: [] - serializedVersion: 2 name: Fantastic @@ -129,8 +144,9 @@ QualitySettings: shadowProjection: 1 shadowCascades: 4 shadowDistance: 150 - shadowCascade2Split: .333333343 - shadowCascade4Split: {x: .0666666701, y: .200000003, z: .466666669} + shadowNearPlaneOffset: 2 + shadowCascade2Split: 0.33333334 + shadowCascade4Split: {x: 0.06666667, y: 0.19999999, z: 0.46666664} blendWeights: 4 textureQuality: 0 anisotropicTextures: 2 @@ -143,6 +159,8 @@ QualitySettings: lodBias: 2 maximumLODLevel: 0 particleRaycastBudget: 4096 + asyncUploadTimeSlice: 2 + asyncUploadBufferSize: 4 excludedTargetPlatforms: [] m_PerPlatformDefaultQuality: Android: 2 -- libgit2 0.21.2