diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Controller Buttons/Item Button.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Controller Buttons/Item Button.prefab index aef28719..06482c67 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Controller Buttons/Item Button.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Controller Buttons/Item Button.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 1465902235892889161} - component: {fileID: 7199637668151358389} - component: {fileID: 5037893579223492369} - - component: {fileID: 1286343195759334092} + - component: {fileID: 5474034017148599487} m_Layer: 5 m_Name: Item Button m_TagString: Untagged @@ -108,7 +108,7 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!114 &1286343195759334092 +--- !u!114 &5474034017148599487 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -117,7 +117,7 @@ MonoBehaviour: m_GameObject: {fileID: 122146249855187030} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e890b5f706c997b4396fb3fc11938954, type: 3} + m_Script: {fileID: 11500000, guid: d4025d96cfa84304caf95db6a4f49d0c, type: 3} m_Name: m_EditorClassIdentifier: coolTimeText: {fileID: 1611366555514620028} diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Controller Buttons/Skill Button.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Controller Buttons/Skill Button.prefab index 23caece9..395316f2 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Controller Buttons/Skill Button.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Controller Buttons/Skill Button.prefab @@ -460,7 +460,7 @@ GameObject: - component: {fileID: 3622686016877026920} - component: {fileID: 6838856260058367113} - component: {fileID: 8637807277690663409} - - component: {fileID: 5127688379423261843} + - component: {fileID: 5964648352921021872} m_Layer: 5 m_Name: Skill Button m_TagString: Untagged @@ -550,14 +550,14 @@ MonoBehaviour: m_MethodName: OnClickSkillButton m_Mode: 2 m_Arguments: - m_ObjectArgument: {fileID: 5127688379423261843} + m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: TON.ControllerUI_SkillButton, Assembly-CSharp m_IntArgument: 0 m_FloatArgument: 0 m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!114 &5127688379423261843 +--- !u!114 &5964648352921021872 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -566,7 +566,7 @@ MonoBehaviour: m_GameObject: {fileID: 8426200199618059491} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 35c94c75c6e511048b4a77d3682e1f85, type: 3} + m_Script: {fileID: 11500000, guid: f9d99c36ec531604e82c8aeebd6afa80, type: 3} m_Name: m_EditorClassIdentifier: coolTimeText: {fileID: 1353060829719948495} @@ -582,6 +582,7 @@ MonoBehaviour: coolDown: 0 slotNumber: 0 requiredLevel: 0 + maxHitCount: 0 k__BackingField: 0 --- !u!1 &9104780789004064627 GameObject: diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Rank Box/Rank Box.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Rank Box/Rank Box.prefab index 5ac6ab2f..072c8bb6 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Rank Box/Rank Box.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Rank Box/Rank Box.prefab @@ -1479,7 +1479,7 @@ GameObject: - component: {fileID: 178720843269296823} - component: {fileID: 2461189433906269157} - component: {fileID: 8806745900426442480} - - component: {fileID: 1836485528427718722} + - component: {fileID: 8169316462191543975} m_Layer: 5 m_Name: Rank Box m_TagString: Untagged @@ -1547,7 +1547,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &1836485528427718722 +--- !u!114 &8169316462191543975 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1556,7 +1556,7 @@ MonoBehaviour: m_GameObject: {fileID: 8201404655171497624} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e5f063d17b315ac49b03acf8e9dd20b4, type: 3} + m_Script: {fileID: 11500000, guid: 4d47caa84e9a090419eb82f5e455a86d, type: 3} m_Name: m_EditorClassIdentifier: rankBoxImage: {fileID: 8201404655171497624} diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Skill Item/Skill Slot.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Skill Item/Skill Slot.prefab index c52d1080..bce9276e 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Skill Item/Skill Slot.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/Skill Item/Skill Slot.prefab @@ -161,7 +161,7 @@ GameObject: - component: {fileID: 8074330830695280406} - component: {fileID: 7221054774098027555} - component: {fileID: 8618505599359909844} - - component: {fileID: 8968069870202076509} + - component: {fileID: 6783571582853110170} - component: {fileID: 5331091819972320112} m_Layer: 5 m_Name: Skill Slot @@ -230,7 +230,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &8968069870202076509 +--- !u!114 &6783571582853110170 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -239,7 +239,7 @@ MonoBehaviour: m_GameObject: {fileID: 6583065413429247215} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 19db9b1bf85c67042afc28005a6af101, type: 3} + m_Script: {fileID: 11500000, guid: 9cc7099481cd73d40a0c87d18da714c4, type: 3} m_Name: m_EditorClassIdentifier: skillImage: {fileID: 6834027631568802153} diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.ControllerUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.ControllerUI.prefab index bf768ec0..c3fbedc0 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.ControllerUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.ControllerUI.prefab @@ -168,7 +168,7 @@ MonoBehaviour: m_EditorClassIdentifier: joystick: {fileID: 7288066023221573359} skillButtonGroup: {fileID: 2009939342780089657} - skillButtonPrefab: {fileID: 1708453278417668396} + skillButtonPrefab: {fileID: 169483457724555279} hpPotionCount: {fileID: 6063099989028787624} mpPotionCount: {fileID: 3723411150709511038} itemButtons: @@ -1218,15 +1218,15 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f023329ca96ab444ca7c60781e310d59, type: 3} ---- !u!114 &1708453278417668396 stripped +--- !u!114 &169483457724555279 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5127688379423261843, guid: f023329ca96ab444ca7c60781e310d59, type: 3} + m_CorrespondingSourceObject: {fileID: 5964648352921021872, guid: f023329ca96ab444ca7c60781e310d59, type: 3} m_PrefabInstance: {fileID: 5808676351208836543} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 35c94c75c6e511048b4a77d3682e1f85, type: 3} + m_Script: {fileID: 11500000, guid: f9d99c36ec531604e82c8aeebd6afa80, type: 3} m_Name: m_EditorClassIdentifier: --- !u!224 &7123232125577925591 stripped diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.RankingUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.RankingUI.prefab index 9ad3c9cb..d52c052e 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.RankingUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.RankingUI.prefab @@ -1269,7 +1269,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: scrollRect: {fileID: 6409563792739250610} - rankBoxPrefab: {fileID: 1836485528427718722, guid: 64f6711fc3dfade4f8926564be683890, type: 3} + rankBoxPrefab: {fileID: 1955426377295528965} uiPrefabList: [] createRankList: [] errorPopup: {fileID: 1150546113968813456} @@ -3186,6 +3186,17 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 64f6711fc3dfade4f8926564be683890, type: 3} +--- !u!114 &1955426377295528965 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8169316462191543975, guid: 64f6711fc3dfade4f8926564be683890, type: 3} + m_PrefabInstance: {fileID: 7673060521725952674} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4d47caa84e9a090419eb82f5e455a86d, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &7495923051705061397 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 178720843269296823, guid: 64f6711fc3dfade4f8926564be683890, type: 3} diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.SkillSettingUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.SkillSettingUI.prefab index f0a12cf7..a69dd957 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.SkillSettingUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.SkillSettingUI.prefab @@ -865,7 +865,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: skillSlotGroup: {fileID: 8234641265010181104} - skillSlotPrefab: {fileID: 9204999392844245365} + skillSlotPrefab: {fileID: 6768435580117781938} createSkillSlots: [] scrollRect: {fileID: 4479471774612506654} skillInfoPrefab: {fileID: 5109309224848002243} @@ -1211,7 +1211,7 @@ MonoBehaviour: m_HandleRect: {fileID: 502097972041828455} m_Direction: 2 m_Value: 0 - m_Size: 1 + m_Size: 0.9999965 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -1327,7 +1327,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.00026580493} + m_AnchoredPosition: {x: 0, y: 0.00003553843} m_SizeDelta: {x: 555, y: 200} m_Pivot: {x: 0, y: 1} --- !u!1001 &273107853452891176 @@ -1467,22 +1467,22 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} ---- !u!224 &8342794310457916222 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} - m_PrefabInstance: {fileID: 273107853452891176} - m_PrefabAsset: {fileID: 0} ---- !u!114 &9204999392844245365 stripped +--- !u!114 &6768435580117781938 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8968069870202076509, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} + m_CorrespondingSourceObject: {fileID: 6783571582853110170, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} m_PrefabInstance: {fileID: 273107853452891176} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 19db9b1bf85c67042afc28005a6af101, type: 3} + m_Script: {fileID: 11500000, guid: 9cc7099481cd73d40a0c87d18da714c4, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &8342794310457916222 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8074330830695280406, guid: 85ce9a177f9e26740921e0ecc2753cea, type: 3} + m_PrefabInstance: {fileID: 273107853452891176} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7813689188184592971 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Gameton-06/Assets/Gameton/Scripts/Character/PlayerDataManager.cs b/Gameton-06/Assets/Gameton/Scripts/Character/PlayerDataManager.cs index d3d7178a..5e0d2baa 100644 --- a/Gameton-06/Assets/Gameton/Scripts/Character/PlayerDataManager.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Character/PlayerDataManager.cs @@ -97,7 +97,7 @@ namespace TON // UpdateUI(); }); } - public void UseGold(int amount, System.Action callback) + public void UseGold(int amount, System.Action callback = null) { if (goldAmount - amount < 0) { diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/ControllerUI_ItemButton.cs b/Gameton-06/Assets/Gameton/Scripts/Skill/PotionButtonItem.cs similarity index 95% rename from Gameton-06/Assets/Gameton/Scripts/UI/ControllerUI_ItemButton.cs rename to Gameton-06/Assets/Gameton/Scripts/Skill/PotionButtonItem.cs index 8195ae5a..8e90d877 100644 --- a/Gameton-06/Assets/Gameton/Scripts/UI/ControllerUI_ItemButton.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Skill/PotionButtonItem.cs @@ -1,12 +1,12 @@ using System.Collections; using System.Collections.Generic; -using UnityEngine.UI; -using UnityEngine; using TMPro; +using UnityEngine; +using UnityEngine.UI; namespace TON { - public class ControllerUI_ItemButton : MonoBehaviour + public class PotionButtonItem : MonoBehaviour { [SerializeField] private TextMeshProUGUI coolTimeText; [SerializeField] private Image coolTimeDimd; diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/RankingUI_RankBox.cs.meta b/Gameton-06/Assets/Gameton/Scripts/Skill/PotionButtonItem.cs.meta similarity index 83% rename from Gameton-06/Assets/Gameton/Scripts/UI/RankingUI_RankBox.cs.meta rename to Gameton-06/Assets/Gameton/Scripts/Skill/PotionButtonItem.cs.meta index 0631e338..4e9095dc 100644 --- a/Gameton-06/Assets/Gameton/Scripts/UI/RankingUI_RankBox.cs.meta +++ b/Gameton-06/Assets/Gameton/Scripts/Skill/PotionButtonItem.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e5f063d17b315ac49b03acf8e9dd20b4 +guid: d4025d96cfa84304caf95db6a4f49d0c MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/ControllerUI_SkillButton.cs b/Gameton-06/Assets/Gameton/Scripts/Skill/SkillButtonItem.cs similarity index 97% rename from Gameton-06/Assets/Gameton/Scripts/UI/ControllerUI_SkillButton.cs rename to Gameton-06/Assets/Gameton/Scripts/Skill/SkillButtonItem.cs index cecc5d61..cf7c51f1 100644 --- a/Gameton-06/Assets/Gameton/Scripts/UI/ControllerUI_SkillButton.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Skill/SkillButtonItem.cs @@ -7,7 +7,7 @@ using UnityEngine.UI; namespace TON { - public class ControllerUI_SkillButton : MonoBehaviour + public class SkillButtonItem : MonoBehaviour { [SerializeField] private TextMeshProUGUI coolTimeText; [SerializeField] private Image coolTimeDimd; @@ -63,6 +63,5 @@ namespace TON { UpdateCooldownUI(); // UI 업데이트 } - } } diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/ControllerUI_ItemButton.cs.meta b/Gameton-06/Assets/Gameton/Scripts/Skill/SkillButtonItem.cs.meta similarity index 83% rename from Gameton-06/Assets/Gameton/Scripts/UI/ControllerUI_ItemButton.cs.meta rename to Gameton-06/Assets/Gameton/Scripts/Skill/SkillButtonItem.cs.meta index bd8fbef7..f376d50f 100644 --- a/Gameton-06/Assets/Gameton/Scripts/UI/ControllerUI_ItemButton.cs.meta +++ b/Gameton-06/Assets/Gameton/Scripts/Skill/SkillButtonItem.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e890b5f706c997b4396fb3fc11938954 +guid: f9d99c36ec531604e82c8aeebd6afa80 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/SkillSettingUI_SkillSlot.cs b/Gameton-06/Assets/Gameton/Scripts/Skill/SkillSettingSlot.cs similarity index 95% rename from Gameton-06/Assets/Gameton/Scripts/UI/SkillSettingUI_SkillSlot.cs rename to Gameton-06/Assets/Gameton/Scripts/Skill/SkillSettingSlot.cs index 320b100c..2db91e28 100644 --- a/Gameton-06/Assets/Gameton/Scripts/UI/SkillSettingUI_SkillSlot.cs +++ b/Gameton-06/Assets/Gameton/Scripts/Skill/SkillSettingSlot.cs @@ -6,7 +6,7 @@ using UnityEngine.UI; namespace TON { - public class SkillSettingUI_SkillSlot : MonoBehaviour + public class SkillSettingSlot : MonoBehaviour { public GameObject skillImage; public GameObject lockerImage; diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/SkillSettingUI_SkillSlot.cs.meta b/Gameton-06/Assets/Gameton/Scripts/Skill/SkillSettingSlot.cs.meta similarity index 83% rename from Gameton-06/Assets/Gameton/Scripts/UI/SkillSettingUI_SkillSlot.cs.meta rename to Gameton-06/Assets/Gameton/Scripts/Skill/SkillSettingSlot.cs.meta index 52755d3f..5e098216 100644 --- a/Gameton-06/Assets/Gameton/Scripts/UI/SkillSettingUI_SkillSlot.cs.meta +++ b/Gameton-06/Assets/Gameton/Scripts/Skill/SkillSettingSlot.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 19db9b1bf85c67042afc28005a6af101 +guid: 9cc7099481cd73d40a0c87d18da714c4 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/ControllerUI.cs b/Gameton-06/Assets/Gameton/Scripts/UI/ControllerUI.cs index 5b9b3b4a..ac5e1b87 100644 --- a/Gameton-06/Assets/Gameton/Scripts/UI/ControllerUI.cs +++ b/Gameton-06/Assets/Gameton/Scripts/UI/ControllerUI.cs @@ -1,9 +1,7 @@ using System.Collections; using System.Collections.Generic; -using System.Linq; using TMPro; using UnityEngine; -using UnityEngine.EventSystems; using UnityEngine.UI; namespace TON @@ -18,11 +16,11 @@ namespace TON public Transform skillButtonGroup; - public ControllerUI_SkillButton skillButtonPrefab; - private List createdSkillButtons = new List(); + public SkillButtonItem skillButtonPrefab; + private List createdSkillButtons = new List(); public UserItemData userItem { get; private set; } = new UserItemData(); - // 보유 포션 수량 + // 보유 포션 수량 [SerializeField] private TextMeshProUGUI hpPotionCount; [SerializeField] private TextMeshProUGUI mpPotionCount; @@ -30,7 +28,7 @@ namespace TON private int hpPotion = 0; private int mpPotion = 0; - public List itemButtons = new List(); + public List itemButtons = new List(); private void OnEnable() { @@ -60,7 +58,7 @@ namespace TON List activatedSkills = SkillDataManager.Singleton.GetEquippedSkills(); for (int i = 0; i < 3; i++) { - ControllerUI_SkillButton newSkillButton = Instantiate(skillButtonPrefab, skillButtonGroup); + SkillButtonItem newSkillButton = Instantiate(skillButtonPrefab, skillButtonGroup); newSkillButton.gameObject.SetActive(true); if (i < activatedSkills.Count) // 해당 인덱스에 활성화된 스킬이 있을 경우 @@ -69,7 +67,7 @@ namespace TON } else { - // 복제 됐을때 기본 상태가 잠금 상태 + // 복제 됐을때 기본 상태가 잠금 상태 newSkillButton.GetComponent