Removed Game class. Fixed reset issue.

Author: ChebanovDD

Assets/Scripts/App.cs

@@ -1,34 +1,75 @@
+using System;
+using Common.GameModes;
+using Match3.Infrastructure.Extensions;
+using Match3.Infrastructure.Interfaces;
 using UnityEngine;
 
 public class App : MonoBehaviour
 {
     [SerializeField] private AppContext _appContext;
 
-    private Game _game;
+    private int _currentModeIndex;
+    
+    private IGameMode _activeMode;
+    private IGameMode[] _gameModes;
 
     private void Awake()
     {
         _appContext.Construct();
-        _game = new Game(_appContext);
+        _gameModes = new IGameMode[]
+        {
+            new DrawGameBoardMode(_appContext),
+            new GameInitMode(_appContext),
+            new GamePlayMode(_appContext),
+            new GameResetMode(_appContext)
+        };
     }
 
     private void Start()
     {
-        _game.Start();
+        ActivateGameMode(0);
     }
 
     private void OnEnable()
     {
-        _game.Enable();
+        foreach (var gameMode in _gameModes)
+        {
+            gameMode.Finished += OnGameModeFinished;
+        }
     }
 
     private void OnDisable()
     {
-        _game.Disable();
+        foreach (var gameMode in _gameModes)
+        {
+            gameMode.Finished -= OnGameModeFinished;
+        }
     }
 
     private void OnDestroy()
     {
-        _game.Dispose();
+        foreach (var gameMode in _gameModes)
+        {
+            gameMode.Dispose();
+        }
+    }
+
+    private void OnGameModeFinished(object sender, EventArgs e)
+    {
+        _currentModeIndex++;
+
+        if (_currentModeIndex >= _gameModes.Length)
+        {
+            _currentModeIndex = 0;
+        }
+
+        ActivateGameMode(_currentModeIndex);
+    }
+
+    private void ActivateGameMode(int gameModeIndex)
+    {
+        _activeMode?.Deactivate();
+        _activeMode = _gameModes[gameModeIndex];
+        _activeMode.Activate();
     }
 }

Assets/Scripts/AppContext.cs

@@ -7,10 +7,12 @@
 using FillStrategies;
 using Match3.Core.Interfaces;
 using Match3.Infrastructure;
+using Match3.Infrastructure.Interfaces;
 using Match3.Infrastructure.SequenceDetectors;
 using Match3.UnityApp;
 using Match3.UnityApp.Interfaces;
 using UnityEngine;
+using IItemGenerator = Common.Interfaces.IItemGenerator;
 
 public class AppContext : MonoBehaviour, IAppContext
 {

Assets/Scripts/Common/Extensions/ItemsPoolExtensions.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using Common.Interfaces;
+using Match3.Infrastructure.Interfaces;
 
 namespace Common.Extensions
 {

Assets/Scripts/Common/GameModes/GameResetMode.cs

@@ -8,19 +8,22 @@ namespace Common.GameModes
     public class GameResetMode : IGameMode
     {
         private readonly UnityGame _unityGame;
-        private readonly Interfaces.IItemsPool<IUnityItem> _itemsPool;
+        private readonly IItemsPool<IUnityItem> _itemsPool;
+        private readonly IUnityGameBoardRenderer _gameBoardRenderer;
 
         public GameResetMode(IAppContext appContext)
         {
             _unityGame = appContext.Resolve<UnityGame>();
-            _itemsPool = appContext.Resolve<Interfaces.IItemsPool<IUnityItem>>();
+            _itemsPool = appContext.Resolve<IItemsPool<IUnityItem>>();
+            _gameBoardRenderer = appContext.Resolve<IUnityGameBoardRenderer>();
         }
 
         public event EventHandler Finished;
 
         public void Activate()
         {
             _itemsPool.ReturnAllItems(_unityGame.GetGridSlots());
+            _gameBoardRenderer.ResetGridTiles();
             _unityGame.ResetGameBoard();
 
             Finished?.Invoke(this, EventArgs.Empty);

Assets/Scripts/Common/Interfaces/IItemsPool.cs

@@ -1,6 +1,8 @@
 using System.Collections.Generic;
 using Common.Interfaces;
+using Match3.Infrastructure.Interfaces;
 using UnityEngine;
+using IItemGenerator = Common.Interfaces.IItemGenerator;
 using Random = System.Random;
 
 namespace Common

Assets/Scripts/Common/Interfaces/IItemsPool.cs.meta

@@ -5,6 +5,7 @@
 using Match3.Core.Interfaces;
 using Match3.Core.Models;
 using Match3.Core.Structs;
+using Match3.Infrastructure.Interfaces;
 using Match3.UnityApp.Interfaces;
 using UnityEngine;