diff --git a/Assets/01.Scenes/99.Tycoon_LMG.unity b/Assets/01.Scenes/99.Tycoon_LMG.unity index 4533e9dbe..7a8f6ead5 100644 --- a/Assets/01.Scenes/99.Tycoon_LMG.unity +++ b/Assets/01.Scenes/99.Tycoon_LMG.unity @@ -846,6 +846,7 @@ RectTransform: - {fileID: 102754989} - {fileID: 1975218146} - {fileID: 1793827945} + - {fileID: 2014397142} m_Father: {fileID: 167369645} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -3880,8 +3881,10 @@ MonoBehaviour: m_uiInputField: {fileID: 0} m_textMeshProInputField: {fileID: 1793827946} content: {fileID: 1962520164} + _enterButton: {fileID: 1723713063} _mainMenuButton: {fileID: 2058300004} _restartButton: {fileID: 102754986} + _greatText: {fileID: 2014397143} --- !u!1 &168822461 GameObject: m_ObjectHideFlags: 0 @@ -32463,8 +32466,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 683, y: -103} - m_SizeDelta: {x: -1568, y: -995} + m_AnchoredPosition: {x: 683, y: -100} + m_SizeDelta: {x: -1568, y: -1000} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1723713063 MonoBehaviour: @@ -33755,8 +33758,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 678, y: 36} - m_SizeDelta: {x: -1420, y: -990} + m_AnchoredPosition: {x: 678, y: 35.5} + m_SizeDelta: {x: -1420, y: -991} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1793827946 MonoBehaviour: @@ -37985,6 +37988,142 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2002396856} m_CullTransparentMesh: 1 +--- !u!1 &2014397141 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2014397142} + - component: {fileID: 2014397144} + - component: {fileID: 2014397143} + m_Layer: 5 + m_Name: GreatText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2014397142 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2014397141} + 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: 25012553} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 680, y: -100} + m_SizeDelta: {x: -1570, y: -1005} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2014397143 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2014397141} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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: Great!! + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2} + m_sharedMaterial: {fileID: 1328173432319114220, guid: 2f35c40df3d2a1a41b57c8b9eca40913, 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: 60 + m_fontSizeBase: 60 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &2014397144 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2014397141} + m_CullTransparentMesh: 1 --- !u!1 &2015843366 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/02.Scripts/Ui/Tycoon/RankUi.cs b/Assets/02.Scripts/Ui/Tycoon/RankUi.cs index 6256e3284..88ed944d7 100644 --- a/Assets/02.Scripts/Ui/Tycoon/RankUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/RankUi.cs @@ -8,6 +8,7 @@ using PixelCrushers; using UnityEngine; using Sirenix.OdinInspector; using TMPro; +using Unity.VisualScripting; using UnityEngine.UI; using UnityEngine.UIElements; using Button = UnityEngine.UI.Button; @@ -31,12 +32,19 @@ namespace BlueWater [SerializeField] public RectTransform content; // ScrollRect의 Content; + [SerializeField] + private Button _enterButton; + [SerializeField] private Button _mainMenuButton; [SerializeField] private Button _restartButton; + [SerializeField] + private TextMeshProUGUI _greatText; + + private FirebaseManager _firebaseManager; private bool _rankOpen = false; @@ -101,6 +109,10 @@ namespace BlueWater public void SetName() { + nameTextField.textMeshProInputField.interactable = false; + _enterButton.gameObject.SetActive(false); + _greatText.gameObject.SetActive(true); + if (_rankOpen && !yourRank.text.Equals("101")) { _firebaseManager.WirteUserDataName(nameTextField.text);