mirror of
https://github.com/ryzij/Cube-Tower-Defense.git
synced 2026-07-14 01:56:57 +00:00
Добавил возможность отслеживать спавн и уничтожение врагов
This commit is contained in:
@@ -5,6 +5,7 @@ public class Debugger : MonoBehaviour
|
||||
[SerializeField] private GameManager _gameManager;
|
||||
[SerializeField] private SandPathBuildService _sandPathBuildService;
|
||||
[SerializeField] private TurretsShop _turretShop;
|
||||
[SerializeField] private SpawnDeathEnemyController _spawnDeathControl;
|
||||
|
||||
private void OnEnable()
|
||||
{
|
||||
@@ -12,6 +13,7 @@ public class Debugger : MonoBehaviour
|
||||
_sandPathBuildService.OnBuildComplete += OnBuildComplete;
|
||||
_turretShop.OnTurretSelected += OnTurretSelected;
|
||||
_turretShop.OnTurretDeselected += OnTurretDeselected;
|
||||
_spawnDeathControl.OnLastEnemyDestroyed += OnLastEnemyDestroyed;
|
||||
}
|
||||
|
||||
private void OnDisable()
|
||||
@@ -20,6 +22,7 @@ public class Debugger : MonoBehaviour
|
||||
_sandPathBuildService.OnBuildComplete -= OnBuildComplete;
|
||||
_turretShop.OnTurretSelected -= OnTurretSelected;
|
||||
_turretShop.OnTurretDeselected -= OnTurretDeselected;
|
||||
_spawnDeathControl.OnLastEnemyDestroyed -= OnLastEnemyDestroyed;
|
||||
}
|
||||
|
||||
private static void OnGameStateChanged(GameManager.GameState newState)
|
||||
@@ -41,4 +44,9 @@ public class Debugger : MonoBehaviour
|
||||
{
|
||||
print("Turret deselected");
|
||||
}
|
||||
|
||||
private void OnLastEnemyDestroyed()
|
||||
{
|
||||
print("Last enemy destroyed");
|
||||
}
|
||||
}
|
||||
+10
-1
@@ -11,6 +11,7 @@ public class Enemy : MonoBehaviour
|
||||
[SerializeField] private int _killReward = 10;
|
||||
[SerializeField] private UnityEvent<float> _onHealthChanged;
|
||||
[SerializeField] private UnityEvent<OnEnemyDeathEventArgs> _onDeath;
|
||||
[SerializeField] private UnityEvent _onDestroyed;
|
||||
|
||||
private Queue<Vector3> _path;
|
||||
private Vector3 _target;
|
||||
@@ -26,7 +27,13 @@ public class Enemy : MonoBehaviour
|
||||
add => _onDeath.AddListener(value);
|
||||
remove => _onDeath.RemoveListener(value);
|
||||
}
|
||||
|
||||
|
||||
public event UnityAction OnDestroyed
|
||||
{
|
||||
add => _onDestroyed.AddListener(value);
|
||||
remove => _onDestroyed.RemoveListener(value);
|
||||
}
|
||||
|
||||
public SandPathBuildService PathBuildService
|
||||
{
|
||||
get => _pathService;
|
||||
@@ -82,6 +89,8 @@ public class Enemy : MonoBehaviour
|
||||
}
|
||||
}
|
||||
|
||||
private void OnDestroy() => _onDestroyed?.Invoke();
|
||||
|
||||
public class OnEnemyDeathEventArgs
|
||||
{
|
||||
public int KillReward { get; set; }
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using UnityEngine;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine.Events;
|
||||
|
||||
public class EnemySpawner : MonoBehaviour
|
||||
{
|
||||
@@ -9,9 +8,13 @@ public class EnemySpawner : MonoBehaviour
|
||||
[SerializeField] private SandPathBuildService _pathBuildService;
|
||||
[SerializeField] private Transform _enemyHolder;
|
||||
[SerializeField] private Transform _spawnPoint;
|
||||
[SerializeField] private Wallet _wallet;
|
||||
[SerializeField] private UnityEvent<Enemy> _onEnemySpawned;
|
||||
|
||||
//private readonly List<Enemy> _enemies = new();
|
||||
public event UnityAction<Enemy> OnEnemySpawned
|
||||
{
|
||||
add => _onEnemySpawned.AddListener(value);
|
||||
remove => _onEnemySpawned.RemoveListener(value);
|
||||
}
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
@@ -42,8 +45,7 @@ public class EnemySpawner : MonoBehaviour
|
||||
{
|
||||
var enemy = Instantiate(prefab, _spawnPoint.position, _spawnPoint.rotation, _enemyHolder);
|
||||
enemy.PathBuildService = _pathBuildService;
|
||||
enemy.OnDeath += e => _wallet.AddMoney(e.KillReward);
|
||||
//_enemies.Add(enemy);
|
||||
_onEnemySpawned?.Invoke(enemy);
|
||||
|
||||
yield return wait;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.Events;
|
||||
|
||||
public class SpawnDeathEnemyController : MonoBehaviour
|
||||
{
|
||||
[SerializeField] private GameManager _gameManager;
|
||||
[SerializeField] private EnemySpawner _enemySpawner;
|
||||
[SerializeField] private Wallet _wallet;
|
||||
[SerializeField] private UnityEvent _onLastEnemyDestroyed;
|
||||
|
||||
public event UnityAction OnLastEnemyDestroyed
|
||||
{
|
||||
add => _onLastEnemyDestroyed.AddListener(value);
|
||||
remove => _onLastEnemyDestroyed.RemoveListener(value);
|
||||
}
|
||||
|
||||
private readonly List<Enemy> _enemies = new();
|
||||
|
||||
private void OnEnable()
|
||||
{
|
||||
_enemySpawner.OnEnemySpawned += OnEnemySpawned;
|
||||
}
|
||||
|
||||
private void OnDisable()
|
||||
{
|
||||
_enemySpawner.OnEnemySpawned -= OnEnemySpawned;
|
||||
}
|
||||
|
||||
private void OnEnemySpawned(Enemy enemy)
|
||||
{
|
||||
enemy.OnDeath += e => _wallet.AddMoney(e.KillReward);
|
||||
enemy.OnDestroyed += () =>
|
||||
{
|
||||
_enemies.Remove(enemy);
|
||||
if (_enemies.Count == 0)
|
||||
_onLastEnemyDestroyed?.Invoke();
|
||||
};
|
||||
_enemies.Add(enemy);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,2 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 584d2a34a7bab574594a37606a39be8e
|
||||
Reference in New Issue
Block a user