com.amanotes.gdk 0.2.37 → 0.2.39

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [0.2.39 - 2023-11-27]
+- Fix variable name and variable value of "ChangeDevMode"
+- Fix Timeout = 0 should cancel the wait for Ad
+
+## [0.2.38 - 2023-11-22]
+- Improve Ads API
+- Add Ad Quality
+
 ## [0.2.37 - 2023-11-21]
 - Improve GDK logs
 - Banner will not show when ad adapter is not ready

package/Runtime/AmaGDK.Ads.cs

@@ -69,11 +69,23 @@ namespace Amanotes.Core
         public static IAdCallback OnAdResult(this IAdCallback ad, Action<bool> callback)
         {
             if (!MakeSureAdNotNull(ad)) return null;
-            Ads.context.onResult -= callback;
-            Ads.context.onResult += callback;
+            Ads.context.onAdResult -= callback;
+            Ads.context.onAdResult += callback;
             return ad;
         }
-
+        
+        /// <summary>
+        /// Call right before the ad actually open (that means Ad has already been cached & available to show).
+        /// This callback will not be triggered in case Ad is not available or no internet
+        /// </summary>
+        public static IAdCallback OnBeforeAdOpen(this IAdCallback ad, Action callback)
+        {
+            if (!MakeSureAdNotNull(ad)) return null;
+            Ads.context.onBeforeAdOpen -= callback;
+            Ads.context.onBeforeAdOpen += callback;
+            return ad;
+        }
+        
         private static bool MakeSureAdNotNull(IAdCallback ad)
         {
             bool isValid = (ad != null);
@@ -165,6 +177,8 @@ namespace Amanotes.Core
             internal static float _savedTimeScale = -1;
             
             internal static readonly AdsData localData = new AdsData().LoadJsonFromFile();
+            
+            public static AdAdapterConfig adConfig => _adConfig;
         }
 
         public partial class Ads // Public
@@ -292,7 +306,22 @@ namespace Amanotes.Core
                 else
                     _adapter.rewardVideo.StopShowAd();
             }
-
+            
+            /// <summary>
+            /// Capping for interstitial ad
+            /// - Time since last interstitial show success > interstitialCappingTime
+            /// - Time since last rewardedVideo show success > rewardVideoCappingTime (for interstitial)
+            /// </summary>
+            /// <param name="interstitialCappingTime"></param>
+            /// <param name="rewardedVideoCappingTime"></param>
+            /// <returns></returns>
+            public static bool IsCapped(float interstitialCappingTime = 0, float rewardedVideoCappingTime = 0)
+            {
+                bool interCapped = (interstitialCappingTime > 0) && TimeSinceLastInterstitialSucceed < interstitialCappingTime;
+                bool rewardCapped = (rewardedVideoCappingTime > 0) && TimeSinceLastVideoRewardSucceed < rewardedVideoCappingTime;
+                return interCapped || rewardCapped;
+            }
+            
             public static int TimeSinceLastInterstitialSucceed => localData.TimeSinceLastShowSuccess(AdType.Interstitial);
             public static int TimeSinceLastVideoRewardSucceed => localData.TimeSinceLastShowSuccess(AdType.VideoReward);
             public static int TimeSinceLastAdSucceed => Math.Min(TimeSinceLastInterstitialSucceed, TimeSinceLastVideoRewardSucceed) ;
@@ -388,6 +417,7 @@ namespace Amanotes.Core.Internal
         public readonly Dictionary<string, object> userData;
         public AdCallback adCallback;
         
+        internal Action onBeforeAdOpen;
         internal Action onOpened;
         internal Action onRewardReceived;
         internal Action onClicked;
@@ -395,7 +425,7 @@ namespace Amanotes.Core.Internal
         internal Action onShowFailed;
         internal Action onClosed;
         internal Action<AdShowReadyStatus> onAdShowReadyStatus;
-        internal Action<bool> onResult;
+        internal Action<bool> onAdResult;
 
         // Stats
         public float showCallAt;
