From ad3ac1661daaf4b445914f87009d3d88c990f040 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期二, 28 四月 2026 11:45:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into h5version
---
Main/System/HeroReturn/HeroReturnCallWin.cs | 29 +++++++++--------------------
1 files changed, 9 insertions(+), 20 deletions(-)
diff --git a/Main/System/HeroReturn/HeroReturnCallWin.cs b/Main/System/HeroReturn/HeroReturnCallWin.cs
index 84a866e..de1a3e8 100644
--- a/Main/System/HeroReturn/HeroReturnCallWin.cs
+++ b/Main/System/HeroReturn/HeroReturnCallWin.cs
@@ -55,6 +55,7 @@
[SerializeField] UIHeroController lhController;
[SerializeField] UIHeroController uiHeroController;
[SerializeField] HeroReturnCallBubbleCell[] bubbleCell;
+ [SerializeField] RichText richText;
[SerializeField] float modleSize = 1f;
HeroReturnManager manager => HeroReturnManager.Instance;
@@ -276,8 +277,10 @@
xbButton10.Display(config.ActTreasureType, 1);
resMoneyCallCntText.text = Language.Get("HeroDebut24", Mathf.Max(treasureSetConfig.DailyMaxCountMoney - xbTypeInfo.treasureCountTodayGold, 0));
- var needCount = GetNextXBCountForBigAward(treasureType);
- nextBigAwardCntText.text = Language.Get("HeroDebut08", needCount.ToString());
+ int buyState = manager.GetZhanLingBuyState();
+ bool isBuyPaidH = buyState == 2 || buyState == 3;
+ var needCount = manager.GetNextXBCountForBigAward(treasureType) - (isBuyPaidH ? manager.subVulue : 0);
+ nextBigAwardCntText.text = Language.Get("HeroDebut08", needCount <= 0 ? 1 : needCount);
heroQualityText.text = Language.Get($"heroCallQaulity{heroConfig.Quality}");
manager.SetheroQaulityColor(heroQualityText, heroConfig.Quality);
@@ -304,28 +307,13 @@
}
}
+ // 璐拱浜嗛珮绾ф垬浠わ紙鐜勭骇锛夋椂闅愯棌richText
+ richText.SetActive(!isBuyPaidH);
+
ShowTop3();
OnSecondEvent();
}
- public int GetNextXBCountForBigAward(int type)
- {
- XBTypeInfo typeInfo = HappyXBModel.Instance.GetXBInfoByType(type);
- if (typeInfo == null) return 0;
-
- var xbConfig = HappyXBModel.Instance.GetXBItemConfigByType(type);
- var luckList = xbConfig.LuckyItemRateInfo.Keys.ToList();
- luckList.Sort();
- for (int i = 0; i < luckList.Count; i++)
- {
- var luckyValue = typeInfo.luckValue;
- if (luckyValue < luckList[i])
- {
- return luckList[i] - luckyValue;
- }
- }
- return 0;
- }
void ShowTop3()
{
for (int i = 0; i < top3NameText.Length; i++)
@@ -353,6 +341,7 @@
scroller.Refresh();
int listCount = list?.Count ?? 0;
+ historyButton.SetActive(listCount > 0);
if (list != null)
{
for (int i = 0; i < listCount; i++)
--
Gitblit v1.8.0