edit: LoadingCurtain convert text to tmp_pro and delete Coroutine

Author: SinlessDevil

Assets/Code/Extensions/DOTweenTMPExtensions.cs

@@ -6,7 +6,8 @@ namespace Code.Extensions
 {
     public static class DOTweenTMPExtensions
     {
-        public static Tweener DOTextCounter(this TMP_Text target, int fromValue, int toValue, float duration, bool addThousandsSeparator = false)
+        public static Tweener DOTextCounter(this TMP_Text target, int fromValue, int toValue, float duration, 
+            bool addThousandsSeparator = false)
         {
             int currentValue = fromValue;
             return DOTween.To(() => currentValue, x =>

Assets/Code/Infrastructure/LoadingCurtain.cs

@@ -1,19 +1,22 @@
-using System.Collections;
+using System;
+using System.Threading;
+using Cysharp.Threading.Tasks;
+using TMPro;
 using UnityEngine;
-using UnityEngine.UI;
 
 namespace Code.Infrastructure
 {
     public class LoadingCurtain : MonoBehaviour, ILoadingCurtain
     {
         private const float Delay = 1.75f;
         private const float AnimationDuration = 0.65f;
-        
+        private const float TextUpdateInterval = 0.15f;
+
         [SerializeField] private RectTransform _right;
         [SerializeField] private RectTransform _left;
-        [SerializeField] private Text _loadingText;
+        [SerializeField] private TMP_Text _loadingText;
 
-        private Coroutine _loadingTextCoroutine;
+        private CancellationTokenSource _textAnimationCts;
 
         private void Awake()
         {
@@ -32,64 +35,73 @@ public void Show()
 
         public void Hide()
         {
-            StartCoroutine(AnimationOpen());
+            AnimationOpenAsync().Forget();
             StartLoadingTextAnimation();
         }
 
-        private IEnumerator AnimationOpen()
+        private async UniTaskVoid AnimationOpenAsync()
         {
-            yield return new WaitForSeconds(Delay);
-            
+            await UniTask.Delay(TimeSpan.FromSeconds(Delay), cancellationToken: this.GetCancellationTokenOnDestroy());
+
             float screenWidth = Screen.width;
             float elapsedTime = 0f;
 
             Vector2 leftStart = _left.anchoredPosition;
-            Vector2 leftTarget = new Vector2(-screenWidth / 2, leftStart.y);
-            
+            Vector2 leftTarget = new Vector2(-screenWidth / 2f, leftStart.y);
+
             Vector2 rightStart = _right.anchoredPosition;
-            Vector2 rightTarget = new Vector2(screenWidth / 2, rightStart.y);
+            Vector2 rightTarget = new Vector2(screenWidth / 2f, rightStart.y);
 
             while (elapsedTime < AnimationDuration)
             {
                 elapsedTime += Time.deltaTime;
-                float t = elapsedTime / AnimationDuration;
+                float t = Mathf.Clamp01(elapsedTime / AnimationDuration);
                 _left.anchoredPosition = Vector2.Lerp(leftStart, leftTarget, t);
                 _right.anchoredPosition = Vector2.Lerp(rightStart, rightTarget, t);
-                yield return null;
+                await UniTask.Yield(PlayerLoopTiming.Update);
             }
 
             _left.anchoredPosition = leftTarget;
             _right.anchoredPosition = rightTarget;
-            
+
             StopLoadingTextAnimation();
             gameObject.SetActive(false);
             IsActive = false;
         }
 
         private void StartLoadingTextAnimation()
         {
-            _loadingTextCoroutine = StartCoroutine(LoadingTextEffect());
+            StopLoadingTextAnimation();
+            _textAnimationCts = new CancellationTokenSource();
+            AnimateLoadingTextAsync(_textAnimationCts.Token).Forget();
         }
 
         private void StopLoadingTextAnimation()
         {
-            if (_loadingTextCoroutine != null)
-                StopCoroutine(_loadingTextCoroutine);
+            if (_textAnimationCts != null && !_textAnimationCts.IsCancellationRequested)
+                _textAnimationCts.Cancel();
+            _textAnimationCts?.Dispose();
+            _textAnimationCts = null;
         }
 
-        private IEnumerator LoadingTextEffect()
+        private async UniTaskVoid AnimateLoadingTextAsync(CancellationToken token)
         {
             string baseText = "Loading";
-            while (true)
+            string[] dots = { "", ".", "..", "..." };
+            int index = 0;
+
+            try
+            {
+                while (!token.IsCancellationRequested)
+                {
+                    _loadingText.text = baseText + dots[index];
+                    index = (index + 1) % dots.Length;
+                    await UniTask.Delay(TimeSpan.FromSeconds(TextUpdateInterval), cancellationToken: token);
+                }
+            }
+            catch (OperationCanceledException)
             {
-                _loadingText.text = baseText + "";
-                yield return new WaitForSeconds(0.15f);
-                _loadingText.text = baseText + ".";
-                yield return new WaitForSeconds(0.15f);
-                _loadingText.text = baseText + "..";
-                yield return new WaitForSeconds(0.15f);
-                _loadingText.text = baseText + "...";
-                yield return new WaitForSeconds(0.15f);
+                
             }
         }
     }

Assets/Resources/Huds/LoadingCurtain.prefab

@@ -59,7 +59,7 @@ Canvas:
   m_OverridePixelPerfect: 0
   m_SortingBucketNormalizedSize: 0
   m_VertexColorAlwaysGammaSpace: 0
-  m_AdditionalShaderChannelsFlag: 0
+  m_AdditionalShaderChannelsFlag: 25
   m_UpdateRectTransformForStandalone: 0
   m_SortingLayerID: 0
   m_SortingOrder: 100
@@ -118,7 +118,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _right: {fileID: 6276509582930694241}
   _left: {fileID: 9210649380886456409}
-  _loadingText: {fileID: 2674375570835396536}
+  _loadingText: {fileID: 7500382623053582182}
 --- !u!225 &4943869930359128343
 CanvasGroup:
   m_ObjectHideFlags: 0
@@ -445,9 +445,9 @@ GameObject:
   m_Component:
   - component: {fileID: 8408788738794632932}
   - component: {fileID: 1794397984737047278}
-  - component: {fileID: 2674375570835396536}
   - component: {fileID: 8245301671873328852}
   - component: {fileID: 1221078767789420150}
+  - component: {fileID: 7500382623053582182}
   m_Layer: 5
   m_Name: Text_Loading
   m_TagString: Untagged
@@ -482,7 +482,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5851812557447389215}
   m_CullTransparentMesh: 1
---- !u!114 &2674375570835396536
+--- !u!114 &8245301671873328852
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -491,32 +491,13 @@ MonoBehaviour:
   m_GameObject: {fileID: 5851812557447389215}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 12800000, guid: c16eb7d7c3953489db00312b8b09df4b, type: 3}
-    m_FontSize: 39
-    m_FontStyle: 0
-    m_BestFit: 1
-    m_MinSize: 0
-    m_MaxSize: 40
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: Loading . . .
---- !u!114 &8245301671873328852
+  m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
+  m_EffectDistance: {x: 2, y: 2}
+  m_UseGraphicAlpha: 1
+--- !u!114 &1221078767789420150
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -525,13 +506,13 @@ MonoBehaviour:
   m_GameObject: {fileID: 5851812557447389215}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
-  m_EffectDistance: {x: 2, y: 2}
+  m_EffectDistance: {x: 0, y: -2}
   m_UseGraphicAlpha: 1
---- !u!114 &1221078767789420150
+--- !u!114 &7500382623053582182
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -540,9 +521,85 @@ MonoBehaviour:
   m_GameObject: {fileID: 5851812557447389215}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3}
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
-  m_EffectDistance: {x: 0, y: -2}
-  m_UseGraphicAlpha: 1
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_text: Loading . . .
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: 9a2157e1f9c4c4d38841fbb92558f587, type: 2}
+  m_sharedMaterial: {fileID: -6360588970910393389, guid: 9a2157e1f9c4c4d38841fbb92558f587, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 39
+  m_fontSizeBase: 39
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
+  m_fontStyle: 0
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_TextWrappingMode: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 0
+  m_ActiveFontFeatures: 6e72656b
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_EmojiFallbackSupport: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 0
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}