Миксер

Почини интерфейс

Assets/Code/Example/Platformer/Entity/Enemies/Bee.cs

@@ -1,5 +1,8 @@
 using System.Collections.Generic;
+using Code.Infrastructure.Audio;
+using Cysharp.Threading.Tasks;
 using PrimeTween;
+using Reflex.Attributes;
 using UnityEngine;
 
 namespace Code.Example.Platformer.Entity.Enemies
@@ -14,7 +17,36 @@ namespace Code.Example.Platformer.Entity.Enemies
         [SerializeField] private Transform _currentTarget;
 
         private Tween _patrolAction;
+        private float _attackThreshold = 0.5f;
 
+        [Inject] private IAudioService _audioService;
+
+        [SerializeField] private EntityHealth health;
+        private void Start()
+        {
+            health.OnEntityDamage = OnEntityDamage;
+            health.OnEntityDeath = OnEntityDeath;
+        }
+        
+        private void OnEntityDeath()
+        {
+            animator.SetBool(Died, true);
+            animator.SetTrigger(OnDeath);
+            Die().Forget();
+        }
+
+        private async UniTaskVoid Die()
+        {
+            await UniTask.WaitForSeconds(1);
+            _audioService.PlayOneShot(AudioNames.Platformer, 3 , AudioGroupType.SFX);
+            Destroy(gameObject);
+        }
+        private void OnEntityDamage(int obj)
+        {
+            _audioService.PlayOneShot(AudioNames.Platformer, 2, AudioGroupType.SFX);
+            UnityEngine.Debug.Log(gameObject.name + " damaged");
+            animator.SetTrigger(OnHit);
+        }
         protected override void Move()
         {
             if (onPatrol && !_patrolAction.isAlive)
@@ -25,6 +57,7 @@ namespace Code.Example.Platformer.Entity.Enemies
             }
             else if(_currentTarget)
             {
+                TryAttack();
                 
                 var direction = _currentTarget.position - transform.position;
                 direction.Normalize();
@@ -39,6 +72,11 @@ namespace Code.Example.Platformer.Entity.Enemies
             }
         }
 
