From 35af44746d8a944e5686524b586f0d0c03dfecc2 Mon Sep 17 00:00:00 2001 From: "aube.lee" Date: Thu, 6 Feb 2025 09:59:56 +0900 Subject: [PATCH] =?UTF-8?q?Lobby=20=ED=99=94=EB=A9=B4=20=EB=A1=9C=EC=A7=81?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Prefabs/UI.ControllerUI.prefab | 2 +- .../Resources/UI/Prefabs/UI.LobbyUI.prefab | 91 +++---------------- .../Gameton/Scripts/Scenes/LobbyScene.cs | 1 + 3 files changed, 17 insertions(+), 77 deletions(-) diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.ControllerUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.ControllerUI.prefab index b502093c..547cd81b 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.ControllerUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.ControllerUI.prefab @@ -1231,7 +1231,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5426365777429535360, guid: 74ca7c3222561dd4dab5958919043890, type: 3} propertyPath: m_SizeDelta.x - value: 3 + value: 60 objectReference: {fileID: 0} - target: {fileID: 5426365777429535360, guid: 74ca7c3222561dd4dab5958919043890, type: 3} propertyPath: m_SizeDelta.y diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.LobbyUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.LobbyUI.prefab index 9e5a7637..abb6da3c 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.LobbyUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.LobbyUI.prefab @@ -31,7 +31,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1001943842854362005} - {fileID: 7502180910464997380} - {fileID: 4787408545320779924} m_Father: {fileID: 5365961854246093496} @@ -1600,6 +1599,7 @@ GameObject: - component: {fileID: 9014045883693178906} - component: {fileID: 7145297699415996833} - component: {fileID: 5452489438995333470} + - component: {fileID: 3958569548250701148} m_Layer: 5 m_Name: Background m_TagString: Untagged @@ -1664,6 +1664,20 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &3958569548250701148 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5311323319972475408} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} + m_Name: + m_EditorClassIdentifier: + radius: 60 + image: {fileID: 5452489438995333470} --- !u!1 &5334848568038522521 GameObject: m_ObjectHideFlags: 0 @@ -2311,81 +2325,6 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] ---- !u!1 &7459885933646046812 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1001943842854362005} - - component: {fileID: 530154713718636374} - - component: {fileID: 725323473058646783} - m_Layer: 5 - m_Name: GameObject - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1001943842854362005 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7459885933646046812} - 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: 4396814966004432854} - 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: 300, y: 140} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &530154713718636374 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7459885933646046812} - m_CullTransparentMesh: 1 ---- !u!114 &725323473058646783 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7459885933646046812} - 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: 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_Sprite: {fileID: 0} - 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!1 &8480312471825142219 GameObject: m_ObjectHideFlags: 0 diff --git a/Gameton-06/Assets/Gameton/Scripts/Scenes/LobbyScene.cs b/Gameton-06/Assets/Gameton/Scripts/Scenes/LobbyScene.cs index 6f6ef549..ca943b3b 100644 --- a/Gameton-06/Assets/Gameton/Scripts/Scenes/LobbyScene.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Scenes/LobbyScene.cs @@ -22,6 +22,7 @@ namespace TON } UIManager.Show(UIList.LobbyUI); + UIManager.Show(UIList.IngameOptionUI); // UIManager.Show(UIList.ControllerUI); // PlayerSpawner.SpawnPlayerCharacter(); }