some fixes
This commit is contained in:
parent
e63c863167
commit
d94a8b64f3
@ -51,8 +51,12 @@ namespace Controller
|
||||
var unitFactory = new UnitFactory(units);
|
||||
|
||||
hexGrid.OnGridLoaded += unitFactory.Spawn;
|
||||
}
|
||||
|
||||
var paintedController = new PaintedController();
|
||||
|
||||
hexGrid.OnHexPainted += paintedController.SetHexColors;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
@ -100,14 +100,14 @@ 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();
|
||||
// #endif
|
||||
|
||||
#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();
|
||||
#endif
|
||||
}
|
||||
|
||||
public void Init()
|
||||
{
|
||||
|
@ -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<AudioClip> 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<AudioListener>();
|
||||
|
@ -1,7 +1,6 @@
|
||||
using System;
|
||||
using Chars;
|
||||
using Data;
|
||||
using DefaultNamespace;
|
||||
using DG.Tweening;
|
||||
using HexFiled;
|
||||
using UnityEngine;
|
||||
@ -158,12 +157,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;
|
||||
}
|
||||
|
||||
@ -185,7 +184,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<WeaponView>().SetWeapon(_weapon);
|
||||
ball.transform.DOMove(
|
||||
new Vector3(_direction.normalized.x,
|
||||
@ -227,7 +226,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);
|
||||
}
|
||||
|
||||
@ -263,7 +262,6 @@ namespace Units
|
||||
{
|
||||
Death();
|
||||
}
|
||||
|
||||
_hp -= dmg;
|
||||
UpdateBarCanvas();
|
||||
}
|
||||
|
@ -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()
|
||||
|
@ -24,6 +24,6 @@ public class WeaponView : MonoBehaviour
|
||||
go.AddComponent<VFXView>();
|
||||
MusicController.Instance.AddAudioSource(go);
|
||||
MusicController.Instance.RemoveAudioSource(gameObject);
|
||||
MusicController.Instance.PlayerAudioClip(_weapon.hitSound, go);
|
||||
MusicController.Instance.PlayAudioClip(_weapon.hitSound, go);
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user