final commit?
This commit is contained in:
parent
0e2a7cc7c3
commit
3f53e2caa8
59 changed files with 3989 additions and 1668 deletions
|
|
@ -53,18 +53,19 @@ public class DialogueManager : MonoBehaviour
|
|||
|
||||
public void StartDialogue(DialogueScript newDialogue)
|
||||
{
|
||||
GameManager.instance.canPause = false;
|
||||
dialogueUI.SetActive(true);
|
||||
WaveManager.instance.bossUI.SetActive(false);
|
||||
dialogueActive = true;
|
||||
currentText = 0;
|
||||
scriptToShow = newDialogue;
|
||||
WaveManager.instance.player.invulnerable = true;
|
||||
battleUIAnimator.SetTrigger(dialogueStartTrigger);
|
||||
DialogueScript.Dialogue currentDialogue = scriptToShow.dialogueList[currentText];
|
||||
if (WaveManager.instance.bossInstance)
|
||||
{
|
||||
bossSpeechBubble.position = WaveManager.instance.bossInstance.transform.position + offset;
|
||||
WaveManager.instance.musicSource.clip = WaveManager.instance.bossDialogueLoop;
|
||||
WaveManager.instance.musicSource.volume = WaveManager.instance.bossVolume;
|
||||
WaveManager.instance.musicSource.Play();
|
||||
}
|
||||
if (WaveManager.instance.lyricaInstance)
|
||||
|
|
@ -74,7 +75,6 @@ public class DialogueManager : MonoBehaviour
|
|||
merlinSpeechBubble.transform.position = WaveManager.instance.merlinInstance.transform.position + offset;
|
||||
lyricaSpeechBubble.transform.position = WaveManager.instance.lyricaInstance.transform.position + offset;
|
||||
WaveManager.instance.musicSource.clip = WaveManager.instance.finalDialogueLoop;
|
||||
WaveManager.instance.musicSource.volume = WaveManager.instance.finalVolume;
|
||||
WaveManager.instance.musicSource.Play();
|
||||
}
|
||||
SetDialogue(currentDialogue);
|
||||
|
|
@ -101,6 +101,7 @@ public class DialogueManager : MonoBehaviour
|
|||
dialogueUI.SetActive(false);
|
||||
WaveManager.instance.player.isStalled = false;
|
||||
WaveManager.instance.player.invulnerable = false;
|
||||
GameManager.instance.canPause = true;
|
||||
battleUIAnimator.SetTrigger(dialogueEndTrigger);
|
||||
if (WaveManager.instance.bossInstance)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue