Override this merge.

jcs090218 · jcs090218 · commit a87d3600239c · 2019-07-18T20:00:09.000+08:00
diff --git a/Assets/JCSUnity/Scripts/GUI/JCS_TextDeltaNumber.cs b/Assets/JCSUnity/Scripts/GUI/JCS_TextDeltaNumber.cs
@@ -222,7 +222,7 @@ private void UpdateTextRender()
 #if TMP_PRO
             if (mTextContainer == null && mTextMesh == null)
 #else
-            if (mText == null)
+            if (mTextContainer == null)
 #endif
             {
                 JCS_Debug.LogError("Text slot cannot be null references...");
diff --git a/Assets/JCSUnity/Scripts/GUI/JCS_TextTimer.cs b/Assets/JCSUnity/Scripts/GUI/JCS_TextTimer.cs
@@ -200,7 +200,7 @@ public void UpdateTimeUI(float hour, float minute, float second)
 #if TMP_PRO
             if (mTextContainer == null && mTextMesh == null)
 #else
-            if (mText == null)
+            if (mTextContainer == null)
 #endif
             {
                 JCS_Debug.LogError("Text slot cannot be null references...");

Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,7 @@ private void UpdateTextRender()`
`222`	`222`	`#if TMP_PRO`
`223`	`223`	`if (mTextContainer == null && mTextMesh == null)`
`224`	`224`	`#else`
`225`		`- if (mText == null)`
	`225`	`+ if (mTextContainer == null)`
`226`	`226`	`#endif`
`227`	`227`	`{`
`228`	`228`	`JCS_Debug.LogError("Text slot cannot be null references...");`
Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ public void UpdateTimeUI(float hour, float minute, float second)`
`200`	`200`	`#if TMP_PRO`
`201`	`201`	`if (mTextContainer == null && mTextMesh == null)`
`202`	`202`	`#else`
`203`		`- if (mText == null)`
	`203`	`+ if (mTextContainer == null)`
`204`	`204`	`#endif`
`205`	`205`	`{`
`206`	`206`	`JCS_Debug.LogError("Text slot cannot be null references...");`