mirror of
https://github.com/ryzij/Cube-Tower-Defense.git
synced 2026-07-14 01:56:57 +00:00
Теперь звук траты денег воспроизводится только при покупке турели
This commit is contained in:
@@ -11915,6 +11915,9 @@ MonoBehaviour:
|
|||||||
_onBlockDeselected:
|
_onBlockDeselected:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
|
_onTurretBought:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
--- !u!114 &1311268620
|
--- !u!114 &1311268620
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -12760,6 +12763,7 @@ MonoBehaviour:
|
|||||||
m_EditorClassIdentifier: '::'
|
m_EditorClassIdentifier: '::'
|
||||||
_wallet: {fileID: 1030979928}
|
_wallet: {fileID: 1030979928}
|
||||||
_gameManager: {fileID: 1875710079}
|
_gameManager: {fileID: 1875710079}
|
||||||
|
_shop: {fileID: 1311268619}
|
||||||
_levelBackgroundMusic: {fileID: 1897118789}
|
_levelBackgroundMusic: {fileID: 1897118789}
|
||||||
_buildBackgroundMusic: {fileID: 1417807937}
|
_buildBackgroundMusic: {fileID: 1417807937}
|
||||||
_winMusic: {fileID: 0}
|
_winMusic: {fileID: 0}
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ public class AudioManager : MonoBehaviour
|
|||||||
{
|
{
|
||||||
[SerializeField] private Wallet _wallet;
|
[SerializeField] private Wallet _wallet;
|
||||||
[SerializeField] private GameManager _gameManager;
|
[SerializeField] private GameManager _gameManager;
|
||||||
|
[SerializeField] private TurretsShop _shop;
|
||||||
[SerializeField] private AudioSource _levelBackgroundMusic;
|
[SerializeField] private AudioSource _levelBackgroundMusic;
|
||||||
[SerializeField] private AudioSource _buildBackgroundMusic;
|
[SerializeField] private AudioSource _buildBackgroundMusic;
|
||||||
[SerializeField] private AudioSource _winMusic;
|
[SerializeField] private AudioSource _winMusic;
|
||||||
@@ -22,14 +23,16 @@ public class AudioManager : MonoBehaviour
|
|||||||
_money = _wallet.Money;
|
_money = _wallet.Money;
|
||||||
_state = _gameManager.CurrentState;
|
_state = _gameManager.CurrentState;
|
||||||
|
|
||||||
_wallet.OnMoneyChanged += OnMoneyChanged;
|
//_wallet.OnMoneyChanged += OnMoneyChanged;
|
||||||
_gameManager.OnStateChanged += OnStateChanged;
|
_gameManager.OnStateChanged += OnStateChanged;
|
||||||
|
_shop.OnTurretBought += OnTurretBought;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnDisable()
|
private void OnDisable()
|
||||||
{
|
{
|
||||||
_wallet.OnMoneyChanged -= OnMoneyChanged;
|
//_wallet.OnMoneyChanged -= OnMoneyChanged;
|
||||||
_gameManager.OnStateChanged -= OnStateChanged;
|
_gameManager.OnStateChanged -= OnStateChanged;
|
||||||
|
_shop.OnTurretBought -= OnTurretBought;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void PlayBlockDestroySound(BlockScript block)
|
public void PlayBlockDestroySound(BlockScript block)
|
||||||
@@ -43,17 +46,22 @@ public class AudioManager : MonoBehaviour
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnMoneyChanged(int money)
|
private void OnTurretBought(TurretShopItem _)
|
||||||
{
|
{
|
||||||
var oldMoney = _money;
|
|
||||||
_money = money;
|
|
||||||
|
|
||||||
if (_moneyChangeSound.Length == 0 || oldMoney <= money)
|
|
||||||
return;
|
|
||||||
|
|
||||||
Play(_moneyChangeSound, ref _moneyChangeSoundIndex);
|
Play(_moneyChangeSound, ref _moneyChangeSoundIndex);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//private void OnMoneyChanged(int money)
|
||||||
|
//{
|
||||||
|
// var oldMoney = _money;
|
||||||
|
// _money = money;
|
||||||
|
|
||||||
|
// if (_moneyChangeSound.Length == 0 || oldMoney <= money)
|
||||||
|
// return;
|
||||||
|
|
||||||
|
// Play(_moneyChangeSound, ref _moneyChangeSoundIndex);
|
||||||
|
//}
|
||||||
|
|
||||||
private void OnStateChanged(GameManager.GameState newState)
|
private void OnStateChanged(GameManager.GameState newState)
|
||||||
{
|
{
|
||||||
if (newState == _state ||
|
if (newState == _state ||
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ public class TurretsShop : MonoBehaviour
|
|||||||
[SerializeField] private TurretShopItem[] _turretShopItems;
|
[SerializeField] private TurretShopItem[] _turretShopItems;
|
||||||
[SerializeField] private UnityEvent<BlockScript> _onBlockSelected;
|
[SerializeField] private UnityEvent<BlockScript> _onBlockSelected;
|
||||||
[SerializeField] private UnityEvent _onBlockDeselected;
|
[SerializeField] private UnityEvent _onBlockDeselected;
|
||||||
|
[SerializeField] private UnityEvent<TurretShopItem> _onTurretBought;
|
||||||
|
|
||||||
public IReadOnlyCollection<TurretShopItem> TurretShopItems => _turretShopItems;
|
public IReadOnlyCollection<TurretShopItem> TurretShopItems => _turretShopItems;
|
||||||
|
|
||||||
@@ -28,6 +29,12 @@ public class TurretsShop : MonoBehaviour
|
|||||||
remove => _onBlockDeselected.RemoveListener(value);
|
remove => _onBlockDeselected.RemoveListener(value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public event UnityAction<TurretShopItem> OnTurretBought
|
||||||
|
{
|
||||||
|
add => _onTurretBought.AddListener(value);
|
||||||
|
remove => _onTurretBought.RemoveListener(value);
|
||||||
|
}
|
||||||
|
|
||||||
private BlockScript _selectedBlock;
|
private BlockScript _selectedBlock;
|
||||||
|
|
||||||
private void OnEnable()
|
private void OnEnable()
|
||||||
@@ -77,6 +84,7 @@ public class TurretsShop : MonoBehaviour
|
|||||||
|
|
||||||
_wallet.TakeMoney(item.Price);
|
_wallet.TakeMoney(item.Price);
|
||||||
Instantiate(item.TurretPrefab, _selectedBlock.transform.position + Vector3.up, Quaternion.identity, _turretsHolder);
|
Instantiate(item.TurretPrefab, _selectedBlock.transform.position + Vector3.up, Quaternion.identity, _turretsHolder);
|
||||||
|
_onTurretBought?.Invoke(item);
|
||||||
DeselectBlock();
|
DeselectBlock();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user