com.amanotes.gdk 0.2.62 → 0.2.63

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [0.2.63 - 2024-06-01]
+- [Fix] Do not include default GDK config asset
+- [Fix] Support compare SemVer with an invalid value
+- [Dev] Add ShowBanner/ HideBanner buttons to AmaGDKExample
+- [Fix] Silent null exception when embedRemoteConfig == null (in Editor)
+- [Dev] Improve banner loading with load failed handler (retry or skip)
+- [Fix] Wrong condition flag for Banner enabled check
+- [Dev] Upgrade Firebase 11.8.0, IronSource 7.9.1, GoogleMobileAds 9.0.0
+- - Fix AppsFlyer error in iOS: Type specifier missing, defaults to ???int???
+- - Min iOS 13.0
+- [Klavar] Parse Klavar structure v0.3
+
 ## [0.2.62 - 2024-05-27]
 - [Dev] Remove pipeline for unity 2020
 - [Dev] Dispatch changes / support callback for when UserId updated

package/Runtime/AmaGDK.Ads.cs

@@ -321,23 +321,37 @@ namespace Amanotes.Core
             public static bool IsRewardedVideoShowing => (context != null) && (context.adType == AdType.VideoReward);
 
 
-            private static bool _isBannerShowing;
+            [NonSerialized] private static bool _isBannerShowing = false;
             
             public static void ShowBanner()
             {
-                if (_config.ad.enableBanner) return;
+                if (!_config.ad.enableBanner)
+                {
+                    LogWarning($"Banner not enabled! {_config.ad.enableBanner}");
+                    return;
+                }
+
+                if (_isBannerShowing)
+                {
+                    LogWarning($"Banner is showing!");
+                    return;
+                }
                 
-                if (_isBannerShowing) return;
                 _isBannerShowing = true;
-                if (_adapter == null) return;
+
+                if (_adapter == null)
+                {
+                    LogWarning($"Adapter is null!");
+                    return;
+                }
 
                 dispatcher.Dispatch(Event.BANNER_SHOW);
-                _adapter.ShowBanner();
+                _adapter.ShowBanner(); 
             }
 
             public static void HideBanner()
             {
-                if (_config.ad.enableBanner) return;
+                if (!_config.ad.enableBanner) return;
                 if (!_isBannerShowing) return;
                 _isBannerShowing = false;
                 if (_adapter == null) return;
@@ -402,9 +416,9 @@ namespace Amanotes.Core.Internal
         [Tooltip("When an ad is not ready to show, verify that there is an internet connection by ping the internet check URL .\nIf there is no internet connection, we will not need to wait for adShowTimeout secs")]
         public bool checkInternet = true;
                 
-        [HideInInspector] public bool enableInterstitial = true;
-        [HideInInspector] public bool enableRewarded = true;
-        [HideInInspector] public bool enableBanner = true;
+        [NonSerialized] public bool enableInterstitial = true;
+        [NonSerialized] public bool enableRewarded = true;
+        [NonSerialized] public bool enableBanner = true;
         
         [Tooltip("Before showing an ad: set AudioListener.volume to 0\nAfter the ad is closed: restore the previously saved AudioListener.volume")]
         public bool autoMute = true;
@@ -929,7 +943,15 @@ namespace Amanotes.Core.Internal
         protected void OnAdShowFailed()
         {
             Log($"[Ad] {adType} OnAdShowFailed");
-
+            
+            // 509		Show Fail: No ads to show
+            // 520		Show Fail: No internet connection; ShouldTrackNetworkState is enabled
+            // 524		Show Fail: Placement %@ has reached its limit as defined per pace
+            // 526		Show Fail: Ad unit has reached its daily cap per session
+            // 1022		Show Fail: Cannot show an RV while another RV is showing
+            // 1023		Show Fail: Show RV called when there are no available ads to show
+            // 1036		Show Fail: Cannot show an  while another  is showing
+            
             if (Ads.context != null)
             {
                 Ads.context.adCallback |= AdCallback.Fail;
@@ -1014,10 +1036,12 @@ namespace Amanotes.Core.Internal
             {
                 LogWarning("[Ad] Something wrong? OnAdReady called when no ad is loading! AdType=" + adType);
             }
-
+            
             _isRequesting = false;
         }
-
+        
+        
+        
         protected void OnAdLoadFailed(string error)
         {
             Log($"[Ad] {adType} OnAdLoadFailed: {error}");

package/Runtime/AmaGDK.RemoteConfig.cs

@@ -69,11 +69,12 @@ namespace Amanotes.Core
 
             public static T Get<T>(string key, T defaultValue = default(T))
             {
+                var embed = Config.remoteConfig.embedRemoteConfig;
 #if UNITY_EDITOR
                 //Override value in editor environment
-                if (Config.remoteConfig.embedRemoteConfig.overrideInEditor)
+                if (embed != null && embed.overrideInEditor)
                 {
-                    foreach (var c in Config.remoteConfig.embedRemoteConfig.overrideConfig)
+                    foreach (var c in embed.overrideConfig)
                         if (c.key == key)
                             return (T)Convert.ChangeType(c.value, typeof(T));
                 }

package/Runtime/AmaGDK.cs

@@ -17,7 +17,7 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.62";
+        public const string VERSION = "0.2.63";
 
         internal static AmaGDK _instance;
         internal static bool _allowInit = false;

package/Runtime/Internal/AmaGDK.Internal.SemVer.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
+using UnityEngine;
 using UnityEngine.Profiling;
 using static Amanotes.Core.Internal.Logging;
 
@@ -9,7 +10,7 @@ namespace Amanotes.Core.Internal
     public struct SemVer : IComparable<SemVer>, IComparer<SemVer>
     {
         public static readonly SemVer ZERO = new SemVer(0, 0, 0);
-        private static readonly Regex VERSION_PATTERN = new Regex(@"^(\d+)\.(\d+)\.(\d+)(?:\.(\d+))?$");
+        private static readonly Regex VERSION_PATTERN = new Regex(@"^(\d+)\.(\d+)(?:\.(\d+))?(?:\.(\d+))?$");
 
         public int major;
         public int minor;
@@ -45,13 +46,21 @@ namespace Amanotes.Core.Internal
                 }
                 major = int.Parse(match.Groups[1].Value);
                 minor = int.Parse(match.Groups[2].Value);
-                patch = int.Parse(match.Groups[3].Value);
+                if (match.Groups.Count > 2)
+                {
+                    if (!int.TryParse(match.Groups[3].Value, out patch))
+                    {
+                        patch = 0;
+                    }
+                }
                 if (match.Groups.Count > 3)
                 {
                     if (!int.TryParse(match.Groups[4].Value, out extra))
+                    {
                         extra = -1;
                 }
             }
+            }
             Profiler.EndSample();
         }
 
@@ -66,6 +75,21 @@ namespace Amanotes.Core.Internal
 
         public int CompareTo(SemVer other)
         {
+            if (!isValid)
+            {
+                if (!other.isValid)
+                {
+                    return 0;
+                }
+                return -1;
+            }
+
+            if (!other.isValid)
+            {
+                return 1;
+            }
+            
+            
             if (major != other.major) return major.CompareTo(other.major);
             if (minor != other.minor) return minor.CompareTo(other.minor);
             if (patch != other.patch) return patch.CompareTo(other.patch);

package/Runtime/Internal/AmaGDK.Internal.cs

@@ -175,7 +175,7 @@ namespace Amanotes.Core.Internal
             analyticsData.cachedEventDetails.Clear();
             analyticsData.migrationLog = new MigrationLog();
             analyticsData.SaveIfDirty();
-            sessionStat.Clear();
+            sessionStat?.Clear();
 #if UNITY_2021_3_OR_NEWER
             eventQueue.Clear();
 #else

package/Runtime/Klavar/Attributes/AccumulatedCountAttribute.cs

@@ -16,4 +16,5 @@ namespace Amanotes.Core
             return AmaGDK.Analytics.GetAccumulatedCount(attr.name) + 1;
         }
     }
+    public class LifetimeCountAttribute : AccumulatedCountAttribute { }
 }

package/package.json

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