add unity5.x and 2017.x support loadasync -> loadassetasync

dkozar · Nov 6, 2017 · 4d8e574 · 4d8e574
1 parent 57e56f3
commit 4d8e574
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 5 deletions.
diff --git a/Unity/Assets/eDriven/Demo/Core/CallbackQueue/Demo2/Main2CSa.cs b/Unity/Assets/eDriven/Demo/Core/CallbackQueue/Demo2/Main2CSa.cs
@@ -55,8 +55,12 @@ private void BundleLoadedHandler(WWW request)
     {
         Debug.Log("Bundle loaded: " + request.url);
         _bundle = request.assetBundle;
-
+
+#if UNITY_5_0_OR_NEWER || UNITY_2017_1_OR_NEWER
+        AssetBundleRequest assetBundleRequest = _bundle.LoadAssetAsync(AssetName, typeof(GameObject));
+#else
         AssetBundleRequest assetBundleRequest = _bundle.LoadAsync(AssetName, typeof(GameObject));
+#endif
         _assetBundleQueue.Send(assetBundleRequest, AssetLoadedHandler);
     }
 

diff --git a/Unity/Assets/eDriven/Demo/Core/CallbackQueue/Demo2/Main2CSb.cs b/Unity/Assets/eDriven/Demo/Core/CallbackQueue/Demo2/Main2CSb.cs
@@ -53,7 +53,11 @@ void OnGUI()
                     Debug.Log("Bundle loaded: " + request.url);
                     _bundle = request.assetBundle;
 
-                    AssetBundleRequest assetBundleRequest = _bundle.LoadAsync(AssetName, typeof(GameObject));
+#if UNITY_5_0_OR_NEWER || UNITY_2017_1_OR_NEWER
+                    AssetBundleRequest assetBundleRequest = _bundle.LoadAssetAsync(AssetName, typeof(GameObject));
+#else
+        AssetBundleRequest assetBundleRequest = _bundle.LoadAsync(AssetName, typeof(GameObject));
+#endif
                     _assetBundleQueue.Send(assetBundleRequest, 
                         delegate(AssetBundleRequest request2)
                         {

diff --git a/Unity/Assets/eDriven/Demo/Core/CallbackQueue/Demo2/Main2JS.js b/Unity/Assets/eDriven/Demo/Core/CallbackQueue/Demo2/Main2JS.js
@@ -57,7 +57,11 @@ class Main2JS extends MonoBehaviour {
         Debug.Log("Bundle loaded: " + request.url);
         _bundle = request.assetBundle;
 
+#if UNITY_5_0_OR_NEWER || UNITY_2017_1_OR_NEWER
+	var assetBundleRequest:AssetBundleRequest = _bundle.LoadAssetAsync(AssetName, typeof (GameObject));
+#else
         var assetBundleRequest:AssetBundleRequest = _bundle.LoadAsync(AssetName, typeof (GameObject));
+#endif
         _assetLoaderQueue.Send(assetBundleRequest, AssetLoadedHandler);
     }
 

diff --git a/Unity/Assets/eDriven/Demo/Core/CallbackQueue/Demo3/Main3CS.cs b/Unity/Assets/eDriven/Demo/Core/CallbackQueue/Demo3/Main3CS.cs
@@ -51,8 +51,11 @@ void OnGUI()
 
                     Debug.Log("Bundle loaded: " + request.url);
                     _loadedBundles.Add(request.assetBundle);
-
-                    AssetBundleRequest assetBundleRequest = request.assetBundle.LoadAsync(assetName, typeof(GameObject));
+#if UNITY_5_0_OR_NEWER || UNITY_2017_1_OR_NEWER
+                    AssetBundleRequest assetBundleRequest = request.assetBundle.LoadAssetAsync(assetName, typeof(GameObject));
+#else
+        AssetBundleRequest assetBundleRequest = request.assetBundle.LoadAsync(AssetName, typeof(GameObject));
+#endif
                     _assetBundleQueue.Send(assetBundleRequest,
                         delegate(AssetBundleRequest request2)
                         {

diff --git a/Unity/Assets/eDriven/Demo/Core/CallbackQueue/Demo3/Main3JS.js b/Unity/Assets/eDriven/Demo/Core/CallbackQueue/Demo3/Main3JS.js
@@ -49,8 +49,11 @@ class Main3JS extends MonoBehaviour {
 	{
 		Debug.Log("Bundle loaded: " + request.url);
 		_bundle = request.assetBundle;
-
+	#if UNITY_5_0_OR_NEWER || UNITY_2017_1_OR_NEWER
+	var assetBundleRequest:AssetBundleRequest = _bundle.LoadAssetAsync(GetAssetName(request.url), typeof (GameObject));
+	#else
 		var assetBundleRequest:AssetBundleRequest = _bundle.LoadAsync(GetAssetName(request.url), typeof (GameObject));
+	#endif
 
 		_assetQueue.Send(assetBundleRequest, AssetLoadedHandler);
 	}