Audio fixes
This commit is contained in:
@@ -1,8 +1,9 @@
|
||||
using System;
|
||||
using Darkmatter.Core.Contracts.Services.Audio;
|
||||
using Darkmatter.Core.Data.Signals.Features.AppBoot;
|
||||
using Darkmatter.Core.Data.Signals.Features.MainMenu;
|
||||
using Darkmatter.Core.Enums.Services.Audio;
|
||||
using Darkmatter.Libs.Observer;
|
||||
using UnityEngine;
|
||||
using VContainer.Unity;
|
||||
|
||||
namespace Darkmatter.Features.Mainmenu
|
||||
@@ -11,17 +12,19 @@ namespace Darkmatter.Features.Mainmenu
|
||||
{
|
||||
private readonly IEventBus _eventBus;
|
||||
private readonly MainMenuView _view;
|
||||
private readonly ISfxPlayer _sfxPlayer;
|
||||
|
||||
|
||||
|
||||
public MainMenuPresenter(MainMenuView view, IEventBus eventBus)
|
||||
public MainMenuPresenter(MainMenuView view, IEventBus eventBus, ISfxPlayer sfxPlayer)
|
||||
{
|
||||
_view = view;
|
||||
_eventBus = eventBus;
|
||||
_sfxPlayer = sfxPlayer;
|
||||
}
|
||||
|
||||
public void Start()
|
||||
{
|
||||
_view.OnPlayBtnPressedEvent += OnPlayBtnPressed;
|
||||
_view.OnPlayBtnClickedEvent += OnPlayBtnClicked;
|
||||
_eventBus.Subscribe<IntroCompletedSignal>(OnIntroComplete);
|
||||
}
|
||||
@@ -31,6 +34,11 @@ namespace Darkmatter.Features.Mainmenu
|
||||
_view.PlayMascotIntro();
|
||||
}
|
||||
|
||||
private void OnPlayBtnPressed()
|
||||
{
|
||||
_sfxPlayer.Play(SfxId.PlayButtonTap);
|
||||
}
|
||||
|
||||
private void OnPlayBtnClicked()
|
||||
{
|
||||
_eventBus.Publish(new PlayBtnClickedSignal());
|
||||
@@ -38,7 +46,8 @@ namespace Darkmatter.Features.Mainmenu
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
_view.OnPlayBtnPressedEvent -= OnPlayBtnPressed;
|
||||
_view.OnPlayBtnClickedEvent -= OnPlayBtnClicked;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -10,7 +10,6 @@ namespace Darkmatter.Features.Mainmenu
|
||||
public class MainMenuView : MonoBehaviour
|
||||
{
|
||||
[Header("UI Elements")]
|
||||
//[SerializeField] private Button playBtn;
|
||||
[SerializeField] private PlayButtonView playBtn;
|
||||
[SerializeField] private SkeletonGraphic mascotSkeletonGraphic;
|
||||
|
||||
@@ -20,12 +19,14 @@ namespace Darkmatter.Features.Mainmenu
|
||||
[SerializeField] private string helloAnimation = "hello";
|
||||
[SerializeField] private float helloInterval = 5f;
|
||||
|
||||
public event Action OnPlayBtnPressedEvent;
|
||||
public event Action OnPlayBtnClickedEvent;
|
||||
|
||||
private CancellationTokenSource helloCts;
|
||||
|
||||
private void Start()
|
||||
{
|
||||
playBtn.OnPlayBtnPressedEvent += () => OnPlayBtnPressedEvent?.Invoke();
|
||||
playBtn.OnPlayBtnClickedEvent += () => OnPlayBtnClickedEvent?.Invoke();
|
||||
}
|
||||
|
||||
|
||||
@@ -12,6 +12,7 @@ namespace Darkmatter.Features.Mainmenu
|
||||
private Animator playBtnAnimator;
|
||||
[SerializeField] private ParticleSystem playBtnParticle;
|
||||
|
||||
public event Action OnPlayBtnPressedEvent;
|
||||
public event Action OnPlayBtnClickedEvent;
|
||||
|
||||
private void Awake()
|
||||
@@ -29,6 +30,7 @@ namespace Darkmatter.Features.Mainmenu
|
||||
{
|
||||
playBtn.interactable = false;
|
||||
playBtnAnimator.enabled = false;
|
||||
OnPlayBtnPressedEvent?.Invoke();
|
||||
PlayBtnSequenceAsync(this.GetCancellationTokenOnDestroy()).Forget();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user