feat: new sounds

Assets/Plugins/FMOD/Cache/Editor/FMODStudioCache.asset

@@ -15,11 +15,92 @@ MonoBehaviour:
   Path: Assets/Audio/Master.strings.bank
   Name: Master.strings
   StudioPath: bank:/Master.strings
-  lastModified: 638490761180000000
+  lastModified: 638490794060000000
   FileSizes:
   - Name: 
-    Value: 788
+    Value: 970
   Exists: 1
+--- !u!114 &-7482134808755505365
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ceb653cd98e289a4e8697a1af55201f2, type: 3}
+  m_Name: event:/SFX_gloom
+  m_EditorClassIdentifier: 
+  Path: event:/SFX_gloom
+  Guid:
+    Data1: -2064803398
+    Data2: 1237488133
+    Data3: 1635234491
+    Data4: 1937340427
+  Banks:
+  - {fileID: 945511457569720226}
+  IsStream: 0
+  Is3D: 0
+  IsOneShot: 1
+  Parameters: []
+  MinDistance: 1
+  MaxDistance: 20
+  Length: 3500
+--- !u!114 &-6897729870758656274
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ceb653cd98e289a4e8697a1af55201f2, type: 3}
+  m_Name: event:/SFX_select
+  m_EditorClassIdentifier: 
+  Path: event:/SFX_select
+  Guid:
+    Data1: -1649360020
+    Data2: 1242044891
+    Data3: -1143008872
+    Data4: 1904821661
+  Banks:
+  - {fileID: 945511457569720226}
+  IsStream: 0
+  Is3D: 0
+  IsOneShot: 1
+  Parameters: []
+  MinDistance: 1
+  MaxDistance: 20
+  Length: 0
+--- !u!114 &-5290817299158589036
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ceb653cd98e289a4e8697a1af55201f2, type: 3}
+  m_Name: event:/SFX_grow
+  m_EditorClassIdentifier: 
+  Path: event:/SFX_grow
+  Guid:
+    Data1: -213766361
+    Data2: 1214886339
+    Data3: 1256039087
+    Data4: -834483166
+  Banks:
+  - {fileID: 945511457569720226}
+  IsStream: 0
+  Is3D: 0
+  IsOneShot: 1
+  Parameters: []
+  MinDistance: 1
+  MaxDistance: 20
+  Length: 0
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -37,12 +118,16 @@ MonoBehaviour:
   - {fileID: 945511457569720226}
   EditorEvents:
   - {fileID: 7120128689512779237}
+  - {fileID: 2181376786679321341}
+  - {fileID: -5290817299158589036}
+  - {fileID: -6897729870758656274}
+  - {fileID: -7482134808755505365}
   EditorParameters: []
   MasterBanks:
   - {fileID: 945511457569720226}
   StringsBanks:
   - {fileID: -8851123648198054470}
-  cacheTime: 638490761180000000
+  cacheTime: 638490794060000000
   cacheVersion: 131590
 --- !u!114 &945511457569720226
 MonoBehaviour:
@@ -59,9 +144,36 @@ MonoBehaviour:
   Path: Assets/Audio/Master.bank
   Name: Master
   StudioPath: bank:/Master
-  lastModified: 638490761180000000
+  lastModified: 638490794060000000
   FileSizes: []
   Exists: 1
+--- !u!114 &2181376786679321341
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ceb653cd98e289a4e8697a1af55201f2, type: 3}
+  m_Name: event:/SFX_back
+  m_EditorClassIdentifier: 
+  Path: event:/SFX_back
+  Guid:
+    Data1: 927500576
+    Data2: 1297093792
+    Data3: -1073879417
+    Data4: 659817285
+  Banks:
+  - {fileID: 945511457569720226}
+  IsStream: 0
+  Is3D: 0
+  IsOneShot: 1
+  Parameters: []
+  MinDistance: 1
+  MaxDistance: 20
+  Length: 0
 --- !u!114 &7120128689512779237
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Scenes/Main.unity

@@ -565,6 +565,20 @@ MonoBehaviour:
   animator: {fileID: 902566664}
   growAnimation: {fileID: 11400000, guid: 7f3b3c6fe0a532348bade08980464924, type: 2}
   endAnimation: {fileID: 11400000, guid: 8bca0def51335744994817560a43be74, type: 2}
+  growEvent:
+    Guid:
+      Data1: -213766361
+      Data2: 1214886339
+      Data3: 1256039087
+      Data4: -834483166
+    Path: event:/SFX_grow
+  gloomEvent:
+    Guid:
+      Data1: -2064803398
+      Data2: 1237488133
+      Data3: 1635234491
+      Data4: 1937340427
+    Path: event:/SFX_gloom
 --- !u!225 &311490074
 CanvasGroup:
   m_ObjectHideFlags: 0

Assets/Scripts/Presenter/ExpressionClick.cs

@@ -21,8 +21,11 @@ namespace Presenter {
 			_view.UpdateView(_score.Value, _score.GrowPercentage);
 			_grow.Grow();
 
+
 			if (CanSpawn)
 				_spawner.SpawnRose();
+			else if (_score.Value % _score.GrowIterations == 0)
+				_grow.GrowStep();
 		}
 
 	}

Assets/Scripts/Presenter/IRoseGrow.cs

@@ -1,5 +1,6 @@
 namespace Presenter {
 	public interface IRoseGrow {
 		void Grow();
+		void GrowStep();
 	}
 }

Assets/Scripts/View/Collections.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 6e69d813584e486485ead64a8a789500
+timeCreated: 1713475813

