diff --git a/Assets/Scripts/Services/Interfaces/IBombService.cs b/Assets/Scripts/Services/Interfaces/IBombService.cs index 8283f4c..542081d 100644 --- a/Assets/Scripts/Services/Interfaces/IBombService.cs +++ b/Assets/Scripts/Services/Interfaces/IBombService.cs @@ -4,7 +4,6 @@ using System.Collections.Generic; using Cysharp.Threading.Tasks; using Enums; using Models.Interfaces; -using Structs; using UnityEngine; namespace Services.Interfaces diff --git a/Assets/Scripts/Services/Interfaces/IMatchService.cs b/Assets/Scripts/Services/Interfaces/IMatchService.cs index 94ed3f6..7074839 100644 --- a/Assets/Scripts/Services/Interfaces/IMatchService.cs +++ b/Assets/Scripts/Services/Interfaces/IMatchService.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using Cysharp.Threading.Tasks; using UnityEngine; using Enums; -using Structs; namespace Services.Interfaces { public interface IMatchService { diff --git a/Assets/Scripts/Services/LevelEntryPoint.cs b/Assets/Scripts/Services/LevelEntryPoint.cs index 5c1e781..f579e72 100644 --- a/Assets/Scripts/Services/LevelEntryPoint.cs +++ b/Assets/Scripts/Services/LevelEntryPoint.cs @@ -1,24 +1,18 @@ -using Presenter; using Services.Interfaces; using UnityEngine; using VContainer.Unity; -using Views; namespace Services { public class LevelEntryPoint : IStartable { - private readonly IObjectPool gemViewPool; private readonly IGameBoardService gameBoardService; private readonly IInputService inputService; - private readonly AudioPresenter audioPresenter; - public LevelEntryPoint(IObjectPool gemViewPool, IGameBoardService gameBoardService, IInputService inputService, AudioPresenter audioPresenter) + public LevelEntryPoint(IGameBoardService gameBoardService, IInputService inputService) { - this.gemViewPool = gemViewPool; this.gameBoardService = gameBoardService; this.inputService = inputService; - this.audioPresenter = audioPresenter; } public void Start() diff --git a/Assets/Scripts/Services/MatchService.cs b/Assets/Scripts/Services/MatchService.cs index 8ce7efa..309e9d6 100644 --- a/Assets/Scripts/Services/MatchService.cs +++ b/Assets/Scripts/Services/MatchService.cs @@ -4,7 +4,6 @@ using Cysharp.Threading.Tasks; using Enums; using Models.Interfaces; using Services.Interfaces; -using Structs; using UnityEngine; namespace Services { diff --git a/Assets/Scripts/Services/ScoreService.cs b/Assets/Scripts/Services/ScoreService.cs index af786cc..2886fe0 100644 --- a/Assets/Scripts/Services/ScoreService.cs +++ b/Assets/Scripts/Services/ScoreService.cs @@ -1,10 +1,9 @@ using System; using Services.Interfaces; -using UnityEngine; namespace Services { public class ScoreService : IScoreService { - private int score = 0; + private int score; public int Score => this.score; public event Action OnScoreChanged; public void AddScore(int value) { diff --git a/Assets/Scripts/Utils/GemUtils.cs b/Assets/Scripts/Utils/GemUtils.cs index 474b850..c81b005 100644 --- a/Assets/Scripts/Utils/GemUtils.cs +++ b/Assets/Scripts/Utils/GemUtils.cs @@ -1,6 +1,5 @@ using Enums; using Models.Interfaces; -using Services; using Structs; using UnityEngine; diff --git a/Assets/Scripts/Utils/RandomUtils.cs b/Assets/Scripts/Utils/RandomUtils.cs index 0fa5b63..ebff26d 100644 --- a/Assets/Scripts/Utils/RandomUtils.cs +++ b/Assets/Scripts/Utils/RandomUtils.cs @@ -1,11 +1,10 @@ using System; -using System.Linq; using Enums; using Random = UnityEngine.Random; namespace Utils { public static class RandomUtils { - private static readonly GemType[] spawnableGems = BuildSpawnableGems(); + private static readonly GemType[] SPAWNABLE_GEMS = BuildSpawnableGems(); private static GemType[] BuildSpawnableGems() { Array values = Enum.GetValues(typeof(GemType)); @@ -31,7 +30,7 @@ namespace Utils { } public static GemType RandomGemType() { - return spawnableGems[Random.Range(0, spawnableGems.Length)]; + return SPAWNABLE_GEMS[Random.Range(0, SPAWNABLE_GEMS.Length)]; } } } \ No newline at end of file diff --git a/Assets/Scripts/Views/GemView.cs b/Assets/Scripts/Views/GemView.cs index 329d4e4..3f8f404 100644 --- a/Assets/Scripts/Views/GemView.cs +++ b/Assets/Scripts/Views/GemView.cs @@ -19,11 +19,11 @@ namespace Views { private CancellationTokenSource spawnScaleCts; - public void Bind(Gem gem, GemTypeValues gemvalue, bool isBomb = false) { + public void Bind(Gem gem, GemTypeValues gemValue, bool isBomb = false) { this.gem = gem; this.gameObject.SetActive(true); - SetupGem(isBomb, gemvalue.gemSprite); + SetupGem(isBomb, gemValue.gemSprite); PlaySpawnScale(); }