对话回顾
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
using System;
|
||||
using AibisDream.Framework;
|
||||
using AibisDream.Utility;
|
||||
using Yarn.Unity;
|
||||
|
||||
@@ -20,6 +21,8 @@ namespace AibisDream
|
||||
return;
|
||||
}
|
||||
|
||||
EnumEventSystem.Global.Send(EventEnum.DialogLine, DialogLine.GetLine(dialogueLine));
|
||||
|
||||
Action jumpVoice = SkipVoice;
|
||||
HandleLineOutput(dialogueLine, jumpVoice, onDialogueLineFinished);
|
||||
HandleVoiceOutput(dialogueLine);
|
||||
@@ -32,9 +35,6 @@ namespace AibisDream
|
||||
|
||||
private void HandleLineOutput(LocalizedLine dialogueLine, Action onTextShowed, Action onDialogueLineFinished)
|
||||
{
|
||||
// 对话系统正在交谈状态
|
||||
//DialogController.Instance.IsTalking = true;
|
||||
|
||||
DialogCanvasManager.GetCurView().ShowLine(dialogueLine.TextWithoutCharacterName.Text,
|
||||
dialogueLine.GetCharacterVo(), onDialogueLineFinished, onTextShowed, dialogueLine.IsAutoSkipLine());
|
||||
}
|
||||
@@ -63,18 +63,8 @@ namespace AibisDream
|
||||
return;
|
||||
}
|
||||
|
||||
//DialogController.Instance.IsTalking = true;
|
||||
DialogCanvasManager.GetCurView().ShowOptions(dialogueOptions, onOptionSelected);
|
||||
}
|
||||
|
||||
public override void InterruptLine(LocalizedLine dialogueLine, Action onDialogueLineFinished)
|
||||
{
|
||||
base.InterruptLine(dialogueLine, onDialogueLineFinished);
|
||||
}
|
||||
|
||||
public override void DismissLine(Action onDismissalComplete)
|
||||
{
|
||||
base.DismissLine(onDismissalComplete);
|
||||
var options = DialogOption.GeneOptions(dialogueOptions, onOptionSelected);
|
||||
DialogCanvasManager.GetCurView().ShowOptions(options);
|
||||
}
|
||||
|
||||
public override void UserRequestedViewAdvancement()
|
||||
@@ -92,7 +82,7 @@ namespace AibisDream
|
||||
if (!DialogCanvasManager.GetCurView().TrySkipLine())
|
||||
{
|
||||
AudioManager.Instance.StopVoice();
|
||||
requestInterrupt.Invoke();
|
||||
requestInterrupt?.Invoke();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user