From c213d8b34bf2aac54d5a32932129d20f32595fad Mon Sep 17 00:00:00 2001
From: neuecc <ils@neue.cc>
Date: Thu, 4 Dec 2014 13:43:25 +0900
Subject: [PATCH] Add ObservableWWW.LoadFromCacheOrDownload (for AssetBundle)
 #36

---
 .../Scripts/UnityEngineBridge/ObservableWWW.cs   |  10 ++++++++++
 .../UnityEngineBridge/UnityEventExtensions.cs    |   4 ++--
 .../UnityVS/Editor/UnityVS.VersionSpecific.dll   | Bin 0 -> 2048 bytes
 3 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll

diff --git a/Assets/UniRx/Scripts/UnityEngineBridge/ObservableWWW.cs b/Assets/UniRx/Scripts/UnityEngineBridge/ObservableWWW.cs
index 706e9533..9bc07454 100644
--- a/Assets/UniRx/Scripts/UnityEngineBridge/ObservableWWW.cs
+++ b/Assets/UniRx/Scripts/UnityEngineBridge/ObservableWWW.cs
@@ -94,6 +94,16 @@ public static IObservable<WWW> PostWWW(string url, WWWForm content, Hash headers
             return Observable.FromCoroutine<WWW>((observer, cancellation) => Fetch(new WWW(url, content.data, MergeHash(contentHeaders, headers)), observer, progress, cancellation));
         }
 
+        public static IObservable<WWW> LoadFromCacheOrDownload(string url, int version, IProgress<float> progress = null)
+        {
+            return Observable.FromCoroutine<WWW>((observer, cancellation) => Fetch(WWW.LoadFromCacheOrDownload(url, version), observer, progress, cancellation));
+        }
+
+        public static IObservable<WWW> LoadFromCacheOrDownload(string url, int version, uint crc, IProgress<float> progress = null)
+        {
+            return Observable.FromCoroutine<WWW>((observer, cancellation) => Fetch(WWW.LoadFromCacheOrDownload(url, version, crc), observer, progress, cancellation));
+        }
+
         static Hash MergeHash(Hash source1, Hash source2)
         {
             foreach (HashEntry item in source2)
diff --git a/Assets/UniRx/Scripts/UnityEngineBridge/UnityEventExtensions.cs b/Assets/UniRx/Scripts/UnityEngineBridge/UnityEventExtensions.cs
index a87c94a4..9ca312bd 100644
--- a/Assets/UniRx/Scripts/UnityEngineBridge/UnityEventExtensions.cs
+++ b/Assets/UniRx/Scripts/UnityEngineBridge/UnityEventExtensions.cs
@@ -1,5 +1,5 @@
-// for uGUI
-#if UNITY_4_6
+// for uGUI(from 4.6)
+#if !(UNITY_4_0 || UNITY_4_1 || UNITY_4_2 || UNITY_4_3 || UNITY_4_4 || UNITY_4_5)
 
 using System;
 using System.Collections.Generic;
diff --git a/Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll b/Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll
new file mode 100644
index 0000000000000000000000000000000000000000..1d094cf32c3222af2f667efc5c9680b973707e91
GIT binary patch
literal 2048
zcmeHHzfTlV5dQW61(XYk#DI<OM2#V4g9OE2F~<R-2E=6H5{ZfI?LBdI*}d$(Ghjim
zu&}c=q0mJC0}|27m{?elSX-fu78Vv1TH(ywT{sdXv9Qv~y_xxDzBg~)zR8VFK1LmY
zdRpu2z%p5uyw*Fb1xjZRzRqH)X(hL8jI89wZ@ZDGgu!%Z&j`o%{XmJ56k*jDt}h11
zEHM+5rP<Qbd^jn6Z3q}KGWh&;emp&G71`V#V^`c%8WiO4(vpw;%qE5V*D^(#;w*eG
zpjH1iZ31-;Xcxd(;%{s6z}{^WI|o|@&{#t$6TVb~O(ka);WciOa{2+1z6og&z?2zE
zFL06`@)TwceVSUy1BF`rC;s}8RzdqWBrjrjGO>)VlF#?qUTzKq;h^V@+OCh8$O%Fz
z&9dhqtrXuog9g;+fbZ15krpDn@os7CFWLhkom}a{p-kN|@|wGnvkKOgf{}E^Z+)-F
z>^4t!_x1EKp#c>(w4rmJwv#>1zNJFfpN=@SNO$6S?wqjjhJ3+(!3#=cR|(SuqH}oS
z@*vq%C~OS30ZklW0tuDXGs`1EdA&H6#(|Rdc>s=**NnG#k1T$mg(<ksisA+q2rpuu
zsxx{(=y`%N_$HXOA0Oyg18WKTq?t`PO|}D_MjP_jhj!F2aK$Fw3$*l;-Wt(|*D!$H
zcombk=x-^q=6q$(j`O4x-Kc7Nma3NBz?|@1HD?w=w>&LjIiXuo{ZS;<SVj6W1e=Sl
zC!u*o%Ph(;as%J0NXNb9IygTXl&hY+@H>K@%N-9#QWC>_qOD}PwgElfo?F6L>5g<1
zthq?Z8RDvOJDip(-OP=~?Z=%Am0cB3|2`*l!G1;KQ>v=uE-}FzusyG2J9i_P4sT$|
z^}@s{THW;eCvXO5Nt<L%^ynyY8j#5}Ha5Pzf1}vZyZVUcCtD|A)W;8lk6)fH{(O=v
dEIoVoqIu%sIbAnZBK~j5bf<y;_Fwt}zW}Zu(5L_a

literal 0
HcmV?d00001