- fix bug

- fix show aoa after close full screen ad
- fix condition show for max ad unit

Author: GrayWolf52

README.md

@@ -23,13 +23,13 @@
 
 ### Add the line below to `Packages/manifest.json`
 
-for version `1.1.7`
+for version `1.1.8`
 ```json
-"com.wolf-org.advertising":"https://github.com/unity-package/advertising-unity.git#1.1.7",
+"com.wolf-org.advertising":"https://github.com/unity-package/advertising-unity.git#1.1.8",
 ```
-dependency `extensions-unity-1.0.5`
+dependency `extensions-unity-1.0.6`
 ```json
-"com.wolf-org.extensions":"https://github.com/unity-package/extensions-unity.git#1.0.5",
+"com.wolf-org.extensions":"https://github.com/unity-package/extensions-unity.git#1.0.6",
 ```
 
 Install `app-tracking-unity` and add define symbol `VIRTUESKY_TRACKING` if you need ad revenue tracking

Runtime/Admob/AdmobAppOpenAdUnit.cs

@@ -15,6 +15,9 @@ public class AdmobAppOpenAdUnit : AdUnit
         [Tooltip("Automatically show AppOpenAd when app status is changed")]
         public bool autoShow = false;
 
+        [Tooltip("Time between closing the previous full-screen ad and starting to show the app open ad - in seconds")]
+        public float timeBetweenFullScreenAd = 2f;
+
         public bool useTestId;
 #if VIRTUESKY_ADS && VIRTUESKY_ADMOB
         private AppOpenAd _appOpenAd;
