Skip to content

Commit 89b406c

Browse files
neueccneuecc
committed
ready for 6.2.2
1 parent 4e780c2 commit 89b406c

14 files changed

+68
-17
lines changed

‎Assets/Plugins/UniRx/Examples/Sample01_ObservableWWW.cs

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
#if !(UNITY_METRO || UNITY_WP8)
2+
3+
#if UNITY_2018_3_OR_NEWER
24
#pragma warning disable CS0618
5+
#endif
36

47
using UnityEngine;
58

@@ -81,4 +84,7 @@ from bing in ObservableWWW.Get("http://bing.com/")
8184
}
8285

8386
#endif
84-
#pragma warning restore CS0618
87+
88+
#if UNITY_2018_3_OR_NEWER
89+
#pragma warning restore CS0618
90+
#endif

‎Assets/Plugins/UniRx/Examples/Sample05_ConvertFromCoroutine.cs

+5-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
using System.Collections;
33
using System.Threading;
44
using UnityEngine;
5+
#if UNITY_2018_3_OR_NEWER
56
#pragma warning disable CS0618
7+
#endif
68

79
namespace UniRx.Examples
810
{
@@ -38,4 +40,6 @@ static IEnumerator GetWWWCore(string url, IObserver<string> observer, Cancellati
3840
}
3941
}
4042
}
41-
#pragma warning restore CS0618
43+
#if UNITY_2018_3_OR_NEWER
44+
#pragma warning restore CS0618
45+
#endif

‎Assets/Plugins/UniRx/Examples/Sample06_ConvertToCoroutine.cs

+4
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ IEnumerator ComplexCoroutineTest()
3131
// You can use ToYieldInstruction.
3232

3333
#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)
34+
#if UNITY_2018_3_OR_NEWER
3435
#pragma warning disable CS0618
36+
#endif
3537

3638
IEnumerator TestNewCustomYieldInstruction()
3739
{
@@ -51,7 +53,9 @@ IEnumerator TestNewCustomYieldInstruction()
5153
// other sample(wait until transform.position.y >= 100)
5254
yield return this.ObserveEveryValueChanged(x => x.transform).FirstOrDefault(x => x.position.y >= 100).ToYieldInstruction();
5355
}
56+
#if UNITY_2018_3_OR_NEWER
5457
#pragma warning restore CS0618
58+
#endif
5559
#endif
5660

5761
}

‎Assets/Plugins/UniRx/ReadMe.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
UniRx - Reactive Extensions for Unity / Ver 6.2.1
1+
UniRx - Reactive Extensions for Unity / Ver 6.2.2
22
===
33
Created by Yoshifumi Kawai(neuecc)
44

‎Assets/Plugins/UniRx/Scripts/Async/CancellationTokenEqualityComparer.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
2-
#if CSHARP_7_OR_LATER || (UNITY_2018_3_OR_NEWER && (NET_STANDARD_2_0 || NET_4_6))
1+
#if CSHARP_7_OR_LATER || (UNITY_2018_3_OR_NEWER && (NET_STANDARD_2_0 || NET_4_6))
2+
#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
3+
34
using System.Collections.Generic;
45
using System.Threading;
56

‎Assets/Plugins/UniRx/Scripts/Async/Internal/MinimumQueue.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
1+
#if CSHARP_7_OR_LATER || (UNITY_2018_3_OR_NEWER && (NET_STANDARD_2_0 || NET_4_6))
2+
#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
3+
#endif
24

35
using System;
46
using System.Runtime.CompilerServices;

‎Assets/Plugins/UniRx/Scripts/Async/UnityAsyncExtensions.cs

+8
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,9 @@ public static ResourceRequestAwaiter GetAwaiter(this ResourceRequest resourceReq
6161

6262
#if ENABLE_WWW
6363

64+
#if UNITY_2018_3_OR_NEWER
6465
#pragma warning disable CS0618
66+
#endif
6567

6668
public static IAwaiter GetAwaiter(this WWW www)
6769
{
@@ -99,7 +101,9 @@ public static UniTask ToUniTask(this WWW www)
99101
return new UniTask(awaiter);
100102
}
101103

104+
#if UNITY_2018_3_OR_NEWER
102105
#pragma warning restore CS0618
106+
#endif
103107

104108
#endif
105109

@@ -434,7 +438,9 @@ public void UnsafeOnCompleted(Action continuation)
434438

435439
#if ENABLE_WWW
436440

441+
#if UNITY_2018_3_OR_NEWER
437442
#pragma warning disable CS0618
443+
#endif
438444

439445
class WWWConfiguredAwaiter : IAwaiter, IPlayerLoopItem
440446
{
@@ -526,7 +532,9 @@ public void UnsafeOnCompleted(Action continuation)
526532
}
527533
}
528534

535+
#if UNITY_2018_3_OR_NEWER
529536
#pragma warning restore CS0618
537+
#endif
530538

531539
#endif
532540

‎Assets/Plugins/UniRx/Scripts/Async/UnityEqualityComparer.cs

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
1+
#if CSHARP_7_OR_LATER || (UNITY_2018_3_OR_NEWER && (NET_STANDARD_2_0 || NET_4_6))
2+
#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
3+
#endif
24

