hesukastro/match3-unity
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Jesus Castro
2025-12-17 00:55:30 +08:00
parent 85b9767201
commit 3786863b00
13 changed files with 37 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/Scripts/Models/GameBoard.cs
View File

@@ -3,10 +3,10 @@ using UnityEngine;
namespace Services {
public class GameBoard : IGameBoard {
private int height, width;
private readonly int height, width;
public int Height => this.height;
public int Width => this.width;
private Gem[,] gemsGrid;
private readonly Gem[,] gemsGrid;
public Gem[,] GemsGrid => this.gemsGrid;
public GameBoard(int width, int height) {
@@ -17,7 +17,7 @@ namespace Services {
public Gem GetGemAt(Vector2Int pos) {
Gem gameObject = this.gemsGrid[pos.x, pos.y];
return gameObject != null ? gameObject : null;
return gameObject;
}
public void SetGemAt(Vector2Int pos, Gem gameObject) {

6
Assets/Scripts/Models/Gem.cs
View File

@@ -4,15 +4,15 @@ using UnityEngine;
namespace Services {
public class Gem {
private GemType type;
private readonly GemType type;
private Vector2Int position;
public GemType Type => this.type;
public Vector2Int Position => this.position;
private int scoreValue;
private readonly int scoreValue;
public int ScoreValue => this.scoreValue;
private GemType colorType;
private readonly GemType colorType;
public GemType MatchColor => this.type == GemType.Bomb ? this.colorType : this.type;
public Gem(GemType type, Vector2Int position, GemTypeValues gemValue, GemType? colorType = null) {

6
Assets/Scripts/Presenter/GemPresenter.cs
View File

@@ -1,13 +1,11 @@
using Services;
using UnityEngine;
using Utils;
using VContainer.Unity;
using Views;
namespace Presenter {
public class GemPresenter {
private Gem gem;
private GemView gemView;
private readonly Gem gem;
private readonly GemView gemView;
public Gem Gem => this.gem;
public GemView GemView => this.gemView;

5
Assets/Scripts/Presenter/ScorePresenter.cs
View File

@@ -1,12 +1,11 @@
using System;
using Services.Interfaces;
using VContainer.Unity;
using Views;
namespace Presenter {
public class ScorePresenter : IDisposable{
private IScoreService scoreService;
private ScoreView scoreView;
private readonly IScoreService scoreService;
private readonly ScoreView scoreView;
public ScorePresenter(IScoreService scoreService, ScoreView scoreView) {
this.scoreService = scoreService;
this.scoreView = scoreView;

5
Assets/Scripts/Scopes/LevelLifetimeScope.cs
View File

@@ -1,4 +1,3 @@
using Models;
using Models.Interfaces;
using Presenter;
using ScriptableObjects;
@@ -23,14 +22,14 @@ namespace Scopes
builder.RegisterComponentInHierarchy<ScoreView>();
builder.Register<IGameBoard>(c =>
builder.Register<IGameBoard>(_ =>
new GameBoard(this.gameVariables.width, this.gameVariables.height),
Lifetime.Scoped);
builder.Register<IMatchService, MatchService>(Lifetime.Scoped);
builder.Register<IScoreService, ScoreService>(Lifetime.Scoped);
builder.Register<IObjectPool<GemView>>(c =>
builder.Register<IObjectPool<GemView>>(_ =>
new ObjectPoolService(this.gameVariables.gemsPrefabs, this.gemsHolder),
Lifetime.Scoped);

4
Assets/Scripts/ScriptableObjects/GameVariables.cs
View File

@@ -1,9 +1,5 @@
using System;
using System.Collections.Generic;
using Enums;
using Structs;
using UnityEngine;
using Views;
namespace ScriptableObjects {
[CreateAssetMenu(fileName = "GameVariables", menuName = "Game Variables")]

1
Assets/Scripts/Services/BombService.cs
View File

@@ -4,7 +4,6 @@ using System.Collections.Generic;
using System.Linq;
using Cysharp.Threading.Tasks;
using Enums;
using Models;
using Services.Interfaces;
using UnityEngine;

1
Assets/Scripts/Services/GameBoardService.cs
View File

@@ -13,7 +13,6 @@ using Utils;
using VContainer.Unity;
using Views;
using Object = UnityEngine.Object;
using Random = UnityEngine.Random;
namespace Services {
public class GameBoardService : IGameBoardService, ITickable, IDisposable {

2
Assets/Scripts/Services/InputService.cs
View File

@@ -42,7 +42,7 @@ namespace Services {
private void TryEmitSwap(Vector2 downScreen, Vector2 upScreen)
{
if (this.inputCamera == null) return;
if (this.inputCamera is null) return;
Vector2 downWorld = this.inputCamera.ScreenToWorldPoint(downScreen);
Vector2 upWorld = this.inputCamera.ScreenToWorldPoint(upScreen);

2
Assets/Scripts/Services/Interfaces/IGameBoardService.cs
View File

@@ -1,7 +1,5 @@
using Cysharp.Threading.Tasks;
using Enums;
using UnityEngine;
using Views;
namespace Services.Interfaces {
public interface IGameBoardService {

66
Assets/Scripts/Services/MatchService.cs
View File

@@ -11,13 +11,13 @@ namespace Services {
private List<Gem> currentMatches = new List<Gem>();
public List<Gem> CurrentMatches => this.currentMatches;
public List<BombSpawnRequest> pendingBombSpawns = new List<BombSpawnRequest>();
private readonly List<BombSpawnRequest> pendingBombSpawns = new List<BombSpawnRequest>();
public IReadOnlyList<BombSpawnRequest> PendingBombSpawns => this.pendingBombSpawns;
private Vector2Int lastSwapFrom;
private Vector2Int lastSwapTo;
private IGameBoard gameBoard;
private readonly IGameBoard gameBoard;
public MatchService(IGameBoard gameBoard) {
this.gameBoard = gameBoard;
@@ -125,9 +125,9 @@ namespace Services {
if (this.currentMatches.All(g => g.Position != pivot))
return;
// If the matched group that includes this pivot has 4+ connected gems, spawn a bomb.
int groupSize = GetMatchedGroupSize(pivot);
if (groupSize < 4)
// Only create a bomb if pivot is part of a straight 4+ line of the SAME color.
int longestLine = GetLongestMatchedLineThroughPivot(pivot, pivotGem.MatchColor);
if (longestLine < 4)
return;
// Prevent duplicates for the same cell.
@@ -137,52 +137,30 @@ namespace Services {
this.pendingBombSpawns.Add(new BombSpawnRequest(pivot, pivotGem.MatchColor));
}
private int GetMatchedGroupSize(Vector2Int pivot) {
Gem pivotGem = this.gameBoard.GetGemAt(pivot);
if (pivotGem == null)
return 0;
private int GetLongestMatchedLineThroughPivot(Vector2Int pivot, GemType color) {
int horizontal = 1 + CountSameColorInDirection(pivot, Vector2Int.left, color)
+ CountSameColorInDirection(pivot, Vector2Int.right, color);
GemType color = pivotGem.MatchColor;
int vertical = 1 + CountSameColorInDirection(pivot, Vector2Int.up, color)
+ CountSameColorInDirection(pivot, Vector2Int.down, color);
HashSet<Vector2Int> matchedPositions = new HashSet<Vector2Int>(
this.currentMatches
.Where(g => g != null && g.MatchColor == color)
.Select(g => g.Position)
);
return Mathf.Max(horizontal, vertical);
}
if (!matchedPositions.Contains(pivot))
return 0;
private int CountSameColorInDirection(Vector2Int start, Vector2Int direction, GemType color) {
int count = 0;
Vector2Int oivot = start + direction;
Queue<Vector2Int> queue = new Queue<Vector2Int>();
HashSet<Vector2Int> visited = new HashSet<Vector2Int>();
while (oivot.x >= 0 && oivot.x < this.gameBoard.Width && oivot.y >= 0 && oivot.y < this.gameBoard.Height) {
Gem g = this.gameBoard.GetGemAt(oivot);
if (g == null || g.Type == GemType.Bomb || g.MatchColor != color)
break;
queue.Enqueue(pivot);
visited.Add(pivot);
Vector2Int[] directions = {
Vector2Int.left,
Vector2Int.right,
Vector2Int.up,
Vector2Int.down
};
while (queue.Count > 0) {
Vector2Int currentPivot = queue.Dequeue();
for (int i = 0; i < directions.Length; i++) {
Vector2Int n = currentPivot + directions[i];
if (visited.Contains(n))
continue;
if (!matchedPositions.Contains(n))
continue;
visited.Add(n);
queue.Enqueue(n);
}
count++;
oivot += direction;
}
return visited.Count;
return count;
}
}
}

1
Assets/Scripts/Views/GemView.cs
View File

@@ -1,6 +1,5 @@
using System.Threading;
using Cysharp.Threading.Tasks;
using Enums;
using Services;
using Structs;
using UnityEngine;

5
Assets/Scripts/Views/ScoreView.cs
View File

@@ -1,12 +1,11 @@
using System;
using TMPro;
using UnityEngine;
namespace Views {
public class ScoreView : MonoBehaviour {
private TextMeshProUGUI scoreText;
private float displayScore = 0;
private int actualScore = 0;
private float displayScore;
private int actualScore;
private void Awake() {
this.scoreText = GetComponentInChildren<TextMeshProUGUI>();