diff --git a/Assets/JAY/Main-Jay.unity b/Assets/JAY/Main-Jay.unity index 7d25dbd..a5a677d 100644 --- a/Assets/JAY/Main-Jay.unity +++ b/Assets/JAY/Main-Jay.unity @@ -178,7 +178,6 @@ GameObject: m_Component: - component: {fileID: 271965289} - component: {fileID: 271965290} - - component: {fileID: 271965292} m_Layer: 0 m_Name: GameManager m_TagString: Untagged @@ -471,6 +470,231 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1545261105 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1867732347} + m_Modifications: + - target: {fileID: 180756268084732627, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 180756268084732627, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 180756268084732627, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 180756268084732627, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 713532354933724924, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 713532354933724924, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 713532354933724924, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1545261107} + - target: {fileID: 713532354933724924, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 713532354933724924, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: OnClickGameStart + objectReference: {fileID: 0} + - target: {fileID: 713532354933724924, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: MainPanelController, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 713532354933724924, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 4282069284025755619, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4733773333797619672, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4733773333797619672, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4733773333797619672, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4733773333797619672, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5033979732381400892, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5033979732381400892, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5033979732381400892, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5033979732381400892, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8446481687955831510, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8446481687955831510, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8446481687955831510, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8446481687955831510, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8564394481744056992, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_Name + value: Main Panel + objectReference: {fileID: 0} + - target: {fileID: 8768541925252566370, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8768541925252566370, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8768541925252566370, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8768541925252566370, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e1835a90a4d722a4b99be61179de8789, type: 3} +--- !u!224 &1545261106 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + m_PrefabInstance: {fileID: 1545261105} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1545261107 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7488082087611091670, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + m_PrefabInstance: {fileID: 1545261105} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b4dc3fd9e59f47df80e344680d1b9803, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1867732343 GameObject: m_ObjectHideFlags: 0 @@ -548,7 +772,7 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 25 + m_AdditionalShaderChannelsFlag: 0 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 diff --git a/Assets/KJM/ShopTest/MainPanelButtonController.cs b/Assets/KJM/ShopTest/MainPanelButtonController.cs index b7845c9..fb512e9 100644 --- a/Assets/KJM/ShopTest/MainPanelButtonController.cs +++ b/Assets/KJM/ShopTest/MainPanelButtonController.cs @@ -38,9 +38,4 @@ public class MainPanelButtonController : MonoBehaviour { GameManager.Instance.panelManager.OpenReplayPanel(); } - - public void OpenRankingPanelClick() - { - GameManager.Instance.panelManager.OnRankingPanelClick(); - } } diff --git a/Assets/Resources/Prefabs/Panels/LeaderboardPanel.prefab b/Assets/Resources/Prefabs/Panels/LeaderboardPanel.prefab index 50adf35..f23839d 100644 --- a/Assets/Resources/Prefabs/Panels/LeaderboardPanel.prefab +++ b/Assets/Resources/Prefabs/Panels/LeaderboardPanel.prefab @@ -12,8 +12,6 @@ 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 @@ -37,7 +35,7 @@ RectTransform: m_Father: {fileID: 1188344226235047902} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} @@ -92,46 +90,6 @@ 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 @@ -168,7 +126,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 40, y: -40} - m_SizeDelta: {x: 36, y: 40} + m_SizeDelta: {x: 73, y: 72} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6169341149558268219 CanvasRenderer: @@ -198,7 +156,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 427761ad91f2d9d4e85af2f6a2894218, type: 3} + m_Sprite: {fileID: 21300000, guid: 2f19224efc36c9b49978cafd03ede1bb, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -252,7 +210,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} + - m_Target: {fileID: 1589736077307570888} m_TargetAssemblyTypeName: LeaderBoardController, Assembly-CSharp m_MethodName: OnBackButtonClicked m_Mode: 1 @@ -361,14 +319,14 @@ MonoBehaviour: m_Elasticity: 0.1 m_Inertia: 1 m_DecelerationRate: 0.135 - m_ScrollSensitivity: 1 + m_ScrollSensitivity: 100 m_Viewport: {fileID: 8740302936727227434} m_HorizontalScrollbar: {fileID: 0} m_VerticalScrollbar: {fileID: 3478506922544614059} m_HorizontalScrollbarVisibility: 2 m_VerticalScrollbarVisibility: 2 m_HorizontalScrollbarSpacing: -3 - m_VerticalScrollbarSpacing: -3 + m_VerticalScrollbarSpacing: -15 m_OnValueChanged: m_PersistentCalls: m_Calls: [] @@ -523,6 +481,7 @@ GameObject: m_Component: - component: {fileID: 227489081374553986} - component: {fileID: 6416582684501908282} + - component: {fileID: 2816695216852066709} m_Layer: 5 m_Name: Content m_TagString: Untagged @@ -544,10 +503,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8740302936727227434} 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: 1060, y: 1493.8} + 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_Pivot: {x: 0, y: 1} --- !u!114 &6416582684501908282 MonoBehaviour: @@ -570,11 +529,25 @@ MonoBehaviour: m_Spacing: 50 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 1 - m_ChildControlHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 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 @@ -633,7 +606,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0, b: 0, a: 1} + m_Color: {r: 1, g: 0.2847969, b: 0, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -659,9 +632,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 @@ -687,46 +660,8 @@ RectTransform: m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: -17} + m_SizeDelta: {x: 20, y: 0} 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 @@ -748,10 +683,10 @@ MonoBehaviour: m_SelectOnRight: {fileID: 0} m_Transition: 1 m_Colors: - m_NormalColor: {r: 1, g: 0.55039775, b: 0, a: 1} + m_NormalColor: {r: 1, g: 0.28627452, b: 0, a: 1} m_HighlightedColor: {r: 1, g: 0, b: 0, 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_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_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 m_FadeDuration: 0.1 @@ -776,6 +711,44 @@ 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 @@ -810,7 +783,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -20, y: -20} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7787380462476439032 GameObject: diff --git a/Assets/Resources/Prefabs/Panels/Ranking Panel.prefab b/Assets/Resources/Prefabs/Panels/Ranking Panel.prefab index 06a872f..df9733e 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: -2.9951172} + m_AnchoredPosition: {x: -392, y: -0.6867676} 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 fc24199..38a4ab3 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: 0 + m_ChildAlignment: 3 m_Spacing: 0 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 diff --git a/Assets/Script/Common/ScrollItem/LeaderboardItem.cs b/Assets/Script/Common/ScrollItem/LeaderboardItem.cs deleted file mode 100644 index 0471a32..0000000 --- a/Assets/Script/Common/ScrollItem/LeaderboardItem.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -[System.Serializable] -public class LeaderboardItem -{ - public string nickname; - public int score; - public float winRate; - public int win; - public int lose; - public int totalGames; - public Sprite profileImage; // 사용자 프로필 이미지 -} diff --git a/Assets/Script/Common/ScrollItem/LeaderboardItem.cs.meta b/Assets/Script/Common/ScrollItem/LeaderboardItem.cs.meta deleted file mode 100644 index 435aea7..0000000 --- a/Assets/Script/Common/ScrollItem/LeaderboardItem.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: a238bcb53de9b72429a5407ca01d5e3e -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/Common/ScrollItem/RankingItem.cs b/Assets/Script/Common/ScrollItem/RankingItem.cs index b142d03..cee7303 100644 --- a/Assets/Script/Common/ScrollItem/RankingItem.cs +++ b/Assets/Script/Common/ScrollItem/RankingItem.cs @@ -8,4 +8,4 @@ public class RankingItem public string Name; public float WinRate; -} \ No newline at end of file +} diff --git a/Assets/Script/Common/ScrollItem/RankingItem.cs.meta b/Assets/Script/Common/ScrollItem/RankingItem.cs.meta index 86669ed..435aea7 100644 --- a/Assets/Script/Common/ScrollItem/RankingItem.cs.meta +++ b/Assets/Script/Common/ScrollItem/RankingItem.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b1c94bf9dc87d3c4ca6e8a47a2d6d0c4 +guid: a238bcb53de9b72429a5407ca01d5e3e MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Script/Main/LeaderBoardController.cs b/Assets/Script/Main/LeaderBoardController.cs deleted file mode 100644 index 5ee8ec6..0000000 --- a/Assets/Script/Main/LeaderBoardController.cs +++ /dev/null @@ -1,119 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.Networking; -using UnityEngine.UI; -using TMPro; - -public class LeaderBoardController : MonoBehaviour -{ - [SerializeField] private GameObject rankingPrefab; // Ranking 프리팹을 참조 (Horizontal Layout) - [SerializeField] private Transform content; // Vertical Layout Group - [SerializeField] private GameObject MainPanel; - [SerializeField] private GameObject leaderboardPanel; - [SerializeField] private Scrollbar verticalScrollbar;// LeaderboardPanel 참조 - - private bool isLeaderboardLoaded = false; - - private void Start() - { - OnClickLeaderboardButton(); - } - - public void OnClickLeaderboardButton() - { - if (isLeaderboardLoaded) return; // 이미 리더보드가 로드되었으면 중복 호출 방지 - - leaderboardPanel.SetActive(true); - StartCoroutine(GetLeaderboardData()); - isLeaderboardLoaded = true; - } - - private IEnumerator GetLeaderboardData() - { - string url = Constants.ServerURL + "/leaderboard"; // 서버의 리더보드 데이터 URL - - UnityWebRequest www = UnityWebRequest.Get(url); // GET 요청으로 데이터 받기 - yield return www.SendWebRequest(); // 요청 전송 대기 - - // 요청이 실패했을 때 - if (www.result == UnityWebRequest.Result.ConnectionError || www.result == UnityWebRequest.Result.ProtocolError) - { - Debug.LogError("Error: " + www.error); - } - else - { - // 성공적으로 데이터를 받아온 경우 - string jsonResponse = www.downloadHandler.text; // 응답으로 받은 JSON 데이터 - - // JSON을 ScoreInfo 리스트로 파싱 - ScoreListWrapper wrapper = JsonUtility.FromJson(jsonResponse); - List leaderboardItems = wrapper.scoreInfos; - - // Show 메서드를 통해 데이터를 표시 - Show(leaderboardItems); - } - } - - public void Show(List leaderboardItems) - { - // 기존 셀 삭제 (리스트가 갱신될 때마다) - foreach (Transform child in content) - { - Destroy(child.gameObject); - } - - // 받은 데이터로 셀 생성 - foreach (var item in leaderboardItems) - { - CreateCell(item); // 셀 생성 - } - } - - private void CreateCell(ScoreInfo item) - { - // Ranking 프리팹을 content의 자식으로 생성 - var scoreCellObj = Instantiate(rankingPrefab, content); - - // Ranking 프리팹에 포함된 ScoreCellController를 찾아서 설정 - var scoreCellController = scoreCellObj.GetComponent(); - - if (scoreCellController != null) - { - // 각 항목에 대한 UI 설정 - scoreCellController.SetCellInfo(item); // ScoreInfo로 셀 정보 설정 - } - else - { - Debug.LogError("ScoreCellController가 Ranking 프리팹에 없습니다."); - } - } - - // BackButton 클릭 시 호출되는 메소드 - public void OnBackButtonClicked() - { - leaderboardPanel.SetActive(false); // LeaderboardPanel 숨기기 - MainPanel.SetActive(true); // SignInPanel 보이게 하기 - } - - private List LoadOfflineLeaderboard() - { - List leaderboard = new List(); - - // 오프라인 데이터 로딩 (PlayerPrefs 사용 예시) - string savedData = PlayerPrefs.GetString("OfflineLeaderboard", string.Empty); - - if (!string.IsNullOrEmpty(savedData)) - { - // 저장된 JSON 데이터를 파싱하여 리더보드 리스트로 변환 - leaderboard = JsonUtility.FromJson(savedData).scoreInfos; - } - - return leaderboard; - } - - private void OnDisable() - { - Destroy(gameObject); // 자기 자신을 삭제 - } -} \ No newline at end of file diff --git a/Assets/Script/Main/LeaderBoardController.cs.meta b/Assets/Script/Main/LeaderBoardController.cs.meta deleted file mode 100644 index d4fd23e..0000000 --- a/Assets/Script/Main/LeaderBoardController.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: d481e07ebe4437c4a9f6bb09a73d3eab -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/Main/NetworkManager.cs b/Assets/Script/Main/NetworkManager.cs index a6df845..0d69e7b 100644 --- a/Assets/Script/Main/NetworkManager.cs +++ b/Assets/Script/Main/NetworkManager.cs @@ -228,7 +228,7 @@ public class NetworkManager : Singleton } } - public IEnumerator GetRanking(Action success, Action failure) + public IEnumerator GetLeaderboard(Action success, Action failure) { using (UnityWebRequest www = new UnityWebRequest(Constants.ServerURL + "/leaderboard", UnityWebRequest.kHttpVerbGET)) diff --git a/Assets/Script/Main/SigninPanelController.cs b/Assets/Script/Main/SigninPanelController.cs index ce3327d..ddd1216 100644 --- a/Assets/Script/Main/SigninPanelController.cs +++ b/Assets/Script/Main/SigninPanelController.cs @@ -1,9 +1,7 @@ using System; -using System.Net.Mime; using TMPro; using UnityEngine; using UnityEngine.Serialization; -using UnityEngine.UI; public struct SigninData { diff --git a/Assets/Script/UI/PanelChildController/RankingItemController.cs b/Assets/Script/UI/PanelChildController/RankingItemController.cs index 8fefe79..6792f4a 100644 --- a/Assets/Script/UI/PanelChildController/RankingItemController.cs +++ b/Assets/Script/UI/PanelChildController/RankingItemController.cs @@ -6,22 +6,22 @@ using UnityEngine.UI; public class RankingItemController : MonoBehaviour { - RankingItem _rankingItem; - public Sprite[] profileSprites; + RankingItem _rankingItem; + public Sprite[] profileSprites; - public void Init(RankingItem rankingItem) - { - _rankingItem = rankingItem; - var itemImage = GetComponentsInChildren()[1]; - var itemText = GetComponentsInChildren(); + public void Init(RankingItem rankingItem) + { + _rankingItem = rankingItem; + var itemImage = GetComponentsInChildren()[1]; + var itemText = GetComponentsInChildren(); - itemImage.sprite = profileSprites[this._rankingItem.ProfileSpriteIndex]; - itemText[0].text = this._rankingItem.Name; - itemText[1].text = this._rankingItem.WinRate.ToString(); - } + itemImage.sprite = profileSprites[this._rankingItem.ProfileSpriteIndex]; + itemText[0].text = this._rankingItem.Name; + itemText[1].text = this._rankingItem.WinRate.ToString(); + } - public void OnClickRankingItem() - { - Debug.Log(_rankingItem.Name + "의 승률은" + _rankingItem.WinRate); - } -} \ No newline at end of file + public void OnClickRankingItem() + { + Debug.Log(_rankingItem.Name + "의 승률은" + _rankingItem.WinRate); + } +}