@@ -499,7 +529,7 @@ namespace Amanotes.Core.Internal
                 int timeout = Ads._adConfig.adLoadTimeoutInSecs;
                 var counter = 0;
 
-                while (counter < timeout || timeout == 0)
+                while (counter < timeout || timeout == -1)
                 {
                     yield return wait1Sec;
                     counter++;
@@ -638,8 +668,8 @@ namespace Amanotes.Core.Internal
             _showState = ShowAdsState.Showing;
             OnAdShowReadyStatus(true, AdShowReadyStatus.None);
             
-            ShowAd();
             HandleBeforeAdShow();
+            ShowAd();
             
             ShowAdContext context = Ads.context;
             while (!context.potentiallyCompleted)
@@ -694,7 +724,7 @@ namespace Amanotes.Core.Internal
             
             // Extra callback
             Ads.context.showFinishAt = Time.realtimeSinceStartup;
-            Ads.context.onResult?.Invoke(isSuccess);
+            Ads.context.onAdResult?.Invoke(isSuccess);
             
             var localData = Ads.localData;
             var stat = _isInterstitial ? localData.interstitial : localData.reward;
@@ -740,6 +770,7 @@ namespace Amanotes.Core.Internal
                 Time.timeScale = 0;
             }
             
+            Ads.context.onBeforeAdOpen?.Invoke();
             Ads._adapter.HandleBeforeAdShow();
         }
         

package/Runtime/AmaGDK.cs

@@ -9,12 +9,13 @@ using Amanotes.Core.Internal;
 using UnityEngine;
 using static Amanotes.Core.Internal.Logging;
 using static Amanotes.Core.Internal.Messsage;
+using Debug = UnityEngine.Debug;
 
 namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.37";
+        public const string VERSION = "0.2.39";
 
         internal static AmaGDK _instance;
         internal static Status _status = Status.None;
@@ -291,17 +292,45 @@ namespace Amanotes.Core
         public void ChangeDevMode()
         {
             string variableName = "GDK_HOME";
-            string output = RunShellCommand($"source ~/.zshrc && echo file:${variableName}");
-            output = output.Trim();
-
-            if (string.IsNullOrEmpty(output))
+            string zshrcPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".zshrc");
+            string zshrcContent;
+        
+            try
+            {
+                zshrcContent = File.ReadAllText(zshrcPath);
+            }
+            catch (FileNotFoundException)
+            {
+                Debug.LogWarning($"Zsh configuration file {zshrcPath} not found.");
+                return;
+            }
+        
+            if (!zshrcContent.Contains($"export {variableName}="))
             {
-                LogWarning($"{variableName} environment variable is not set.");
+                Debug.LogWarning($"{variableName} environment variable is not set in {zshrcPath}.");
                 return;
             }
+        
+            int startIndex = zshrcContent.IndexOf($"export {variableName}=");
+            if (startIndex >= 0)
+            {
+                startIndex += $"export {variableName}=".Length;
+                int endIndex = zshrcContent.IndexOfAny(new char[] { '\n', '\r' }, startIndex);
+                string gdkHomeValue = endIndex >= 0
+                    ? zshrcContent.Substring(startIndex, endIndex - startIndex).Trim()
+                    : zshrcContent.Substring(startIndex).Trim();
             
-            UpdateManifest(output);
-            Log("AmaGDK changes to dev mode successfully");
+                if (string.IsNullOrEmpty(gdkHomeValue))
+                {
+                    Debug.LogWarning($"{variableName} environment variable is set but has an empty value in {zshrcPath}.");
+                    return;
+                }
+            }
+        
+            string output = RunShellCommand($"source ~/.zshrc && echo file:${variableName}");
+            output = output.Trim();
+            UpdateManifest(output); 
+            Debug.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.37",
+    "version": "0.2.39",
     "displayName": "AmaGDK",
     "description": "Amanotes Game Development Kit",
     "unity": "2019.4",