PHXH
/
UniTask
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tweaks

master
hadashiA 2023-09-21 10:00:27 +09:00
parent be8dbe8804
commit 3ed28e534a
1 changed files with 11 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/UniTask/Assets/Plugins/UniTask/Runtime/External/DOTween/DOTweenAsyncExtensions.cs vendored
View File

@ -251,30 +251,7 @@ namespace Cysharp.Threading.Tasks
source.tween.Complete(true); source.tween.Complete(true);
break; break;
case TweenCancelBehaviour.CancelAwait: case TweenCancelBehaviour.CancelAwait:
// restore to original callback source.RestoreOriginalCallback();
switch (callbackType)
{
case CallbackType.Kill:
tween.onKill = source.originalCompleteAction;
break;
case CallbackType.Complete:
tween.onComplete = source.originalCompleteAction;
break;
case CallbackType.Pause:
tween.onPause = source.originalCompleteAction;
break;
case CallbackType.Play:
tween.onPlay = source.originalCompleteAction;
break;
case CallbackType.Rewind:
tween.onRewind = source.originalCompleteAction;
break;
case CallbackType.StepComplete:
tween.onStepComplete = source.originalCompleteAction;
break;
default:
break;
}
source.core.TrySetCanceled(source.cancellationToken); source.core.TrySetCanceled(source.cancellationToken);
break; break;
} }
@ -379,6 +356,16 @@ namespace Cysharp.Threading.Tasks
core.Reset(); core.Reset();
cancellationRegistration.Dispose(); cancellationRegistration.Dispose();
RestoreOriginalCallback();
tween = default;
cancellationToken = default;
originalCompleteAction = default;
return pool.TryPush(this);
}
void RestoreOriginalCallback()
{
switch (callbackType) switch (callbackType)
{ {
case CallbackType.Kill: case CallbackType.Kill:
@ -402,11 +389,6 @@ namespace Cysharp.Threading.Tasks
default: default:
break; break;
} }
tween = default;
cancellationToken = default;
originalCompleteAction = default;
return pool.TryPush(this);
} }
} }
} }