diff --git a/Assets/KJM/KJMprefabs/Gibo Panel.prefab b/Assets/KJM/KJMprefabs/Replay Panel.prefab similarity index 99% rename from Assets/KJM/KJMprefabs/Gibo Panel.prefab rename to Assets/KJM/KJMprefabs/Replay Panel.prefab index 4c6afe6..99bb34b 100644 --- a/Assets/KJM/KJMprefabs/Gibo Panel.prefab +++ b/Assets/KJM/KJMprefabs/Replay Panel.prefab @@ -104,7 +104,7 @@ GameObject: - component: {fileID: 9008029491930858052} - component: {fileID: 5051480494068645349} m_Layer: 5 - m_Name: Gibo Panel + m_Name: Replay Panel m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -195,6 +195,7 @@ MonoBehaviour: panelRectTransform: {fileID: 1819504122199746525} scrollItemPrefab: {fileID: 7605012172595602668, guid: bef1de10a3cc5834a95a8689a2de2bb7, type: 3} content: {fileID: 7514948643227889924} + replayCellPrefab: {fileID: 6381393519116383223, guid: e4d9ccbb1a6d7b1408923e47b6e7b690, type: 3} --- !u!1 &3668037476601755215 GameObject: m_ObjectHideFlags: 0 @@ -438,7 +439,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: -56.893047} + m_AnchoredPosition: {x: -392, y: 0} m_SizeDelta: {x: 784, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &7384686566427463252 diff --git a/Assets/KJM/KJMprefabs/Gibo Panel.prefab.meta b/Assets/KJM/KJMprefabs/Replay Panel.prefab.meta similarity index 100% rename from Assets/KJM/KJMprefabs/Gibo Panel.prefab.meta rename to Assets/KJM/KJMprefabs/Replay Panel.prefab.meta diff --git a/Assets/KJM/KJMprefabs/ScrollItem/GiboScrollItem.prefab b/Assets/KJM/KJMprefabs/ScrollItem/ReplayScrollItem.prefab similarity index 74% rename from Assets/KJM/KJMprefabs/ScrollItem/GiboScrollItem.prefab rename to Assets/KJM/KJMprefabs/ScrollItem/ReplayScrollItem.prefab index 6023701..f14a3f7 100644 --- a/Assets/KJM/KJMprefabs/ScrollItem/GiboScrollItem.prefab +++ b/Assets/KJM/KJMprefabs/ScrollItem/ReplayScrollItem.prefab @@ -74,8 +74,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4282076928 + m_fontColor: {r: 0, g: 0.31132078, b: 0.23010668, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -92,8 +92,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -134,6 +134,81 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &2925920792659963135 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6243070150297500116} + - component: {fileID: 548835481879647278} + - component: {fileID: 5279064539717668063} + m_Layer: 5 + m_Name: WinImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6243070150297500116 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2925920792659963135} + 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: 782808433606758938} + 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: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &548835481879647278 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2925920792659963135} + m_CullTransparentMesh: 1 +--- !u!114 &5279064539717668063 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2925920792659963135} + 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: 21300000, guid: 5a30ddccdc758dd45a470cfeb06cc240, 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!1 &4113615148583358116 GameObject: m_ObjectHideFlags: 0 @@ -208,8 +283,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4282076928 + m_fontColor: {r: 0, g: 0.31132078, b: 0.23010668, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -226,8 +301,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -268,6 +343,81 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &4210606424410061969 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 379352358508670316} + - component: {fileID: 1085849272306452399} + - component: {fileID: 7205159236927224312} + m_Layer: 5 + m_Name: LoseImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &379352358508670316 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4210606424410061969} + 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: 782808433606758938} + 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: 0} + m_SizeDelta: {x: 120, y: 120} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1085849272306452399 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4210606424410061969} + m_CullTransparentMesh: 1 +--- !u!114 &7205159236927224312 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4210606424410061969} + 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: 21300000, guid: a8641453282ed4c4b9f416044a57055a, 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!1 &6889607079215043674 GameObject: m_ObjectHideFlags: 0 @@ -278,7 +428,6 @@ GameObject: m_Component: - component: {fileID: 782808433606758938} - component: {fileID: 5549477541863909970} - - component: {fileID: 7039574631113950906} m_Layer: 5 m_Name: WInLoseImage m_TagString: Untagged @@ -297,7 +446,9 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 6243070150297500116} + - {fileID: 379352358508670316} m_Father: {fileID: 423109112585897887} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -313,36 +464,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6889607079215043674} m_CullTransparentMesh: 1 ---- !u!114 &7039574631113950906 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6889607079215043674} - 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 &7605012172595602668 GameObject: m_ObjectHideFlags: 0 @@ -355,9 +476,9 @@ GameObject: - component: {fileID: 4515818582551300206} - component: {fileID: 5750108967662755581} - component: {fileID: 6941609111617388457} - - component: {fileID: 619118269883992892} + - component: {fileID: 7980988615992817018} m_Layer: 5 - m_Name: GiboScrollItem + m_Name: ReplayScrollItem m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -413,8 +534,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c06da2c324d0fee43b8b1998cf9fcd09, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 05a670e614d7817429ee256ceb7efbe6, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -467,9 +588,9 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 619118269883992892} - m_TargetAssemblyTypeName: GiboItemController, Assembly-CSharp - m_MethodName: OnClickGiboItem + - m_Target: {fileID: 7980988615992817018} + m_TargetAssemblyTypeName: ReplayCell, Assembly-CSharp + m_MethodName: OnClickReplayButton m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -479,7 +600,7 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!114 &619118269883992892 +--- !u!114 &7980988615992817018 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -488,9 +609,10 @@ MonoBehaviour: m_GameObject: {fileID: 7605012172595602668} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 446a80ba82242004eb31339c44f8ac3b, type: 3} + m_Script: {fileID: 11500000, guid: caf41582c1233374abe9b362322de638, type: 3} m_Name: m_EditorClassIdentifier: - profileSprites: - - {fileID: 21300000, guid: edeacd6d8f6ab0d42bbdf4ada3c61a27, type: 3} - - {fileID: 21300000, guid: 2f801858eeb5f4540a432b60aca3d57a, type: 3} + winImage: {fileID: 5279064539717668063} + loseImage: {fileID: 7205159236927224312} + playerNicknameText: {fileID: 1459786160726782322} + recordDateText: {fileID: 857776554898951878} diff --git a/Assets/KJM/KJMprefabs/ScrollItem/GiboScrollItem.prefab.meta b/Assets/KJM/KJMprefabs/ScrollItem/ReplayScrollItem.prefab.meta similarity index 100% rename from Assets/KJM/KJMprefabs/ScrollItem/GiboScrollItem.prefab.meta rename to Assets/KJM/KJMprefabs/ScrollItem/ReplayScrollItem.prefab.meta diff --git a/Assets/Prefabs/ReplayCell.prefab b/Assets/LIN/Prefabs/ReplayCellLIN.prefab similarity index 99% rename from Assets/Prefabs/ReplayCell.prefab rename to Assets/LIN/Prefabs/ReplayCellLIN.prefab index 3a53226..46aa3df 100644 --- a/Assets/Prefabs/ReplayCell.prefab +++ b/Assets/LIN/Prefabs/ReplayCellLIN.prefab @@ -601,7 +601,7 @@ GameObject: - component: {fileID: 7107302514257622686} - component: {fileID: 5230863580921726021} m_Layer: 5 - m_Name: ReplayCell + m_Name: ReplayCellLIN m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Prefabs/ReplayCell.prefab.meta b/Assets/LIN/Prefabs/ReplayCellLIN.prefab.meta similarity index 100% rename from Assets/Prefabs/ReplayCell.prefab.meta rename to Assets/LIN/Prefabs/ReplayCellLIN.prefab.meta diff --git a/Assets/Prefabs/ReplayPanel.prefab b/Assets/LIN/Prefabs/ReplayPanelLIN.prefab similarity index 99% rename from Assets/Prefabs/ReplayPanel.prefab rename to Assets/LIN/Prefabs/ReplayPanelLIN.prefab index 721a470..801b1cc 100644 --- a/Assets/Prefabs/ReplayPanel.prefab +++ b/Assets/LIN/Prefabs/ReplayPanelLIN.prefab @@ -302,7 +302,7 @@ GameObject: - component: {fileID: 5559365133802195336} - component: {fileID: 5893210151593350084} m_Layer: 5 - m_Name: ReplayPanel + m_Name: ReplayPanelLIN m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Prefabs/ReplayPanel.prefab.meta b/Assets/LIN/Prefabs/ReplayPanelLIN.prefab.meta similarity index 100% rename from Assets/Prefabs/ReplayPanel.prefab.meta rename to Assets/LIN/Prefabs/ReplayPanelLIN.prefab.meta diff --git a/Assets/LIN/Scenes/MainTestLIN.unity b/Assets/LIN/Scenes/MainTestLIN.unity index cf70d1a..3de1fde 100644 --- a/Assets/LIN/Scenes/MainTestLIN.unity +++ b/Assets/LIN/Scenes/MainTestLIN.unity @@ -150,6 +150,10 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: OnclickRecordButton objectReference: {fileID: 0} + - target: {fileID: 1316706425349991338, guid: 6f42a47846f21b044b1cda32a9516609, type: 3} + propertyPath: replayPanel + value: + objectReference: {fileID: 3090474328172188941, guid: c63914e01332f8d479ada92325335e41, type: 3} - target: {fileID: 4282069284025755619, guid: 6f42a47846f21b044b1cda32a9516609, type: 3} propertyPath: m_SizeDelta.x value: 0 @@ -622,6 +626,51 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1464921194 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1464921196} + - component: {fileID: 1464921195} + m_Layer: 0 + m_Name: StoneController + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1464921195 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1464921194} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8f82a74d5e1f8de44af5f574b2934a95, type: 3} + m_Name: + m_EditorClassIdentifier: + stones: [] +--- !u!4 &1464921196 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1464921194} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 540, y: 960, 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!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -630,3 +679,4 @@ SceneRoots: - {fileID: 1017982171} - {fileID: 759297939} - {fileID: 1231053601} + - {fileID: 1464921196} diff --git a/Assets/LIN/Scripts/GameManagerTestLIN.cs b/Assets/LIN/Scripts/GameManagerTestLIN.cs index 8e406d6..cd111c2 100644 --- a/Assets/LIN/Scripts/GameManagerTestLIN.cs +++ b/Assets/LIN/Scripts/GameManagerTestLIN.cs @@ -33,6 +33,7 @@ public class GameManagerTestLIN : Singleton private void Start() { + Debug.Log(UserManager.Instance.Nickname); //TODO: 기보 타입으로 들어왔을 때 데이터 로드 테스트 수정할것 ReplayManager.Instance.InitReplayBoard(ReplayManager.Instance.LoadReplayDatas()[9]); diff --git a/Assets/Script/Game/GameManager.cs b/Assets/Script/Game/GameManager.cs index 1345826..b1fb50f 100644 --- a/Assets/Script/Game/GameManager.cs +++ b/Assets/Script/Game/GameManager.cs @@ -252,7 +252,7 @@ public class GameManager : Singleton if (_canvas != null) { var settingsPanelObject = Instantiate(giboPanel, _canvas.transform); - settingsPanelObject.GetComponent().Show(giboItems); + settingsPanelObject.GetComponent().Show(); } } } \ No newline at end of file diff --git a/Assets/Script/Replay/ReplayCell.cs b/Assets/Script/Replay/ReplayCell.cs index d62e0b4..2701543 100644 --- a/Assets/Script/Replay/ReplayCell.cs +++ b/Assets/Script/Replay/ReplayCell.cs @@ -1,5 +1,6 @@ using System.Collections; using System.Collections.Generic; +using System.Text; using TMPro; using UnityEngine; using UnityEngine.UI; @@ -45,7 +46,32 @@ public class ReplayCell : MonoBehaviour public void SetRecordDate(string date) { - recordDateText.text = date; + if (string.IsNullOrEmpty(date)) + { + // 입력이 비어있거나 null인 경우 예외 처리 + recordDateText.text = "Invalid Date Format"; + return; + } + + string[] dateSplit = date.Split(' '); + if (dateSplit.Length == 2) + { + StringBuilder text = new StringBuilder(); + + // 첫 번째 부분 (날짜) - "-"을 "."으로 교체 + text.Append(dateSplit[0].Replace("-", ".")); + text.Append("\n"); + + // 두 번째 부분 (시간) - "_"을 ":"으로 교체 + text.Append(dateSplit[1].Replace("_", ":")); + + recordDateText.text = text.ToString(); + } + else + { + // 잘못된 포맷 처리 + recordDateText.text = "Invalid Date Format"; + } } public void SetReplayRecord(ReplayRecord record) diff --git a/Assets/Script/Replay/ReplayPanelController.cs.meta b/Assets/Script/Replay/ReplayPanelController.cs.meta deleted file mode 100644 index 142e658..0000000 --- a/Assets/Script/Replay/ReplayPanelController.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: da5600fa3dce9594587497bca64f7394 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Script/UI/PanelController/GiboPanelController.cs b/Assets/Script/UI/PanelController/GiboPanelController.cs deleted file mode 100644 index 9c93e57..0000000 --- a/Assets/Script/UI/PanelController/GiboPanelController.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class GiboPanelController : ScrollPanelController -{ - public virtual void Show(List items) - { - for (int i = 0; i < items.Count && i <= MAX_COUNT; i++) - { - var scrollItem= Instantiate(scrollItemPrefab, content.transform); - scrollItem.GetComponent().Init(items[i]); - - } - base.Show(); - } -} diff --git a/Assets/Script/UI/PanelController/PanelController.cs b/Assets/Script/UI/PanelController/PanelController.cs index 1452f54..0a32cee 100644 --- a/Assets/Script/UI/PanelController/PanelController.cs +++ b/Assets/Script/UI/PanelController/PanelController.cs @@ -24,6 +24,11 @@ public class PanelController : MonoBehaviour /// public void Show() { + if (backGroundCanvasGroup == null) + { + backGroundCanvasGroup = GetComponent(); + } + backGroundCanvasGroup.alpha = 0; panelRectTransform.localScale = Vector3.zero; diff --git a/Assets/Script/Replay/ReplayPanelController.cs b/Assets/Script/UI/PanelController/ReplayPanelController.cs similarity index 53% rename from Assets/Script/Replay/ReplayPanelController.cs rename to Assets/Script/UI/PanelController/ReplayPanelController.cs index c83bfcd..0e0565e 100644 --- a/Assets/Script/Replay/ReplayPanelController.cs +++ b/Assets/Script/UI/PanelController/ReplayPanelController.cs @@ -1,36 +1,22 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -using UnityEngine.Serialization; -public class ReplayPanelController : MonoBehaviour +public class ReplayPanelController : ScrollPanelController { - [SerializeField] private RectTransform panelRectTransform; - [SerializeField] private GameObject replayCellPrefab; - [SerializeField] private Transform contentTransform; - - private CanvasGroup _backgroundCanvasGroup; - - public delegate void PanelControllerHideDelegate(); - + private string _myNickname; private void Awake() { - _backgroundCanvasGroup = GetComponent(); - - //TODO:Test용 닉네임 나중에 삭제하고 PlayerInfo에서 가져올 것 - _myNickname = "Gildong"; - } - - private void Start() - { + //TODO: 로그인 기능 연동 후 닉네임 바꾸기 + _myNickname = "PlayerA"; List records = new List(); // ReplayManager에서 가져온 기보 데이터들을 패널 셀에 초기화 records = ReplayManager.Instance.LoadReplayDatas(); foreach (var replayRecord in records) { - var replayCellButtonObject = Instantiate(replayCellPrefab, contentTransform); + var replayCellButtonObject = Instantiate(scrollItemPrefab, content.transform); ReplayCell replayCell = replayCellButtonObject.GetComponent(); Enums.PlayerType myPlayerType = _myNickname.Equals(replayRecord.playerA) ? Enums.PlayerType.PlayerA : Enums.PlayerType.PlayerB; @@ -43,20 +29,8 @@ public class ReplayPanelController : MonoBehaviour replayCell.SetReplayRecord(replayRecord); } } - - - - public void OnClickCloseButton() + public virtual void Show() { - Hide(() => - { - Destroy(gameObject); - }); - } - public void Hide(PanelControllerHideDelegate hideDelegate = null) - { - _backgroundCanvasGroup.alpha = 0; - panelRectTransform.localScale = Vector3.zero; - hideDelegate?.Invoke(); + base.Show(); } } diff --git a/Assets/Script/UI/PanelController/GiboPanelController.cs.meta b/Assets/Script/UI/PanelController/ReplayPanelController.cs.meta similarity index 100% rename from Assets/Script/UI/PanelController/GiboPanelController.cs.meta rename to Assets/Script/UI/PanelController/ReplayPanelController.cs.meta diff --git a/Assets/Script/UI/PanelController/TestPanelController.cs b/Assets/Script/UI/PanelController/TestPanelController.cs index d2299f4..0be65ad 100644 --- a/Assets/Script/UI/PanelController/TestPanelController.cs +++ b/Assets/Script/UI/PanelController/TestPanelController.cs @@ -55,12 +55,12 @@ public class TestPanelController : MonoBehaviour } } - public void OpenGiboPanel(List giboItems) + public void OpenGiboPanel() { if (_canvas != null) { var settingsPanelObject = Instantiate(giboPanel, _canvas.transform); - settingsPanelObject.GetComponent().Show(giboItems); + settingsPanelObject.GetComponent().Show(); } } @@ -123,21 +123,8 @@ public class TestPanelController : MonoBehaviour //기보 패널 생성 public void OnGiboPanelClick() { - - List giboItems = new List(); //테스트 데이터 리스트 생성 - for (int i = 0; i < 30; i++) - { - GiboItem giboItem = new GiboItem - { - WinLoseSpriteIndex = Random.Range(0, 2), - Date = DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss"), - Name = i.ToString(), - }; - - giboItems.Add(giboItem); - } - - OpenGiboPanel(giboItems); + + OpenGiboPanel(); } diff --git a/Assets/Sprites/Panel UI/DLose.png b/Assets/Sprites/Panel UI/DLose.png new file mode 100644 index 0000000..15fd2e4 Binary files /dev/null and b/Assets/Sprites/Panel UI/DLose.png differ diff --git a/Assets/Sprites/Panel UI/DLose.png.meta b/Assets/Sprites/Panel UI/DLose.png.meta new file mode 100644 index 0000000..c800446 --- /dev/null +++ b/Assets/Sprites/Panel UI/DLose.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: a8641453282ed4c4b9f416044a57055a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Panel UI/DWin.png b/Assets/Sprites/Panel UI/DWin.png new file mode 100644 index 0000000..9126603 Binary files /dev/null and b/Assets/Sprites/Panel UI/DWin.png differ diff --git a/Assets/Sprites/Panel UI/DWin.png.meta b/Assets/Sprites/Panel UI/DWin.png.meta new file mode 100644 index 0000000..00be0be --- /dev/null +++ b/Assets/Sprites/Panel UI/DWin.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 5a30ddccdc758dd45a470cfeb06cc240 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: