diff --git a/Client/Assets/Resources/Prefabs/UI/Popup/UI_Lobby.prefab b/Client/Assets/Resources/Prefabs/UI/Popup/UI_Lobby.prefab index dd31aeb161..8e8641e838 100644 --- a/Client/Assets/Resources/Prefabs/UI/Popup/UI_Lobby.prefab +++ b/Client/Assets/Resources/Prefabs/UI/Popup/UI_Lobby.prefab @@ -1221,6 +1221,193 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_renderer: {fileID: 3989861217343820854} m_maskType: 0 +--- !u!1 &4331411678385100476 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6640169641802309154} + - component: {fileID: 8478029794862825873} + - component: {fileID: 7299377812615405431} + - component: {fileID: 6290351527859106962} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6640169641802309154 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4331411678385100476} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1697421417279355726} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.000061035156, y: -3.9999924} + m_SizeDelta: {x: -31.9, y: -22.6} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!23 &8478029794862825873 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4331411678385100476} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 + m_Materials: + - {fileID: 21809785584020342, guid: 0b65c99348f068b49bef5db0bb76a6e4, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &7299377812615405431 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4331411678385100476} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Game Tutorial + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 0b65c99348f068b49bef5db0bb76a6e4, type: 2} + m_sharedMaterial: {fileID: 21809785584020342, guid: 0b65c99348f068b49bef5db0bb76a6e4, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 400 + m_fontSizeBase: 400 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 4096 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 8478029794862825873} + m_maskType: 0 +--- !u!114 &6290351527859106962 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4331411678385100476} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e4870c7d0bdddd644a64ab8bc98f83ba, type: 3} + m_Name: + m_EditorClassIdentifier: + themeController: {fileID: 11400000, guid: e00c7d2bc58a2424b8dc09ecdafdb067, type: 2} + hasImage: 0 + isText: 1 --- !u!1 &4438479117411909143 GameObject: m_ObjectHideFlags: 0 @@ -1602,6 +1789,173 @@ MonoBehaviour: m_isRichTextEditingAllowed: 0 m_LineLimit: 0 m_InputValidator: {fileID: 0} +--- !u!1 &4838545182556263800 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1697421417279355726} + - component: {fileID: 5720622962412268167} + - component: {fileID: 1473397692796460974} + - component: {fileID: 9101871486830315579} + - component: {fileID: 4309577063415052153} + - component: {fileID: 8184727493518866067} + m_Layer: 5 + m_Name: Btn_GameTutorial + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1697421417279355726 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4838545182556263800} + m_LocalRotation: {x: -0, y: -0, z: 1.1641532e-10, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.00002980232} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6640169641802309154} + m_Father: {fileID: 8957683470639851676} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 77.3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5720622962412268167 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4838545182556263800} + m_CullTransparentMesh: 0 +--- !u!114 &1473397692796460974 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4838545182556263800} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0.6862745, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: a8292d7c3170a7348accf3d85c0e7359, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &9101871486830315579 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4838545182556263800} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 0 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 2 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.7169812, g: 0.7169812, b: 0.7169812, a: 1} + m_PressedColor: {r: 0.49056602, g: 0.49056602, b: 0.49056602, a: 1} + m_SelectedColor: {r: 0.7169812, g: 0.7169812, b: 0.7169812, a: 1} + m_DisabledColor: {r: 0.26415092, g: 0.26415092, b: 0.26415092, a: 0.11764706} + m_ColorMultiplier: 1 + m_FadeDuration: 0.05 + m_SpriteState: + m_HighlightedSprite: {fileID: 21300000, guid: a4fde6e0b21dc224d813ee493157874f, type: 3} + m_PressedSprite: {fileID: 21300000, guid: e5a390d359542f845bd18b3970c5eff3, type: 3} + m_SelectedSprite: {fileID: 21300000, guid: a4fde6e0b21dc224d813ee493157874f, type: 3} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Highlighted + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1473397692796460974} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &4309577063415052153 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4838545182556263800} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 0 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: + m_MethodName: PlayHover + 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 +--- !u!114 &8184727493518866067 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4838545182556263800} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e4870c7d0bdddd644a64ab8bc98f83ba, type: 3} + m_Name: + m_EditorClassIdentifier: + themeController: {fileID: 11400000, guid: e00c7d2bc58a2424b8dc09ecdafdb067, type: 2} + hasImage: 1 + isText: 0 --- !u!1 &5675815985082143341 GameObject: m_ObjectHideFlags: 0 @@ -2690,11 +3044,12 @@ RectTransform: - {fileID: 1023245837755421318} - {fileID: 1465000354078030855} - {fileID: 3120333899345481715} + - {fileID: 1697421417279355726} m_Father: {fileID: 1133780434038183659} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -522.4, y: 368.3} + m_AnchoredPosition: {x: -522.4, y: 517.4} m_SizeDelta: {x: 360, y: 262} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3236452343860603818 diff --git a/Client/Assets/Resources/Prefabs/UI/WorldSpace/UI_LobbyController.prefab b/Client/Assets/Resources/Prefabs/UI/WorldSpace/UI_LobbyController.prefab index 60126b6fd6..96afe90f10 100644 --- a/Client/Assets/Resources/Prefabs/UI/WorldSpace/UI_LobbyController.prefab +++ b/Client/Assets/Resources/Prefabs/UI/WorldSpace/UI_LobbyController.prefab @@ -438,6 +438,173 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!1 &307995232675274289 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2900374389301404373} + - component: {fileID: 5782762776742486580} + - component: {fileID: 4712626952924408333} + - component: {fileID: 7739899617205382442} + - component: {fileID: 5030408011205639705} + - component: {fileID: 3554067309097480798} + m_Layer: 5 + m_Name: Btn_Credit + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2900374389301404373 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 307995232675274289} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2784352984981734209} + m_Father: {fileID: 7230166337123955069} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 77.3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5782762776742486580 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 307995232675274289} + m_CullTransparentMesh: 0 +--- !u!114 &4712626952924408333 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 307995232675274289} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0.6862745, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: a8292d7c3170a7348accf3d85c0e7359, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &7739899617205382442 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 307995232675274289} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 0 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 2 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.7169812, g: 0.7169812, b: 0.7169812, a: 1} + m_PressedColor: {r: 0.49056602, g: 0.49056602, b: 0.49056602, a: 1} + m_SelectedColor: {r: 0.7169812, g: 0.7169812, b: 0.7169812, a: 1} + m_DisabledColor: {r: 0.26415092, g: 0.26415092, b: 0.26415092, a: 0.11764706} + m_ColorMultiplier: 1 + m_FadeDuration: 0.05 + m_SpriteState: + m_HighlightedSprite: {fileID: 21300000, guid: a4fde6e0b21dc224d813ee493157874f, type: 3} + m_PressedSprite: {fileID: 21300000, guid: e5a390d359542f845bd18b3970c5eff3, type: 3} + m_SelectedSprite: {fileID: 21300000, guid: a4fde6e0b21dc224d813ee493157874f, type: 3} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Highlighted + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 4712626952924408333} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: + m_MethodName: PlayCampaign + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: IntroCinematic + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &5030408011205639705 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 307995232675274289} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 0 + callback: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &3554067309097480798 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 307995232675274289} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e4870c7d0bdddd644a64ab8bc98f83ba, type: 3} + m_Name: + m_EditorClassIdentifier: + themeController: {fileID: 11400000, guid: e00c7d2bc58a2424b8dc09ecdafdb067, type: 2} + hasImage: 1 + isText: 0 --- !u!1 &412239207655262158 GameObject: m_ObjectHideFlags: 0 @@ -982,7 +1149,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 158.1, y: -164.00008} + m_AnchoredPosition: {x: 158.1, y: -176.2} m_SizeDelta: {x: 140.8, y: 43.895} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3309775770556531199 @@ -3159,6 +3326,193 @@ MonoBehaviour: themeController: {fileID: 11400000, guid: e00c7d2bc58a2424b8dc09ecdafdb067, type: 2} hasImage: 1 isText: 0 +--- !u!1 &1416543172065519320 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2784352984981734209} + - component: {fileID: 8091043997160005586} + - component: {fileID: 3924805475270136013} + - component: {fileID: 4341775525550945347} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2784352984981734209 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1416543172065519320} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2900374389301404373} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.000061035156, y: -4} + m_SizeDelta: {x: -31.9, y: -22.6} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!23 &8091043997160005586 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1416543172065519320} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 + m_Materials: + - {fileID: 21809785584020342, guid: 0b65c99348f068b49bef5db0bb76a6e4, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &3924805475270136013 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1416543172065519320} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Credit + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 0b65c99348f068b49bef5db0bb76a6e4, type: 2} + m_sharedMaterial: {fileID: 21809785584020342, guid: 0b65c99348f068b49bef5db0bb76a6e4, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 400 + m_fontSizeBase: 400 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 4096 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 8091043997160005586} + m_maskType: 0 +--- !u!114 &4341775525550945347 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1416543172065519320} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e4870c7d0bdddd644a64ab8bc98f83ba, type: 3} + m_Name: + m_EditorClassIdentifier: + themeController: {fileID: 11400000, guid: e00c7d2bc58a2424b8dc09ecdafdb067, type: 2} + hasImage: 0 + isText: 1 --- !u!1 &1503821548427758625 GameObject: m_ObjectHideFlags: 0 @@ -3637,7 +3991,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -219.40005, y: -137.4} + m_AnchoredPosition: {x: -219.40005, y: -147.1} m_SizeDelta: {x: 56.1, y: 56.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4463401436015918626 @@ -12342,12 +12696,13 @@ RectTransform: - {fileID: 6340460835501725980} - {fileID: 464368535415374179} - {fileID: 5897129122861968451} + - {fileID: 2900374389301404373} - {fileID: 5424237462197944828} m_Father: {fileID: 5612959573203458588} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 114.5} + m_AnchoredPosition: {x: 0, y: 96.1} m_SizeDelta: {x: 457, y: 513} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3942407438679267310 @@ -14517,7 +14872,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90.00001} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -244.70041, y: -47.399925} + m_AnchoredPosition: {x: -244.70041, y: -56.2} m_SizeDelta: {x: 104.29, y: 32.52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5078034033045305328 diff --git a/Client/Assets/Resources/Prefabs/UI/WorldSpace/UI_NameTag.prefab b/Client/Assets/Resources/Prefabs/UI/WorldSpace/UI_NameTag.prefab index db919d77d9..f0a8bcb4f0 100644 --- a/Client/Assets/Resources/Prefabs/UI/WorldSpace/UI_NameTag.prefab +++ b/Client/Assets/Resources/Prefabs/UI/WorldSpace/UI_NameTag.prefab @@ -219,7 +219,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 1 + m_PresetInfoIsWorld: 0 --- !u!114 &4210145973067032045 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Client/Assets/Scenes/LobbyScene.unity b/Client/Assets/Scenes/LobbyScene.unity index 27f3982790..cee0d12383 100644 --- a/Client/Assets/Scenes/LobbyScene.unity +++ b/Client/Assets/Scenes/LobbyScene.unity @@ -123,6 +123,53 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &316468524 +GameObject: + m_ObjectHideFlags: 8 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 316468526} + - component: {fileID: 316468525} + m_Layer: 0 + m_Name: Fusion_PhotonBackgroundConnectionHandler + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &316468525 +MonoBehaviour: + m_ObjectHideFlags: 8 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 316468524} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1222927710, guid: 7de3b8b9e1263ad479e2d0c4261b7646, type: 3} + m_Name: + m_EditorClassIdentifier: + DisconnectAfterKeepAlive: 0 + KeepAliveInBackground: 60000 + ApplyDontDestroyOnLoad: 1 +--- !u!4 &316468526 +Transform: + m_ObjectHideFlags: 8 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 316468524} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &857381977 GameObject: m_ObjectHideFlags: 1 @@ -432,6 +479,26 @@ PrefabInstance: propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 464368535415374179, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 464368535415374179, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 464368535415374179, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 464368535415374179, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 464368535415374179, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 466914539720844741, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -468,6 +535,26 @@ PrefabInstance: propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 2900374389301404373, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2900374389301404373, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2900374389301404373, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2900374389301404373, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2900374389301404373, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2988376792748448426, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -512,10 +599,122 @@ PrefabInstance: propertyPath: m_Name value: UI_LobbyController objectReference: {fileID: 0} + - target: {fileID: 4331961526646302238, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4331961526646302238, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4331961526646302238, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4331961526646302238, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4556837811718761772, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4556837811718761772, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4556837811718761772, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4556837811718761772, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5424237462197944828, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5424237462197944828, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5424237462197944828, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5424237462197944828, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5424237462197944828, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5897129122861968451, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5897129122861968451, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5897129122861968451, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5897129122861968451, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5897129122861968451, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6335667850849267601, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} propertyPath: m_Camera value: objectReference: {fileID: 1927752680451546957} + - target: {fileID: 6340460835501725980, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6340460835501725980, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6340460835501725980, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6340460835501725980, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6340460835501725980, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6745988065969898044, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6745988065969898044, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6745988065969898044, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6745988065969898044, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6745988065969898044, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8405222892225819197, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} propertyPath: m_Camera value: @@ -582,12 +781,18 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 6725219249098563249, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} insertIndex: -1 addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 6473156088478886136, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} - targetCorrespondingSourceObject: {fileID: 6800760803472516193, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} insertIndex: -1 addedObject: {fileID: 0} - targetCorrespondingSourceObject: {fileID: 3944118695192308725, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} insertIndex: -1 addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 1416543172065519320, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} - targetCorrespondingSourceObject: {fileID: 1057408873562476025, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} insertIndex: -1 addedObject: {fileID: 0} @@ -889,3 +1094,4 @@ SceneRoots: - {fileID: 8338188522265301179} - {fileID: 2062673589} - {fileID: 1636694469} + - {fileID: 316468526} diff --git a/Client/Assets/Scripts/UI/Popup/UI_Lobby.cs b/Client/Assets/Scripts/UI/Popup/UI_Lobby.cs index e1b3ac94cb..f1299b519a 100644 --- a/Client/Assets/Scripts/UI/Popup/UI_Lobby.cs +++ b/Client/Assets/Scripts/UI/Popup/UI_Lobby.cs @@ -17,6 +17,7 @@ public enum Buttons Btn_QuickStart, Btn_CreateGame, Btn_RefreshSession, + Btn_GameTutorial, } #endregion diff --git a/Client/Assets/Scripts/UI/WorldScene/UI_LobbyController.cs b/Client/Assets/Scripts/UI/WorldScene/UI_LobbyController.cs index e372d68a95..4672f82464 100644 --- a/Client/Assets/Scripts/UI/WorldScene/UI_LobbyController.cs +++ b/Client/Assets/Scripts/UI/WorldScene/UI_LobbyController.cs @@ -23,6 +23,7 @@ enum Buttons Btn_PlayCampaign, Btn_Settings, Btn_Manual, + Btn_Credit, Btn_Exit, Btn_No1, Btn_Yes, @@ -134,6 +135,7 @@ public void ReturnMenu() public void DisablePlayCampaign() { GetObject(GameObjects.PLAY).SetActive(false); + GetObject(GameObjects.TITLE).SetActive(true); } public void Position3() @@ -166,7 +168,7 @@ public void AreYouSure() GetObject(GameObjects.TITLE).SetActive(false); GetObject(GameObjects.EXIT).SetActive(true); if (GetObject(GameObjects.EXTRAS)) GetObject(GameObjects.EXTRAS).SetActive(false); - DisablePlayCampaign(); + GetObject(GameObjects.PLAY).SetActive(false); } public void AreYouSureMobile()