35
using System;
46
using System.Collections.Generic;
@@ -80,6 +82,7 @@ static object GetDefaultHelper(Type type)
8082
if (t.Equals(vector3Type)) return (object)UnityEqualityComparer.Vector3;
8183
if (t.Equals(vector4Type)) return (object)UnityEqualityComparer.Vector4;
8284
if (t.Equals(colorType)) return (object)UnityEqualityComparer.Color;
85+
if (t.Equals(color32Type)) return (object)UnityEqualityComparer.Color32;
8386
if (t.Equals(rectType)) return (object)UnityEqualityComparer.Rect;
8487
if (t.Equals(boundsType)) return (object)UnityEqualityComparer.Bounds;
8588
if (t.Equals(quaternionType)) return (object)UnityEqualityComparer.Quaternion;

‎Assets/Plugins/UniRx/Scripts/UnityEngineBridge/CoroutineAsyncBridge.cs

+5
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,17 @@ public static CoroutineAsyncBridge GetAwaiter(this Coroutine coroutine)
9595

9696
// should use UniRx.Async in C# 7.0
9797

98+
#if UNITY_2018_3_OR_NEWER
9899
#pragma warning disable CS0618
100+
#endif
99101
public static CoroutineAsyncBridge<WWW> GetAwaiter(this WWW www)
100102
{
101103
return CoroutineAsyncBridge<WWW>.Start(www);
102104
}
105+
#if UNITY_2018_3_OR_NEWER
103106
#pragma warning restore CS0618
107+
#endif
108+
104109

105110

106111
public static CoroutineAsyncBridge<AsyncOperation> GetAwaiter(this AsyncOperation asyncOperation)

‎Assets/Plugins/UniRx/Scripts/UnityEngineBridge/MainThreadDispatcher.cs

+12-4
Original file line numberDiff line numberDiff line change
@@ -117,14 +117,18 @@ void ConsumeEnumerator(IEnumerator routine)
117117
}
118118

119119
var type = current.GetType();
120-
#pragma warning disable CS0618
120+
#if UNITY_2018_3_OR_NEWER
121+
#pragma warning disable CS0618
122+
#endif
121123
if (type == typeof(WWW))
122124
{
123125
var www = (WWW)current;
124126
editorQueueWorker.Enqueue(_ => ConsumeEnumerator(UnwrapWaitWWW(www, routine)), null);
125127
return;
126128
}
127-
#pragma warning restore CS0618
129+
#if UNITY_2018_3_OR_NEWER
130+
#pragma warning restore CS0618
131+
#endif
128132
else if (type == typeof(AsyncOperation))
129133
{
130134
var asyncOperation = (AsyncOperation)current;
@@ -158,7 +162,9 @@ void ConsumeEnumerator(IEnumerator routine)
158162
}
159163
}
160164

161-
#pragma warning disable CS0618
165+
#if UNITY_2018_3_OR_NEWER
166+
#pragma warning disable CS0618
167+
#endif
162168
IEnumerator UnwrapWaitWWW(WWW www, IEnumerator continuation)
163169
{
164170
while (!www.isDone)
@@ -167,7 +173,9 @@ IEnumerator UnwrapWaitWWW(WWW www, IEnumerator continuation)
167173
}
168174
ConsumeEnumerator(continuation);
169175
}
170-
#pragma warning restore CS0618
176+
#if UNITY_2018_3_OR_NEWER
177+
#pragma warning restore CS0618
178+
#endif
171179

172180
IEnumerator UnwrapWaitAsyncOperation(AsyncOperation asyncOperation, IEnumerator continuation)
173181
{

‎Assets/Plugins/UniRx/Scripts/UnityEngineBridge/Observable.Unity.cs

+6-2
Original file line numberDiff line numberDiff line change
@@ -229,9 +229,13 @@ public static partial class Observable
229229
{
230230
readonly static HashSet<Type> YieldInstructionTypes = new HashSet<Type>
231231
{
232-
#pragma warning disable CS0618
232+
#if UNITY_2018_3_OR_NEWER
233+
#pragma warning disable CS0618
234+
#endif
233235
typeof(WWW),
234-
#pragma warning restore CS0618
236+
#if UNITY_2018_3_OR_NEWER
237+
#pragma warning restore CS0618
238+
#endif
235239
typeof(WaitForEndOfFrame),
236240
typeof(WaitForFixedUpdate),
237241
typeof(WaitForSeconds),

‎Assets/Plugins/UniRx/Scripts/UnityEngineBridge/ObservableWWW.cs

+5-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
using ObservableUnity = UniRx.Observable;
77
#endif
88

9+
#if UNITY_2018_3_OR_NEWER
910
#pragma warning disable CS0618
11+
#endif
1012

1113
namespace UniRx
1214
{
@@ -435,4 +437,6 @@ public override string ToString()
435437
}
436438
}
437439

438-
#pragma warning restore CS0618
440+
#if UNITY_2018_3_OR_NEWER
441+
#pragma warning restore CS0618
442+
#endif

‎Assets/Plugins/UniRx/Scripts/UnityEngineBridge/ReactiveProperty.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
1+
#if CSHARP_7_OR_LATER || (UNITY_2018_3_OR_NEWER && (NET_STANDARD_2_0 || NET_4_6))
2+
#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
3+
#endif
24

35
using System;
46
using System.Collections.Generic;

‎Assets/Scripts/Sandbox/SandboxScene.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
2-
#if CSHARP_7_OR_LATER || (UNITY_2018_3_OR_NEWER && (NET_STANDARD_2_0 || NET_4_6))
1+
#if CSHARP_7_OR_LATER || (UNITY_2018_3_OR_NEWER && (NET_STANDARD_2_0 || NET_4_6))
2+
#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
33
using System;
44
using System.Threading;
55
using System.Threading.Tasks;

0 commit comments

Comments
 (0)