TCG/tcg-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
YiHan0621
2025-09-14 20:22:00 +08:00
parent db68c377bd 211454c34f
commit ca04bba0bc
4 changed files with 58 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Assets/TcgEngine/Scripts/GameClient/BoardDeck.cs
View File

@@ -20,6 +20,7 @@ namespace TcgEngine.Client
public Text discard_value;
private bool hover = false;
private string prev_deck_path = null;
void Start()
{
@@ -43,28 +44,20 @@ namespace TcgEngine.Client
if (player == null)
return;
// 获取卡背数据，如果为空则使用默认路径
CardbackData cb = CardbackData.Get(player.cardback);
if (deck_render != null)
string targetDeckPath = cb != null && !string.IsNullOrEmpty(cb.deck_path) ? cb.deck_path : "Cardbacks/deck_silver.png";
if (deck_render != null && (deck_render.sprite == null || prev_deck_path != targetDeckPath))
{
if (cb != null)
Sprite sprite = SpriteLoader.Get()?.LoadSprite(targetDeckPath);
if (sprite != null)
{
deck_render.sprite = cb.GetDeck();
deck_render.sprite = sprite;
deck_render.gameObject.transform.localScale = Vector3.one * 0.5f;
prev_deck_path = targetDeckPath;
}
else
{
// 如果卡背数据为空，使用默认路径
Sprite defaultDeckSprite = SpriteLoader.Get()?.LoadSprite("Cardbacks/deck_silver.png");
if (defaultDeckSprite != null)
{
deck_render.sprite = defaultDeckSprite;
deck_render.transform.localScale = Vector3.one * 0.5f;
}
else
{
Debug.LogWarning($"[BoardDeck] {(opponent ? "敌方" : "我方")} 默认牌组图片加载失败: Cardbacks/deck_silver.png");
}
Debug.LogWarning($"[BoardDeck] {(opponent ? "敌方" : "我方")} 牌组图片加载失败: {targetDeckPath}");
}
}

2
Assets/TcgEngine/Scripts/UI/AvatarUI.cs
View File

@@ -67,6 +67,8 @@ namespace TcgEngine.UI
/// </summary>
public void SetAvatarPath(string path)
{
if (avatar_path == path)
return;
avatar_path = path;
LoadAvatarSprite();
}

50
Assets/TcgEngine/Scripts/UI/CardUI.cs
View File

@@ -68,17 +68,21 @@ namespace TcgEngine.UI
if (card == null)
return;
bool isSameCard = (this.card == card) && (this.variant == variant);
this.card = card;
this.variant = variant;
if(card_image != null)
card_image.sprite = card.GetFullArt(variant);
if (frame_image != null)
frame_image.sprite = variant.frame;
if (card_title != null)
card_title.text = card.GetTitle().ToUpper();
if (card_text != null)
card_text.text = card.GetText();
if (!isSameCard)
{
if(card_image != null)
card_image.sprite = card.GetFullArt(variant);
if (frame_image != null)
frame_image.sprite = (variant != null) ? variant.frame : frame_image.sprite;
if (card_title != null)
card_title.text = card.GetTitle().ToUpper();
if (card_text != null)
card_text.text = card.GetText();
}
if (attack_icon != null)
attack_icon.enabled = card.IsCharacter();
@@ -102,20 +106,34 @@ namespace TcgEngine.UI
if (hp != null)
hp.text = card.hp.ToString();
if (team_icon != null)
if (!isSameCard)
{
team_icon.sprite = card.team.icon;
team_icon.enabled = team_icon.sprite != null;
if (team_icon != null)
{
Sprite teamSprite = (card.team != null) ? card.team.icon : null;
team_icon.sprite = teamSprite;
team_icon.enabled = teamSprite != null;
}
}
if (rarity_icon != null)
if (!isSameCard)
{
rarity_icon.sprite = card.rarity.icon;
rarity_icon.enabled = rarity_icon.sprite != null && card.type != CardType.Hero;
if (rarity_icon != null)
{
Sprite raritySprite = (card.rarity != null) ? card.rarity.icon : null;
rarity_icon.sprite = raritySprite;
rarity_icon.enabled = raritySprite != null && card.type != CardType.Hero;
}
}
foreach (TraitUI stat in stats)
stat.SetCard(card);
if (stats != null)
{
foreach (TraitUI stat in stats)
{
if (stat != null)
stat.SetCard(card);
}
}
if (!gameObject.activeSelf)
gameObject.SetActive(true);