feat: LoadNextLevel

Author: SinlessDevil

Assets/Code/Infrastructure/Generator/ButtonGenerateLevel.cs

@@ -36,7 +36,7 @@ private void OnDestroy()
 
         private void OnGenerateLevelButtonClick()
         {
-            _levelGeneratorService.GenerateLevel();
+            _levelGeneratorService.LoadNextLevel();
         }
     }
 }

Assets/Code/Infrastructure/Generator/Services/ILevelGeneratorService.cs

@@ -1,11 +1,13 @@
+using System;
 using UnityEngine;
 
 namespace Code.Infrastructure.Generator.Services
 {
     public interface ILevelGeneratorService
     {
         void SetUpRootMapHolder(GameObject rootMapHolder);
-        void CleanUp();
+        void CleanUp(Action onComplete = null);
         void GenerateLevel();
+        void LoadNextLevel();
     }
 }

Assets/Code/Infrastructure/Generator/Services/LevelGeneratorService.cs

@@ -3,6 +3,7 @@
 using Code.Infrastructure.StaticData;
 using Code.LevelEditor;
 using DG.Tweening;
+using System;
 using UnityEngine;
 
 namespace Code.Infrastructure.Generator.Services
@@ -12,39 +13,67 @@ public class LevelGeneratorService : ILevelGeneratorService
         private Tile[,] _tileMatrix;
         private GameObject _rootMapHolder;
         private int _currentLevelIndex = 1;
-        
+
         private readonly IStaticDataService _staticDataService;
         private readonly ITileFactory _tileFactory;
         private readonly IBlockFactory _blockFactory;
 
         public LevelGeneratorService(
-            IStaticDataService staticDataService, 
+            IStaticDataService staticDataService,
             ITileFactory tileFactory,
             IBlockFactory blockFactory)
         {
             _staticDataService = staticDataService;
             _tileFactory = tileFactory;
             _blockFactory = blockFactory;
         }
-        
+
         public void SetUpRootMapHolder(GameObject rootMapHolder)
         {
             _rootMapHolder = rootMapHolder;
         }
 
-        public void CleanUp()
+        public void CleanUp(Action onComplete = null)
         {
-            if (_tileMatrix == null) return;
+            if (_tileMatrix == null)
+            {
+                onComplete?.Invoke();
+                return;
+            }
+
+            int width = _tileMatrix.GetLength(0);
+            int height = _tileMatrix.GetLength(1);
+            float baseDelay = 0.01f;
+            int counter = 0;
+            int total = width * height;
 
-            foreach (var tile in _tileMatrix)
+            for (int y = height - 1; y >= 0; y--)
             {
-                if (tile != null)
+                for (int x = width - 1; x >= 0; x--)
                 {
-                    UnityEngine.Object.Destroy(tile.gameObject);
+                    Tile tile = _tileMatrix[x, y];
+                    if (tile == null)
+                    {
+                        counter++;
+                        continue;
+                    }
+
+                    float delay = ((width - x) + (height - y)) * baseDelay;
+                    DOVirtual.DelayedCall(delay, () =>
+                    {
+                        tile.PlayAnimationHideTile(() =>
+                        {
+                            UnityEngine.Object.Destroy(tile.gameObject);
+                            counter++;
+                            if (counter >= total)
+                            {
+                                _tileMatrix = null;
+                                onComplete?.Invoke();
+                            }
+                        });
+                    });
                 }
             }
-
-            _tileMatrix = null;
         }
 
         public void GenerateLevel()
@@ -96,5 +125,10 @@ public void GenerateLevel()
             }
         }
 
+        public void LoadNextLevel()
+        {
+            CleanUp(() => GenerateLevel());
+            _currentLevelIndex++;
+        }
     }
-}
+}

Assets/Code/Infrastructure/Services/StaticData/StaticDataService.cs

@@ -43,11 +43,11 @@ public LevelDataDTO GetLevelData(string levelId)
 
         private int ExtractIndexFromId(string levelId)
         {
-            if (string.IsNullOrEmpty(levelId))
-                return 0;
-
+            if (int.TryParse(levelId, out int result))
+                return result;
+            
             var parts = levelId.Split('_');
-            if (parts.Length == 2 && int.TryParse(parts[1], out int result))
+            if (parts.Length == 2 && int.TryParse(parts[1], out result))
                 return result;
 
             return 0;