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

ready for 2.0.27

master
neuecc 2020-07-30 08:12:32 +09:00
parent e9474649c4
commit 2e35324403
2 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/UniTask/Assets/Plugins/UniTask/package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "com.cysharp.unitask", "name": "com.cysharp.unitask",
"displayName": "UniTask", "displayName": "UniTask",
"version": "2.0.26", "version": "2.0.27",
"unity": "2018.4", "unity": "2018.4",
"description": "Provides an efficient async/await integration to Unity.", "description": "Provides an efficient async/await integration to Unity.",
"keywords": [ "async/await", "async", "Task", "UniTask" ], "keywords": [ "async/await", "async", "Task", "UniTask" ],

37
src/UniTask/Assets/Scenes/SandboxMain.cs
View File

@ -464,7 +464,7 @@ public class SandboxMain : MonoBehaviour
private void Awake() private void Awake()
{ {
PlayerLoopInfo.Inject(); // PlayerLoopInfo.Inject();
PrepareCamera(); PrepareCamera();
} }
@ -482,12 +482,24 @@ public class SandboxMain : MonoBehaviour
}); });
} }
async void RunStandardTaskAsync()
{
Debug.Log("Wait 3 seconds");
await Task.Delay(TimeSpan.FromSeconds(3));
Debug.Log("Current SyncContext:" + SynchronizationContext.Current.GetType().FullName);
}
async UniTaskVoid Start() async UniTaskVoid Start()
{ {
var url = "http://google.com/404"; RunStandardTaskAsync();
var webRequestAsyncOperation = UnityWebRequest.Get(url).SendWebRequest();
await webRequestAsyncOperation.ToUniTask(); UnityEngine.Debug.Log("UniTaskPlayerLoop ready? " + PlayerLoopHelper.IsInjectedUniTaskPlayerLoop());
//var url = "http://google.com/404";
//var webRequestAsyncOperation = UnityWebRequest.Get(url).SendWebRequest();
//await webRequestAsyncOperation.ToUniTask();
//PlayerLoopInfo.Inject(); //PlayerLoopInfo.Inject();
@ -694,7 +706,9 @@ public class SandboxMain : MonoBehaviour
//StartCoroutine(Coroutine()); //StartCoroutine(Coroutine());
//await UniTask.Delay(TimeSpan.FromSeconds(1)); // PlayerLoopInfo.Inject();
await UniTask.Delay(TimeSpan.FromSeconds(1));
PlayerLoopInfo.DumpPlayerLoop("current", PlayerLoop.GetCurrentPlayerLoop());
// _ = ReturnToMainThreadTest(); // _ = ReturnToMainThreadTest();
@ -1060,6 +1074,17 @@ public class SandboxMain : MonoBehaviour
} }
} }
public class SyncContextInjecter
{
[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
public static void Inject()
{
SynchronizationContext.SetSynchronizationContext(new UniTaskSynchronizationContext());
}
}
public class PlayerLoopInfo public class PlayerLoopInfo
{ {
// [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)] // [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
@ -1094,7 +1119,7 @@ public class PlayerLoopInfo
public static Type CurrentLoopType { get; private set; } public static Type CurrentLoopType { get; private set; }
[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)] // [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
public static void Inject() public static void Inject()
{ {
var system = PlayerLoop.GetCurrentPlayerLoop(); var system = PlayerLoop.GetCurrentPlayerLoop();