Changed param type for OnSequencesSolved method.

RUBIUS\chebanovdd · RUBIUS\chebanovdd · commit 8edb43359f82 · 2022-04-22T14:42:18.000+07:00
diff --git a/samples/Terminal.Match3/LevelGoals/CollectRowMaxItems.cs b/samples/Terminal.Match3/LevelGoals/CollectRowMaxItems.cs
@@ -1,5 +1,4 @@
 ﻿using System;
-using System.Collections.Generic;
 using Match3.App;
 using Match3.App.Interfaces;
 using Match3.Infrastructure.SequenceDetectors;
@@ -16,9 +15,9 @@ public CollectRowMaxItems(IGameBoard<ITerminalGridSlot> gameBoard)
             _maxRowLength = GetMaxRowLength(gameBoard);
         }
 
-        public override void OnSequencesSolved(IEnumerable<ItemSequence<ITerminalGridSlot>> sequences)
+        public override void OnSequencesSolved(SolvedData<ITerminalGridSlot> solvedData)
         {
-            foreach (var sequence in sequences)
+            foreach (var sequence in solvedData.SolvedSequences)
             {
                 if (sequence.SequenceDetectorType != typeof(HorizontalLineDetector<ITerminalGridSlot>))
                 {
diff --git a/samples/Unity.Match3/Assets/Scripts/Common/GameScoreBoard.cs b/samples/Unity.Match3/Assets/Scripts/Common/GameScoreBoard.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using System.Text;
 using Common.Interfaces;
 using Match3.App;
@@ -9,9 +8,9 @@ namespace Common
 {
     public class GameScoreBoard : ISolvedSequencesConsumer<IUnityGridSlot>
     {
-        public void OnSequencesSolved(IEnumerable<ItemSequence<IUnityGridSlot>> sequences)
+        public void OnSequencesSolved(SolvedData<IUnityGridSlot> solvedData)
         {
-            foreach (var sequence in sequences)
+            foreach (var sequence in solvedData.SolvedSequences)
             {
                 RegisterSequenceScore(sequence);
             }
diff --git a/samples/Unity.Match3/Assets/Scripts/Common/LevelGoals/CollectRowMaxItems.cs b/samples/Unity.Match3/Assets/Scripts/Common/LevelGoals/CollectRowMaxItems.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using Common.Interfaces;
 using Match3.App;
 using Match3.App.Interfaces;
@@ -16,9 +15,9 @@ public CollectRowMaxItems(IGameBoard<IUnityGridSlot> gameBoard)
             _maxRowLength = GetMaxRowLength(gameBoard);
         }
 
-        public override void OnSequencesSolved(IEnumerable<ItemSequence<IUnityGridSlot>> sequences)
+        public override void OnSequencesSolved(SolvedData<IUnityGridSlot> solvedData)
         {
-            foreach (var sequence in sequences)
+            foreach (var sequence in solvedData.SolvedSequences)
             {
                 if (sequence.SequenceDetectorType != typeof(HorizontalLineDetector<IUnityGridSlot>))
                 {
diff --git a/src/Match3.App/Interfaces/ISolvedSequencesConsumer.cs b/src/Match3.App/Interfaces/ISolvedSequencesConsumer.cs
@@ -1,10 +1,9 @@
-using System.Collections.Generic;
 using Match3.Core.Interfaces;
 
 namespace Match3.App.Interfaces
 {
     public interface ISolvedSequencesConsumer<TGridSlot> where TGridSlot : IGridSlot
     {
-        void OnSequencesSolved(IEnumerable<ItemSequence<TGridSlot>> sequences);
+        void OnSequencesSolved(SolvedData<TGridSlot> solvedData);
     }
 }
diff --git a/src/Match3.App/Internal/BaseGame.cs b/src/Match3.App/Internal/BaseGame.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using Match3.App.Interfaces;
 using Match3.Core.Interfaces;
 using Match3.Core.Structs;
@@ -97,18 +96,18 @@ protected bool IsSolved(GridPosition position1, GridPosition position2, out Solv
             return solvedData.SolvedSequences.Count > 0;
         }
 
-        protected void NotifySequencesSolved(IReadOnlyCollection<ItemSequence<TGridSlot>> sequences)
+        protected void NotifySequencesSolved(SolvedData<TGridSlot> solvedData)
         {
             foreach (var sequencesConsumer in _solvedSequencesConsumers)
             {
-                sequencesConsumer.OnSequencesSolved(sequences);
+                sequencesConsumer.OnSequencesSolved(solvedData);
             }
 
             foreach (var levelGoal in _levelGoals)
             {
                 if (levelGoal.IsAchieved == false)
                 {
-                    levelGoal.OnSequencesSolved(sequences);
+                    levelGoal.OnSequencesSolved(solvedData);
                 }
             }
         }
diff --git a/src/Match3.App/LevelGoal.cs b/src/Match3.App/LevelGoal.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using Match3.App.Interfaces;
 using Match3.Core.Interfaces;
 
@@ -11,7 +10,7 @@ public abstract class LevelGoal<TGridSlot> : ISolvedSequencesConsumer<TGridSlot>
 
         public event EventHandler Achieved;
 
-        public abstract void OnSequencesSolved(IEnumerable<ItemSequence<TGridSlot>> sequences);
+        public abstract void OnSequencesSolved(SolvedData<TGridSlot> solvedData);
 
         protected void MarkAchieved()
         {
diff --git a/src/Match3.App/Match3Game.cs b/src/Match3.App/Match3Game.cs
@@ -79,7 +79,7 @@ private async UniTask SwapItemsAsync(IBoardFillStrategy<TGridSlot> fillStrategy,
 
             if (IsSolved(position1, position2, out var solvedData))
             {
-                NotifySequencesSolved(solvedData.SolvedSequences);
+                NotifySequencesSolved(solvedData);
                 await _jobsExecutor.ExecuteJobsAsync(fillStrategy.GetSolveJobs(GameBoard, solvedData), cancellationToken);
             }
             else
diff --git a/src/Match3.UnityPackage/Assets/Plugins/Match3/Runtime/Match3.App/Interfaces/ISolvedSequencesConsumer.cs b/src/Match3.UnityPackage/Assets/Plugins/Match3/Runtime/Match3.App/Interfaces/ISolvedSequencesConsumer.cs
@@ -1,10 +1,9 @@
-using System.Collections.Generic;
 using Match3.Core.Interfaces;
 
 namespace Match3.App.Interfaces
 {
     public interface ISolvedSequencesConsumer<TGridSlot> where TGridSlot : IGridSlot
     {
-        void OnSequencesSolved(IEnumerable<ItemSequence<TGridSlot>> sequences);
+        void OnSequencesSolved(SolvedData<TGridSlot> solvedData);
     }
 }
diff --git a/src/Match3.UnityPackage/Assets/Plugins/Match3/Runtime/Match3.App/Internal/BaseGame.cs b/src/Match3.UnityPackage/Assets/Plugins/Match3/Runtime/Match3.App/Internal/BaseGame.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using Match3.App.Interfaces;
 using Match3.Core.Interfaces;
 using Match3.Core.Structs;
@@ -97,18 +96,18 @@ protected bool IsSolved(GridPosition position1, GridPosition position2, out Solv
             return solvedData.SolvedSequences.Count > 0;
         }
 
-        protected void NotifySequencesSolved(IReadOnlyCollection<ItemSequence<TGridSlot>> sequences)
+        protected void NotifySequencesSolved(SolvedData<TGridSlot> solvedData)
         {
             foreach (var sequencesConsumer in _solvedSequencesConsumers)
             {
-                sequencesConsumer.OnSequencesSolved(sequences);
+                sequencesConsumer.OnSequencesSolved(solvedData);
             }
 
             foreach (var levelGoal in _levelGoals)
             {
                 if (levelGoal.IsAchieved == false)
                 {
-                    levelGoal.OnSequencesSolved(sequences);
+                    levelGoal.OnSequencesSolved(solvedData);
                 }
             }
         }
diff --git a/src/Match3.UnityPackage/Assets/Plugins/Match3/Runtime/Match3.App/LevelGoal.cs b/src/Match3.UnityPackage/Assets/Plugins/Match3/Runtime/Match3.App/LevelGoal.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using Match3.App.Interfaces;
 using Match3.Core.Interfaces;
 
@@ -11,7 +10,7 @@ public abstract class LevelGoal<TGridSlot> : ISolvedSequencesConsumer<TGridSlot>
 
         public event EventHandler Achieved;
 
-        public abstract void OnSequencesSolved(IEnumerable<ItemSequence<TGridSlot>> sequences);
+        public abstract void OnSequencesSolved(SolvedData<TGridSlot> solvedData);
 
         protected void MarkAchieved()
         {
diff --git a/src/Match3.UnityPackage/Assets/Plugins/Match3/Runtime/Match3.App/Match3Game.cs b/src/Match3.UnityPackage/Assets/Plugins/Match3/Runtime/Match3.App/Match3Game.cs
@@ -79,7 +79,7 @@ private async UniTask SwapItemsAsync(IBoardFillStrategy<TGridSlot> fillStrategy,
 
             if (IsSolved(position1, position2, out var solvedData))
             {
-                NotifySequencesSolved(solvedData.SolvedSequences);
+                NotifySequencesSolved(solvedData);
                 await _jobsExecutor.ExecuteJobsAsync(fillStrategy.GetSolveJobs(GameBoard, solvedData), cancellationToken);
             }
             else

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using System;`
`2`		`-using System.Collections.Generic;`
`3`	`2`	`using Match3.App;`
`4`	`3`	`using Match3.App.Interfaces;`
`5`	`4`	`using Match3.Infrastructure.SequenceDetectors;`
`@@ -16,9 +15,9 @@ public CollectRowMaxItems(IGameBoard<ITerminalGridSlot> gameBoard)`
`16`	`15`	`_maxRowLength = GetMaxRowLength(gameBoard);`
`17`	`16`	`}`
`18`	`17`
`19`		`- public override void OnSequencesSolved(IEnumerable<ItemSequence<ITerminalGridSlot>> sequences)`
	`18`	`+ public override void OnSequencesSolved(SolvedData<ITerminalGridSlot> solvedData)`
`20`	`19`	`{`
`21`		`- foreach (var sequence in sequences)`
	`20`	`+ foreach (var sequence in solvedData.SolvedSequences)`
`22`	`21`	`{`
`23`	`22`	`if (sequence.SequenceDetectorType != typeof(HorizontalLineDetector<ITerminalGridSlot>))`
`24`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-using System.Collections.Generic;`
`2`	`1`	`using System.Text;`
`3`	`2`	`using Common.Interfaces;`
`4`	`3`	`using Match3.App;`
`@@ -9,9 +8,9 @@ namespace Common`
`9`	`8`	`{`
`10`	`9`	`public class GameScoreBoard : ISolvedSequencesConsumer<IUnityGridSlot>`
`11`	`10`	`{`
`12`		`- public void OnSequencesSolved(IEnumerable<ItemSequence<IUnityGridSlot>> sequences)`
	`11`	`+ public void OnSequencesSolved(SolvedData<IUnityGridSlot> solvedData)`
`13`	`12`	`{`
`14`		`- foreach (var sequence in sequences)`
	`13`	`+ foreach (var sequence in solvedData.SolvedSequences)`
`15`	`14`	`{`
`16`	`15`	`RegisterSequenceScore(sequence);`
`17`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,9 @@`
`1`		`-using System.Collections.Generic;`
`2`	`1`	`using Match3.Core.Interfaces;`
`3`	`2`
`4`	`3`	`namespace Match3.App.Interfaces`
`5`	`4`	`{`
`6`	`5`	`public interface ISolvedSequencesConsumer<TGridSlot> where TGridSlot : IGridSlot`
`7`	`6`	`{`
`8`		`- void OnSequencesSolved(IEnumerable<ItemSequence<TGridSlot>> sequences);`
	`7`	`+ void OnSequencesSolved(SolvedData<TGridSlot> solvedData);`
`9`	`8`	`}`
`10`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ private async UniTask SwapItemsAsync(IBoardFillStrategy<TGridSlot> fillStrategy,`
`79`	`79`
`80`	`80`	`if (IsSolved(position1, position2, out var solvedData))`
`81`	`81`	`{`
`82`		`- NotifySequencesSolved(solvedData.SolvedSequences);`
	`82`	`+ NotifySequencesSolved(solvedData);`
`83`	`83`	`await _jobsExecutor.ExecuteJobsAsync(fillStrategy.GetSolveJobs(GameBoard, solvedData), cancellationToken);`
`84`	`84`	`}`
`85`	`85`	`else`