更新UniRx、UniTask

Author: wanderer

GameFramework/Runtime/GameFramework.asmdef

@@ -1,13 +1,21 @@
 {
     "name": "GameFramework",
     "references": [
-        "Libraries"
+        "GUID:87b7f08973070ad4cbd7876379f056f5",
+        "GUID:560b04d1a97f54a4e82edc0cbbb69285",
+        "GUID:f51ebe6a0ceec4240a699833d6309b23",
+        "GUID:593a5b492d29ac6448b1ebf7f035ef33",
+        "GUID:029c1c1b674aaae47a6841a0b89ad80e",
+        "GUID:5c01796d064528144a599661eaab93a6",
+        "GUID:dc47925d1a5fa2946bdd37746b2b5d48"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
     "allowUnsafeCode": true,
     "overrideReferences": false,
-    "precompiledReferences": [],
+    "precompiledReferences": [
+        ""
+    ],
     "autoReferenced": true,
     "defineConstraints": [],
     "versionDefines": [],

GameFramework/Runtime/Resource/BundleResourceHelper.cs

@@ -16,6 +16,7 @@
 using UnityEngine.Networking;
 using UnityEngine.SceneManagement;
 using Object = UnityEngine.Object;
+using Cysharp.Threading.Tasks;
 
 
 namespace Wanderer.GameFramework

Libraries/Libraries.asmdef

@@ -5,7 +5,9 @@
     "excludePlatforms": [],
     "allowUnsafeCode": true,
     "overrideReferences": false,
-    "precompiledReferences": [],
+    "precompiledReferences": [
+        ""
+    ],
     "autoReferenced": true,
     "defineConstraints": [],
     "versionDefines": [],

Libraries/LitJson/JsonException.cs

@@ -21,44 +21,44 @@ public class JsonException :
         ApplicationException
 #endif
     {
-        public JsonException () : base ()
+        public JsonException() : base()
         {
         }
 
-        internal JsonException (ParserToken token) :
-            base (String.Format (
+        internal JsonException(ParserToken token) :
+            base(String.Format(
                     "Invalid token '{0}' in input string", token))
         {
         }
 
-        internal JsonException (ParserToken token,
+        internal JsonException(ParserToken token,
                                 Exception inner_exception) :
-            base (String.Format (
+            base(String.Format(
                     "Invalid token '{0}' in input string", token),
                 inner_exception)
         {
         }
 
-        internal JsonException (int c) :
-            base (String.Format (
-                    "Invalid character '{0}' in input string", (char) c))
+        internal JsonException(int c) :
+            base(String.Format(
+                    "Invalid character '{0}' in input string", (char)c))
         {
         }
 
-        internal JsonException (int c, Exception inner_exception) :
-            base (String.Format (
-                    "Invalid character '{0}' in input string", (char) c),
+        internal JsonException(int c, Exception inner_exception) :
+            base(String.Format(
+                    "Invalid character '{0}' in input string", (char)c),
                 inner_exception)
         {
         }
 
 
-        public JsonException (string message) : base (message)
+        public JsonException(string message) : base(message)
         {
         }
 
-        public JsonException (string message, Exception inner_exception) :
-            base (message, inner_exception)
+        public JsonException(string message, Exception inner_exception) :
+            base(message, inner_exception)
         {
         }
     }

Libraries/Unity3dAsyncAwaitUtil.meta renamed to Libraries/UniRx.meta

@@ -1,5 +1,9 @@
 #if !(UNITY_METRO || UNITY_WP8)
 
+#if UNITY_2018_3_OR_NEWER
+#pragma warning disable CS0618
+#endif
+
 using UnityEngine;
 
 namespace UniRx.Examples
@@ -79,4 +83,8 @@ from bing in ObservableWWW.Get("http://bing.com/")
     }
 }
 
+#endif
+
+#if UNITY_2018_3_OR_NEWER
+#pragma warning restore CS0618
 #endif

Libraries/Unity3dAsyncAwaitUtil/UniRx/Examples.meta renamed to Libraries/UniRx/Examples.meta

@@ -2,6 +2,9 @@
 using System.Collections;
 using System.Threading;
 using UnityEngine;
+#if UNITY_2018_3_OR_NEWER
+#pragma warning disable CS0618
+#endif
 
 namespace UniRx.Examples
 {
@@ -36,4 +39,7 @@ static IEnumerator GetWWWCore(string url, IObserver<string> observer, Cancellati
             }
         }
     }
-}
+}
+#if UNITY_2018_3_OR_NEWER
+#pragma warning restore CS0618
+#endif

Libraries/Unity3dAsyncAwaitUtil/UniRx/Examples/Sample01_ObservableWWW.cs renamed to Libraries/UniRx/Examples/Sample01_ObservableWWW.cs

@@ -31,6 +31,9 @@ IEnumerator ComplexCoroutineTest()
         // You can use ToYieldInstruction.
 
 #if !(UNITY_4_0 || UNITY_4_1 || UNITY_4_2 || UNITY_4_3 || UNITY_4_4 || UNITY_4_5 || UNITY_4_6 || UNITY_5_0 || UNITY_5_1 || UNITY_5_2)
+#if UNITY_2018_3_OR_NEWER
+#pragma warning disable CS0618
+#endif
 
         IEnumerator TestNewCustomYieldInstruction()
         {
@@ -50,7 +53,9 @@ IEnumerator TestNewCustomYieldInstruction()
             // other sample(wait until transform.position.y >= 100) 
             yield return this.ObserveEveryValueChanged(x => x.transform).FirstOrDefault(x => x.position.y >= 100).ToYieldInstruction();
         }
-
+#if UNITY_2018_3_OR_NEWER
+#pragma warning restore CS0618
+#endif
 #endif
 
     }

Libraries/Unity3dAsyncAwaitUtil/UniRx/Examples/Sample01_ObservableWWW.cs.meta renamed to Libraries/UniRx/Examples/Sample01_ObservableWWW.cs.meta

@@ -63,7 +63,7 @@ public class Enemy
     {
         public IReactiveProperty<long> CurrentHp { get; private set; }
 
-        public IReactiveProperty<bool> IsDead { get; private set; }
+        public IReadOnlyReactiveProperty<bool> IsDead { get; private set; }
 
         public Enemy(int initialHp)
         {

Libraries/Unity3dAsyncAwaitUtil/UniRx/Examples/Sample02_ObservableTriggers.cs renamed to Libraries/UniRx/Examples/Sample02_ObservableTriggers.cs

@@ -0,0 +1,12 @@
+{
+    "name": "UniRx.Examples",
+    "references": [
+        "UniRx"
+    ],
+    "optionalUnityReferences": [
+        "TestAssemblies"
+    ],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false
+}