+        private void TryAttack()
+        {
+            if ((transform.position - _currentTarget.position).magnitude < _attackThreshold) _currentTarget.GetComponent<EntityHealth>().GiveDamage(1);
+        }
+
         private void OnControlPointReached()
         { 
             if (++_currentPatrolPoint >= partolPoints.Count) _currentPatrolPoint = 0; 

Assets/Code/Example/Platformer/Entity/Enemies/Boar.cs

@@ -18,6 +18,10 @@ namespace Code.Example.Platformer.Entity.Enemies
         [SerializeField] private EntityHealth health;
         
         [Inject] private IAudioService _audioService;
+        
+        private Transform _target;
+        private float _attackThreshold = 0.5f;
+        
         private void Start()
         {
             health.OnEntityDamage = OnEntityDamage;
@@ -34,12 +38,12 @@ namespace Code.Example.Platformer.Entity.Enemies
         private async UniTaskVoid Die()
         {
             await UniTask.WaitForSeconds(1);
-            _audioService.PlayOneShot(AudioNames.Platformer, 3 );
+            _audioService.PlayOneShot(AudioNames.Platformer, 3 , AudioGroupType.SFX);
             Destroy(gameObject);
         }
         private void OnEntityDamage(int obj)
         {
-            _audioService.PlayOneShot(AudioNames.Platformer, 2);
+            _audioService.PlayOneShot(AudioNames.Platformer, 2, AudioGroupType.SFX);
             UnityEngine.Debug.Log(gameObject.name + " damaged");
             animator.SetTrigger(OnHit);
         }
@@ -83,11 +87,9 @@ namespace Code.Example.Platformer.Entity.Enemies
 
         private void TryAttack()
         {
-            if ((transform.position - _target.position).magnitude < attackThreshold) _target.GetComponent<EntityHealth>().GiveDamage(1);
+            if ((transform.position - _target.position).magnitude < _attackThreshold) _target.GetComponent<EntityHealth>().GiveDamage(1);
         }
         
-        private Transform _target;
-        private float attackThreshold = 0.5f;
 
         public void GotTarget(Transform target)
         {

Assets/Code/Example/Platformer/Entity/Enemies/PlayerCollisionDamager.cs

@@ -0,0 +1,12 @@
+using UnityEngine;
+
+namespace Code.Example.Platformer.Entity.Enemies
+{
+    public class PlayerCollisionDamager : MonoBehaviour
+    {
+        private void OnTriggerStay2D(Collider2D other)
+        {
+            other.GetComponent<EntityHealth>().GiveDamage(1);
+        }
+    }
+}

Assets/Code/Example/Platformer/Entity/Enemies/PlayerCollisionDamager.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 55c5190afe54409f89d7a16c315e48f9
+timeCreated: 1774276433

Assets/Code/Example/Platformer/Entity/Enemies/Snail.cs

@@ -1,4 +1,7 @@
+using Code.Infrastructure.Audio;
 using Code.Infrastructure.Configs;
+using Cysharp.Threading.Tasks;
+using Reflex.Attributes;
 using UnityEngine;
 
 namespace Code.Example.Platformer.Entity.Enemies
@@ -9,6 +12,35 @@ namespace Code.Example.Platformer.Entity.Enemies
         [SerializeField] private Vector2 groundRight;
         [SerializeField] private bool _directionRight;
 
+        [SerializeField] private EntityHealth health;
+        [Inject] private IAudioService _audioService;
+
+        private void Start()
+        {
+            health.OnEntityDamage = OnEntityDamage;
+            health.OnEntityDeath = OnEntityDeath;
+        }
+        
+        private void OnEntityDeath()
+        {
+            animator.SetBool(Died, true);
+            animator.SetTrigger(OnDeath);
+            Die().Forget();
+        }
+
+        private async UniTaskVoid Die()
+        {
+            await UniTask.WaitForSeconds(1);
+            _audioService.PlayOneShot(AudioNames.Platformer, 3 , AudioGroupType.SFX);
+            Destroy(gameObject);
+        }
+        private void OnEntityDamage(int obj)
+        {
+            _audioService.PlayOneShot(AudioNames.Platformer, 2, AudioGroupType.SFX);
+            UnityEngine.Debug.Log(gameObject.name + " damaged");
+            animator.SetTrigger(OnHit);
+        }
+
         protected override void Move()
         {
             CheckupDirection();

Assets/Code/Example/Platformer/Entity/Entity.cs

@@ -1,9 +1,16 @@
 using Code.Infrastructure.Configs;
+using Code.Infrastructure.EventBus;
+using Reflex.Attributes;
 using UnityEngine;
 
 namespace Code.Example.Platformer.Entity
 {
-    public abstract class Entity : MonoBehaviour
+    public interface IGameplayFreezeable : IGlobalSubscriber
+    {
+        void Freeze();
+        void UnFreeze();
+    } 
+    public abstract class Entity : MonoBehaviour, IGameplayFreezeable
     {
         protected static readonly int VelocityY = Animator.StringToHash("VelocityY");
         protected static readonly int VelocityX = Animator.StringToHash("VelocityX");
@@ -12,26 +19,47 @@ namespace Code.Example.Platformer.Entity
         protected static readonly int OnDeath = Animator.StringToHash("OnDeath");
         protected static readonly int Died = Animator.StringToHash("Died");
         
-        [SerializeField] protected Rigidbody2D rigidbody2D;
+        [SerializeField] protected new Rigidbody2D rigidbody2D;
         [SerializeField] protected Animator animator;
         [SerializeField] protected SpriteRenderer spriteRenderer;
         [SerializeField] private Vector2 groundPoint;
         
         private PlatformerEntityData _data; // TODO
-        protected bool isFreezed;
+        protected bool isFreezed = true;
         protected bool onGround;
+        private EventBus _eventBus;
+
+        private Vector2 _frozenVelocity;
+
         public void SetData(PlatformerEntityData data)
         {
             _data = data;
         }
 
+        [Inject]
+        private void Construct(EventBus eventBus)
+        {
+            _eventBus = eventBus;
+            _eventBus.Subscribe(this);
+        }
+
+        protected virtual void OnDestroy()
+        {
+            _eventBus.Unsubscribe(this);
+        }
+
         public void Freeze()
         {
+            _frozenVelocity = rigidbody2D.linearVelocity;
+            rigidbody2D.linearVelocity =  Vector2.zero;
+            
             rigidbody2D.bodyType = RigidbodyType2D.Kinematic;
             isFreezed = true;
         }
         public void UnFreeze()
         {
+            rigidbody2D.linearVelocity = _frozenVelocity;
+            
             rigidbody2D.bodyType = RigidbodyType2D.Dynamic;
             isFreezed = false;
         }

Assets/Code/Example/Platformer/Entity/EntityHealth.cs

@@ -47,9 +47,7 @@ namespace Code.Example.Platformer.Entity
                 IsDead = true;
                 OnEntityDeath?.Invoke();    
             }
-            
-            _eventBus.RaiseEvent<IEntityDamagedHandler>(x=> x.EntityDamaged(gameObject, damage, IsDead));
-            
+             
             WaitThreshold().Forget();
         }
 
@@ -60,17 +58,7 @@ namespace Code.Example.Platformer.Entity
             else _health += heal;
             
             OnEntityHeal?.Invoke(_health);
-            
-            _eventBus.RaiseEvent<IEntityHealedHandler>(x=> x.EntityHealed(gameObject, heal));
+             
         }
     }
-
-    public interface IEntityDamagedHandler : IGlobalSubscriber
-    {
-        void EntityDamaged(GameObject entity, int damageCount, bool isDied);
-    }
-    public interface IEntityHealedHandler : IGlobalSubscriber
-    {
-        void EntityHealed(GameObject entity, int healCount);
-    }
 }

Assets/Code/Example/Platformer/Entity/PlatformerEnemyFactory.cs

@@ -95,6 +95,8 @@ namespace Code.Example.Platformer.Entity
             health.Setup(_enemyConfigs[enemyType].EntityData.maxHealth, _enemyConfigs[enemyType].EntityData.damageRecieveThreshold);
             
             GameObjectInjector.InjectObject(gameObject, Container.RootContainer);
+            
+            _eventBus.RaiseEvent<IPlatformerEnemySpawnedHandle>(x=>x.PlatformerEnemySpawned(entity));
         }
 
         public void Dispose()
