diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/SkillInformationItem.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/SkillInformationItem.prefab index f5cea02d..5b057d56 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/SkillInformationItem.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/SkillInformationItem.prefab @@ -396,12 +396,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ed9616c40d2f25049a1cd91f744b3eff, type: 3} m_Name: m_EditorClassIdentifier: + imageSprites: + keys: [] + values: [] skillImage: {fileID: 1387251271655878441} skillName: {fileID: 8742526129269004090} skillDamage: {fileID: 6604346907373336785} skillCooltime: {fileID: 5644015466645616352} skillReqMp: {fileID: 2735593499604854753} skillReqLv: {fileID: 8218594638945546518} + locker: {fileID: 8836474559121583485} --- !u!1 &1100155134931810629 GameObject: m_ObjectHideFlags: 0 diff --git a/Gameton-06/Assets/Gameton/Scenes/Personal Scenes/dev_jinjoo/Edit_Ingame.unity b/Gameton-06/Assets/Gameton/Scenes/Personal Scenes/dev_jinjoo/Edit_Ingame.unity index 78c82b70..a0aabcd3 100644 --- a/Gameton-06/Assets/Gameton/Scenes/Personal Scenes/dev_jinjoo/Edit_Ingame.unity +++ b/Gameton-06/Assets/Gameton/Scenes/Personal Scenes/dev_jinjoo/Edit_Ingame.unity @@ -494,7 +494,7 @@ RectTransform: 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.000032424927} + m_AnchoredPosition: {x: 0, y: -0.000008385263} m_SizeDelta: {x: 555, y: 200} m_Pivot: {x: 0, y: 1} --- !u!1 &301396581 @@ -1315,6 +1315,7 @@ MonoBehaviour: space: 10 uiPrefab: {fileID: 979625317529729593, guid: 2e1a2579c7ed2da4fbf06f231e0bb679, type: 3} uiPrefabList: [] + playerLevel: 0 --- !u!1 &986376091 GameObject: m_ObjectHideFlags: 0 @@ -2292,7 +2293,7 @@ MonoBehaviour: m_HandleRect: {fileID: 505319090} m_Direction: 2 m_Value: 0 - m_Size: 1 + m_Size: 0.9999971 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -3004,6 +3005,7 @@ GameObject: - component: {fileID: 2053288269} - component: {fileID: 2053288271} - component: {fileID: 2053288270} + - component: {fileID: 2053288272} m_Layer: 5 m_Name: Viewport m_TagString: Untagged @@ -3038,7 +3040,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2053288268} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} m_Name: @@ -3052,6 +3054,20 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2053288268} m_CullTransparentMesh: 1 +--- !u!114 &2053288272 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2053288268} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: {x: 0, y: 0, z: 0, w: 0} + m_Softness: {x: 0, y: 0} --- !u!1 &2135657550 GameObject: m_ObjectHideFlags: 0 diff --git a/Gameton-06/Assets/Gameton/Scripts/Skill/SkillInformationItem.cs b/Gameton-06/Assets/Gameton/Scripts/Skill/SkillInformationItem.cs index 7bfbf003..e5ef04b4 100644 --- a/Gameton-06/Assets/Gameton/Scripts/Skill/SkillInformationItem.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Skill/SkillInformationItem.cs @@ -18,13 +18,21 @@ namespace TON public TextMeshProUGUI skillReqMp; public TextMeshProUGUI skillReqLv; - public void Initalize(SkillData skillData) + public GameObject locker; + + + public void Initalize(SkillData skillData, int playerLevel) { skillName.text = skillData.name; skillDamage.text = $"{skillData.damage}"; skillCooltime.text = $"{skillData.coolDown}"; skillReqMp.text = $"{skillData.mpConsumption}"; skillReqLv.text = $"{skillData.requiredLevel}"; + + if (playerLevel >= skillData.requiredLevel) + { + locker.SetActive(false); + } } } diff --git a/Gameton-06/Assets/Gameton/Scripts/Skill/SkillScrollViewController.cs b/Gameton-06/Assets/Gameton/Scripts/Skill/SkillScrollViewController.cs index 295fbb08..1cba423b 100644 --- a/Gameton-06/Assets/Gameton/Scripts/Skill/SkillScrollViewController.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Skill/SkillScrollViewController.cs @@ -13,9 +13,12 @@ namespace TON public GameObject uiPrefab; public List uiPrefabList = new List(); + public int playerLevel; + private void Start() { scrollRect = GetComponent(); + playerLevel = PlayerDataManager.Singleton.player.level; Initialize(); } @@ -29,7 +32,7 @@ namespace TON { SkillData skillData = skillDatas[i]; GameObject skillInfoItem = Instantiate(uiPrefab, scrollRect.content); - skillInfoItem.GetComponent().Initalize(skillData); + skillInfoItem.GetComponent().Initalize(skillData, playerLevel); RectTransform rectTransform = skillInfoItem.GetComponent();