Skip to content

Commit 38ba923

Browse files
committed
feat: Compatible to all text mesh
1 parent b3e2516 commit 38ba923

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

Assets/JCSUnity/Scripts/UI/DeltaNumber/JCS_TextDeltaNumber.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ private void DoDeltaCurrentNumber()
241241
private void UpdateTextRender()
242242
{
243243
#if TMP_PRO
244-
if (mTextContainer == null && mTextMesh == null)
244+
if (mTextContainer == null && mTMP_Text == null)
245245
#else
246246
if (mTextContainer == null)
247247
#endif
@@ -263,8 +263,8 @@ private void UpdateTextRender()
263263
if (mTextContainer)
264264
mTextContainer.text = mFullString;
265265
#if TMP_PRO
266-
if (mTextMesh)
267-
mTextMesh.text = mFullString;
266+
if (mTMP_Text)
267+
mTMP_Text.text = mFullString;
268268
#endif
269269
}
270270
}

Assets/JCSUnity/Scripts/UI/JCS_TextObject.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ public class JCS_TextObject : MonoBehaviour
3737
#if TMP_PRO
3838
[Tooltip("Target text renderer. (TMP)")]
3939
[SerializeField]
40-
protected TextMeshPro mTextMesh = null;
40+
protected TMP_Text mTMP_Text = null;
4141
#endif
4242

4343
/* Setter & Getter */
4444

4545
public Text TextContainer { get { return this.mTextContainer; } set { this.mTextContainer = value; } }
4646
#if TMP_PRO
47-
public TextMeshPro TextMesh { get { return this.mTextMesh; } set { this.mTextMesh = value; } }
47+
public TMP_Text TMP_Text { get { return this.mTMP_Text; } set { this.mTMP_Text = value; } }
4848
#endif
4949

5050
/* Functions */
@@ -56,7 +56,7 @@ public string text
5656
{
5757
if (this.mTextContainer) this.mTextContainer.text = value;
5858
#if TMP_PRO
59-
if (this.mTextMesh) this.mTextMesh.text = value;
59+
if (this.mTMP_Text) this.mTMP_Text.text = value;
6060
#endif
6161
}
6262
}

Assets/JCSUnity/Scripts/UI/Language/JCS_LangText.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public void Refresh()
5555
{
5656
JCS_UIUtil.SetLangText(this.mLangData, this.mTextContainer);
5757
#if TMP_PRO
58-
JCS_UIUtil.SetLangText(this.mLangData, this.mTextMesh);
58+
JCS_UIUtil.SetLangText(this.mLangData, this.mTMP_Text);
5959
#endif
6060
}
6161
}

Assets/JCSUnity/Scripts/UI/Timer/JCS_TextTimer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ public void UpdateTimeUI()
199199
public void UpdateTimeUI(float hour, float minute, float second)
200200
{
201201
#if TMP_PRO
202-
if (mTextContainer == null && mTextMesh == null)
202+
if (mTextContainer == null && mTMP_Text == null)
203203
#else
204204
if (mTextContainer == null)
205205
#endif

Assets/JCSUnity/Scripts/Util/JCS_UIUtil.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public static void SetLangText(JCS_LangDataList data, Text txt)
6868
/// </summary>
6969
/// <param name="data"> Language data list. </param>
7070
/// <param name="txt"> Text container to display language data. </param>
71-
public static void SetLangText(JCS_LangDataList data, TextMeshPro txt)
71+
public static void SetLangText(JCS_LangDataList data, TMP_Text txt)
7272
{
7373
SystemLanguage lang = JCS_ApplicationManager.instance.systemLanguage;
7474

@@ -102,7 +102,7 @@ public static void SetText(Text txt, string data)
102102
/// </summary>
103103
/// <param name="txt"> Target text mesh to be set. </param>
104104
/// <param name="data"> Text value to display inside text mesh. </param>
105-
public static void SetText(TextMeshPro txt, string data)
105+
public static void SetText(TMP_Text txt, string data)
106106
{
107107
if (txt == null) return;
108108
txt.text = data;

Assets/_Project/Scenes/UI/FT_TextSlider.unity

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ Canvas:
273273
m_OverridePixelPerfect: 0
274274
m_SortingBucketNormalizedSize: 0
275275
m_VertexColorAlwaysGammaSpace: 0
276-
m_AdditionalShaderChannelsFlag: 0
276+
m_AdditionalShaderChannelsFlag: 25
277277
m_UpdateRectTransformForStandalone: 0
278278
m_SortingLayerID: 0
279279
m_SortingOrder: 0
@@ -1052,7 +1052,7 @@ MonoBehaviour:
10521052
m_Name:
10531053
m_EditorClassIdentifier:
10541054
mTextContainer: {fileID: 1842546916}
1055-
mTextMesh: {fileID: 0}
1055+
mTMP_Text: {fileID: 0}
10561056
mSlider: {fileID: 1408916069}
10571057
mRoundPlace: 2
10581058
--- !u!1 &2002942730

0 commit comments

Comments
 (0)