Assets/Scripts/View/Collections/ExpressionInputCollection.cs

@@ -1,6 +1,6 @@
 using Presenter;
 
-namespace View {
+namespace View.Collections {
 	public class ExpressionInputCollection : IExpressionInput {
 		private readonly IExpressionInput[] _inputs;
 

Assets/Scripts/View/Collections/RoseGrowCollection.cs

@@ -0,0 +1,21 @@
+using Presenter;
+
+namespace View.Collections {
+	public class RoseGrowCollection : IRoseGrow {
+		private readonly IRoseGrow[] _grows;
+
+		public RoseGrowCollection(IRoseGrow[] grows) {
+			_grows = grows;
+		}
+
+		public void Grow() {
+			foreach (IRoseGrow grow in _grows)
+				grow.Grow();
+		}
+
+		public void GrowStep() {
+			foreach (IRoseGrow grow in _grows)
+				grow.GrowStep();
+		}
+	}
+}

Assets/Scripts/View/Collections/RoseGrowCollection.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 6f517298528d4766a83770b1867f905f
+timeCreated: 1713475808

Assets/Scripts/View/Dependencies.cs

@@ -3,6 +3,7 @@ using Domain;
 using Presenter;
 using Presenter.SaveSystem;
 using UnityEngine;
+using View.Collections;
 using View.Scene;
 using View.UI;
 
@@ -25,8 +26,10 @@ namespace View {
 			IRoseSpawner spawner = FindObjectOfType<RoseSpawner>();
 
 			IRoseGrow grow = FindObjectOfType<GrowParticlesSpawner>();
+			IRoseGrow inputGrow = FindObjectOfType<ExpressionInput>();
+			IRoseGrow growCollection = new RoseGrowCollection(new[] { grow, inputGrow });
 
-			ExpressionClick = new ExpressionClick(Score, inputCollections, spawner, grow);
+			ExpressionClick = new ExpressionClick(Score, inputCollections, spawner, growCollection);
 
 			CustomInput = new CustomInput();
 

Assets/Scripts/View/Scene/GrowParticlesSpawner.cs

@@ -14,6 +14,8 @@ namespace View.Scene {
 			Instantiate(growParticle, growParticlePositions.position, Quaternion.Euler(0f, 0f, randomRotation));
 		}
 
+		public void GrowStep() { }
+
 		private void OnDrawGizmosSelected() {
 			Gizmos.color = Color.red;
 			float angle = angleRange / 2f + 90f;

Assets/Scripts/View/UI/ExpressionInput.cs

@@ -1,5 +1,6 @@
 using Domain;
 using Domain.Input;
+using FMODUnity;
 using Presenter;
 using TMPro;
 using UnityEngine;
@@ -8,7 +9,7 @@ using Animation = FramedAnimator.Animation;
 using Animator = FramedAnimator.Animator;
 
 namespace View.UI {
-	public class ExpressionInput : MonoBehaviour, IExpressionInput {
+	public class ExpressionInput : MonoBehaviour, IExpressionInput, IRoseGrow {
 		[SerializeField] private TMP_Text text;
 
 		private ExpressionClick _click;
@@ -21,6 +22,9 @@ namespace View.UI {
 		[SerializeField] private Animation growAnimation;
 		[SerializeField] private Animation endAnimation;
 
+		[SerializeField] private EventReference growEvent;
+		[SerializeField] private EventReference gloomEvent;
+
 		private void Start() {
 			_click = FindObjectOfType<Dependencies>().ExpressionClick;
 			_customInput = FindObjectOfType<Dependencies>().CustomInput;
@@ -32,6 +36,7 @@ namespace View.UI {
 		private void AnimationEnded(string animationName) {
 			if (animationName == "Rosa_Grow") {
 				animator.ChangeAnimation(endAnimation);
+				RuntimeManager.PlayOneShot(gloomEvent);
 				animator.PlayUntil(1f);
 				return;
 			}
@@ -54,6 +59,13 @@ namespace View.UI {
 			_firstUpdate = false;
 		}
 
+		public void Grow() { }
+		public void GrowStep() {
+			if (animator.CurrentAnimation == "Rosa_Grow" && _score.GrowPercentage < 1f) {
+				RuntimeManager.PlayOneShot(growEvent);
+			}
+		}
+
 		private bool IsLastGrowState(int score, float growPercentage) {
 			if (growPercentage != 0)
 				return false;

Assets/Scripts/View/UI/SettingsMenu.cs

@@ -44,8 +44,8 @@ namespace View.UI {
 			AppWindowUtility.AlwaysOnTop = state;
 		}
 
-		private void SFXStateChange(bool state) => _sfxBus.setMute(state);
-		private void MusicStateChange(bool state) => _musicBus.setMute(state);
+		private void SFXStateChange(bool state) => _sfxBus.setMute(!state);
+		private void MusicStateChange(bool state) => _musicBus.setMute(!state);
 
 		private void OpenSettings() {
 			mainUIGroup.interactable = mainUIGroup.blocksRaycasts = false;

Assets/StreamingAssets/Master.bank.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9fae0bf3dff27014298516fa3ce46d3d
+guid: 3afe14e670dbb8a468241fbbdda13888
 labels:
 - FMOD
 DefaultImporter:

Assets/StreamingAssets/Master.strings.bank.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d813570f6dbbcec4ab8ce5fa5eb7ffc9
+guid: d53db7c1236d1ea4ab19f79ac3060d30
 labels:
 - FMOD
 DefaultImporter: