diff --git a/Assets/TcgEngine/Resources/Packs/elite.asset b/Assets/TcgEngine/Resources/Packs/elite.asset index c20db92..2aa097a 100644 --- a/Assets/TcgEngine/Resources/Packs/elite.asset +++ b/Assets/TcgEngine/Resources/Packs/elite.asset @@ -41,3 +41,4 @@ MonoBehaviour: sort_order: 1 available: 1 cost: 200 + tradeCurrency: 1 diff --git a/Assets/TcgEngine/Scenes/Menu/Menu.unity b/Assets/TcgEngine/Scenes/Menu/Menu.unity index ed3eb8e..4bd1584 100644 --- a/Assets/TcgEngine/Scenes/Menu/Menu.unity +++ b/Assets/TcgEngine/Scenes/Menu/Menu.unity @@ -14025,7 +14025,7 @@ CanvasGroup: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 706214460} m_Enabled: 1 - m_Alpha: 0 + m_Alpha: 1 m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 @@ -15147,8 +15147,13 @@ MonoBehaviour: m_EditorClassIdentifier: display_speed: 4 buy_five_btn: {fileID: 972743013} + buy_five_cove: {fileID: 386328252} + five_coin_img: {fileID: 71117350} + five_crystal_img: {fileID: 1633028212} buy_ten_btn: {fileID: 1355495570} - pack: {fileID: 0} + buy_ten_cove: {fileID: 1270028685} + ten_coin_img: {fileID: 632034726} + ten_crystal_img: {fileID: 88014993} --- !u!225 &764244353 CanvasGroup: m_ObjectHideFlags: 0 @@ -40810,7 +40815,7 @@ CanvasGroup: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2036228771} m_Enabled: 1 - m_Alpha: 1 + m_Alpha: 0 m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 diff --git a/Assets/TcgEngine/Scenes/Menu/OpenPack.unity b/Assets/TcgEngine/Scenes/Menu/OpenPack.unity index 764cea5..1488d96 100644 --- a/Assets/TcgEngine/Scenes/Menu/OpenPack.unity +++ b/Assets/TcgEngine/Scenes/Menu/OpenPack.unity @@ -909,8 +909,13 @@ MonoBehaviour: m_EditorClassIdentifier: display_speed: 4 buy_five_btn: {fileID: 61205} + buy_five_cove: {fileID: 2119087126} + five_coin_img: {fileID: 353545632} + five_crystal_img: {fileID: 121980004} buy_ten_btn: {fileID: 153241175} - pack: {fileID: 11400000, guid: 2db0d9f08bdfa57419101c08b8598c1a, type: 2} + buy_ten_cove: {fileID: 1531772641} + ten_coin_img: {fileID: 27200932} + ten_crystal_img: {fileID: 262082719} --- !u!225 &385062621 CanvasGroup: m_ObjectHideFlags: 0 @@ -1492,7 +1497,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u4E94\u8FDE\u62BD" + m_Text: "\u5341\u8FDE\u62BD" --- !u!222 &900000827 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/TcgEngine/Scripts/Menu/PackBuyPanel.cs b/Assets/TcgEngine/Scripts/Menu/PackBuyPanel.cs index b667440..c21f252 100644 --- a/Assets/TcgEngine/Scripts/Menu/PackBuyPanel.cs +++ b/Assets/TcgEngine/Scripts/Menu/PackBuyPanel.cs @@ -11,11 +11,20 @@ namespace TcgEngine.UI /// public class PackBuyPanel : UIPanel { + [Header("五连抽")] public Button buy_five_btn; // 购买1张按钮 + public Text buy_five_cove; + public Image five_coin_img; + public Image five_crystal_img; + + [Header("十连抽")] public Button buy_ten_btn; // 购买2张按钮 + public Text buy_ten_cove; + public Image ten_coin_img; + public Image ten_crystal_img; [Header("准备购买数据!")] - public PackData pack; // 当前购买的卡包数据 + private PackData pack; // 当前购买的卡包数据 protected override void Awake() @@ -40,6 +49,7 @@ namespace TcgEngine.UI public void SetPack(string packId) { pack = PackData.Get(packId); + SetBuyMessage(); } public void SetPack(PackData pack) @@ -47,7 +57,35 @@ namespace TcgEngine.UI this.pack = pack; Show(); } + + private void OnClickBuy(int quantity) + { + BuyPackApi(quantity); + } + private void SetBuyMessage() + { + // 设置图标 + switch (pack.tradeCurrency) + { + case TradeCurrency.Coin: + five_coin_img.gameObject.SetActive(true); + ten_coin_img.gameObject.SetActive(true); + + five_crystal_img.gameObject.SetActive(false); + ten_crystal_img.gameObject.SetActive(false); + break; + case TradeCurrency.Crystal: + five_coin_img.gameObject.SetActive(false); + ten_coin_img.gameObject.SetActive(false); + + five_crystal_img.gameObject.SetActive(true); + ten_crystal_img.gameObject.SetActive(true); + break; + } + buy_five_cove.text = pack.cost.ToString(); + buy_ten_cove.text = (pack.cost * 2).ToString(); + } private async void BuyPackApi(int quantity) { if (pack == null || quantity <= 0) return; @@ -80,11 +118,7 @@ namespace TcgEngine.UI Debug.LogError(res.error); } } - - private void OnClickBuy(int quantity) - { - BuyPackApi(quantity); - } + } }