Merge pull request #65 from VirtueSky/dev

Dev

Author: VirtueSky

README.md

@@ -23,16 +23,15 @@
 ### 1: Download the repository and drop it into folder `Assets`
 ### 2: Add the line below to `Packages/manifest.json`
 
-for version `3.4.2`
+for version `3.4.3`
 ```json
-"com.virtuesky.sunflower":"https://github.com/VirtueSky/sunflower.git#3.4.2",
+"com.virtuesky.sunflower":"https://github.com/VirtueSky/sunflower.git#3.4.3",
 ```
 
 ## Includes modules
 
 ```bash
 ├── Core (Update only called once in Monobehaviour, Delay...)
-├── ATT_IOS
 ├── Advertising (Support for Max, Admob and IronSource)
 ├── In App Purchase (IAP)
 ├── Asset Finder

VirtueSky/ATT_IOS.meta

@@ -62,8 +62,7 @@ void RegisterAppStateChange()
 
         void OnAppStateChanged(GoogleMobileAds.Common.AppState state)
         {
-            if (state == GoogleMobileAds.Common.AppState.Foreground && adSetting.AdmobAppOpenVariable.AutoShow &&
-                !AdStatic.isShowingAd)
+            if (state == GoogleMobileAds.Common.AppState.Foreground && adSetting.AdmobAppOpenVariable.autoShow)
             {
                 if (adSetting.UseAdmob) ShowAppOpen();
             }

VirtueSky/ATT_IOS/Editor.meta

@@ -36,7 +36,8 @@ public void SetIdRuntime(string unitId)
         public override AdUnitVariable Show()
         {
             ResetChainCallback();
-            if (!Application.isMobilePlatform || string.IsNullOrEmpty(Id) || AdStatic.IsRemoveAd) return this;
+            if (!Application.isMobilePlatform || string.IsNullOrEmpty(Id) || AdStatic.IsRemoveAd ||
+                !IsReady()) return this;
             ShowImpl();
             return this;
         }

VirtueSky/ATT_IOS/Editor/PostBuildStep.cs

@@ -13,15 +13,17 @@ namespace VirtueSky.Ads
     [EditorIcon("icon_scriptable")]
     public class AdmobAppOpenVariable : AdmobAdUnitVariable
     {
-        [Tooltip("Automatically show AppOpenAd when app status is changed"), SerializeField]
-        private bool autoShow = false;
+        [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;
 #endif
         private DateTime _expireTime;
-        public bool AutoShow => autoShow;
 
         public override void Init()
         {
@@ -48,21 +50,13 @@ 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
         }
 
-        public override AdUnitVariable Show()
-        {
-            ResetChainCallback();
-            if (!Application.isMobilePlatform || string.IsNullOrEmpty(Id) || AdStatic.IsRemoveAd ||
-                !IsReady()) return this;
-            ShowImpl();
-            return this;
-        }
-
         protected override void ShowImpl()
         {
 #if VIRTUESKY_ADS && VIRTUESKY_ADMOB
@@ -110,7 +104,7 @@ private void OnAdClicked()
         private void OnAdOpening()
         {
             AdStatic.waitAppOpenDisplayedAction?.Invoke();
-            AdStatic.isShowingAd = true;
+            AdStatic.IsShowingAd = true;
             Common.CallActionAndClean(ref displayedCallback);
             OnDisplayedAdEvent?.Invoke();
         }
@@ -124,7 +118,7 @@ private void OnAdFailedToShow(AdError obj)
         private void OnAdClosed()
         {
             AdStatic.waitAppOpenClosedAction?.Invoke();
-            AdStatic.isShowingAd = false;
+            AdStatic.IsShowingAd = false;
             Common.CallActionAndClean(ref closedCallback);
             OnClosedAdEvent?.Invoke();
             Destroy();