diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Stage/StagePage.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Stage/StagePage.prefab index 9c9b4550..a637ceef 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Stage/StagePage.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Stage/StagePage.prefab @@ -587,6 +587,7 @@ RectTransform: - {fileID: 8587569203289185346} - {fileID: 6357892206167044803} - {fileID: 1077768852921302574} + - {fileID: 3381290883136237391} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -825,8 +826,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -100, y: -100} + m_AnchoredPosition: {x: 0, y: 65} + m_SizeDelta: {x: -100, y: -230} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7337848446441565437 CanvasRenderer: @@ -911,6 +912,37 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6168401667605346058 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3381290883136237391} + m_Layer: 0 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3381290883136237391 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6168401667605346058} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -35.98712, y: 37.11862, z: 0.25480598} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1148402191174711415} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6397828788548295884 GameObject: m_ObjectHideFlags: 0 @@ -1020,7 +1052,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 50} + m_AnchoredPosition: {x: 0, y: 200} m_SizeDelta: {x: -240, y: 120} m_Pivot: {x: 0.5, y: 0} --- !u!114 &839082804887539808 @@ -1083,8 +1115,8 @@ RectTransform: 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: 400, y: 400} + m_AnchoredPosition: {x: 0, y: 80} + m_SizeDelta: {x: 300, y: 300} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3496248864513463585 CanvasRenderer: diff --git a/Gameton-06/Assets/Gameton/Scenes/Stage 4.unity b/Gameton-06/Assets/Gameton/Scenes/Stage 4.unity index 844f1efe..38c8eb14 100644 --- a/Gameton-06/Assets/Gameton/Scenes/Stage 4.unity +++ b/Gameton-06/Assets/Gameton/Scenes/Stage 4.unity @@ -18368,7 +18368,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_ConfineMode: 0 m_BoundingVolume: {fileID: 0} - m_BoundingShape2D: {fileID: 0} + m_BoundingShape2D: {fileID: 2055061001} m_ConfineScreenEdges: 1 m_Damping: 0.5 --- !u!114 &1271586654 diff --git a/Gameton-06/Assets/Gameton/Scripts/Character/PlayerDataManager.cs b/Gameton-06/Assets/Gameton/Scripts/Character/PlayerDataManager.cs index d2bc600f..6d67a24d 100644 --- a/Gameton-06/Assets/Gameton/Scripts/Character/PlayerDataManager.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Character/PlayerDataManager.cs @@ -93,7 +93,7 @@ namespace TON PlayerPrefs.SetInt("SelectedPlayerIndex", 0); player = playersData[0]; // FIXME: 테스트를 위해 캐릭터 레벨 강제 적용함 - // player.level = 15; + player.level = 15; } else { diff --git a/Gameton-06/Assets/Gameton/Scripts/Common/BootStrapper.cs b/Gameton-06/Assets/Gameton/Scripts/Common/BootStrapper.cs index 6c046bf4..79724c6a 100644 --- a/Gameton-06/Assets/Gameton/Scripts/Common/BootStrapper.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Common/BootStrapper.cs @@ -49,9 +49,11 @@ namespace TON // UIManager.Show(UIList.LobbyUI); // UIManager.Show(UIList.IngameOptionUI); // UIManager.Show(UIList.SkillSettingUI); + // PlayerDataManager.Singleton.SetCurrentUserData(); // UIManager.Show(UIList.ControllerUI); - // UIManager.Show(UIList.IngameUI); // ControllerUI.Instance.Initalize(); + // UIManager.Show(UIList.IngameUI); + // PlayerSpawner.SpawnPlayerCharacter(); } } } diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/LobbyUI.cs b/Gameton-06/Assets/Gameton/Scripts/UI/LobbyUI.cs index 4ef135a8..e97aedbf 100644 --- a/Gameton-06/Assets/Gameton/Scripts/UI/LobbyUI.cs +++ b/Gameton-06/Assets/Gameton/Scripts/UI/LobbyUI.cs @@ -91,16 +91,17 @@ namespace TON public void OnClickStagePlayButton() { - // 가지고 있는 하트가 없다면 입장 불가 - if (HeartDataManager.Singleton.GetCurrentHearts() < 1) - { - // TODO: 입장 불가 modal 출력 - Debug.Log("보유한 하트 없음"); - return; - } + // FIXME: 개발 편의를 위해 스테이지 입장시 하트 소모 로직 주석처리 + // // 가지고 있는 하트가 없다면 입장 불가 + // if (HeartDataManager.Singleton.GetCurrentHearts() < 1) + // { + // // TODO: 입장 불가 modal 출력 + // Debug.Log("보유한 하트 없음"); + // return; + // } - // 입장 시 하트 소모 - HeartDataManager.Singleton.UseHeart(); + // // 입장 시 하트 소모 + // HeartDataManager.Singleton.UseHeart(); Main.Singleton.ChangeScene(SceneType.Stage); } diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/LobbyUI_StagePage.cs b/Gameton-06/Assets/Gameton/Scripts/UI/LobbyUI_StagePage.cs index 35e2769b..a49c7632 100644 --- a/Gameton-06/Assets/Gameton/Scripts/UI/LobbyUI_StagePage.cs +++ b/Gameton-06/Assets/Gameton/Scripts/UI/LobbyUI_StagePage.cs @@ -78,6 +78,10 @@ namespace TON SetDefaultStarPoint(); // 이전 스테이지를 클리어하지 않은 경우 stageEntryButton.interactable = false; + + // FIXME: 개발 편의를 위해 스테이지 입장 가능하게 오픈 + stageEntryButton.interactable = true; + } } else