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/HeroUI/HeroCardCell.cs | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/Main/System/HeroUI/HeroCardCell.cs b/Main/System/HeroUI/HeroCardCell.cs
index aece00f..6b9ff13 100644
--- a/Main/System/HeroUI/HeroCardCell.cs
+++ b/Main/System/HeroUI/HeroCardCell.cs
@@ -15,6 +15,8 @@
[SerializeField] RedpointBehaviour redpoint;
[SerializeField] Image newImage; //鏂版爣璇嗗拰绾㈢偣浜掓枼
[SerializeField] Image trainStateImg;
+ [SerializeField] TextEx trainStatetxt;
+ [SerializeField] OutlineEx trainStateOutline;
[SerializeField] Image starRedImg;
[SerializeField] Text nameText;
[SerializeField] Image awakeImg;
@@ -49,7 +51,7 @@
newImage.SetActive(false);
}
else
- {
+ {
redpoint.redpointId = 0;
newImage.SetActive(HeroUIManager.Instance.newHeroIDList.Contains(hero.heroId));
}
@@ -59,6 +61,22 @@
{
trainStateImg.SetActive(true);
trainStateImg.SetSprite("herofuncstate" + funcState);
+ trainStatetxt.text = funcState switch
+ {
+ 1 => Language.Get("herocard41"),
+ 2 => Language.Get("HeroGift3"),
+ 3 => Language.Get("L1111"),
+ 4 => Language.Get("L1109"),
+ _ => string.Empty,
+ };
+ trainStateOutline.OutlineColor = funcState switch
+ {
+ 1 => new Color32(0x5c, 0x2b, 0x2b, 255),
+ 2 => new Color32(0x5c, 0x46, 0x2b, 255),
+ 3 => new Color32(0x2b, 0x3d, 0x5c, 255),
+ 4 => new Color32(0x2e, 0x5c, 0x2b, 255),
+ _ => Color.white,
+ };
}
else
{
--
Gitblit v1.8.0