com.amanotes.gdk 0.2.26 → 0.2.27

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [0.2.27 - 2023-11-01]
+- No longer stop ad
+- Update ad status by adapter
+
 ## [0.2.26 - 2023-10-30]
 - Add Ads event tracking
 - Check real internet connection

package/Runtime/AmaGDK.Ads.cs

@@ -159,24 +159,26 @@ namespace Amanotes.Core
             {
                 if (context == null) return true;
                 float duration = Time.realtimeSinceStartup - context.showCallAt;
-                bool willSkip = duration < Mathf.Max(5f, _adConfig.adShowTimeoutInSecs);
-                if (willSkip)
-                {
-                    LogWarning($"[AD] ShowRequest IGNORED as another ad is showing (elapsedTime: {duration:n2}s):\n" + JsonUtility.ToJson(context, true));
-                    return false;
-                }
-                
-                LogWarning($"[AD] FORCE STOPPED the previous ad, as it seems to hang (elapsedTime: {duration:n2}s):\n" + JsonUtility.ToJson(context, true));
-                // possibly hang: force stop
-                if (context.adType == AdType.Interstitial)
-                {
-                    _adapter.interstitial.StopShowAd();
-                } else
-                {
-                    _adapter.rewardVideo.StopShowAd();
-                }
-                context = null;
-                return true;
+                // bool willSkip = duration < Mathf.Max(60f, _adConfig.adShowTimeoutInSecs);
+                LogWarning($"[AD] ShowRequest IGNORED as another ad is showing (elapsedTime: {duration:n2}s):\n" + JsonUtility.ToJson(context, true));
+                return false;
+
+                // if (willSkip)
+                // {
+                //     LogWarning($"[AD] ShowRequest IGNORED as another ad is showing (elapsedTime: {duration:n2}s):\n" + JsonUtility.ToJson(context, true));
+                //     return false;
+                // }
+                //
+                // LogWarning($"[AD] FORCE STOPPED the previous ad, as it seems to hang (elapsedTime: {duration:n2}s):\n" + JsonUtility.ToJson(context, true));
+                // // possibly hang: force stop
+                // if (context.adType == AdType.Interstitial)
+                // {
+                //     _adapter.interstitial.StopShowAd();
+                // } else
+                // {
+                //     _adapter.rewardVideo.StopShowAd();
+                // }
+                // return true;
             }
 
             public static IAdCallback ShowInterstitial(string placementName = null, Dictionary<string, object> userData = null)
@@ -242,7 +244,7 @@ namespace Amanotes.Core
             {
                 if (context == null)
                     return;
-
+                
                 if (context.adType == AdType.Interstitial)
                     _adapter.interstitial.StopShowAd();
                 else
@@ -370,7 +372,20 @@ namespace Amanotes.Core.Internal
         private static readonly WaitForSeconds wait1Sec = new WaitForSeconds(1f);
 
         internal LoadAdsState _loadState = LoadAdsState.None;
-        internal bool hasAd => _loadState == LoadAdsState.Ready;
+        internal bool hasAd
+        {
+            get
+            {
+                if (_loadState == LoadAdsState.Ready && !isAdReady)
+                {
+                    LogWarning("[Ad] Inconsistent Ready state (might caused by poor internet condition)");
+                    _loadState = LoadAdsState.None;
+                    StartLoadAd();
+                }
+                
+                return _loadState == LoadAdsState.Ready;
+            }
+        }
 
         internal Coroutine _loadRoutine;
 
@@ -499,12 +514,21 @@ namespace Amanotes.Core.Internal
             if (_showAdRoutine == null) return;
             _instance.StopCoroutine(_showAdRoutine);
             _showAdRoutine = null;
+
+            if (Ads.context.adType == AdType.Interstitial)
+            {
+                ShowAdRoutineCompleted(!Ads.context.hasFailedOrCancelled);    
+            }
+            else
+            {
+                ShowAdRoutineCompleted(Ads.context.hasReward);
+            }
         }
 
         IEnumerator ShowAdRoutine()
         {
-            // Wait 1 frame so that all AdCallback to register
-            yield return null;
+            // Wait to end frame so that all AdCallbacks finish registering
+            yield return new WaitForEndOfFrame();
             
             // Wait for Ad
             if (!isAdReady)

package/Runtime/AmaGDK.cs

@@ -14,7 +14,7 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.26";
+        public const string VERSION = "0.2.27";
 
         internal static AmaGDK _instance;
         internal static Status _status = Status.None;
@@ -297,6 +297,7 @@ namespace Amanotes.Core
             }
             
             UpdateManifest(output);
+            Log("AmaGDK changes to dev mode successfully");
         }
             
         private string RunShellCommand(string command)

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "com.amanotes.gdk",
-    "version": "0.2.26",
+    "version": "0.2.27",
     "displayName": "AmaGDK",
     "description": "Amanotes Game Development Kit",
     "unity": "2019.4",