Geri/Emojiji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Message delay working properly

Browse source
This commit is contained in:
Gerard Gascón 2024-01-28 10:30:57 +01:00
parent 2f9b516605
commit 60fd82cff5
30 changed files with 538 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Assets/Scripts/Audio/AudioManager.cs
View file

@ -31,8 +31,8 @@ namespace Audio {
};
s.source = sound.AddComponent<AudioSource>();
if (soundList.mainMixer && soundList.sfxMixer) {
s.source.outputAudioMixerGroup = s.type == Sounds.List.Type.Music ? soundList.mainMixer : soundList.sfxMixer;
if (soundList.musicMixer && soundList.sfxMixer) {
s.source.outputAudioMixerGroup = s.type == Sounds.List.Type.Music ? soundList.musicMixer : soundList.sfxMixer;
}
s.source.clip = s.clip;

2
Assets/Scripts/Audio/Sounds.cs
View file

@ -6,7 +6,7 @@ namespace Audio {
public class Sounds : ScriptableObject {
[Tooltip("The music mixer.")]
public AudioMixerGroup mainMixer;
public AudioMixerGroup musicMixer;
[Tooltip("The SFX mixer.")]
public AudioMixerGroup sfxMixer;

28
Assets/Scripts/Messaging/Typer/MessageManager.cs
View file

@ -18,7 +18,6 @@ namespace Messaging {
[SerializeField] private TextAsset[] jokes;
[SerializeField, Min(0)] private float sendJokeDelay = 2f;
[SerializeField, Min(0)] private float sendJokeLongDelay = 8f;
[SerializeField, Min(0)] private float initialSendJokeDelay = 4f;
private List<TextAsset> _jokesBag;
@ -42,12 +41,23 @@ namespace Messaging {
}
private void Start() {
SendRandomJoke(initialSendJokeDelay);
StartCoroutine(SendRandomJoke(initialSendJokeDelay));
}
private async void SendRandomJoke(float delay) {
private IEnumerator SendRandomJoke(float delay) {
_sendButton.Lock();
await Task.Delay((int)(delay * 1000));
yield return new WaitForSeconds(delay);
_sendButton.Unlock();
_currentJoke = GetRandomJoke();
CreateMessage(_currentJoke.QuestionMessage.Key, false);
_emojiButtonManager.SetButtonImages(GenerateButtonOptions());
}
private IEnumerator SendRandomJoke(Coroutine routine, float delay) {
yield return routine;
_sendButton.Lock();
yield return new WaitForSeconds(delay);
_sendButton.Unlock();
_currentJoke = GetRandomJoke();
@ -62,17 +72,17 @@ namespace Messaging {
_currentJokeIndex = Mathf.Max(_currentJokeIndex, 0);
if (message == _currentJoke.AnswerMessage.Key) {
_sendButton.Lock();
StartCoroutine(ShowRealTexts());
Coroutine routine = StartCoroutine(ShowRealTexts());
if(_currentJokeIndex == 0)
SendRandomJoke(sendJokeLongDelay);
StartCoroutine(SendRandomJoke(routine, sendJokeDelay));
else
SendRandomJoke(sendJokeDelay);
StartCoroutine(SendRandomJoke(routine, sendJokeDelay));
} else {
_lives.Wrong();
if (_lives.CurrentLives == 0) {
_sendButton.Lock();
StartCoroutine(ShowRealTexts());
SendRandomJoke(sendJokeLongDelay);
Coroutine routine = StartCoroutine(ShowRealTexts());
StartCoroutine(SendRandomJoke(routine, initialSendJokeDelay));
_lives.ResetLives();
}
}