From 51b0f6ed9f4e1d3bb6f8144470b46908c7699a96 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 11 五月 2026 16:20:37 +0800
Subject: [PATCH] Merge branch 'master' into h5version
---
Main/System/HeroUI/HeroBestWin.cs | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/Main/System/HeroUI/HeroBestWin.cs b/Main/System/HeroUI/HeroBestWin.cs
index 4d180ee..f36291c 100644
--- a/Main/System/HeroUI/HeroBestWin.cs
+++ b/Main/System/HeroUI/HeroBestWin.cs
@@ -127,7 +127,7 @@
allAttrScroll.verticalNormalizedPosition = 1;
Display();
HeroUIManager.Instance.skinRedpoint.state = HeroUIManager.Instance.HeroAllSkinStateForRedpoint(HeroUIManager.Instance.selectForPreviewHeroID, true) > 0 ? RedPointState.Simple : RedPointState.None;
-
+
}
@@ -143,7 +143,7 @@
jobPosNameText.text = HeroUIManager.Instance.GetJobName(heroConfig.Class);
descText.text = heroConfig.Desc;
HeroUIManager.Instance.PlayerLHSound(skinID);
-
+
RefreshConn();
normalSkillCell.Init(heroConfig.AtkSkillID, () =>
{
@@ -195,8 +195,17 @@
{
if (heroConfig.FetterIDList.Length > 0)
{
- connetionForm.SetActive(true);
- connetionForm.Display(heroConfig.FetterIDList[0], Language.Get("herocard38") + "\n", true);
+ int fetterID = heroConfig.FetterIDList[0];
+ HeroFetterConfig fetterConfig = HeroFetterConfig.Get(fetterID);
+ if (fetterConfig != null && HeroUIManager.IsFetterAllHeroOpen(fetterConfig))
+ {
+ connetionForm.SetActive(true);
+ connetionForm.Display(fetterID, Language.Get("herocard38") + "\n", true);
+ }
+ else
+ {
+ connetionForm.SetActive(false);
+ }
}
else
{
@@ -223,7 +232,7 @@
}
HeroUIManager.Instance.selectForPreviewHeroID = HeroUIManager.Instance.heroCollectList[resultIndex];
Display();
-
+
//鎺у埗涓�绾у姛鑳界晫闈㈢殑鐨偆鎸夐挳
var ui = UIManager.Instance.GetUI<HeroBestBaseWin>();
if (ui != null)
@@ -332,7 +341,7 @@
}
-
+
void RefreshAllPotential()
{
@@ -396,11 +405,21 @@
//缇佺粖
void RefreshFetter()
{
- if (heroConfig.FetterIDList.Length == 0)
+ if (heroConfig.FetterIDList.IsNullOrEmpty())
{
fetterGo.SetActive(false);
return;
}
+
+ // 妫�鏌ョ涓�涓緛缁婄粍鍚堟槸鍚︽弧瓒冲紑鏈嶅ぉ鏉′欢锛屼笉婊¤冻鍒欓殣钘忔暣涓緛缁婂尯鍩�
+ int firstFetterID = heroConfig.FetterIDList[0];
+ HeroFetterConfig firstFetterConfig = HeroFetterConfig.Get(firstFetterID);
+ if (firstFetterConfig == null || !HeroUIManager.IsFetterAllHeroOpen(firstFetterConfig))
+ {
+ fetterGo.SetActive(false);
+ return;
+ }
+
fetterGo.SetActive(true);
for (int i = 0; i < fetterText.Length; i++)
@@ -528,6 +547,5 @@
}
}
}
-
}
\ No newline at end of file
--
Gitblit v1.8.0