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 63627cd..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 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 99% rename from Assets/KJM/KJMprefabs/ScrollItem/GiboScrollItem.prefab rename to Assets/KJM/KJMprefabs/ScrollItem/ReplayScrollItem.prefab index 05fe7af..bcc9185 100644 --- a/Assets/KJM/KJMprefabs/ScrollItem/GiboScrollItem.prefab +++ b/Assets/KJM/KJMprefabs/ScrollItem/ReplayScrollItem.prefab @@ -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 @@ -509,7 +509,7 @@ GameObject: - component: {fileID: 6941609111617388457} - component: {fileID: 7980988615992817018} m_Layer: 5 - m_Name: GiboScrollItem + m_Name: ReplayScrollItem m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 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/Script/Game/GameManager.cs b/Assets/Script/Game/GameManager.cs index a0b9ca2..982dd2d 100644 --- a/Assets/Script/Game/GameManager.cs +++ b/Assets/Script/Game/GameManager.cs @@ -182,7 +182,7 @@ public class GameManager : Singleton if (_canvas != null) { var settingsPanelObject = Instantiate(giboPanel, _canvas.transform); - settingsPanelObject.GetComponent().Show(); + settingsPanelObject.GetComponent().Show(); } } } \ No newline at end of file diff --git a/Assets/Script/Replay/ReplayPanelController.cs b/Assets/Script/Replay/ReplayPanelController.cs deleted file mode 100644 index 8c73b37..0000000 --- a/Assets/Script/Replay/ReplayPanelController.cs +++ /dev/null @@ -1,61 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.Serialization; - -public class ReplayPanelController : MonoBehaviour -{ - [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(); - - _myNickname = UserManager.Instance.Nickname; - } - - private void Start() - { - List records = new List(); - - // ReplayManager에서 가져온 기보 데이터들을 패널 셀에 초기화 - records = ReplayManager.Instance.LoadReplayDatas(); - foreach (var replayRecord in records) - { - var replayCellButtonObject = Instantiate(replayCellPrefab, contentTransform); - ReplayCell replayCell = replayCellButtonObject.GetComponent(); - - Enums.PlayerType myPlayerType = _myNickname.Equals(replayRecord.playerA) ? Enums.PlayerType.PlayerA : Enums.PlayerType.PlayerB; - string opponentNickname = myPlayerType==Enums.PlayerType.PlayerA ? replayRecord.playerB : replayRecord.playerA; - - replayCell.SetMyPlayerType(myPlayerType); - replayCell.SetWinImage(myPlayerType.ToString().Equals(replayRecord.winnerPlayerType)); - replayCell.SetOpponentPlayerNickname(opponentNickname); - replayCell.SetRecordDate(replayRecord.gameDate); - replayCell.SetReplayRecord(replayRecord); - } - } - - - - public void OnClickCloseButton() - { - Hide(() => - { - Destroy(gameObject); - }); - } - public void Hide(PanelControllerHideDelegate hideDelegate = null) - { - _backgroundCanvasGroup.alpha = 0; - panelRectTransform.localScale = Vector3.zero; - hideDelegate?.Invoke(); - } -} 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/ReplayPanelController.cs similarity index 90% rename from Assets/Script/UI/PanelController/GiboPanelController.cs rename to Assets/Script/UI/PanelController/ReplayPanelController.cs index 4c9bf09..0e0565e 100644 --- a/Assets/Script/UI/PanelController/GiboPanelController.cs +++ b/Assets/Script/UI/PanelController/ReplayPanelController.cs @@ -2,14 +2,14 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -public class GiboPanelController : ScrollPanelController +public class ReplayPanelController : ScrollPanelController { private string _myNickname; private void Awake() { //TODO: 로그인 기능 연동 후 닉네임 바꾸기 - _myNickname = "Test1"; + _myNickname = "PlayerA"; List records = new List(); // ReplayManager에서 가져온 기보 데이터들을 패널 셀에 초기화 @@ -31,8 +31,6 @@ public class GiboPanelController : ScrollPanelController } public virtual void Show() { - Debug.Log("GiboPanelController.Show"); - 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 609dfce..0be65ad 100644 --- a/Assets/Script/UI/PanelController/TestPanelController.cs +++ b/Assets/Script/UI/PanelController/TestPanelController.cs @@ -60,7 +60,7 @@ public class TestPanelController : MonoBehaviour if (_canvas != null) { var settingsPanelObject = Instantiate(giboPanel, _canvas.transform); - settingsPanelObject.GetComponent().Show(); + settingsPanelObject.GetComponent().Show(); } }