feat: spawn blocks

Author: SinlessDevil

Assets/Code/Infrastructure/BootstrapInstaller.cs

@@ -29,6 +29,7 @@ private void BindFactory()
         {
             Container.BindInterfacesTo<UIFactory>().AsSingle();
             Container.BindInterfacesTo<TileFactory>().AsSingle();
+            Container.BindInterfacesTo<BlockFactory>().AsSingle();
         }
 
         private void BindSaveLoad() =>

Assets/Code/Infrastructure/Generator/Factory/BlockFactory.cs

@@ -0,0 +1,21 @@
+using UnityEngine;
+using Zenject;
+
+namespace Code.Infrastructure.Generator.Factory
+{
+    public class BlockFactory : Infrastructure.Factory.Factory, IBlockFactory
+    {
+        private const string TilePrefabPath = "Tile/Tile";
+        
+        public BlockFactory(IInstantiator instantiator) : base(instantiator)
+        {
+            
+        }
+        
+        public GameObject CreateBlock(GameObject prefab,GameObject parent)
+        {
+            var blockGameObject = Instantiate(prefab, parent.transform);
+            return blockGameObject;
+        }
+    }
+}

Assets/Code/Infrastructure/Generator/Factory/BlockFactory.cs.meta

@@ -0,0 +1,9 @@
+using UnityEngine;
+
+namespace Code.Infrastructure.Generator.Factory
+{
+    public interface IBlockFactory
+    {
+        GameObject CreateBlock(GameObject prefab,GameObject parent);
+    }
+}

Assets/Code/Infrastructure/Generator/Factory/IBlockFactory.cs

@@ -1,6 +1,7 @@
 using Code.Infrastructure.Generator.Factory;
 using Code.Infrastructure.Services.StaticData;
 using Code.Infrastructure.StaticData;
+using Code.LevelEditor;
 using DG.Tweening;
 using UnityEngine;
 
@@ -14,13 +15,16 @@ public class LevelGeneratorService : ILevelGeneratorService
 
         private readonly IStaticDataService _staticDataService;
         private readonly ITileFactory _tileFactory;
+        private readonly IBlockFactory _blockFactory;
 
         public LevelGeneratorService(
             IStaticDataService staticDataService, 
-            ITileFactory tileFactory)
+            ITileFactory tileFactory,
+            IBlockFactory blockFactory)
         {
             _staticDataService = staticDataService;
             _tileFactory = tileFactory;
+            _blockFactory = blockFactory;
         }
 
         public void SetUpRootMapHolder(GameObject rootMapHolder)
@@ -45,15 +49,15 @@ public void CleanUp()
 
         public void GenerateLevel()
         {
-            CleanUp(); // 👈 очищаем предыдущую генерацию
-
             const int gridSize = 11;
             _tileMatrix = new Tile[gridSize, gridSize];
 
             TileBalanceData tileBalanceData = _staticDataService.Balance.TileBalanceData;
 
             float baseDelay = 0.02f;
 
+            var levelData = _staticDataService.GetLevelData(_currentLevelIndex.ToString());
+            
             for (int y = 0; y < gridSize; y++)
             {
                 for (int x = 0; x < gridSize; x++)
@@ -66,14 +70,24 @@ public void GenerateLevel()
 
                     Tile tile = _tileFactory.CreateTile(_rootMapHolder);
                     tile.transform.localPosition = spawnPosition;
-
+                    
                     bool isEven = (x + y) % 2 == 0;
                     Color tileColor = isEven ? tileBalanceData.ColorEven : tileBalanceData.ColorNotEven;
                     tile.SetColor(tileColor);
                     tile.SetUpScale();
                     float delay = (x + y) * baseDelay;
                     DOVirtual.DelayedCall(delay, tile.PlayAnimationShowTile);
 
+                    LevelCell cellData = levelData.Cells[x, y];
+                    if (cellData != null && cellData.Block != null)
+                    {
+                        GameObject block = _blockFactory.CreateBlock(cellData.Block.Prefab,tile.gameObject);
+                        block.transform.rotation = cellData.Rotation;
+                        
+                        tile.SetBlock(block);
+                        DOVirtual.DelayedCall(delay, tile.PlayAnimationShowBlock);
+                    }
+                    
                     _tileMatrix[x, y] = tile;
                 }
             }

Assets/Code/Infrastructure/Generator/Factory/IBlockFactory.cs.meta

@@ -7,6 +7,6 @@ namespace Code.LevelEditor
     public class LevelCell
     {
         public BlockDataEditor Block;
-        public Quaternion Rotation = Quaternion.identity;
+        [SerializeField] public Quaternion Rotation = Quaternion.identity;
     }
 }

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

@@ -93,10 +93,6 @@ private void DrawCellContent(Rect rect, LevelCell cell)
                 DrawBlockId(rect, cell.Block.ID);
                 DrawRotationArrow(rect, cell.Rotation);
             }
-            else
-            {
-                //  EditorGUI.DrawRect(rect.Padding(4), Color.gray);
-            }
         }
 
         private void DrawHexagonOutline(Rect rect)
@@ -136,17 +132,20 @@ private void DrawRotationArrow(Rect rect, Quaternion rotation)
         {
             var oldMatrix = GUI.matrix;
             Vector2 center = rect.center;
-            GUIUtility.RotateAroundPivot(rotation.eulerAngles.z, center);
+            
+            float angle = rotation.eulerAngles.y;
+            GUIUtility.RotateAroundPivot(angle, center);
+
             GUI.Label(new Rect(center.x - 10, rect.yMin - 4, 25, 25), "↑", new GUIStyle(GUI.skin.label)
             {
                 alignment = TextAnchor.UpperCenter,
                 fontSize = 25,
                 normal = { textColor = Color.green },
                 fontStyle = FontStyle.Bold
             });
+
             GUI.matrix = oldMatrix;
         }
-
         private void DrawSelectionOverlay(Rect rect, int x, int y)
         {
             if (_currentSelection.Contains(new Vector2Int(x, y)))

Assets/Code/LevelEditor/LevelCell.cs

@@ -92,7 +92,9 @@ private void DrawRotationArrow(Rect rect, Quaternion rotation)
         {
             var oldMatrix = GUI.matrix;
             Vector2 center = rect.center;
-            GUIUtility.RotateAroundPivot(rotation.eulerAngles.z, center);
+            
+            float angle = rotation.eulerAngles.y;
+            GUIUtility.RotateAroundPivot(angle, center);
 
             GUI.Label(new Rect(center.x - 10, rect.yMin - 4, 25, 25), "↑", new GUIStyle(GUI.skin.label)
             {
@@ -205,7 +207,9 @@ private void ApplyBlock(BlockDataEditor block, LevelCell fallbackCell)
 
         private void ApplyRotation(float angle, LevelCell fallbackCell)
         {
-            Quaternion rotation = Quaternion.Euler(0, 0, angle);
+            Debug.Log($"⟳ Apply Rotation: {angle}°");
+            
+            Quaternion rotation = Quaternion.Euler(0, angle, 0);
 
             if (currentSelection.Count > 0)
             {