Changed stateful slot logic.

Author: RUBIUS\chebanovdd

samples/Unity.Match3/Assets/Scripts/Common/GridTiles/StatefulGridTile.cs

@@ -17,27 +17,33 @@ protected override void Start()
             _stateSpriteRenderer.sprite = GetStateSprite(_currentStateIndex);
         }
 
-        public virtual bool NextState()
+        public void NextState()
         {
             _currentStateIndex++;
 
-            if (_currentStateIndex >= _stateSpriteNames.Length)
+            if (_currentStateIndex < _stateSpriteNames.Length)
+            {
+                _stateSpriteRenderer.sprite = GetStateSprite(_currentStateIndex);
+            }
+            else
             {
                 _stateSpriteRenderer.enabled = false;
-                return false;
+                OnComplete();
             }
-
-            _stateSpriteRenderer.sprite = GetStateSprite(_currentStateIndex);
-            return true;
         }
 
-        public virtual void ResetState()
+        public void ResetState()
         {
             _currentStateIndex = 0;
             _stateSpriteRenderer.enabled = true;
             _stateSpriteRenderer.sprite = GetStateSprite(0);
+
+            OnReset();
         }
 
+        protected abstract void OnComplete();
+        protected abstract void OnReset();
+
         private Sprite GetStateSprite(int index)
         {
             return GetSprite(_stateSpriteNames[index]);

samples/Unity.Match3/Assets/Scripts/Common/GridTiles/States/IceState.cs

@@ -10,21 +10,13 @@ public class IceState : StatefulGridTile
         public override bool CanContainItem => true;
         public override TileGroup Group => TileGroup.Ice;
 
-        public override bool NextState()
+        protected override void OnComplete()
         {
-            var hasNextState = base.NextState();
-            if (hasNextState)
-            {
-                return true;
-            }
-
             _isLocked = false;
-            return false;
         }
 
-        public override void ResetState()
+        protected override void OnReset()
         {
-            base.ResetState();
             _isLocked = true;
         }
     }

samples/Unity.Match3/Assets/Scripts/Common/GridTiles/States/StoneState.cs

@@ -11,24 +11,14 @@ public class StoneState : StatefulGridTile
         public override bool CanContainItem => _canContainItem;
         public override TileGroup Group => TileGroup.Stone;
 
-        public override bool NextState()
+        protected override void OnComplete()
         {
-            var hasNextState = base.NextState();
-            if (hasNextState)
-            {
-                return true;
-            }
-
             _isLocked = false;
             _canContainItem = true;
-
-            return false;
         }
 
-        public override void ResetState()
+        protected override void OnReset()
         {
-            base.ResetState();
-
             _isLocked = true;
             _canContainItem = false;
         }

samples/Unity.Match3/Assets/Scripts/Common/Interfaces/IStatefulSlot.cs

@@ -2,7 +2,7 @@ namespace Common.Interfaces
 {
     public interface IStatefulSlot
     {
-        bool NextState();
+        void NextState();
         void ResetState();
     }
 }