diff --git a/Assets/ResWork/Table/butler.xlsm b/Assets/ResWork/Table/butler.xlsm index c2ade7e3a..5bde81639 100644 Binary files a/Assets/ResWork/Table/butler.xlsm and b/Assets/ResWork/Table/butler.xlsm differ diff --git a/Assets/ResWork/UIPrefabs/Gacha/GachaRewardCard.prefab b/Assets/ResWork/UIPrefabs/Gacha/GachaRewardCard.prefab index 75a29fe3d..2ae06ce46 100644 --- a/Assets/ResWork/UIPrefabs/Gacha/GachaRewardCard.prefab +++ b/Assets/ResWork/UIPrefabs/Gacha/GachaRewardCard.prefab @@ -262,6 +262,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c77f40d8be0d24c4d9e39a4e24919561, type: 3} m_Name: m_EditorClassIdentifier: + images: + - {fileID: 5364980981734795523} + texts: + - {fileID: 8248318834976252547} + gos: + - {fileID: 8378390155349259184} --- !u!1 &3233518760462765412 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Script/UI/Gacha/GachaRewardCard.cs b/Assets/Script/UI/Gacha/GachaRewardCard.cs index f1fb2308a..2ff3cb708 100644 --- a/Assets/Script/UI/Gacha/GachaRewardCard.cs +++ b/Assets/Script/UI/Gacha/GachaRewardCard.cs @@ -1,7 +1,23 @@ +using TMPro; +using UnityEngine; +using UnityEngine.UI; + public class GachaRewardCard : CardBase { + public Image[] images; // 0 아이콘 + public TextMeshProUGUI[] texts; // 0 수량 + public GameObject[] gos; // 0 체크 상태 + + GachaRandomBagTableData m_Data; + public override void Set(T _base) { base.Set(_base); + + m_Data = _base as GachaRandomBagTableData; + + images[0].sprite = UIAtlasMgr.Ins.Get_Sprite(m_Data.n_RewardID); + texts[0].text = "1"; + gos[0].SetActive(false); } } \ No newline at end of file