dushes/Run-and-capture
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Prod' into Zakhar

Browse Source
This commit is contained in:
dddushesss 2021-12-30 20:00:57 +03:00 committed by GitHub
commit ec9b0b8e17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Assets/Scripts/Controller/GameInit.cs
View File

@ -55,8 +55,9 @@ namespace Controller
var paintedController = new PaintedController();
hexGrid.OnHexPainted += paintedController.SetHexColors;
}
}
}
}

14
Assets/Scripts/HexFiled/HexGrid.cs
View File

@ -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()
{

9
Assets/Scripts/MusicController.cs
View File

@ -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>();

14
Assets/Scripts/Units/Unit.cs
View File

@ -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<WeaponView>().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();
}

7
Assets/Scripts/Units/Views/UnitView.cs
View File

@ -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()

2
Assets/Scripts/Weapons/WeaponView.cs
View File

@ -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);
}
}