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/HeroCallHopeWin.cs | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/Main/System/HappyXB/HeroCallHopeWin.cs b/Main/System/HappyXB/HeroCallHopeWin.cs
index 563581c..13c1c24 100644
--- a/Main/System/HappyXB/HeroCallHopeWin.cs
+++ b/Main/System/HappyXB/HeroCallHopeWin.cs
@@ -50,11 +50,12 @@
HappyXBModel.Instance.selectWishListTab = functionOrder;
HappyXBModel.Instance.RefreshXBTypeInfoAct += RefreshXBTypeInfo;
HappyXBModel.Instance.OnSelectWishHeroEvent += OnSelectWishHeroEvent;
+ InvestModel.Instance.onInvestUpdate += OnInvestUpdate;
scroller.OnRefreshCell += OnRefreshCell;
HappyXBModel.Instance.TryGetHeroWishIDByQuality((int)HappXBTitle.HeroCallAdvanced, 5, out HappyXBModel.Instance.selectSHHeroWishID, out int shWishCnt, out bool shAuto);
HappyXBModel.Instance.TryGetHeroWishIDByQuality((int)HappXBTitle.HeroCallAdvanced, 4, out HappyXBModel.Instance.selectCSHeroWishID, out int csWishCnt, out bool cqAuto);
-
- tip.text = Language.Get("HeroCall7", HappyXBModel.wishMaxOutCnt);
+
+
Display();
}
@@ -63,10 +64,28 @@
HappyXBModel.Instance.RefreshXBTypeInfoAct -= RefreshXBTypeInfo;
scroller.OnRefreshCell -= OnRefreshCell;
HappyXBModel.Instance.OnSelectWishHeroEvent -= OnSelectWishHeroEvent;
+ InvestModel.Instance.onInvestUpdate -= OnInvestUpdate;
}
+
+
+ void OnInvestUpdate(int type)
+ {
+ Display();
+ }
+
void Display()
{
+ bool isInvest = InvestModel.Instance.IsInvested(InvestModel.monthCardType);
+ if (isInvest)
+ {
+ tip.text = Language.Get("HeroCall17");
+ }
+ else
+ {
+ tip.text = Language.Get("HeroCall7", HappyXBModel.wishMaxOutCnt) + Language.Get("HeroCall18");
+ }
+
int shHeroID = 0;
if (HappyXBModel.Instance.selectSHHeroWishID == -1)
{
--
Gitblit v1.8.0