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

Prevent UnitTasks from continuing after exiting play mode #22

pull/24/head 1.1.0
neuecc 2019-06-28 20:41:04 +09:00
parent 021a1da1fa
commit f82c762263
3 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Tests/AsyncTest.cs
View File

@ -195,7 +195,6 @@ namespace UniRx.AsyncTests
var currentThreadId = Thread.CurrentThread.ManagedThreadId; var currentThreadId = Thread.CurrentThread.ManagedThreadId;
UnityEngine.Debug.Log("Before:" + currentThreadId);
await UniTask.SwitchToThreadPool(); await UniTask.SwitchToThreadPool();
@ -209,7 +208,6 @@ namespace UniRx.AsyncTests
var switchedThreadId = Thread.CurrentThread.ManagedThreadId; var switchedThreadId = Thread.CurrentThread.ManagedThreadId;
UnityEngine.Debug.Log("After:" + switchedThreadId);
currentThreadId.Should().NotBe(switchedThreadId); currentThreadId.Should().NotBe(switchedThreadId);

8
Assets/UniRx.Async/EnumeratorAsyncExtensions.cs
View File

@ -232,14 +232,6 @@ namespace UniRx.Async
}; };
} }
static IEnumerator UnwrapEnumerator(IEnumerator enumerator)
{
while (enumerator.MoveNext())
{
yield return null;
}
}
static IEnumerator UnwrapWaitAsyncOperation(AsyncOperation asyncOperation) static IEnumerator UnwrapWaitAsyncOperation(AsyncOperation asyncOperation)
{ {
while (!asyncOperation.isDone) while (!asyncOperation.isDone)

20
Assets/UniRx.Async/PlayerLoopHelper.cs
View File

@ -67,13 +67,33 @@ namespace UniRx.Async
var yieldLoop = new PlayerLoopSystem var yieldLoop = new PlayerLoopSystem
{ {
type = loopRunnerYieldType, type = loopRunnerYieldType,
#if UNITY_EDITOR
updateDelegate = () =>
{
if (Application.isPlaying)
{
cq.Run();
}
}
#else
updateDelegate = cq.Run updateDelegate = cq.Run
#endif
}; };
var runnerLoop = new PlayerLoopSystem var runnerLoop = new PlayerLoopSystem
{ {
type = loopRunnerType, type = loopRunnerType,
#if UNITY_EDITOR
updateDelegate = () =>
{
if (Application.isPlaying)
{
runner.Run();
}
}
#else
updateDelegate = runner.Run updateDelegate = runner.Run
#endif
}; };
var dest = new PlayerLoopSystem[loopSystem.subSystemList.Length + 2]; var dest = new PlayerLoopSystem[loopSystem.subSystemList.Length + 2];