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/HeroTrainWin.cs | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/Main/System/HeroUI/HeroTrainWin.cs b/Main/System/HeroUI/HeroTrainWin.cs
index e34b969..c6daefa 100644
--- a/Main/System/HeroUI/HeroTrainWin.cs
+++ b/Main/System/HeroUI/HeroTrainWin.cs
@@ -373,8 +373,17 @@
{
if (hero.heroConfig.FetterIDList.Length > 0)
{
- connetionForm.SetActive(true);
- connetionForm.Display(hero.heroConfig.FetterIDList[0], Language.Get("herocard38") + "\n", true, guid);
+ int fetterID = hero.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, guid);
+ }
+ else
+ {
+ connetionForm.SetActive(false);
+ }
}
else
{
@@ -696,6 +705,16 @@
fetterGo.SetActive(false);
return;
}
+
+ // 妫�鏌ョ涓�涓緛缁婄粍鍚堟槸鍚︽弧瓒冲紑鏈嶅ぉ鏉′欢锛屼笉婊¤冻鍒欓殣钘忔暣涓緛缁婂尯鍩�
+ int firstFetterID = hero.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++)
--
Gitblit v1.8.0