From 0cd1334a74a5acbb4260cf7ae9aaf6eee5df2db1 Mon Sep 17 00:00:00 2001 From: Google Play Team Date: Tue, 28 Jul 2020 19:26:50 -0400 Subject: [PATCH] Remove inner experimental #ifdefs. PiperOrigin-RevId: 323677067 --- .../AssetDeliveryDemo/Scripts/AssetPackBatchDownloader.cs | 7 ------- .../AssetDeliveryDemo/Scripts/AssetPackDownloader.cs | 7 ------- 2 files changed, 14 deletions(-) diff --git a/GooglePlayPlugins/com.google.play.assetdelivery/Samples/AssetDeliveryDemo/Scripts/AssetPackBatchDownloader.cs b/GooglePlayPlugins/com.google.play.assetdelivery/Samples/AssetDeliveryDemo/Scripts/AssetPackBatchDownloader.cs index c173f206..9ef2e82c 100644 --- a/GooglePlayPlugins/com.google.play.assetdelivery/Samples/AssetDeliveryDemo/Scripts/AssetPackBatchDownloader.cs +++ b/GooglePlayPlugins/com.google.play.assetdelivery/Samples/AssetDeliveryDemo/Scripts/AssetPackBatchDownloader.cs @@ -149,7 +149,6 @@ private void SetInitialStatus() private IEnumerator CoLoadAssetPackBatch() { -#if PLAY_ASSET_DELIVERY_EXPERIMENTAL var assetPackNames = Assets.Select(a => a.AssetPackName).Distinct().ToList(); _batchRequest = PlayAssetDelivery.RetrieveAssetPackBatchAsync(assetPackNames); _requestInProgress = true; @@ -185,12 +184,6 @@ private IEnumerator CoLoadAssetPackBatch() } _requestInProgress = false; -#else - // Assign values to avoid unassigned variable warning. - _batchRequest = null; - _requestInProgress = false; - throw new Exception("Experimental Play Asset Delivery methods are disabled."); -#endif } } } \ No newline at end of file diff --git a/GooglePlayPlugins/com.google.play.assetdelivery/Samples/AssetDeliveryDemo/Scripts/AssetPackDownloader.cs b/GooglePlayPlugins/com.google.play.assetdelivery/Samples/AssetDeliveryDemo/Scripts/AssetPackDownloader.cs index 598c4bc0..39c227c4 100644 --- a/GooglePlayPlugins/com.google.play.assetdelivery/Samples/AssetDeliveryDemo/Scripts/AssetPackDownloader.cs +++ b/GooglePlayPlugins/com.google.play.assetdelivery/Samples/AssetDeliveryDemo/Scripts/AssetPackDownloader.cs @@ -200,7 +200,6 @@ private void SetInitialStatus() private IEnumerator DownloadAssetPackCo() { -#if PLAY_ASSET_DELIVERY_EXPERIMENTAL _request = PlayAssetDelivery.RetrieveAssetPackAsync(AssetPackName); _requestInProgress = true; @@ -238,12 +237,6 @@ private IEnumerator DownloadAssetPackCo() } _requestInProgress = false; -#else - // Assign values to avoid unassigned variable warning. - _request = null; - _requestInProgress = false; - throw new Exception("Experimental Play Asset Delivery methods are disabled."); -#endif } private IEnumerator LoadAssetBundleFromRequest()