edit: convert IEnumerator to UniTask

Author: SinlessDevil

Assets/Code/Infrastructure/LoadingCurtain.cs

@@ -11,7 +11,9 @@ public class LoadingCurtain : MonoBehaviour, ILoadingCurtain
         private const float Delay = 1.75f;
         private const float AnimationDuration = 0.65f;
         private const float TextUpdateInterval = 0.15f;
-
+        private const string BaseText = "Loading";
+        private readonly string[] DotsText = { "", ".", "..", "..." };
+        
         [SerializeField] private RectTransform _right;
         [SerializeField] private RectTransform _left;
         [SerializeField] private TMP_Text _loadingText;
@@ -80,22 +82,21 @@ private void StopLoadingTextAnimation()
         {
             if (_textAnimationCts != null && !_textAnimationCts.IsCancellationRequested)
                 _textAnimationCts.Cancel();
+            
             _textAnimationCts?.Dispose();
             _textAnimationCts = null;
         }
 
         private async UniTaskVoid AnimateLoadingTextAsync(CancellationToken token)
         {
-            string baseText = "Loading";
-            string[] dots = { "", ".", "..", "..." };
             int index = 0;
 
             try
             {
                 while (!token.IsCancellationRequested)
                 {
-                    _loadingText.text = baseText + dots[index];
-                    index = (index + 1) % dots.Length;
+                    _loadingText.text = BaseText + DotsText[index];
+                    index = (index + 1) % DotsText.Length;
                     await UniTask.Delay(TimeSpan.FromSeconds(TextUpdateInterval), cancellationToken: token);
                 }
             }

Assets/Code/UI/ButtonScaler.cs

@@ -1,19 +1,22 @@
-using System.Collections;
+using System.Threading;
 using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityEngine.UI;
+using Cysharp.Threading.Tasks;
 
 namespace Code.UI
 {
     public class ButtonScaler : MonoBehaviour, IPointerDownHandler, IPointerUpHandler
     {
         [SerializeField] private Image _image;
+        
         [Header("Setup")]
         [SerializeField] private float ScaleAmount = 0.8f;
         [SerializeField] private float ScaleDuration = 0.2f;
-    
+
         private Vector3 _originalScale;
-    
+        private CancellationTokenSource _scaleCts;
+
         private void Start() => SetupScaleOrigin();
 
         public void SetupScaleOrigin()
@@ -23,39 +26,41 @@ public void SetupScaleOrigin()
 
         public void OnPointerDown(PointerEventData eventData)
         {
-            StopAllCoroutines();
-            _image.transform.localScale = _originalScale;
-            
             if (!_image.gameObject.activeInHierarchy)
                 return;
-            
-            StartCoroutine(ScaleButton(_originalScale * ScaleAmount, ScaleDuration));
+
+            _scaleCts?.Cancel();
+            _scaleCts = new CancellationTokenSource();
+            _ = ScaleButtonAsync(_originalScale * ScaleAmount, ScaleDuration, _scaleCts.Token);
         }
 
         public void OnPointerUp(PointerEventData eventData)
         {
-            StopAllCoroutines();
-            
             if (!_image.gameObject.activeInHierarchy)
                 return;
 
-            StartCoroutine(ScaleButton(_originalScale, ScaleDuration));
+            _scaleCts?.Cancel();
+            _scaleCts = new CancellationTokenSource();
+            _ = ScaleButtonAsync(_originalScale, ScaleDuration, _scaleCts.Token);
         }
 
-        private IEnumerator ScaleButton(Vector3 targetScale, float duration)
+        private async UniTaskVoid ScaleButtonAsync(Vector3 targetScale, float duration, CancellationToken token)
         {
-            float time = 0;
+            float time = 0f;
             Vector3 startScale = _image.transform.localScale;
 
             while (time < duration)
             {
+                if (token.IsCancellationRequested) 
+                    return;
+
                 float t = time / duration;
                 _image.transform.localScale = Vector3.Lerp(startScale, targetScale, t);
                 time += Time.unscaledDeltaTime;
-                yield return null;
+                await UniTask.Yield(PlayerLoopTiming.Update, token);
             }
 
             _image.transform.localScale = targetScale;
         }
-    }   
-}
+    }
+}