pengtaihao
/
UniTask
mirror of https://github.com/Cysharp/UniTask
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix DOTweenExt's TweenCancelBehaviour.CancelAwait

pull/61/head
neuecc 2020-05-23 02:53:48 +09:00
parent 07cf65c1ec
commit f3e3ba8864
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/UniTask/Assets/Plugins/UniTask/Runtime/External/DoTweenAsyncExtensions.cs vendored
View File

@ -86,7 +86,8 @@ namespace Cysharp.Threading.Tasks
sealed class TweenConfiguredSource : IUniTaskSource, IPromisePoolItem sealed class TweenConfiguredSource : IUniTaskSource, IPromisePoolItem
{ {
static readonly PromisePool<TweenConfiguredSource> pool = new PromisePool<TweenConfiguredSource>(); static readonly PromisePool<TweenConfiguredSource> pool = new PromisePool<TweenConfiguredSource>();
static Action<object> CancellationCallbackDelegate = CancellationCallback; static readonly Action<object> CancellationCallbackDelegate = CancellationCallback;
static readonly TweenCallback EmptyTweenCallback = () => { };
Tween tween; Tween tween;
TweenCancelBehaviour cancelBehaviour; TweenCancelBehaviour cancelBehaviour;
@ -138,14 +139,7 @@ namespace Cysharp.Threading.Tasks
cancellationTokenRegistration.Dispose(); cancellationTokenRegistration.Dispose();
if (canceled) if (canceled)
{ {
if (cancelBehaviour == TweenCancelBehaviour.CancelAwait) core.TrySetCanceled(cancellationToken);
{
// already called TrySetCanceled, do nothing.
}
else
{
core.TrySetCanceled(cancellationToken);
}
} }
else else
{ {
@ -189,7 +183,7 @@ namespace Cysharp.Threading.Tasks
self.tween.Complete(true); self.tween.Complete(true);
break; break;
case TweenCancelBehaviour.CancelAwait: case TweenCancelBehaviour.CancelAwait:
self.canceled = true; self.tween.onKill = EmptyTweenCallback; // replace to empty(avoid callback after Caceled(instance is returned to pool.)
self.core.TrySetCanceled(self.cancellationToken); self.core.TrySetCanceled(self.cancellationToken);
break; break;
} }