diff --git a/Assets/Scripts/Controller/GameInit.cs b/Assets/Scripts/Controller/GameInit.cs index d60b7687..b4e87339 100644 --- a/Assets/Scripts/Controller/GameInit.cs +++ b/Assets/Scripts/Controller/GameInit.cs @@ -55,8 +55,9 @@ namespace Controller var paintedController = new PaintedController(); hexGrid.OnHexPainted += paintedController.SetHexColors; - } + } + } } \ No newline at end of file diff --git a/Assets/Scripts/HexFiled/HexGrid.cs b/Assets/Scripts/HexFiled/HexGrid.cs index 45bc6d71..3a8c861e 100644 --- a/Assets/Scripts/HexFiled/HexGrid.cs +++ b/Assets/Scripts/HexFiled/HexGrid.cs @@ -100,14 +100,16 @@ namespace HexFiled } } } - + + #if UNITY_EDITOR - TMP_Text label = Object.Instantiate(_cellLabelPrefab, _gridCanvas.transform, false); - label.rectTransform.anchoredPosition = - new Vector2(position.x, position.z); - label.text = cell.coordinates.ToStringOnSeparateLines(); + TMP_Text label = Object.Instantiate(_cellLabelPrefab, _gridCanvas.transform, false); + label.rectTransform.anchoredPosition = + new Vector2(position.x, position.z); + label.text = cell.coordinates.ToStringOnSeparateLines(); #endif - } + } + public void Init() { diff --git a/Assets/Scripts/MusicController.cs b/Assets/Scripts/MusicController.cs index 77c2f47e..3758b90f 100644 --- a/Assets/Scripts/MusicController.cs +++ b/Assets/Scripts/MusicController.cs @@ -22,13 +22,20 @@ public class MusicController _data = data; } - public void PlayerAudioClip(AudioClip clip, GameObject source) + public void PlayAudioClip(AudioClip clip, GameObject source) { _sources[source].clip = clip; _sources[source].volume = _data.Settings.isSFXAllowed ? 1f : 0f; _sources[source].Play(); } + public void PlayRandomClip(List clips, GameObject source) + { + _sources[source].clip = clips[Random.Range(0, clips.Count - 1)]; + _sources[source].volume = _data.Settings.isSFXAllowed ? 1f : 0f; + _sources[source].Play(); + } + public void AddAudioListener(GameObject gameObject) { _audioListener = gameObject.AddComponent(); diff --git a/Assets/Scripts/Units/Unit.cs b/Assets/Scripts/Units/Unit.cs index dfc7984c..73cfab4a 100644 --- a/Assets/Scripts/Units/Unit.cs +++ b/Assets/Scripts/Units/Unit.cs @@ -1,7 +1,6 @@ using System; using Chars; using Data; -using DefaultNamespace; using DG.Tweening; using HexFiled; using UnityEngine; @@ -163,12 +162,12 @@ namespace Units } else { - var capturesMusic = MusicController.Instance.MusicData.SfxMusic.Captures; - MusicController.Instance.PlayerAudioClip(capturesMusic[Random.Range(0, capturesMusic.Count - 1)], - _cell.gameObject); + CaptureHex(); + MusicController.Instance.PlayRandomClip(MusicController.Instance.MusicData.SfxMusic.Captures, + _cell.gameObject); } - + _isHardToCapture = false; } @@ -190,7 +189,7 @@ namespace Units _instance.transform.forward + _instance.transform.position + new Vector3(0, 2), _instance.transform.rotation); MusicController.Instance.AddAudioSource(ball); - MusicController.Instance.PlayerAudioClip(_weapon.shotSound, ball); + MusicController.Instance.PlayAudioClip(_weapon.shotSound, ball); ball.AddComponent().SetWeapon(_weapon); ball.transform.DOMove( new Vector3(_direction.normalized.x, @@ -232,7 +231,7 @@ namespace Units _unitView.OnHit -= Damage; _isAlive = false; _animator.SetTrigger("Death"); - MusicController.Instance.PlayerAudioClip(MusicController.Instance.MusicData.SfxMusic.Death, _instance); + MusicController.Instance.PlayAudioClip(MusicController.Instance.MusicData.SfxMusic.Death, _instance); MusicController.Instance.RemoveAudioSource(_instance); } @@ -268,7 +267,6 @@ namespace Units { Death(); } - _hp -= dmg; UpdateBarCanvas(); } diff --git a/Assets/Scripts/Units/Views/UnitView.cs b/Assets/Scripts/Units/Views/UnitView.cs index 092c2738..9de5a17c 100644 --- a/Assets/Scripts/Units/Views/UnitView.cs +++ b/Assets/Scripts/Units/Views/UnitView.cs @@ -55,7 +55,7 @@ public class UnitView : MonoBehaviour _capureHex.Invoke(); captureBar.DOFillAmount(0f, 0f).SetEase(Ease.Linear); captureBar.gameObject.SetActive(false); - MusicController.Instance.PlayerAudioClip(MusicController.Instance.MusicData.SfxMusic.HardCapture, + MusicController.Instance.PlayRandomClip(MusicController.Instance.MusicData.SfxMusic.Captures, cell.gameObject); })); } @@ -101,9 +101,8 @@ public class UnitView : MonoBehaviour private void Land() { - MusicController.Instance.PlayerAudioClip( - MusicController.Instance.MusicData.SfxMusic.Step[ - Random.Range(0, MusicController.Instance.MusicData.SfxMusic.Step.Count - 1)], gameObject); + MusicController.Instance.PlayRandomClip( + MusicController.Instance.MusicData.SfxMusic.Step, gameObject); } private void AttackEnd() diff --git a/Assets/Scripts/Weapons/WeaponView.cs b/Assets/Scripts/Weapons/WeaponView.cs index 6b654238..5b1794ba 100644 --- a/Assets/Scripts/Weapons/WeaponView.cs +++ b/Assets/Scripts/Weapons/WeaponView.cs @@ -24,6 +24,6 @@ public class WeaponView : MonoBehaviour go.AddComponent(); MusicController.Instance.AddAudioSource(go); MusicController.Instance.RemoveAudioSource(gameObject); - MusicController.Instance.PlayerAudioClip(_weapon.hitSound, go); + MusicController.Instance.PlayAudioClip(_weapon.hitSound, go); } }