@@ -118,4 +120,8 @@ namespace Code.Example.Platformer.Entity
     {
         public void PlatformerEnemyLoaded(PlatformerEntityType type, Entity entity);
     }
+    public interface IPlatformerEnemySpawnedHandle : IGlobalSubscriber
+    {
+        public void PlatformerEnemySpawned(Entity entity);
+    }
 }

Assets/Code/Example/Platformer/Entity/PlatformerPlayerFactory.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using Code.Infrastructure.Configs;
 using Code.Infrastructure.EventBus;
 using Cysharp.Threading.Tasks;
@@ -9,7 +7,6 @@ using Reflex.Injectors;
 using UnityEngine;
 using UnityEngine.AddressableAssets;
 using UnityEngine.ResourceManagement.AsyncOperations;
-using UnityEngine.SceneManagement;
 using Object = UnityEngine.Object;
 
 namespace Code.Example.Platformer.Entity

Assets/Code/Example/Platformer/Entity/PlayerEntity.cs

@@ -1,7 +1,6 @@
-using System;
 using Code.Infrastructure.Audio;
-using Code.Infrastructure.Camera;
 using Code.Infrastructure.Configs;
+using Code.Infrastructure.EventBus;
 using Code.Infrastructure.Input;
 using Reflex.Attributes;
 using UnityEngine;
