1
This commit is contained in:
@@ -4,6 +4,7 @@ using System.Collections.Concurrent;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.Linq;
|
||||
using System.Threading;
|
||||
using BITKit;
|
||||
using Cysharp.Threading.Tasks;
|
||||
|
||||
@@ -57,9 +58,10 @@ namespace Net.Project.B.Dialogue
|
||||
public event Action<IDialogueData> OnDialogueEnd;
|
||||
public event Func<IDialogueData, IReadOnlyCollection<IDialogueChoice>, UniTask<int>> OnDialogueChoose;
|
||||
public event Action<IDialogueData, IDialogueChoice> OnDialogueChose;
|
||||
|
||||
public async UniTask CreateDialogue(IDialogueData dialogueData)
|
||||
{
|
||||
dialogueData.CancellationTokenSource ??= new CancellationTokenSource();
|
||||
|
||||
if (_dialogues.TryAdd(dialogueData.Identity, dialogueData) is false)
|
||||
{
|
||||
dialogueData.Identity = _dialogues.Keys.Max() + 1;
|
||||
@@ -68,19 +70,23 @@ namespace Net.Project.B.Dialogue
|
||||
|
||||
try
|
||||
{
|
||||
await OnDialogueStart.UniTaskFunc(dialogueData);
|
||||
await OnDialogueStart.UniTaskFunc(dialogueData)
|
||||
.AttachExternalCancellation(dialogueData.CancellationTokenSource.Token);
|
||||
}
|
||||
catch (OperationCanceledException)
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
catch (OperationAbortedException)
|
||||
{
|
||||
|
||||
|
||||
}
|
||||
finally
|
||||
{
|
||||
dialogueData.CancellationTokenSource.Cancel();
|
||||
|
||||
OnDialogueEnd?.Invoke(dialogueData);
|
||||
}
|
||||
|
||||
|
||||
OnDialogueEnd?.Invoke(dialogueData);
|
||||
}
|
||||
|
||||
public async UniTask<int> CreateDialogue(IDialogueData dialogueData,
|
||||
|
Reference in New Issue
Block a user