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/Component/UI/Core/TextLanguageAdapter.cs | 85 +++++++++++++++++++++++-------------------
1 files changed, 47 insertions(+), 38 deletions(-)
diff --git a/Main/Component/UI/Core/TextLanguageAdapter.cs b/Main/Component/UI/Core/TextLanguageAdapter.cs
index edcd1c2..fea97e7 100644
--- a/Main/Component/UI/Core/TextLanguageAdapter.cs
+++ b/Main/Component/UI/Core/TextLanguageAdapter.cs
@@ -156,11 +156,22 @@
private bool m_IsApplied = false;
- public TextComponentType TargetTextType => m_TargetTextType;
- public Component TargetTextComponent => m_TargetTextComponent;
- public LanguageConfigDictionary LanguageConfigs => m_LanguageConfigs;
-
private void Awake() => DetectTargetComponent();
+
+ // 寮�鏀� set 鏉冮檺锛屽厑璁稿閮ㄦ垨缂栬緫鍣ㄦ墜鍔ㄨ祴鍊�
+ public TextComponentType TargetTextType
+ {
+ get => m_TargetTextType;
+ set => m_TargetTextType = value;
+ }
+
+ public Component TargetTextComponent
+ {
+ get => m_TargetTextComponent;
+ set => m_TargetTextComponent = value;
+ }
+
+ public LanguageConfigDictionary LanguageConfigs => m_LanguageConfigs;
private void OnEnable()
{
@@ -171,19 +182,37 @@
}
}
-#if UNITY_EDITOR
- private void Reset()
- {
- DetectTargetComponent();
- if (!HasConfig(DefaultLangId)) ReadCurrentToConfig(DefaultLangId);
- }
-#endif
-
public LanguageConfigItem GetConfig(string languageId) => m_LanguageConfigs.Get(languageId);
public void SetConfig(string languageId, LanguageConfigItem config) => m_LanguageConfigs.Set(languageId, config);
public void RemoveConfig(string languageId) => m_LanguageConfigs.Remove(languageId);
public bool HasConfig(string languageId) => m_LanguageConfigs.ContainsKey(languageId);
public List<string> GetConfiguredLanguages() => new List<string>(m_LanguageConfigs.keys);
+
+ private void DetectTargetComponent()
+ {
+ if (m_TargetTextComponent != null)
+ {
+ DetermineTextType(m_TargetTextComponent);
+ return;
+ }
+
+ m_TargetTextComponent = GetComponent<TextEx>() ?? GetComponentInChildren<TextEx>(true) as Component
+ ?? GetComponent<GradientText>() ?? GetComponentInChildren<GradientText>(true) as Component
+ ?? GetComponent<Text>() ?? GetComponentInChildren<Text>(true) as Component;
+
+ DetermineTextType(m_TargetTextComponent);
+ }
+
+ private void DetermineTextType(Component component)
+ {
+ m_TargetTextType = component switch
+ {
+ TextEx _ => TextComponentType.TextEx,
+ GradientText _ => TextComponentType.GradientText,
+ Text _ => TextComponentType.Text,
+ _ => TextComponentType.None
+ };
+ }
public void ApplyConfig(string languageId)
{
@@ -212,33 +241,13 @@
return languageId;
}
- private void DetectTargetComponent()
- {
- if (m_TargetTextComponent != null)
- {
- DetermineTextType(m_TargetTextComponent);
- return;
- }
-
- m_TargetTextComponent = GetComponent<GradientText>() ?? GetComponentInChildren<GradientText>(true) as Component
- ?? GetComponent<TextEx>() ?? GetComponentInChildren<TextEx>(true) as Component
- ?? GetComponent<Text>() ?? GetComponentInChildren<Text>(true) as Component;
-
- DetermineTextType(m_TargetTextComponent);
- }
-
- private void DetermineTextType(Component component)
- {
- m_TargetTextType = component switch
- {
- GradientText _ => TextComponentType.GradientText,
- TextEx _ => TextComponentType.TextEx,
- Text _ => TextComponentType.Text,
- _ => TextComponentType.None
- };
- }
-
#if UNITY_EDITOR
+ private void Reset()
+ {
+ DetectTargetComponent();
+ if (!HasConfig(DefaultLangId)) ReadCurrentToConfig(DefaultLangId);
+ }
+
[ContextMenu("鍒锋柊缁勪欢妫�娴�")]
public void Editor_ForceRefreshDetection()
{
--
Gitblit v1.8.0