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/Guild/GuildEmblemSelectCell.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Main/System/Guild/GuildEmblemSelectCell.cs b/Main/System/Guild/GuildEmblemSelectCell.cs
index b325ac1..6212360 100644
--- a/Main/System/Guild/GuildEmblemSelectCell.cs
+++ b/Main/System/Guild/GuildEmblemSelectCell.cs
@@ -7,7 +7,7 @@
public class GuildEmblemSelectCell : MonoBehaviour
{
[SerializeField] GuildEmblemCell emblemIcon;
- [SerializeField] Image useImg;
+ [SerializeField] TextEx usetext;
[SerializeField] Image lockImg;
[SerializeField] Image selectImg;
[SerializeField] Button selectBtn;
@@ -19,11 +19,11 @@
emblemIcon.Display(id, "", 0.5f);
if (PlayerDatas.Instance.fairyData.fairy == null)
{
- useImg.SetActive(false);
+ usetext.SetActive(false);
}
else
{
- useImg.SetActive(id == PlayerDatas.Instance.fairyData.fairy.EmblemID);
+ usetext.SetActive(id == PlayerDatas.Instance.fairyData.fairy.EmblemID);
}
lockImg.SetActive(!GuildEmblemModel.Instance.IsUnLock(id));
selectImg.SetActive(id == GuildEmblemModel.Instance.nowChooseEmblemId);
--
Gitblit v1.8.0