Merge remote-tracking branch 'origin/master' into h5version

yyl

2026-03-26 f4a702e212d1853735f8dae399da69d23bfa510e

 Main/System/HappyXB/HeroCallHopeAddCell.cs

@@ -12,6 +12,7 @@
    [SerializeField] Button addBtn;
    [SerializeField] Transform tipRect;
    [SerializeField] Text freeText;
    [SerializeField] Text powerText;
    [SerializeField] Text itemCntText;
    [SerializeField] Image itemIcon;

@@ -38,7 +39,8 @@
        {
            return;
        }
        if (wishData.wishCnt < HappyXBModel.wishMaxOutCnt)
        bool isInvest = InvestModel.Instance.IsInvested(InvestModel.monthCardType);
        if (wishData.wishCnt < HappyXBModel.wishMaxOutCnt || isInvest)
        {
            var clientwWishID = quality == 5 ? HappyXBModel.Instance.selectSHHeroWishID : HappyXBModel.Instance.selectCSHeroWishID;
            if (clientwWishID <= 0)
@@ -48,7 +50,17 @@
            else
            {
                tipRect.SetActive(true);
                freeText.SetActive(true);
                if (isInvest)
                {
                    powerText.SetActive(true);
                    freeText.SetActive(false);
                }
                else
                {
                    powerText.SetActive(false);
                    freeText.SetActive(true);
                }

                itemCntText?.SetActive(false);

            }
@@ -64,6 +76,7 @@
            {
                tipRect.SetActive(true);
                freeText.SetActive(false);
                powerText.SetActive(false);
                itemCntText.SetActive(true);
                itemIcon.SetItemSprite(itemID);
                itemCntText.text = UIHelper.ShowUseItem(PackType.Item, itemID, 1, bright: false);