com.amanotes.gdk 0.2.40 → 0.2.42

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [0.2.42 - 2023-11-28]
+- [Fix] AdShowNotReady only trigger for 3 type of status
+- [Fix] WaitForSeconds can not be shared between different routines
+
+## [0.2.41 - 2023-11-28]
+- Add more state callbacks for AdShowReadyStatus
+- Fix not wait for RewardCancel event (not exist any more)
+- Timeout for Adapter init should be 1s
+
 ## [0.2.40 - 2023-11-27]
 - Fix ShowAdTimeout = 0 should not wait for Ad
 

package/Runtime/AmaGDK.Ads.cs

@@ -407,7 +407,9 @@ namespace Amanotes.Core.Internal
         None,
         Wifi3GDisabled,
         NoInternet,
-        TimeOut
+        WaitForAd,
+        TimeOut,
+        Ready,
     }
     
     public class ShowAdContext : IAdCallback
@@ -450,8 +452,6 @@ namespace Amanotes.Core.Internal
 
     public abstract class AdLogic
     {
-        private static readonly WaitForSecondsRealtime wait1Sec = new WaitForSecondsRealtime(1f);
-
         internal LoadAdsState _loadState = LoadAdsState.None;
         internal bool hasAd
         {
@@ -504,6 +504,7 @@ namespace Amanotes.Core.Internal
                 yield break;
             }
             
+            var wait1Sec = new WaitForSecondsRealtime(1f);
             Log("[Ad] LoadAdRoutine start(): isAdReady = " + isAdReady);
             while (true)
             {
@@ -645,12 +646,14 @@ namespace Amanotes.Core.Internal
                 }
                 
                 _showState = ShowAdsState.WaitForAd;
-                if (_loadState != LoadAdsState.Requesting) StartLoadAd();
+                OnAdShowReadyStatus(false, AdShowReadyStatus.WaitForAd);
                 
+                if (_loadState != LoadAdsState.Requesting) StartLoadAd();
                 var counter = 0;
                 bool? hasInternet = null;
                 _instance.StartCoroutine(WebUtils.CheckInternet(result => hasInternet = result));
                 
+                var wait1Sec = new WaitForSecondsRealtime(1f);
                 while (counter < timeout || timeout == -1)
                 {
                     yield return wait1Sec;
@@ -681,7 +684,7 @@ namespace Amanotes.Core.Internal
             }
             
             _showState = ShowAdsState.Showing;
-            OnAdShowReadyStatus(true, AdShowReadyStatus.None);
+            OnAdShowReadyStatus(true, AdShowReadyStatus.Ready);
             HandleBeforeAdShow();
             ShowAd();
             
@@ -707,13 +710,9 @@ namespace Amanotes.Core.Internal
 
             if (context.hasClosed)
             {
-                while (!context.hasFailedOrCancelled && !context.hasReward)
-                {
-                    Log($"[Ad] {adType} Waiting for [cancel] or [reward]");
-                    yield return null;
-                }
-
-                ShowAdRoutineCompleted(!context.hasFailedOrCancelled);
+                // wait 1 frame in case hasReward callback after onClose
+                if (!context.hasReward) yield return null;
+                ShowAdRoutineCompleted(context.hasReward);
                 yield break;
             }
             
@@ -876,21 +875,21 @@ namespace Amanotes.Core.Internal
 
         protected void OnAdShowReadyStatus(bool isReady, AdShowReadyStatus status)
         {
-            if (Ads.context != null)
+            if (Ads.context == null)
             {
+                LogWarning("[Ad] OnAdOpen() Something wrong - No AdContext");
+                return;
+            }
+            
                 Ads.context.adCallback |= AdCallback.ShowReadyStatus;
-                if (!isReady)
-                {
                     Ads.context.onAdShowReadyStatus?.Invoke(status);
-                    OnAdShowNotReady(status);
-                } else
+            if (status == AdShowReadyStatus.Ready)
                 {
                     OnAdShowReady();
                 }
-            }
-            else
+            else if (status == AdShowReadyStatus.NoInternet || status == AdShowReadyStatus.TimeOut || status == AdShowReadyStatus.Wifi3GDisabled)
             {
-                LogWarning("[Ad] OnAdOpen() Something wrong - No AdContext");
+                OnAdShowNotReady(status);    
             }
         }
         

package/Runtime/AmaGDK.cs

@@ -15,7 +15,7 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.40";
+        public const string VERSION = "0.2.42";
 
         internal static AmaGDK _instance;
         internal static Status _status = Status.None;
@@ -69,7 +69,7 @@ namespace Amanotes.Core
             yield return StartCoroutine(User.Init());
 
             float time = 0;
-            float timeout = 10;
+            float timeout = 1;
 
             var counter = 0;
             const int INIT_TOLERANCE = 10 * 60;

package/package.json

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