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

Add Audio

Browse Source
This commit is contained in:
Jesus Castro
2025-12-17 01:46:24 +08:00
parent 3786863b00
commit 9f2ef833b2
12 changed files with 116 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Assets/Scripts/Presenter/AudioPresenter.cs Normal file
View File

@@ -0,0 +1,21 @@
using Services.Interfaces;
using UnityEngine;
namespace Presenter {
public class AudioPresenter {
private readonly IAudioService audioService;
public AudioPresenter(IAudioService audioService) {
this.audioService = audioService;
}
public void OnMatch(AudioClip clip) {
this.audioService.PlaySound(clip);
}
public void OnBombExplosion (AudioClip clip) {
this.audioService.PlaySound(clip);
}
}
}

3
Assets/Scripts/Presenter/AudioPresenter.cs.meta Normal file
View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 152ac95510fc404ebbeff098e3214802
timeCreated: 1765905002

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

@@ -35,6 +35,8 @@ namespace Scopes
builder.Register<IBombService, BombService>(Lifetime.Scoped);
builder.Register<AudioPresenter>(Lifetime.Scoped);
builder.Register<ScorePresenter>(Lifetime.Scoped);
builder.Register<IGameBoardService, GameBoardService>(Lifetime.Scoped).AsImplementedInterfaces();

3
Assets/Scripts/Scopes/RootLifetimeScope.cs
View File

@@ -9,6 +9,9 @@ namespace Scopes {
{
builder.RegisterComponentInHierarchy<InputService>()
.As<IInputService>();
builder.Register<IAudioService, AudioService>(Lifetime.Scoped)
.AsImplementedInterfaces();
}
}
}

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

@@ -7,10 +7,16 @@ namespace ScriptableObjects {
[Header("Prefabs")]
public GameObject bgTilePrefabs;
public GemTypeValues[] gemsPrefabs;
[Header("Board Setup")]
public int width;
public int height;
[Header("Audio")]
public AudioClip matchSfx;
public AudioClip bombExplodeSfx;
[Header("Bomb")]
[Tooltip("How long before the gems around the bomb explode")]
public float bombDelay = 0.1f;

43
Assets/Scripts/Services/AudioService.cs Normal file
View File

@@ -0,0 +1,43 @@
using System;
using Services.Interfaces;
using UnityEngine;
using VContainer.Unity;
namespace Services
{
public sealed class AudioService : IAudioService, IInitializable, IDisposable
{
private readonly float volume = 1f;
private GameObject gameObject;
private AudioSource source;
public void Initialize()
{
this.gameObject = new GameObject("AudioService");
UnityEngine.Object.DontDestroyOnLoad(this.gameObject);
this.source = this.gameObject.AddComponent<AudioSource>();
this.source.playOnAwake = false;
this.source.loop = false;
this.source.volume = this.volume;
}
public void PlaySound(AudioClip clip)
{
if (clip == null) return;
if (this.source == null) return; // In case called before Initialize in some edge setup
this.source.PlayOneShot(clip);
}
public void Dispose()
{
if (this.gameObject != null)
{
UnityEngine.Object.Destroy(this.gameObject);
this.gameObject = null;
this.source = null;
}
}
}
}

3
Assets/Scripts/Services/AudioService.cs.meta Normal file
View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 6f530c8e01a54246bfc83a74bbbb1fc1
timeCreated: 1765904827

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

@@ -21,6 +21,7 @@ namespace Services {
private readonly GameVariables gameVariables;
private readonly IMatchService matchService;
private readonly IScoreService scoreService;
private readonly AudioPresenter audioPresenter;
private readonly IBombService bombService;
private readonly IObjectPool<GemView> objectPool;
private readonly Transform gemsHolder;
@@ -32,7 +33,7 @@ namespace Services {
private GameState currentState = GameState.Move;
#endregion
public GameBoardService(IGameBoard gameBoard, GameVariables gameVariables, IMatchService matchService, IScoreService scoreSerivce, IBombService bombService, IObjectPool<GemView> objectPool, Transform gemsHolder, ScorePresenter scorePresenter) {
public GameBoardService(IGameBoard gameBoard, GameVariables gameVariables, IMatchService matchService, IScoreService scoreSerivce, IBombService bombService, IObjectPool<GemView> objectPool, Transform gemsHolder, ScorePresenter scorePresenter, AudioPresenter audioPresenter) {
this.gameBoard = gameBoard;
this.gameVariables = gameVariables;
this.matchService = matchService;
@@ -41,6 +42,7 @@ namespace Services {
this.objectPool = objectPool;
this.gemsHolder = gemsHolder;
this.scorePresenter = scorePresenter;
this.audioPresenter = audioPresenter;
}
public void Tick() {
@@ -224,6 +226,19 @@ namespace Services {
return;
}
bool willBreakAnyNonBombGem = false;
foreach (Vector2Int pos in matchPositions) {
Gem gem = GetGem(pos);
if (gem == null) continue;
if (gem.Type == GemType.Bomb) continue;
willBreakAnyNonBombGem = true;
break;
}
if (willBreakAnyNonBombGem)
this.audioPresenter.OnMatch(this.gameVariables.matchSfx);
foreach (Vector2Int pos in matchPositions.Distinct().ToList()) {
Gem gem = GetGem(pos);
if (gem == null) continue;
@@ -248,6 +263,9 @@ namespace Services {
Gem gem = GetGem(pos);
if (gem == null)
return UniTask.CompletedTask;
if (gem.Type == GemType.Bomb)
this.audioPresenter.OnBombExplosion(this.gameVariables.bombExplodeSfx);
this.scoreService.ScoreCheck(gem.ScoreValue);
DestroyMatchedGems(pos);

7
Assets/Scripts/Services/Interfaces/IAudioService.cs Normal file
View File

@@ -0,0 +1,7 @@
using UnityEngine;
namespace Services.Interfaces {
public interface IAudioService {
void PlaySound(AudioClip clip);
}
}

3
Assets/Scripts/Services/Interfaces/IAudioService.cs.meta Normal file
View File

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: d04aef7bff08494fbae7a04db1fcda22
timeCreated: 1765904685

5
Assets/Scripts/Services/LevelEntryPoint.cs
View File

@@ -1,3 +1,4 @@
using Presenter;
using Services.Interfaces;
using UnityEngine;
using VContainer.Unity;
@@ -10,12 +11,14 @@ namespace Services
private readonly IObjectPool<GemView> gemViewPool;
private readonly IGameBoardService gameBoardService;
private readonly IInputService inputService;
private readonly AudioPresenter audioPresenter;
public LevelEntryPoint(IObjectPool<GemView> gemViewPool, IGameBoardService gameBoardService, IInputService inputService)
public LevelEntryPoint(IObjectPool<GemView> gemViewPool, IGameBoardService gameBoardService, IInputService inputService, AudioPresenter audioPresenter)
{
this.gemViewPool = gemViewPool;
this.gameBoardService = gameBoardService;
this.inputService = inputService;
this.audioPresenter = audioPresenter;
}
public void Start()