Merge remote-tracking branch 'origin/develop' into feature/combo-skill-short-cut

Assets/PerfectWorld/Scripts/Sound/AudioManager.cs

@@ -11,7 +11,8 @@ public class AudioManager : MonoBehaviour
 
     [SerializeField] private AudioMixerGroup _bgmMixerGroup;
     [SerializeField] private AudioMixerGroup _ambienceMixerGroup;
-
+    [SerializeField] private AudioMixerGroup _sfxMixerGroup;
+    public AudioMixerGroup GetSfxMixerGroup => _sfxMixerGroup;
     private AudioSource _ambienceSource;
 
     void Awake()

Assets/PerfectWorld/Scripts/Sound/SFXManager.cs

@@ -219,5 +219,10 @@ namespace BrewMonster.Scripts
                 _moveSoundSource.Play();
             }
         }
+        public async UniTaskVoid StopMoveSoundAsync()
+        {
+            if (_moveSoundSource == null) return;
+            _moveSoundSource.Stop();
+        }
     }
 }

Assets/Prefabs/UI/Music.prefab

@@ -29,7 +29,8 @@ Transform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 2281112146744556387}
   m_Father: {fileID: 4292995824318243454}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &4656951194032224
@@ -44,7 +45,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 4cfa292fff0815d40b82f32256b3f2cc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  _moveSoundSource: {fileID: 8780839799255791761}
+  _moveSoundSource: {fileID: 2796487417538969809}
 --- !u!1 &6634120867767479402
 GameObject:
   m_ObjectHideFlags: 0
@@ -97,6 +98,7 @@ MonoBehaviour:
   bgmSource: {fileID: 8780839799255791761}
   _bgmMixerGroup: {fileID: 1439606312574676259, guid: 9c6a7598ca0dfcd4fa51470ebbdd7549, type: 2}
   _ambienceMixerGroup: {fileID: 661067059137401939, guid: 9c6a7598ca0dfcd4fa51470ebbdd7549, type: 2}
+  _sfxMixerGroup: {fileID: 217038053835239290, guid: 9c6a7598ca0dfcd4fa51470ebbdd7549, type: 2}
 --- !u!82 &8780839799255791761
 AudioSource:
   m_ObjectHideFlags: 0
@@ -312,3 +314,132 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   _worldMusicDB: {fileID: 11400000, guid: 7602c1f71697aae42a7751212c5144dc, type: 2}
+--- !u!1 &9129044928287689905
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2281112146744556387}
+  - component: {fileID: 2796487417538969809}
+  m_Layer: 0
+  m_Name: MoveSoundSource
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2281112146744556387
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9129044928287689905}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3636302681040170949}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!82 &2796487417538969809
+AudioSource:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9129044928287689905}
+  m_Enabled: 1
+  serializedVersion: 4
+  OutputAudioMixerGroup: {fileID: 217038053835239290, guid: 9c6a7598ca0dfcd4fa51470ebbdd7549, type: 2}
+  m_audioClip: {fileID: 0}
+  m_Resource: {fileID: 0}
+  m_PlayOnAwake: 1
+  m_Volume: 1
+  m_Pitch: 1
+  Loop: 0
+  Mute: 0
+  Spatialize: 0
+  SpatializePostEffects: 0
+  Priority: 128
+  DopplerLevel: 1
+  MinDistance: 1
+  MaxDistance: 500
+  Pan2D: 0
+  rolloffMode: 0
+  BypassEffects: 0
+  BypassListenerEffects: 0
+  BypassReverbZones: 0
+  rolloffCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 1
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  panLevelCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  spreadCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  reverbZoneMixCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4

Assets/Scripts/CECHostPlayer.cs

@@ -4213,7 +4213,7 @@ namespace BrewMonster
             }
             else
             {
-                newId = 164;
+                newId = 0;
             }
 
             PlayMoveSound(newId);
@@ -4227,7 +4227,14 @@ namespace BrewMonster
         {
             if (id == _curMoveSndId) return;
             _curMoveSndId = id;
-            SFXManager.Instance?.PlayMoveSoundAsync(id).Forget();
+            if(id > 0)
+            {   
+                SFXManager.Instance?.PlayMoveSoundAsync(id).Forget();
+            }
+            else
+            {
+                SFXManager.Instance?.StopMoveSoundAsync().Forget();
+            }
         }
 
         /// <summary>