ready for 2.0.27

Cysharp · Jul 29, 2020 · 2e35324 · 2e35324
1 parent e947464
commit 2e35324
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 10 deletions.
diff --git a/src/UniTask/Assets/Plugins/UniTask/package.json b/src/UniTask/Assets/Plugins/UniTask/package.json
@@ -1,7 +1,7 @@
 {
     "name": "com.cysharp.unitask",
     "displayName": "UniTask",
-    "version": "2.0.26",
+    "version": "2.0.27",
     "unity": "2018.4",
     "description": "Provides an efficient async/await integration to Unity.",
     "keywords": [ "async/await", "async", "Task", "UniTask" ],

diff --git a/src/UniTask/Assets/Scenes/SandboxMain.cs b/src/UniTask/Assets/Scenes/SandboxMain.cs
@@ -192,7 +192,7 @@ void Increment(int value)
     async UniTask RunStandardDelayAsync()
     {
 
-        
+
 
         UnityEngine.Debug.Log("DEB");
 
@@ -223,9 +223,9 @@ async UniTask RunJobAsync()
 
     async UniTaskVoid Update2()
     {
-
 
-
+
+
 
 
 
@@ -464,7 +464,7 @@ async void Nanika()
 
     private void Awake()
     {
-        PlayerLoopInfo.Inject();
+        // PlayerLoopInfo.Inject();
         PrepareCamera();
     }
 
@@ -482,12 +482,24 @@ public IUniTaskAsyncEnumerable<int> MyEveryUpdate()
         });
     }
 
+    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()
     {
-        var url =  "http://google.com/404";
-        var webRequestAsyncOperation = UnityWebRequest.Get(url).SendWebRequest();
-        await webRequestAsyncOperation.ToUniTask();
+        RunStandardTaskAsync();
+
+        UnityEngine.Debug.Log("UniTaskPlayerLoop ready? " + PlayerLoopHelper.IsInjectedUniTaskPlayerLoop());
+
+        //var url =  "http://google.com/404";
+        //var webRequestAsyncOperation = UnityWebRequest.Get(url).SendWebRequest();
+        //await webRequestAsyncOperation.ToUniTask();
 
         //PlayerLoopInfo.Inject();
 
@@ -694,7 +706,9 @@ async UniTaskVoid Start()
 
         //StartCoroutine(Coroutine());
 
-        //await UniTask.Delay(TimeSpan.FromSeconds(1));
+        // PlayerLoopInfo.Inject();
+        await UniTask.Delay(TimeSpan.FromSeconds(1));
+        PlayerLoopInfo.DumpPlayerLoop("current", PlayerLoop.GetCurrentPlayerLoop());
 
 
         // _ = ReturnToMainThreadTest();
@@ -1060,6 +1074,17 @@ async UniTask ShootAsync()
     }
 }
 
+
+public class SyncContextInjecter
+{
+    [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
+    public static void Inject()
+    {
+        SynchronizationContext.SetSynchronizationContext(new UniTaskSynchronizationContext());
+    }
+}
+
+
 public class PlayerLoopInfo
 {
     // [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
@@ -1094,7 +1119,7 @@ public static void DumpPlayerLoop(string which, UnityEngine.LowLevel.PlayerLoopS
 
     public static Type CurrentLoopType { get; private set; }
 
-    [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
+    // [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
     public static void Inject()
     {
         var system = PlayerLoop.GetCurrentPlayerLoop();