From 9e89e605d5429babb4b33df2e47ea86dff9d2ba7 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 20 十一月 2025 11:55:04 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Guild/GuildEmblemCell.cs | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/Main/System/Guild/GuildEmblemCell.cs b/Main/System/Guild/GuildEmblemCell.cs
index 2f7690d..b10f7aa 100644
--- a/Main/System/Guild/GuildEmblemCell.cs
+++ b/Main/System/Guild/GuildEmblemCell.cs
@@ -8,10 +8,10 @@
[RequireComponent(typeof(UIEffectPlayer))]
public class GuildEmblemCell : MonoBehaviour
{
- [SerializeField] ImageEx emblemIcon;
+ [SerializeField] Image emblemIcon;
[SerializeField] UIFrame frame;
[SerializeField] UIEffectPlayer uiEffect;
- [Header("瀛� F9E29F 鍖呰竟 683C00 瀛楀彿36 Y:-9")]
+ [Header("浠ｇ爜宸插鐞� 瀛� F9E29F 鍖呰竟 683C00 瀛楀彿72 Y:-18")]
[SerializeField] Text emblemNameText; //瀛� F9E29F 鍖呰竟 683C00 瀛楀彿36 Y-9
public void Display(int emblemID, string emblemName, float _scale = 1f)
@@ -19,6 +19,11 @@
FamilyEmblemConfig config = FamilyEmblemConfig.Get(emblemID);
if (config == null)
{
+ return;
+ }
+ if (emblemIcon == null)
+ {
+ Debug.LogError("鍏細寰界珷鏈缃�");
return;
}
@@ -47,7 +52,19 @@
emblemIcon.SetNativeSize();
}
emblemIcon.rectTransform.localScale = new Vector3(_scale, _scale, _scale);
- emblemNameText.text = emblemName;
+ if (emblemNameText != null)
+ {
+ emblemNameText.text = emblemName;
+ emblemNameText.fontSize = 72;
+ emblemNameText.rectTransform.localPosition = new Vector3(0, -18, 0);
+ emblemNameText.color = new Color32(255, 222, 159, 255);
+ var outline = emblemNameText.GetComponent<OutlineEx>();
+ if (outline != null)
+ {
+ emblemNameText.GetComponent<OutlineEx>().OutlineColor = new Color32(104, 60, 0, 255);
+ }
+ }
+
}
}
--
Gitblit v1.8.0