Skip to content

Commit c6fee4c

Browse files
author
RUBIUS\chebanovdd
committed
Fixed SimpleFillStrategy issue.
1 parent 8edb433 commit c6fee4c

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

samples/Unity.Match3/Assets/Scripts/FillStrategies/SimpleFillStrategy.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public override IEnumerable<IJob> GetSolveJobs(IGameBoard<IUnityGridSlot> gameBo
3535
ReturnItemToPool(currentItem);
3636
}
3737

38-
foreach (var specialItemGridSlot in solvedData.GetSpecialItemGridSlots())
38+
foreach (var specialItemGridSlot in solvedData.GetSpecialItemGridSlots(true))
3939
{
4040
var item = GetItemFromPool();
4141
item.SetWorldPosition(GetWorldPosition(specialItemGridSlot.GridPosition));

src/Match3.App/SolvedData.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,15 @@ public IEnumerable<TGridSlot> GetSolvedGridSlots()
2626
}
2727
}
2828

29-
public IEnumerable<TGridSlot> GetSpecialItemGridSlots()
29+
public IEnumerable<TGridSlot> GetSpecialItemGridSlots(bool excludeOccupied = false)
3030
{
3131
foreach (var specialItemGridSlot in SpecialItemGridSlots)
3232
{
33+
if (excludeOccupied && specialItemGridSlot.HasItem)
34+
{
35+
continue;
36+
}
37+
3338
yield return specialItemGridSlot;
3439
}
3540
}

src/Match3.UnityPackage/Assets/Plugins/Match3/Runtime/Match3.App/SolvedData.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,15 @@ public IEnumerable<TGridSlot> GetSolvedGridSlots()
2626
}
2727
}
2828

29-
public IEnumerable<TGridSlot> GetSpecialItemGridSlots()
29+
public IEnumerable<TGridSlot> GetSpecialItemGridSlots(bool excludeOccupied = false)
3030
{
3131
foreach (var specialItemGridSlot in SpecialItemGridSlots)
3232
{
33+
if (excludeOccupied && specialItemGridSlot.HasItem)
34+
{
35+
continue;
36+
}
37+
3338
yield return specialItemGridSlot;
3439
}
3540
}

0 commit comments

Comments
 (0)