@@ -15,8 +14,9 @@ namespace Code.Example.Platformer.Entity
         private IInputService _inputService;
 
         [Inject]
-        private void Construct(IInputService inputService, IAudioService audioService)
+        private void Construct(IInputService inputService, IAudioService audioService, EventBus eventBus)
         {
+            _eventBus = eventBus;
             _audioService = audioService;
             
             _inputService = inputService;
@@ -32,8 +32,9 @@ namespace Code.Example.Platformer.Entity
             //cameraFactory.GetCinematicCamera(CameraMode.Platformer).Follow = transform;   , CameraFactory cameraFactory
         }
 
-        private void OnDestroy()
+        protected override void OnDestroy()
         {
+            base.OnDestroy();
             if(!health.IsDead) UnbindControls();
         }
 
@@ -72,7 +73,7 @@ namespace Code.Example.Platformer.Entity
             
             _acceleration = 1f; 
             
-            _audioService.PlayOneShot(AudioNames.Platformer, 6);
+            _audioService.PlayOneShot(AudioNames.Platformer, 6, AudioGroupType.SFX);
         }
 
         [SerializeField] private Vector2 attackOffset;
@@ -83,7 +84,7 @@ namespace Code.Example.Platformer.Entity
             //
 
             //
-            _audioService.PlayOneShot(AudioNames.Platformer, 1);
+            _audioService.PlayOneShot(AudioNames.Platformer, 1, AudioGroupType.SFX);
             animator.SetBool(OnAttack, true);
         }
 
@@ -114,6 +115,7 @@ namespace Code.Example.Platformer.Entity
         public void AttackEnd() => animator.SetBool(OnAttack, false);
         
         [SerializeField] private EntityHealth health;
+        private EventBus _eventBus;
 
         private void Start()
         {
@@ -124,6 +126,19 @@ namespace Code.Example.Platformer.Entity
         private void OnEntityDamage(int obj)
         {
             UnityEngine.Debug.Log("Player damaged");
+            
+            _audioService.PlayOneShot(AudioNames.Platformer, 8, AudioGroupType.SFX);
+            
+            _audioService.ApplyParameter(
+                "PlatformerDamage",
+                1f, 
+                0.5f,
+                () => _audioService.ApplyParameter(
+                    "PlatformerDamage",
+                    5000f, 
+                    1f));
+            
+            _eventBus.RaiseEvent<IPlayerDamagedHandle>(x=>x.PlayerDamaged());
         }
 
         private void OnEntityDeath()
@@ -133,7 +148,19 @@ namespace Code.Example.Platformer.Entity
             animator.SetBool(Died, true);
             
             UnbindControls();
+            
+            _eventBus.RaiseEvent<IPlayerDiedHandle>(x=>x.PlayerDied());
             // Destroy(gameObject, 1f);
         }
     }
+
+    public interface IPlayerDiedHandle : IGlobalSubscriber
+    {
+        void PlayerDied();
+    }
+
+    public interface IPlayerDamagedHandle : IGlobalSubscriber
+    {
+        void PlayerDamaged();
+    }
 }

Assets/Code/Example/Platformer/Entity/Spawners.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: ab2cbe7f4c0142f980f9640c57d27030
+timeCreated: 1774277361

Assets/Code/Example/Platformer/PlatformerState.cs

@@ -9,12 +9,18 @@ using Code.Infrastructure.Input;
 using Code.Infrastructure.Loadings;
 using Code.Infrastructure.SceneLoader;
 using Code.Infrastructure.UI;
