From ea1d06ff2a6cb61486b549a83c24fee9fbf7370c Mon Sep 17 00:00:00 2001 From: Mateus Pires Date: Thu, 25 Feb 2016 18:07:05 -0300 Subject: [PATCH] Org and repeat button nufinished --- Assets/Resources/GUI/round_sprite.png | Bin 0 -> 313 bytes Assets/Resources/GUI/round_sprite.png.meta | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Assets/Scenes/Main.unity | 744 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------- Assets/Scripts/Animation List/SampleItem.cs | 4 ---- Assets/Scripts/Player Manager/GenericPlayerManager.cs | 6 ------ Assets/Scripts/PlayerManager.cs | 62 +++++++++++++++++++++++++++++++++----------------------------- Assets/Scripts/UI/ScreenManager.cs | 34 ++++++++++++++++++++++------------ Assets/Scripts/UI/TutorialManager.cs | 2 +- 8 files changed, 803 insertions(+), 105 deletions(-) create mode 100644 Assets/Resources/GUI/round_sprite.png create mode 100644 Assets/Resources/GUI/round_sprite.png.meta diff --git a/Assets/Resources/GUI/round_sprite.png b/Assets/Resources/GUI/round_sprite.png new file mode 100644 index 0000000..b007844 Binary files /dev/null and b/Assets/Resources/GUI/round_sprite.png differ diff --git a/Assets/Resources/GUI/round_sprite.png.meta b/Assets/Resources/GUI/round_sprite.png.meta new file mode 100644 index 0000000..212b1cd --- /dev/null +++ b/Assets/Resources/GUI/round_sprite.png.meta @@ -0,0 +1,56 @@ +fileFormatVersion: 2 +guid: 9508c7fa52bc67f44bf75321e581396e +timeCreated: 1456433420 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 198271c..78582e8 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -309,7 +309,7 @@ RectTransform: m_Children: [] m_Father: {fileID: 1164416486} m_RootOrder: 2 - m_AnchorMin: {x: 0, y: .860000014} + m_AnchorMin: {x: 0, y: .800000012} m_AnchorMax: {x: 1, y: .99000001} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} @@ -459,8 +459,8 @@ RectTransform: m_Children: [] m_Father: {fileID: 1164416486} m_RootOrder: 3 - m_AnchorMin: {x: .0399999991, y: .600000024} - m_AnchorMax: {x: .959999979, y: .839999974} + m_AnchorMin: {x: .0399999991, y: .439999998} + m_AnchorMax: {x: .959999979, y: .74000001} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: .5, y: .5} @@ -495,7 +495,7 @@ MonoBehaviour: m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 - m_LineSpacing: 1 + m_LineSpacing: .879999995 m_Text: "Verifique sua conex\xE3o com a internet e tente novamente." --- !u!222 &163763092 CanvasRenderer: @@ -874,7 +874,7 @@ RectTransform: - {fileID: 191800646} - {fileID: 2010584310} m_Father: {fileID: 1414104007} - m_RootOrder: 8 + m_RootOrder: 9 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} @@ -970,7 +970,7 @@ RectTransform: - {fileID: 1632068377} - {fileID: 1874017187} m_Father: {fileID: 1414104007} - m_RootOrder: 4 + m_RootOrder: 5 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} @@ -1296,6 +1296,141 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 363895483} +--- !u!1 &366095107 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 133590, guid: 5ccb0ba277304a14b9bb8d4e34161675, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 366095108} + - 222: {fileID: 366095111} + - 114: {fileID: 366095110} + - 114: {fileID: 366095109} + m_Layer: 5 + m_Name: b_repeat + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &366095108 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22474260, guid: 5ccb0ba277304a14b9bb8d4e34161675, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 366095107} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: .949999988, y: .949999988, z: 1} + m_Children: [] + m_Father: {fileID: 813876602} + m_RootOrder: 0 + m_AnchorMin: {x: .300000012, y: .159999996} + m_AnchorMax: {x: .699999988, y: .839999974} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &366095109 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11431640, guid: 5ccb0ba277304a14b9bb8d4e34161675, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 366095107} + 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: .960784316, g: .960784316, b: .960784316, a: 1} + m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} + m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_ColorMultiplier: 1 + m_FadeDuration: .100000001 + 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: 366095110} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 578311381} + m_MethodName: repeat + 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: 813876601} + 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 &366095110 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11451830, guid: 5ccb0ba277304a14b9bb8d4e34161675, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 366095107} + 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: 5324882cb6bf20141b5cff66b4764ffb, 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 &366095111 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22202710, guid: 5ccb0ba277304a14b9bb8d4e34161675, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 366095107} --- !u!1 &388597102 GameObject: m_ObjectHideFlags: 0 @@ -1867,7 +2002,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 578311381} - m_MethodName: switchPauseState + m_MethodName: setPauseState m_Mode: 6 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -2283,10 +2418,10 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1265043070} + m_Father: {fileID: 1952387009} m_RootOrder: 0 - m_AnchorMin: {x: 0, y: .419999987} - m_AnchorMax: {x: 1, y: .579999983} + m_AnchorMin: {x: 0, y: .400000006} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: .5, y: .5} @@ -2352,6 +2487,78 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 568312204} +--- !u!1 &577197974 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 577197975} + - 222: {fileID: 577197977} + - 114: {fileID: 577197976} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &577197975 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 577197974} + 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: 1584409086} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &577197976 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 577197974} + 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: .196078435, g: .196078435, b: .196078435, 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: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: afasdasdasds +--- !u!222 &577197977 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 577197974} --- !u!1 &578311380 stripped GameObject: m_PrefabParentObject: {fileID: 125100, guid: da45329542b035e4da18f1132cc3d700, type: 2} @@ -2520,6 +2727,91 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 582478958} +--- !u!1 &593910183 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 127404, guid: 5ccb0ba277304a14b9bb8d4e34161675, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 593910184} + - 222: {fileID: 593910187} + - 114: {fileID: 593910186} + - 114: {fileID: 593910185} + m_Layer: 5 + m_Name: container (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &593910184 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22468874, guid: 5ccb0ba277304a14b9bb8d4e34161675, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 593910183} + 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: 0} + m_Children: + - {fileID: 1584409086} + m_Father: {fileID: 861767965} + m_RootOrder: 1 + m_AnchorMin: {x: .839999974, y: 1} + m_AnchorMax: {x: 1, y: 2} + m_AnchoredPosition: {x: -5, y: 10} + m_SizeDelta: {x: -10, y: -43.817131} + m_Pivot: {x: .5, y: 0} +--- !u!114 &593910185 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 593910183} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1254083943, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AspectMode: 1 + m_AspectRatio: 1 +--- !u!114 &593910186 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11464616, guid: 5ccb0ba277304a14b9bb8d4e34161675, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 593910183} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, 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: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &593910187 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22208740, guid: 5ccb0ba277304a14b9bb8d4e34161675, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 593910183} --- !u!1 &600160454 GameObject: m_ObjectHideFlags: 0 @@ -2894,24 +3186,109 @@ MonoBehaviour: --- !u!114 &702185297 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11476848, guid: 5ccb0ba277304a14b9bb8d4e34161675, + m_PrefabParentObject: {fileID: 11476848, guid: 5ccb0ba277304a14b9bb8d4e34161675, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 702185294} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 5 + m_Bottom: 5 + m_ChildAlignment: 4 + m_Spacing: 26 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 +--- !u!1 &813876601 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 127404, guid: 5ccb0ba277304a14b9bb8d4e34161675, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 813876602} + - 222: {fileID: 813876605} + - 114: {fileID: 813876604} + - 114: {fileID: 813876603} + m_Layer: 5 + m_Name: container + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &813876602 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22468874, guid: 5ccb0ba277304a14b9bb8d4e34161675, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 813876601} + 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: 0} + m_Children: + - {fileID: 366095108} + m_Father: {fileID: 861767965} + m_RootOrder: 0 + m_AnchorMin: {x: .839999974, y: 1} + m_AnchorMax: {x: 1, y: 2} + m_AnchoredPosition: {x: -5, y: 10} + m_SizeDelta: {x: -10, y: -43.817131} + m_Pivot: {x: .5, y: 0} +--- !u!114 &813876603 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 813876601} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1254083943, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AspectMode: 1 + m_AspectRatio: 1 +--- !u!114 &813876604 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11464616, guid: 5ccb0ba277304a14b9bb8d4e34161675, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 813876601} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, 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: 8cb2fa7829f176b4c9c1f9775977665f, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &813876605 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22208740, guid: 5ccb0ba277304a14b9bb8d4e34161675, type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 702185294} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -405508275, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 5 - m_Bottom: 5 - m_ChildAlignment: 4 - m_Spacing: 26 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 0 + m_GameObject: {fileID: 813876601} --- !u!1 &814612176 GameObject: m_ObjectHideFlags: 0 @@ -3187,7 +3564,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1414104007} - m_RootOrder: 10 + m_RootOrder: 11 --- !u!114 &842733391 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3235,6 +3612,122 @@ MonoBehaviour: m_FirstSelected: {fileID: 0} m_sendNavigationEvents: 1 m_DragThreshold: 5 +--- !u!1 &848083142 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 848083143} + - 222: {fileID: 848083145} + - 114: {fileID: 848083144} + m_Layer: 5 + m_Name: layer_conn_error + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &848083143 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 848083142} + 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: 1164416486} + m_Father: {fileID: 1414104007} + m_RootOrder: 12 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &848083144 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 848083142} + 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: 0} + 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: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &848083145 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 848083142} +--- !u!1 &861767964 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 861767965} + - 114: {fileID: 861767966} + m_Layer: 5 + m_Name: layer_repeat + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &861767965 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 861767964} + 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: 813876602} + - {fileID: 593910184} + m_Father: {fileID: 1414104007} + m_RootOrder: 4 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 76.8571396} + m_Pivot: {x: 1, y: 0} +--- !u!114 &861767966 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 861767964} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1254083943, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AspectMode: 1 + m_AspectRatio: 3.5 --- !u!1 &874328297 GameObject: m_ObjectHideFlags: 0 @@ -3736,7 +4229,7 @@ RectTransform: - {fileID: 1265796708} - {fileID: 1976368185} m_Father: {fileID: 1414104007} - m_RootOrder: 6 + m_RootOrder: 7 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} @@ -3818,7 +4311,7 @@ RectTransform: m_Children: - {fileID: 263667178} m_Father: {fileID: 1414104007} - m_RootOrder: 7 + m_RootOrder: 8 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 0} @@ -4228,7 +4721,7 @@ GameObject: - 222: {fileID: 1024302434} - 114: {fileID: 1024302433} m_Layer: 5 - m_Name: pause_menu + m_Name: layer_pause_menu m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -4711,12 +5204,12 @@ GameObject: - 222: {fileID: 1164416488} - 114: {fileID: 1164416487} m_Layer: 5 - m_Name: connection_error + m_Name: container m_TagString: conn_err m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1164416486 RectTransform: m_ObjectHideFlags: 0 @@ -4733,9 +5226,9 @@ RectTransform: - {fileID: 142212435} - {fileID: 163763090} - {fileID: 1266698452} - m_Father: {fileID: 1414104007} - m_RootOrder: 11 - m_AnchorMin: {x: .0299999993, y: .300000012} + m_Father: {fileID: 848083143} + m_RootOrder: 0 + m_AnchorMin: {x: .0299999993, y: .419999987} m_AnchorMax: {x: .970000029, y: .699999988} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} @@ -5181,7 +5674,7 @@ GameObject: - 224: {fileID: 1265043070} - 114: {fileID: 1265043071} m_Layer: 5 - m_Name: loading_snippet + m_Name: layer_loading_snippet m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -5198,12 +5691,11 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 568312205} - - {fileID: 1496206517} + - {fileID: 1952387009} m_Father: {fileID: 1414104007} m_RootOrder: 0 - m_AnchorMin: {x: 0, y: .200000003} - m_AnchorMax: {x: 1, y: .800000012} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: .5, y: .5} @@ -5392,8 +5884,8 @@ RectTransform: - {fileID: 152065639} m_Father: {fileID: 1164416486} m_RootOrder: 4 - m_AnchorMin: {x: .340000004, y: .340000004} - m_AnchorMax: {x: .660000026, y: .540000021} + m_AnchorMin: {x: .340000004, y: .100000001} + m_AnchorMax: {x: .660000026, y: .360000014} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: .5, y: .5} @@ -6017,6 +6509,7 @@ RectTransform: - {fileID: 1533000892} - {fileID: 2119336824} - {fileID: 1024302432} + - {fileID: 861767965} - {fileID: 263018772} - {fileID: 1935189154} - {fileID: 951727302} @@ -6024,7 +6517,7 @@ RectTransform: - {fileID: 228512394} - {fileID: 2044204295} - {fileID: 842733390} - - {fileID: 1164416486} + - {fileID: 848083143} m_Father: {fileID: 0} m_RootOrder: 0 m_AnchorMin: {x: 0, y: 0} @@ -6837,10 +7330,10 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1265043070} + m_Father: {fileID: 1952387009} m_RootOrder: 1 - m_AnchorMin: {x: 0, y: .330000013} - m_AnchorMax: {x: 1, y: .419999987} + m_AnchorMin: {x: 0, y: .0399999991} + m_AnchorMax: {x: 1, y: .360000014} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: .5, y: .5} @@ -6980,7 +7473,7 @@ GameObject: - 114: {fileID: 1533000891} - 222: {fileID: 1533000890} m_Layer: 5 - m_Name: subtitle_container + m_Name: layer_subtitle m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -7057,7 +7550,7 @@ RectTransform: m_Children: [] m_Father: {fileID: 1164416486} m_RootOrder: 0 - m_AnchorMin: {x: 0, y: .300000012} + m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} @@ -7111,6 +7604,116 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1537204752} +--- !u!1 &1584409085 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1584409086} + - 222: {fileID: 1584409089} + - 114: {fileID: 1584409088} + - 114: {fileID: 1584409087} + m_Layer: 5 + m_Name: Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1584409086 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1584409085} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 577197975} + m_Father: {fileID: 593910184} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1584409087 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1584409085} + 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: 0, b: 0, a: 1} + m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} + m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} + m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_ColorMultiplier: 1 + m_FadeDuration: .100000001 + 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: 1584409088} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &1584409088 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1584409085} + 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: 0, b: 0, 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: 0} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1584409089 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1584409085} --- !u!1 &1585560342 GameObject: m_ObjectHideFlags: 0 @@ -7923,8 +8526,8 @@ RectTransform: m_Children: [] m_Father: {fileID: 1164416486} m_RootOrder: 1 - m_AnchorMin: {x: 0, y: .850000024} - m_AnchorMax: {x: 1, y: .850000024} + m_AnchorMin: {x: 0, y: .779999971} + m_AnchorMax: {x: 1, y: .779999971} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 1} m_Pivot: {x: .5, y: .5} @@ -8419,7 +9022,7 @@ RectTransform: - {fileID: 2002966284} - {fileID: 1175405161} m_Father: {fileID: 1414104007} - m_RootOrder: 5 + m_RootOrder: 6 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} @@ -8471,6 +9074,40 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1935189153} +--- !u!1 &1952387008 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1952387009} + m_Layer: 5 + m_Name: container + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1952387009 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1952387008} + 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: 568312205} + - {fileID: 1496206517} + m_Father: {fileID: 1265043070} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: .419999987} + m_AnchorMax: {x: 1, y: .579999983} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} --- !u!1 &1976368184 GameObject: m_ObjectHideFlags: 0 @@ -9027,7 +9664,7 @@ RectTransform: - {fileID: 815279418} - {fileID: 1221700622} m_Father: {fileID: 1414104007} - m_RootOrder: 9 + m_RootOrder: 10 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} @@ -9993,8 +10630,9 @@ MonoBehaviour: dictButtonImage: {fileID: 1649730299} infoButtonImage: {fileID: 2079280005} loadingSnippet: {fileID: 1265043069} - connectionErrorDialog: {fileID: 1164416485} + connectionErrorDialog: {fileID: 848083142} pauseMenu: {fileID: 1024302431} + avatarCollider: {fileID: 535548073} --- !u!4 &2131993093 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Animation List/SampleItem.cs b/Assets/Scripts/Animation List/SampleItem.cs index 26a1559..1b0f718 100644 --- a/Assets/Scripts/Animation List/SampleItem.cs +++ b/Assets/Scripts/Animation List/SampleItem.cs @@ -11,10 +11,6 @@ public class SampleItem : MonoBehaviour { { PlayerManager playerManager = GameObject.FindGameObjectWithTag("PlayerManager").GetComponent(); playerManager.playDict(title.text); - - ScreenManager screenManager = GameObject.FindGameObjectWithTag("ScreenManager").GetComponent(); - screenManager.hideScreen(); - screenManager.setPauseMenuState(false); } } diff --git a/Assets/Scripts/Player Manager/GenericPlayerManager.cs b/Assets/Scripts/Player Manager/GenericPlayerManager.cs index 257cda2..d7f3d0d 100644 --- a/Assets/Scripts/Player Manager/GenericPlayerManager.cs +++ b/Assets/Scripts/Player Manager/GenericPlayerManager.cs @@ -22,7 +22,6 @@ public abstract class GenericPlayerManager : MonoBehaviour { private GameObject AVATAR; // Referencia para o componente animador do avatar private Animation COMPONENT_ANIMATION; - private BoxCollider AVATAR_COLLIDER; public Text SUBTITLES; // Guarda os nomes das palavras já carregadas @@ -64,7 +63,6 @@ public abstract class GenericPlayerManager : MonoBehaviour { AVATAR = GameObject.FindGameObjectWithTag("avatar"); COMPONENT_ANIMATION = AVATAR.GetComponent(); - AVATAR_COLLIDER = GameObject.FindGameObjectWithTag("avatar").GetComponent(); // Sinais ignorados na legenda string[] flags = new string[] { @@ -96,10 +94,6 @@ public abstract class GenericPlayerManager : MonoBehaviour { this.randomAnimations.setAnimations(intervalAnimations); } - public void SetAvatarCollider(bool isActive) { - AVATAR_COLLIDER.enabled = isActive; - } - // Define a velocidade das animacões com base no slider da GUI public void setSlider(float sliderPosition) { diff --git a/Assets/Scripts/PlayerManager.cs b/Assets/Scripts/PlayerManager.cs index c0dfc4b..b6c0272 100644 --- a/Assets/Scripts/PlayerManager.cs +++ b/Assets/Scripts/PlayerManager.cs @@ -73,22 +73,21 @@ public class PlayerManager : GenericPlayerManager { forcePlayInCache(); } - public void playAfterError() { - forcePlayInCache(); - } - public void playDict(string word) { base.glosa = word; base.play(true, true, true); - } - //private bool cancelTranslation() + this.screenManager.hideScreen(); + this.screenManager.setPauseMenuState(false); + } public void playTranslate() { stopTranslation(); StartCoroutine("translate", translateScreenText.text); + + this.screenManager.setPauseMenuState(false); } public void stopTranslation() @@ -153,42 +152,47 @@ public class PlayerManager : GenericPlayerManager { this.screenManager.switchScreen("translate"); } + private System.Object translateLocker = new System.Object(); + private IEnumerator translate(string glosa) { - base.randomAnimations.lockFor("translate"); - this.screenManager.setLoadingSnippetState(true); - - WWW glosaRequest = new WWW(SERVER_URL + WWW.EscapeURL(glosa)); - - if (glosaRequest != null) + lock (this.translateLocker) { - yield return glosaRequest.isDone; + base.randomAnimations.lockFor("translate"); + this.screenManager.setLoadingSnippetState(true); + + WWW glosaRequest = new WWW(SERVER_URL + WWW.EscapeURL(glosa)); - if (glosaRequest.error == null) + if (glosaRequest != null) { - yield return glosaRequest; + yield return glosaRequest.isDone; - if ( ! String.IsNullOrEmpty(glosaRequest.text)) + if (glosaRequest.error == null) { - Debug.Log("Server answer: " + glosaRequest.text); + yield return glosaRequest; - base.playNext(glosaRequest.text); - this.screenManager.setLoadingSnippetState(false); - base.randomAnimations.unlockFor("translate"); + if ( ! String.IsNullOrEmpty(glosaRequest.text)) + { + Debug.Log("Server answer: " + glosaRequest.text); - yield break; + base.playNext(glosaRequest.text); + this.screenManager.setLoadingSnippetState(false); + base.randomAnimations.unlockFor("translate"); + + yield break; + } + else Debug.Log("Error at PlayerManager.translate: empty answer."); } - else Debug.Log("Error at PlayerManager.translate: empty answer."); + else Debug.Log("Error at PlayerManager.translate: (WWW) glosaRequest: " + glosaRequest.error); } - else Debug.Log("Error at PlayerManager.translate: (WWW) glosaRequest: " + glosaRequest.error); - } - else Debug.Log ("Error at PlayerManager.translate: (WWW) glosaRequest is NULL."); + else Debug.Log ("Error at PlayerManager.translate: (WWW) glosaRequest is NULL."); - base.glosa = glosa.ToUpper(); + base.glosa = glosa.ToUpper(); - this.screenManager.setLoadingSnippetState(false); - this.screenManager.showConnectionErrorDialog(); - base.randomAnimations.unlockFor("translate"); + this.screenManager.setLoadingSnippetState(false); + this.screenManager.showConnectionErrorDialog(); + base.randomAnimations.unlockFor("translate"); + } } } diff --git a/Assets/Scripts/UI/ScreenManager.cs b/Assets/Scripts/UI/ScreenManager.cs index 171520e..850c0d8 100644 --- a/Assets/Scripts/UI/ScreenManager.cs +++ b/Assets/Scripts/UI/ScreenManager.cs @@ -22,6 +22,8 @@ public class ScreenManager : MonoBehaviour { public GameObject connectionErrorDialog; public GameObject pauseMenu; + public BoxCollider avatarCollider; + private bool exit = false; public void Update() @@ -58,15 +60,16 @@ public class ScreenManager : MonoBehaviour { public bool hasActiveScreen() { - return infoScreen.activeSelf - || translateScreen.activeSelf - || dictScreen.activeSelf - || tutorialScreen.activeSelf; + return this.infoScreen.activeSelf + || this.translateScreen.activeSelf + || this.dictScreen.activeSelf + || this.tutorialScreen.activeSelf + || this.makersScreen.activeSelf; } public void hideScreen() { - playerManager.SetAvatarCollider(true); + setAvatarColliderState(true); randomAnimations.unlockFor(LOCK_ID); if (infoScreen.activeSelf) @@ -117,7 +120,7 @@ public class ScreenManager : MonoBehaviour { setPauseMenuState(true); } - playerManager.SetAvatarCollider(false); + setAvatarColliderState(false); randomAnimations.lockFor(LOCK_ID); if (screen == infoScreen) @@ -144,25 +147,32 @@ public class ScreenManager : MonoBehaviour { case "dict": return this.dictScreen; case "info": return this.infoScreen; case "tutorial": return this.tutorialScreen; + case "makers": return this.makersScreen; } return null; } - public void setPauseMenuState(bool enabled) { - this.pauseMenu.SetActive(enabled); + public void setPauseMenuState(bool active) + { + if (this.pauseMenu.activeSelf != active) + this.pauseMenu.SetActive(active); } - public void setLoadingSnippetState(bool state) { - this.loadingSnippet.SetActive(state); + public void setLoadingSnippetState(bool active) + { + this.loadingSnippet.SetActive(active); + + if (active && this.pauseMenu.activeSelf) + this.pauseMenu.SetActive(false); } public void showConnectionErrorDialog() { this.connectionErrorDialog.SetActive(true); } - public void switchToMakersScreen() { - switchScreen(this.makersScreen); + public void setAvatarColliderState(bool active) { + this.avatarCollider.enabled = active; } } diff --git a/Assets/Scripts/UI/TutorialManager.cs b/Assets/Scripts/UI/TutorialManager.cs index ec8fe2e..c00627f 100644 --- a/Assets/Scripts/UI/TutorialManager.cs +++ b/Assets/Scripts/UI/TutorialManager.cs @@ -75,7 +75,7 @@ public class TutorialManager : MonoBehaviour { if (index == 5) { //this.gameObject.SetActive(false); - this.screenManager.switchToMakersScreen(); + this.screenManager.switchScreen("makers"); select(0); } -- libgit2 0.21.2