diff --git a/Assets/ResWork/UIPrefabs/Skill/SkillCard.prefab b/Assets/ResWork/UIPrefabs/Skill/SkillCard.prefab index 4fc429fa7..d1543d8e7 100644 --- a/Assets/ResWork/UIPrefabs/Skill/SkillCard.prefab +++ b/Assets/ResWork/UIPrefabs/Skill/SkillCard.prefab @@ -450,8 +450,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 65f581562538e304cbbfe8ee3beab09c, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 0a62d0c13cadbb845ac7aa7e57423e3c, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -812,6 +812,7 @@ MonoBehaviour: gos: - {fileID: 3461405196294374866} - {fileID: 2727674756677301650} + - {fileID: 6616647774013715798} --- !u!1 &4113569226595764447 GameObject: m_ObjectHideFlags: 0 @@ -842,6 +843,7 @@ RectTransform: m_Children: - {fileID: 5158015191648705450} - {fileID: 2403893713390902708} + - {fileID: 1076428386558673207} - {fileID: 6764527112815540176} - {fileID: 8396956566727566944} m_Father: {fileID: 6245114044720075376} @@ -916,7 +918,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 9970de3787141654389a70952c62dc05, type: 3} + m_Sprite: {fileID: 21300000, guid: 0a62d0c13cadbb845ac7aa7e57423e3c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -958,10 +960,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 161820827906782735} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 80, y: 80} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7347588006284354083 CanvasRenderer: @@ -991,7 +993,82 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 9970de3787141654389a70952c62dc05, type: 3} + m_Sprite: {fileID: 21300000, guid: 0a62d0c13cadbb845ac7aa7e57423e3c, 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 &6616647774013715798 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1076428386558673207} + - component: {fileID: 6168363853872753694} + - component: {fileID: 7845713616129279461} + m_Layer: 5 + m_Name: + + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1076428386558673207 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6616647774013715798} + 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: 161820827906782735} + 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: 32, y: 32} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6168363853872753694 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6616647774013715798} + m_CullTransparentMesh: 1 +--- !u!114 &7845713616129279461 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6616647774013715798} + 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: c5bd971ccc5ce5443a651f8185f7162b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Res_Addr/MainUI/NewGameUI.prefab b/Assets/Res_Addr/MainUI/NewGameUI.prefab index 4eb63523e..ae285ec6d 100644 --- a/Assets/Res_Addr/MainUI/NewGameUI.prefab +++ b/Assets/Res_Addr/MainUI/NewGameUI.prefab @@ -36769,7 +36769,7 @@ MonoBehaviour: m_Left: 5 m_Right: 0 m_Top: 5 - m_Bottom: 0 + m_Bottom: 40 m_ChildAlignment: 0 m_StartCorner: 0 m_StartAxis: 0 diff --git a/Assets/Script/UI/Skill/SkillCard.cs b/Assets/Script/UI/Skill/SkillCard.cs index cfcd41aa3..4253aecb1 100644 --- a/Assets/Script/UI/Skill/SkillCard.cs +++ b/Assets/Script/UI/Skill/SkillCard.cs @@ -12,7 +12,7 @@ public class SkillCard : CardCoolTimeBase, IDropHandler public Image[] images; // 0 1 아이콘, 2 버튼, 3 상태bg public TextMeshProUGUI[] texts; // 0 상태 public GameObject[] gos_type; // 0 전투, 1 ui - public GameObject[] gos; // 0 상태, 1 잠김 + public GameObject[] gos; // 0 상태, 1 잠김, 2 + SkillDragItem m_skillDragItem; SkillListTableData m_Data; @@ -28,10 +28,12 @@ public class SkillCard : CardCoolTimeBase, IDropHandler if (!DSUtil.CheckNull(m_Data)) { var sdata = ServerInfo.Ins.m_ServerData; + images[0].enabled = true; images[0].sprite = images[1].sprite = m_Data.Get_Icon(); var lv = sdata.Get_SkillLv(eRole.PC, m_Data.n_SkillID); gos[0].SetActive(true); gos[1].SetActive(lv == 0); + gos[2].SetActive(false); if (sdata.IsEquipSkill(m_Data.n_SkillID, sdata.Equip.Preset)) { @@ -51,9 +53,8 @@ public class SkillCard : CardCoolTimeBase, IDropHandler } else { - gos[0].SetActive(false); - gos[1].SetActive(true); - images[0].sprite = UIAtlasMgr.Ins.Get_Sprite("plus icon"); + DSUtil.ActivateGameObjects(gos, 0); + images[0].enabled = false; } } public override void Set(int _val)