@@ -46,7 +49,8 @@ public override void Load()
         public override bool IsReady()
         {
 #if VIRTUESKY_ADS && VIRTUESKY_ADMOB
-            return _appOpenAd != null && _appOpenAd.CanShowAd() && DateTime.Now < _expireTime;
+            return _appOpenAd != null && _appOpenAd.CanShowAd() && DateTime.Now < _expireTime &&
+                   (DateTime.Now - AdStatic.AdClosingTime).TotalSeconds > timeBetweenFullScreenAd;
 #else
             return false;
 #endif

Runtime/Admob/AdmobClient.cs

@@ -1,4 +1,5 @@
 #if VIRTUESKY_ADS && VIRTUESKY_ADMOB
+using System;
 using GoogleMobileAds.Api;
 #endif
 
@@ -57,8 +58,7 @@ private void RegisterAppStateChange()
 
         void OnAppStateChanged(GoogleMobileAds.Common.AppState state)
         {
-            if (state == GoogleMobileAds.Common.AppState.Foreground && adSettings.AdmobAppOpenAdUnit.autoShow &&
-                !AdStatic.isShowingAd)
+            if (state == GoogleMobileAds.Common.AppState.Foreground && adSettings.AdmobAppOpenAdUnit.autoShow)
             {
                 if (adSettings.CurrentAdNetwork == AdNetwork.Admob) ShowAppOpen();
             }

Runtime/Admob/AdmobNativeOverlayAdUnit.cs

@@ -117,7 +117,7 @@ public void Hide()
         /// </summary>
         public void RenderAd()
         {
-#if VIRTUESKY_ADS && VIRTUESKY_ADS
+#if VIRTUESKY_ADS && VIRTUESKY_ADMOB
             if (_nativeOverlayAd == null) return;
             _nativeOverlayAd.RenderTemplate(Style(), ConvertSize(), ConvertPosition(adsPosition));
 #endif
@@ -129,7 +129,7 @@ public void RenderAd()
         /// <param name="uiElement">RectTransform of uiElement, used to determine position for native overlay ads</param>
         public void RenderAd(RectTransform uiElement)
         {
-#if VIRTUESKY_ADS && VIRTUESKY_ADS
+#if VIRTUESKY_ADS && VIRTUESKY_ADMOB
             if (_nativeOverlayAd == null) return;
             (int admobX, int admobY) = ConvertUiElementPosToNativeAdsPos(uiElement);
             _nativeOverlayAd.RenderTemplate(Style(), admobX, admobY);
@@ -144,7 +144,7 @@ public void RenderAd(RectTransform uiElement)
         /// <param name="height">Custom height for native overlay ads</param>
         public void RenderAd(RectTransform uiElement, int width, int height)
         {
-#if VIRTUESKY_ADS && VIRTUESKY_ADS
+#if VIRTUESKY_ADS && VIRTUESKY_ADMOB
             if (_nativeOverlayAd == null) return;
             (int admobX, int admobY) = ConvertUiElementPosToNativeAdsPos(uiElement);
             _nativeOverlayAd.RenderTemplate(Style(), new AdSize(width, height), admobX, admobY);

Runtime/General/AdStatic.cs

@@ -41,10 +41,27 @@ public static bool IsRemoveAd
 #endif
         }
 
-        public static bool isShowingAd;
+        public static DateTime AdClosingTime { get; internal set; }
+
+        internal static bool isShowingAd;
+
+        public static bool IsShowingAd
+        {
+            get => isShowingAd;
+            internal set
+            {
+                isShowingAd = value;
+                if (!value)
+                {
+                    AdClosingTime = DateTime.Now;
+                }
+            }
+        }
+
         internal static Action waitAppOpenDisplayedAction;
         internal static Action waitAppOpenClosedAction;
 
+
         public static AdUnit OnDisplayed(this AdUnit unit, Action onDisplayed)
         {
             unit.displayedCallback = onDisplayed;

Runtime/Max/MaxAdClient.cs

@@ -23,7 +23,7 @@ public override void Initialize()
 #if VIRTUESKY_ADS && VIRTUESKY_APPLOVIN
         private void OnAppStateChange(bool pauseStatus)
         {
-            if (!pauseStatus && adSettings.MaxAppOpenAdUnit.autoShow && !AdStatic.isShowingAd) ShowAppOpen();
+            if (!pauseStatus && adSettings.MaxAppOpenAdUnit.autoShow) ShowAppOpen();
         }
 #endif
     }

Runtime/Max/MaxAppOpenAdUnit.cs

@@ -10,6 +10,8 @@ public class MaxAppOpenAdUnit : AdUnit
         [Tooltip("Automatically show AppOpenAd when app status is changed")]
         public bool autoShow = false;
 
+        [Tooltip("Time between closing the previous full-screen ad and starting to show the app open ad - in seconds")]
+        public float timeBetweenFullScreenAd = 2f;
 
         public override void Init()
         {
@@ -39,12 +41,22 @@ public override void Load()
         public override bool IsReady()
         {
 #if VIRTUESKY_ADS && VIRTUESKY_APPLOVIN
-            return !string.IsNullOrEmpty(Id) && MaxSdk.IsAppOpenAdReady(Id);
+            return !string.IsNullOrEmpty(Id) && MaxSdk.IsAppOpenAdReady(Id) &&
+                   (DateTime.Now - AdStatic.AdClosingTime).TotalSeconds > timeBetweenFullScreenAd;
 #else
             return false;
 #endif
         }
 
+        public override AdUnit Show()
+        {
+            ResetChainCallback();
+            if (!Application.isMobilePlatform || string.IsNullOrEmpty(Id) || AdStatic.IsRemoveAd || !IsReady())
+                return this;
+            ShowImpl();
+            return this;
+        }
+
         protected override void ShowImpl()
         {
 #if VIRTUESKY_ADS && VIRTUESKY_APPLOVIN

Runtime/Max/MaxInterstitialAdUnit.cs

@@ -1,4 +1,5 @@
 using System;
+using UnityEngine;
 using VirtueSky.Misc;
 
 namespace VirtueSky.Ads
@@ -44,6 +45,15 @@ public override bool IsReady()
 #endif
         }
 
+        public override AdUnit Show()
+        {
+            ResetChainCallback();
+            if (!Application.isMobilePlatform || string.IsNullOrEmpty(Id) || AdStatic.IsRemoveAd || !IsReady())
+                return this;
+            ShowImpl();
+            return this;
+        }
+
         protected override void ShowImpl()
         {
 #if VIRTUESKY_ADS && VIRTUESKY_APPLOVIN

package.json

@@ -2,7 +2,7 @@
   "name": "com.wolf-org.advertising",
   "displayName": "UnityCommon-ADS",
   "description": "Support show ads for game unity",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "unity": "2022.3",
   "category": "virtuesky",
   "license": "MIT",