+using Code.Infrastructure.UI.Panels;
 using Reflex.Core;
 using Unity.Cinemachine;
 using UnityEngine.SceneManagement;
 
 namespace Code.Example.Platformer
 {
+    public interface IPlayerReachedFinishHandle : IGlobalSubscriber
+    {
+        void PlayerReachedFinish();
+    }
+
     [State(typeof(AppStates),typeof(AppStateMachineContext))]
     [StateRaisingEvent]
     public partial class PlatformerState :
@@ -26,7 +32,11 @@ namespace Code.Example.Platformer
         IPlatformerPlayerLoadedHandle,
         IPlatformerPlayerSpawnedHandle,
         IReadyToPlayHandle,
-        IPlayerReachedFinishHandle
+        IPlayerReachedFinishHandle,
+        ILoadingPanelOpenedHandle,
+        ILoadingPanelClosedHandle,
+        IPlatformerEnemySpawnedHandle,
+        IPlayerDiedHandle
     {  
         private IPlatformerEnemyFactory _enemyFactory;
         private IPlatformerPlayerFactory _playerFactory;
@@ -37,7 +47,7 @@ namespace Code.Example.Platformer
         
         private Container _fixdamncontainer;
         
-        private Loading _loading;                                 
+        private Loading _loading;                             
         
         public PlatformerState(AppStateMachineContext context, EventBus eventBus) : base(context, eventBus)
         { 
@@ -49,30 +59,11 @@ namespace Code.Example.Platformer
         {
             EventBus.Subscribe(this);
 
-            // Dependency scene
-            // Level scene
-            // Camera
-            // Enemy snail
-            // Enemy bee
-            // Enemy boar
-            // Player
-            // Music
-            _loading = new(8, InitialLoadingCompleted);
+            // LoadingScreen
+            _loading = new(1, StartInitialLoading);
             
             Context.UIService.OpenPanel(UIPanelType.Loading);
-            Context.SceneLoader.LoadSceneAsync(SceneId.Platformer, LoadSceneMode.Single).Forget();
-            Context.InputService.EnableMap(ActionMappings.Platformer);
-            Context.CameraFactory.LoadCinemachineCamera(CameraMode.Platformer).Forget();
         }
-        private void InitialLoadingCompleted()
-        {
-            Context.UIService.ClosePanel(UIPanelType.Loading);
-
-            _enemyFactory.SpawnEnemy(PlatformerEntityType.Boar, _currentLevelData.enemySpawnPoints[0].position);
-
-            _playerFactory.SpawnPlayer(_currentLevelData.playerCheckPoints[0].position);
-        }
-
 
         protected override void OnExitState()
         {
@@ -83,10 +74,51 @@ namespace Code.Example.Platformer
             _playerFactory.ReleasePlayer();
 
             Context.CameraFactory.ReleaseCinemachineCamera(CameraMode.Platformer);
-            EventBus.Unsubscribe(this);
             Context.InputService.DisableMap(ActionMappings.Platformer);
             
             _audioFactory.ReleaseAudios(AudioNames.Platformer);
+            
+            EventBus.Unsubscribe(this);
+        }
+
+        private void StartInitialLoading()
+        {
+            
+            // Dependency scene
+            // Level scene
+            // Camera
+            // Enemy snail
+            // Enemy bee
+            // Enemy boar
+            // Player
+            // Music
+            _loading = new(8, InitialLoadingCompleted);
+            
+            Context.AudioService.ChangeGroupVolume(
+                AudioGroupType.Music,
+                1f, 
+                0.5f,
+                () => Context.AudioService.PlayRepeatedly(AudioNames.Platformer,0, AudioGroupType.Music));
+            
+            Context.SceneLoader.LoadSceneAsync(SceneId.Platformer, LoadSceneMode.Single).Forget();
+            Context.InputService.EnableMap(ActionMappings.Platformer);
+            Context.CameraFactory.LoadCinemachineCamera(CameraMode.Platformer).Forget();
+        }
+
+        private void InitialLoadingCompleted()
+        {
+            _loading = new Loading(2, CloseLevel1LoadingScreen);
+            
+            _enemyFactory.SpawnEnemy(PlatformerEntityType.Snail, _currentLevelData.enemySpawnPoints[0].position);
+            
+            _playerFactory.SpawnPlayer(_currentLevelData.playerCheckPoints[0].position);
+        }
+
+        private void CloseLevel1LoadingScreen()
+        {
+            Context.UIService.ClosePanel(UIPanelType.Loading);
+            
+            EventBus.RaiseEvent<IGameplayFreezeable>(x=> x.UnFreeze());
         }
 
 
@@ -110,6 +142,13 @@ namespace Code.Example.Platformer
             _playerEntity = entity;
             
             Context.CameraFactory.GetCinematicCamera(CameraMode.Platformer).Follow = entity.transform;
+            
+            _loading.DoProgress();
+        }
+
+        public void PlatformerEnemySpawned(Entity.Entity entity)
+        {
+            _loading.DoProgress();
         }
 
         public void OnReadyToPlay(AudioNames groupName)
@@ -119,25 +158,40 @@ namespace Code.Example.Platformer
 
         public void PlayerReachedFinish()
         {
-            _loading = new(1, Level2LoadingCompleted);
+            _loading = new Loading(1, StartLevel2Loading);
+            
+            Context.AudioService.ChangeGroupVolume(
+                AudioGroupType.Music,
+                0f, 
+                0.5f,
+                () => Context.AudioService.CancelMusic(AudioNames.Platformer, 0));
+            
             Context.UIService.OpenPanel(UIPanelType.Loading);
             
-            _playerEntity.Freeze();
+            EventBus.RaiseEvent<IGameplayFreezeable>(x=> x.Freeze());
             
             SceneManager.MoveGameObjectToScene(_playerEntity.gameObject, Context.SceneLoader.GetScene(SceneId.Platformer));
+        }
+
+        private void StartLevel2Loading()
+        {
+            _loading = new(2, StartLevel2Gameplay);
             
             Context.SceneLoader.UnloadSceneAsync(SceneId.Platformer2).Forget();
             Context.SceneLoader.LoadSceneAsync(SceneId.Platformer3, LoadSceneMode.Additive).Forget();
         }
-
-        private void Level2LoadingCompleted()
+        
+        private void StartLevel2Gameplay()
         {
-            Context.UIService.ClosePanel(UIPanelType.Loading);
+            Context.AudioService.ChangeGroupVolume(
+                AudioGroupType.Music,
+                1f, 
+                0.5f,
+                () => Context.AudioService.PlayRepeatedly(AudioNames.Platformer,7, AudioGroupType.Music));
             
-            _enemyFactory.SpawnEnemy(PlatformerEntityType.Boar, _currentLevelData.enemySpawnPoints[0].position);
+            Context.UIService.ClosePanel(UIPanelType.Loading);
 
-            _playerEntity.transform.position = _currentLevelData.playerCheckPoints[0].position;
-            _playerEntity.UnFreeze();
+            EventBus.RaiseEvent<IGameplayFreezeable>(x=> x.UnFreeze());
         }
 
         public void OnPlatformerSceneLoaded()
@@ -179,6 +233,13 @@ namespace Code.Example.Platformer
 
         public void OnPlatformer3SceneLoaded()
         { 
+            SceneManager.SetActiveScene(Context.SceneLoader.GetScene(SceneId.Platformer3));
+            
+            _enemyFactory.SpawnEnemy(PlatformerEntityType.Boar, _currentLevelData.enemySpawnPoints[0].position);
+
+            _playerEntity.transform.position = _currentLevelData.playerCheckPoints[0].position;
+            
+            _loading.DoProgress();
         }
 
         public void OnPlatformer3SceneInitialized(Container container)
@@ -187,10 +248,20 @@ namespace Code.Example.Platformer
             
             _loading.DoProgress();
         }
-    }
 
-    public interface IPlayerReachedFinishHandle : IGlobalSubscriber
-    {
-        void PlayerReachedFinish();
+        public void LoadingPanelOpened(UIPanel panel)
+        {
+            _loading.DoProgress();
+        }
+
+        public void LoadingPanelClosed()
+        {
+        }
+
+        public void PlayerDied()
+        {
+            Context.StateMachine.SwitchState(AppStates.MainMenu)
+                .AllowStateTransition(AppStates.Platformer);
+        }
     }
 }