From 1d4fdfab23d5c103ff200d54d1831ab0f68606d6 Mon Sep 17 00:00:00 2001 From: Parkillhwan Date: Thu, 20 Mar 2025 17:41:22 +0900 Subject: [PATCH] =?UTF-8?q?Revert=20"DO-16=20=EB=9E=AD=ED=82=B9=20?= =?UTF-8?q?=EB=B0=B1=20=EB=B2=84=ED=8A=BC,=20=EC=8A=A4=ED=81=AC=EB=A1=A4?= =?UTF-8?q?=20=EB=B0=94=20=EC=B6=94=EA=B0=80"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 9a590f18f6676899f30f167725b3f311b7acbd9d. --- .../Prefabs/Panels/LeaderboardPanel.prefab | 173 ++++++++++-------- .../Prefabs/Panels/Main Panel.prefab | 2 +- .../Prefabs/Panels/Ranking Panel.prefab | 2 +- Assets/Resources/Prefabs/Ranking.prefab | 2 +- 4 files changed, 103 insertions(+), 76 deletions(-) diff --git a/Assets/Resources/Prefabs/Panels/LeaderboardPanel.prefab b/Assets/Resources/Prefabs/Panels/LeaderboardPanel.prefab index f23839d..50adf35 100644 --- a/Assets/Resources/Prefabs/Panels/LeaderboardPanel.prefab +++ b/Assets/Resources/Prefabs/Panels/LeaderboardPanel.prefab @@ -12,6 +12,8 @@ GameObject: - component: {fileID: 2911450618660204948} - component: {fileID: 2729261171078307673} - component: {fileID: 4465141290128179683} + - component: {fileID: 2835505888941074797} + - component: {fileID: 5687316735128766768} m_Layer: 5 m_Name: Viewport m_TagString: Untagged @@ -35,7 +37,7 @@ RectTransform: m_Father: {fileID: 1188344226235047902} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {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: 0, y: 1} @@ -90,6 +92,46 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ShowMaskGraphic: 1 +--- !u!114 &2835505888941074797 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1858212639388121281} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 1 + m_VerticalFit: 2 +--- !u!114 &5687316735128766768 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1858212639388121281} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 5 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &2602607401298266001 GameObject: m_ObjectHideFlags: 0 @@ -126,7 +168,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 40, y: -40} - m_SizeDelta: {x: 73, y: 72} + m_SizeDelta: {x: 36, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6169341149558268219 CanvasRenderer: @@ -156,7 +198,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 2f19224efc36c9b49978cafd03ede1bb, type: 3} + m_Sprite: {fileID: 21300000, guid: 427761ad91f2d9d4e85af2f6a2894218, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -210,7 +252,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1589736077307570888} + - m_Target: {fileID: 0} m_TargetAssemblyTypeName: LeaderBoardController, Assembly-CSharp m_MethodName: OnBackButtonClicked m_Mode: 1 @@ -319,14 +361,14 @@ MonoBehaviour: m_Elasticity: 0.1 m_Inertia: 1 m_DecelerationRate: 0.135 - m_ScrollSensitivity: 100 + m_ScrollSensitivity: 1 m_Viewport: {fileID: 8740302936727227434} m_HorizontalScrollbar: {fileID: 0} m_VerticalScrollbar: {fileID: 3478506922544614059} m_HorizontalScrollbarVisibility: 2 m_VerticalScrollbarVisibility: 2 m_HorizontalScrollbarSpacing: -3 - m_VerticalScrollbarSpacing: -15 + m_VerticalScrollbarSpacing: -3 m_OnValueChanged: m_PersistentCalls: m_Calls: [] @@ -481,7 +523,6 @@ GameObject: m_Component: - component: {fileID: 227489081374553986} - component: {fileID: 6416582684501908282} - - component: {fileID: 2816695216852066709} m_Layer: 5 m_Name: Content m_TagString: Untagged @@ -503,10 +544,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8740302936727227434} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1060, y: 1493.8} m_Pivot: {x: 0, y: 1} --- !u!114 &6416582684501908282 MonoBehaviour: @@ -529,25 +570,11 @@ MonoBehaviour: m_Spacing: 50 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 ---- !u!114 &2816695216852066709 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3568653418969612126} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 1 - m_VerticalFit: 2 --- !u!1 &4202334049855500581 GameObject: m_ObjectHideFlags: 0 @@ -606,7 +633,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.2847969, b: 0, a: 1} + m_Color: {r: 1, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -632,9 +659,9 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2084150948806744478} + - component: {fileID: 7465938882283913230} + - component: {fileID: 1080045383039686757} - component: {fileID: 3478506922544614059} - - component: {fileID: 6301460630123320729} - - component: {fileID: 1849839432792571899} m_Layer: 5 m_Name: Scrollbar Vertical m_TagString: Untagged @@ -660,8 +687,46 @@ RectTransform: m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 0} + m_SizeDelta: {x: 20, y: -17} m_Pivot: {x: 1, y: 1} +--- !u!222 &7465938882283913230 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5452094549188284008} + m_CullTransparentMesh: 1 +--- !u!114 &1080045383039686757 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5452094549188284008} + 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, 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: 0} + m_Type: 1 + 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 &3478506922544614059 MonoBehaviour: m_ObjectHideFlags: 0 @@ -683,10 +748,10 @@ MonoBehaviour: m_SelectOnRight: {fileID: 0} m_Transition: 1 m_Colors: - m_NormalColor: {r: 1, g: 0.28627452, b: 0, a: 1} + m_NormalColor: {r: 1, g: 0.55039775, b: 0, a: 1} m_HighlightedColor: {r: 1, g: 0, b: 0, a: 1} - m_PressedColor: {r: 0.93710685, g: 0.33299702, b: 0.33299702, a: 1} - m_SelectedColor: {r: 0.8409424, g: 0.9685534, b: 0.57564956, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 m_FadeDuration: 0.1 @@ -711,44 +776,6 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] ---- !u!222 &6301460630123320729 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5452094549188284008} - m_CullTransparentMesh: 1 ---- !u!114 &1849839432792571899 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5452094549188284008} - 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: 0.59607846} - 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: 1 - 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 &6747908716986530392 GameObject: m_ObjectHideFlags: 0 @@ -783,7 +810,7 @@ RectTransform: 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_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7787380462476439032 GameObject: diff --git a/Assets/Resources/Prefabs/Panels/Main Panel.prefab b/Assets/Resources/Prefabs/Panels/Main Panel.prefab index da3a302..9a6246d 100644 --- a/Assets/Resources/Prefabs/Panels/Main Panel.prefab +++ b/Assets/Resources/Prefabs/Panels/Main Panel.prefab @@ -1714,7 +1714,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: name + m_text: "\uBC15\uC77C\uD658" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2} m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, type: 2} diff --git a/Assets/Resources/Prefabs/Panels/Ranking Panel.prefab b/Assets/Resources/Prefabs/Panels/Ranking Panel.prefab index df9733e..06a872f 100644 --- a/Assets/Resources/Prefabs/Panels/Ranking Panel.prefab +++ b/Assets/Resources/Prefabs/Panels/Ranking Panel.prefab @@ -545,7 +545,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -392, y: -0.6867676} + m_AnchoredPosition: {x: -392, y: -2.9951172} m_SizeDelta: {x: 784, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &5526954107552917871 diff --git a/Assets/Resources/Prefabs/Ranking.prefab b/Assets/Resources/Prefabs/Ranking.prefab index 38a4ab3..fc24199 100644 --- a/Assets/Resources/Prefabs/Ranking.prefab +++ b/Assets/Resources/Prefabs/Ranking.prefab @@ -1185,7 +1185,7 @@ MonoBehaviour: m_Right: 0 m_Top: 30 m_Bottom: 35 - m_ChildAlignment: 3 + m_ChildAlignment: 0 m_Spacing: 0 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1