From f4a702e212d1853735f8dae399da69d23bfa510e Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 26 三月 2026 18:16:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into h5version
---
Main/System/HappyXB/HeroCallHopeAddCell.cs | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/Main/System/HappyXB/HeroCallHopeAddCell.cs b/Main/System/HappyXB/HeroCallHopeAddCell.cs
index 4d1cec9..a081469 100644
--- a/Main/System/HappyXB/HeroCallHopeAddCell.cs
+++ b/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);
--
Gitblit v1.8.0