Added onlyMovable param to GetSolvedGridSlots method.

RUBIUS\chebanovdd · RUBIUS\chebanovdd · commit bd94a386ac04 · 2022-04-22T15:26:41.000+07:00
diff --git a/src/Match3.App/SolvedData.cs b/src/Match3.App/SolvedData.cs
@@ -15,12 +15,17 @@ public SolvedData(IReadOnlyCollection<ItemSequence<TGridSlot>> solvedSequences,
         public IReadOnlyCollection<TGridSlot> SpecialItemGridSlots { get; }
         public IReadOnlyCollection<ItemSequence<TGridSlot>> SolvedSequences { get; }
 
-        public IEnumerable<TGridSlot> GetSolvedGridSlots()
+        public IEnumerable<TGridSlot> GetSolvedGridSlots(bool onlyMovable = false)
         {
             foreach (var sequence in SolvedSequences)
             {
                 foreach (var solvedGridSlot in sequence.SolvedGridSlots)
                 {
+                    if (onlyMovable && solvedGridSlot.IsMovable == false)
+                    {
+                        continue;
+                    }
+
                     yield return solvedGridSlot;
                 }
             }
diff --git a/src/Match3.Infrastructure/Extensions/ItemsSequenceExtensions.cs b/src/Match3.Infrastructure/Extensions/ItemsSequenceExtensions.cs
@@ -11,13 +11,8 @@ public static IEnumerable<TGridSlot> GetUniqueSolvedGridSlots<TGridSlot>(this So
         {
             var solvedGridSlots = new HashSet<TGridSlot>();
 
-            foreach (var solvedGridSlot in solvedData.GetSolvedGridSlots())
+            foreach (var solvedGridSlot in solvedData.GetSolvedGridSlots(onlyMovable))
             {
-                if (onlyMovable && solvedGridSlot.IsMovable == false)
-                {
-                    continue;
-                }
-
                 if (solvedGridSlots.Add(solvedGridSlot) == false)
                 {
                     continue;
diff --git a/src/Match3.Infrastructure/GameBoardSolver.cs b/src/Match3.Infrastructure/GameBoardSolver.cs
@@ -9,7 +9,7 @@
 
 namespace Match3.Infrastructure
 {
-    public class GameBoardSolver<TGridSlot> : IGameBoardSolver<TGridSlot> where TGridSlot : class, IGridSlot
+    public class GameBoardSolver<TGridSlot> : IGameBoardSolver<TGridSlot> where TGridSlot : IGridSlot
     {
         private readonly ISpecialItemDetector<TGridSlot>[] _specialItemDetectors;
         private readonly ISequenceDetector<TGridSlot>[] _sequenceDetectors;
diff --git a/src/Match3.UnityPackage/Assets/Plugins/Match3/Runtime/Match3.App/SolvedData.cs b/src/Match3.UnityPackage/Assets/Plugins/Match3/Runtime/Match3.App/SolvedData.cs
@@ -15,12 +15,17 @@ public SolvedData(IReadOnlyCollection<ItemSequence<TGridSlot>> solvedSequences,
         public IReadOnlyCollection<TGridSlot> SpecialItemGridSlots { get; }
         public IReadOnlyCollection<ItemSequence<TGridSlot>> SolvedSequences { get; }
 
-        public IEnumerable<TGridSlot> GetSolvedGridSlots()
+        public IEnumerable<TGridSlot> GetSolvedGridSlots(bool onlyMovable = false)
         {
             foreach (var sequence in SolvedSequences)
             {
                 foreach (var solvedGridSlot in sequence.SolvedGridSlots)
                 {
+                    if (onlyMovable && solvedGridSlot.IsMovable == false)
+                    {
+                        continue;
+                    }
+
                     yield return solvedGridSlot;
                 }
             }
diff --git a/src/Match3.UnityPackage/Assets/Plugins/Match3/Runtime/Match3.Infrastructure/Extensions/ItemsSequenceExtensions.cs b/src/Match3.UnityPackage/Assets/Plugins/Match3/Runtime/Match3.Infrastructure/Extensions/ItemsSequenceExtensions.cs
@@ -11,13 +11,8 @@ public static IEnumerable<TGridSlot> GetUniqueSolvedGridSlots<TGridSlot>(this So
         {
             var solvedGridSlots = new HashSet<TGridSlot>();
 
-            foreach (var solvedGridSlot in solvedData.GetSolvedGridSlots())
+            foreach (var solvedGridSlot in solvedData.GetSolvedGridSlots(onlyMovable))
             {
-                if (onlyMovable && solvedGridSlot.IsMovable == false)
-                {
-                    continue;
-                }
-
                 if (solvedGridSlots.Add(solvedGridSlot) == false)
                 {
                     continue;
diff --git a/src/Match3.UnityPackage/Assets/Plugins/Match3/Runtime/Match3.Infrastructure/GameBoardSolver.cs b/src/Match3.UnityPackage/Assets/Plugins/Match3/Runtime/Match3.Infrastructure/GameBoardSolver.cs
@@ -9,7 +9,7 @@
 
 namespace Match3.Infrastructure
 {
-    public class GameBoardSolver<TGridSlot> : IGameBoardSolver<TGridSlot> where TGridSlot : class, IGridSlot
+    public class GameBoardSolver<TGridSlot> : IGameBoardSolver<TGridSlot> where TGridSlot : IGridSlot
     {
         private readonly ISpecialItemDetector<TGridSlot>[] _specialItemDetectors;
         private readonly ISequenceDetector<TGridSlot>[] _sequenceDetectors;

Original file line number	Diff line number	Diff line change
`@@ -15,12 +15,17 @@ public SolvedData(IReadOnlyCollection<ItemSequence<TGridSlot>> solvedSequences,`
`15`	`15`	`public IReadOnlyCollection<TGridSlot> SpecialItemGridSlots { get; }`
`16`	`16`	`public IReadOnlyCollection<ItemSequence<TGridSlot>> SolvedSequences { get; }`
`17`	`17`
`18`		`- public IEnumerable<TGridSlot> GetSolvedGridSlots()`
	`18`	`+ public IEnumerable<TGridSlot> GetSolvedGridSlots(bool onlyMovable = false)`
`19`	`19`	`{`
`20`	`20`	`foreach (var sequence in SolvedSequences)`
`21`	`21`	`{`
`22`	`22`	`foreach (var solvedGridSlot in sequence.SolvedGridSlots)`
`23`	`23`	`{`
	`24`	`+ if (onlyMovable && solvedGridSlot.IsMovable == false)`
	`25`	`+ {`
	`26`	`+ continue;`
	`27`	`+ }`
	`28`	`+`
`24`	`29`	`yield return solvedGridSlot;`
`25`	`30`	`}`
`26`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,13 +11,8 @@ public static IEnumerable<TGridSlot> GetUniqueSolvedGridSlots<TGridSlot>(this So`
`11`	`11`	`{`
`12`	`12`	`var solvedGridSlots = new HashSet<TGridSlot>();`
`13`	`13`
`14`		`- foreach (var solvedGridSlot in solvedData.GetSolvedGridSlots())`
	`14`	`+ foreach (var solvedGridSlot in solvedData.GetSolvedGridSlots(onlyMovable))`
`15`	`15`	`{`
`16`		`- if (onlyMovable && solvedGridSlot.IsMovable == false)`
`17`		`- {`
`18`		`- continue;`
`19`		`- }`
`20`		`-`
`21`	`16`	`if (solvedGridSlots.Add(solvedGridSlot) == false)`
`22`	`17`	`{`
`23`	`18`	`continue;`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`
`10`	`10`	`namespace Match3.Infrastructure`
`11`	`11`	`{`
`12`		`- public class GameBoardSolver<TGridSlot> : IGameBoardSolver<TGridSlot> where TGridSlot : class, IGridSlot`
	`12`	`+ public class GameBoardSolver<TGridSlot> : IGameBoardSolver<TGridSlot> where TGridSlot : IGridSlot`
`13`	`13`	`{`
`14`	`14`	`private readonly ISpecialItemDetector<TGridSlot>[] _specialItemDetectors;`
`15`	`15`	`private readonly ISequenceDetector<TGridSlot>[] _sequenceDetectors;`