com.amanotes.gdk 0.2.56 → 0.2.57

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## [0.2.57 - 2024-04-08]
+- [Dev] Fix bug in value conversion within KlavarEvent
+- [Dev] Auto get change log
+- [Dev] Auto publish command
+- [Dev] Upgrade to Unity 2021.3.35f1
+- [Dev] Add support for various banner sizes in IronsourceAdapter
+- [Dev] Clean up and add tooltip for options
+- [Fix] Null exception in LocalBuild Version
+
+
 ## [0.2.56 - 2024-04-03]
 - Release AmaGDK v0.2.56
 

package/Editor/AmaGDKEditor.cs

@@ -369,20 +369,7 @@ namespace Amanotes.Editor
             {
                 configOpen.Add(adapterId, isOpen = false);
             }
-
-            // if (adapter == null)
-            // {
-            //     // EditorGUILayout.HelpBox("Adapter<" + adapterId + "> not imported!", MessageType.Info);
-            //     string adapterName = FindBestAdapterFor(adapterId);
-            //     var package = $"{Res.PACKAGE_PATH}{adapterName}";
-            //     
-            //     if (GUILayout.Button(adapterName))
-            //     {
-            //         AssetDatabase.ImportPackage(package, false);    
-            //     }
-            //     return;
-            // }
-
+            
             SDKStatus status = SDKStatus.Get(adapterId);
             bool changed = AmaGUI.Foldout(ObjectNames.NicifyVariableName(adapterId), ref isOpen, () =>
             {
@@ -461,18 +448,21 @@ namespace Amanotes.Editor
                 EditorGUILayout.HelpBox($"{adapterId} SDK not installed", MessageType.Warning);
                 return;
             }
+            
             if (!status.adapterInstalled)
             {
                 EditorGUILayout.HelpBox($"{adapterId}-GDKAdapter not installed", MessageType.Warning);
+                if (adapterId == IRONSOURCE)
+                {
+                    AmaGUI.Foldout("Enabled AdNetworks", ref showIRSAdapter, () =>
+                    {
+                        DrawIRSAdapterVersions();
+                        GUILayout.Space(8f);
+                    });
+                }
                 return;
-            }
-
-            if (!status.adapterInstalled)
-            {
-                EditorGUILayout.HelpBox($"{adapterId}-GDKAdapter not installed", MessageType.Warning);
-                return;
-            }
-
+            } 
+            
             DrawModuleConfig(adapter, adapterId);
         }
 

package/Editor/Extra/GDKLocalBuild.cs

@@ -11,7 +11,7 @@ using UnityObject = UnityEngine.Object;
 
 namespace Amanotes.Editor
 {
-    [CreateAssetMenu(menuName = "Ama GDK/Build Config", fileName = "LocalBuild")]
+    [CreateAssetMenu(menuName = "Ama GDK/Local Build Config", fileName = "LocalBuild")]
     public class GDKLocalBuild : ScriptableObject
     {
         private const string DEFAULT_BUILD_FOLDER = "../../_Build";
@@ -37,7 +37,6 @@ namespace Amanotes.Editor
         public List<UnityObject> listUnused;
         public BuildRequestTS buildRQ;
         public UnityEvent beforeBuild;
-        public TextAsset shTemplate;
         
         [NonSerialized] private BuildInfo _buildInfo;
         [NonSerialized] private int _lockCount;
@@ -493,12 +492,14 @@ namespace Amanotes.Editor
                 buildNumber++;
                 if (string.IsNullOrEmpty(buildVersion)) buildVersion = "1.0.0";
 
-                string[] arr = buildVersion.Split('.');
-                int last = int.Parse(arr[2]);
+                List<string> list = buildVersion.Split('.').ToList();
+                if (list.Count < 2) list.Add("0");
+                if (list.Count < 3) list.Add("0");
+                int last = int.Parse(list[2]);
                 last++;
 
-                arr[2] = last.ToString();
-                buildVersion = string.Join(".", arr);
+                list[2] = last.ToString();
+                buildVersion = string.Join(".", list);
             }
         }
 

package/Runtime/AmaGDK.Adapters.cs

@@ -13,7 +13,7 @@ namespace Amanotes.Core.Internal
         [HideInInspector] [SerializeField] internal bool enabled = true;
         [NonSerialized] internal string adapterId;
         [NonSerialized] internal string adapterVersion;
-        [NonSerialized] protected internal Status status = Status.None;
+        [NonSerialized] internal protected Status status = Status.None;
         
         protected abstract void Init(Action<bool> onComplete);
         

package/Runtime/AmaGDK.Ads.cs

@@ -9,8 +9,6 @@ using static Amanotes.Core.AmaGDK;
 
 namespace Amanotes.Core
 {
-    
-    
     public static class AdExtension
     {
         public static IAdCallback OnAdOpened(this IAdCallback ad, Action callback)
@@ -173,20 +171,7 @@ namespace Amanotes.Core
         [Serializable]
         public class AdAdapterConfig
         {
-            // public bool manualInit;
-            public int adLoadTimeoutInSecs = 60;
-            public int adShowTimeoutInSecs = 5;
-            public BannerPosition bannerPosition = BannerPosition.BOTTOM;
-            public bool autoLogEvent = true;
-
-            public bool enableInterstitial = true;
-            public bool enableRewarded = true;
-            public bool enableBanner = true;
-            public bool autoMute = true;
-            public bool autoTimeScale = true;
             
-            [Header("EDITOR")]
-            [Range(0f, 1f)] public float rewardAdShowSuccessRate = 1;
         }
 
         public partial class Ads
@@ -255,7 +240,7 @@ namespace Amanotes.Core
                 if (_isBannerShowing)
                 {
                     _isBannerShowing = false;
-                    ShowBanner(_showingBannerPosition);
+                    ShowBanner();
                 }
             }
 
@@ -298,22 +283,22 @@ namespace Amanotes.Core
 
 
             private static bool _isBannerShowing;
-            private static BannerPosition _showingBannerPosition;
             
-            public static void ShowBanner(BannerPosition? bannerPosition = null)
+            public static void ShowBanner()
             {
+                if (_config.ad.enableBanner) return;
+                
                 if (_isBannerShowing) return;
                 _isBannerShowing = true;
-                _showingBannerPosition = bannerPosition ?? Config.ad.bannerPosition;
-
                 if (_adapter == null) return;
 
                 dispatcher.Dispatch(Event.BANNER_SHOW);
-                _adapter.ShowBanner(_showingBannerPosition);
+                _adapter.ShowBanner();
             }
 
             public static void HideBanner()
             {
+                if (_config.ad.enableBanner) return;
                 if (!_isBannerShowing) return;
                 _isBannerShowing = false;
                 if (_adapter == null) return;
@@ -369,22 +354,27 @@ namespace Amanotes.Core.Internal
 {
     [Serializable] public class AdModuleConfig
     {
-        // [Header("-----     MODULE CONFIG      -----")]
-        // public bool manualInit;
+        [Tooltip("Automatically retry requesting ad if an ad failed to response in this amount of time (in secs)")]
         public int adLoadTimeoutInSecs = 60;
+        
+        [Tooltip("When an ad is not ready to show, keep waiting for this amount of time (in secs)\n\nIf the ad is ready during that time, it would be shown normally.")]
         public int adShowTimeoutInSecs = 5;
-        public BannerPosition bannerPosition = BannerPosition.BOTTOM;
-        public bool autoLogEvent = true;
+        
+        [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;
-
-        public bool enableInterstitial = true;
-        public bool enableRewarded = true;
-        public bool enableBanner = true;
-
+                
+        [HideInInspector] public bool enableInterstitial = true;
+        [HideInInspector] public bool enableRewarded = true;
+        [HideInInspector] 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;
+        
+        [Tooltip("Before showing an ad: set Time.timeScale to 0\nAfter the ad is closed: restore the previously saved Time.timeScale")]
         public bool autoTimeScale = true;
 
         [Header("EDITOR")]
+        [Tooltip("Only applicable in Editor\n0 = 0% success\n1 = 100% success")]
         [Range(0f, 1f)] public float rewardAdShowSuccessRate = 1;
     }
 
@@ -399,14 +389,14 @@ namespace Amanotes.Core.Internal
         protected AdModuleConfig moduleConfig => Config.ad;
 
         // APIs
-        protected internal abstract AdLogic interstitial { get; }
-        protected internal abstract AdLogic rewardVideo { get; }
+        internal protected abstract AdLogic interstitial { get; }
+        internal protected abstract AdLogic rewardVideo { get; }
 
-        public abstract void ShowBanner(BannerPosition bannerPosition);
+        public abstract void ShowBanner();
         public abstract void HideBanner();
 
         // Internally used
-        protected internal abstract void SetUserId(string userId);
+        internal protected abstract void SetUserId(string userId);
     }
     
     public interface IAdCallback { }
@@ -443,13 +433,6 @@ namespace Amanotes.Core.Internal
         Fail = 256
     }
     
-    public enum BannerPosition
-    {
-        TOP = 1,
-        BOTTOM = 2,
-        RECTANGLE = 3
-    }
-
     public enum AdType
     {
         Interstitial,

package/Runtime/AmaGDK.Analytics.cs

@@ -2,7 +2,6 @@ using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Text;
-using System.Text.RegularExpressions;
 using Amanotes.Core.Internal;
 using UnityEngine;
 using UnityEngine.Profiling;
@@ -1050,10 +1049,10 @@ namespace Amanotes.Core.Internal
     {
         // [Header("-----     MODULE CONFIG      -----")]
         public bool showAnalyticsLog;
-        public bool normalizeEventName = true;
-        public bool checkMigrationIntegrity = true;
-        public bool migrateAccumulatedCount = true;
-        public bool enableEventStat;
+        [HideInInspector] public bool normalizeEventName = true;
+        [HideInInspector] public bool checkMigrationIntegrity = true;
+        [HideInInspector] public bool migrateAccumulatedCount = true;
+        [HideInInspector] public bool enableEventStat;
         public AnalyticQualityConfig quality;
     }
     
@@ -1079,11 +1078,10 @@ namespace Amanotes.Core.Internal
     
     public abstract class AnalyticsAdapter : Adapter2
     {
-        public bool SendEventByDefault;
-
-        public List<string> NeverSend;
-        public List<string> AlwaysSend;
-
+        [HideInInspector] public List<string> NeverSend = new List<string>();
+        [HideInInspector] public List<string> AlwaysSend = new List<string>();
+        protected abstract bool SendEventByDefault { get; }
+        
         public bool IsForbidden(string eventName)
         {
             return SendEventByDefault

package/Runtime/AmaGDK.RemoteConfig.cs

@@ -361,20 +361,6 @@ namespace Amanotes.Core
             }
         }
     }
-
-    // public static class RemoteConfigExtension
-    // {
-    //     public static void InitRemoteConfigModule(this RemoteConfigAdapter ap, Action<bool> onCompleteCallback)
-    //     {
-    //         if (AmaGDK.RemoteConfig.fetchState != AmaGDK.RemoteConfig.FetchState.None)
-    //         {
-    //             LogWarning($"[RemoteConfig] Current state {AmaGDK.RemoteConfig.fetchState.ToString()}\nCannot start to initialize");
-    //             return;
-    //         }
-    //         
-    //         AmaGDK.RemoteConfig.NextState();
-    //     }
-    // }
 }
 
 namespace Amanotes.Core.Internal
@@ -382,10 +368,13 @@ namespace Amanotes.Core.Internal
     [Serializable]
     public class RemoteConfigConfig
     {
-        // [Header("-----     MODULE CONFIG      -----")]
-
+        [Tooltip("Fetch timeout for first session (in secs)")]
         public float firstFetchTimeOutInSeconds = 10;
+        
+        [Tooltip("Fetch timeout for 2nd+ session (in secs)")]
         public float defaultTimeOutInSeconds = 3;
+        
+        [Tooltip("To create embed Remote config:\n\n- Right click in Project panel\n- Create > AmaGDK > Embed Remote Config\n- Drag & drop the asset here")]
         [SerializeField] internal EmbedRemoteConfigAsset embedRemoteConfig;
     }
     

package/Runtime/AmaGDK.cs

@@ -17,7 +17,7 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.56";
+        public const string VERSION = "0.2.57";
 
         internal static AmaGDK _instance;
         internal static Status _status = Status.None;

package/Runtime/Internal/AmaGDK.WebUtils.cs

@@ -151,6 +151,7 @@ namespace Amanotes.Core.Internal
 
     public partial class SDKConfig
     {
-        public string internetCheckUrl = "http://www.google.com";
+        [Tooltip("The URL we would use to ping to verify if the app is actually connected to the internet")]
+        public string internetCheckUrl = "http://clients3.google.com/generate_204";
     }
 }

package/Runtime/Klavar/Attributes/ToStringAttribute.cs

@@ -43,14 +43,22 @@ namespace Amanotes.Core
         {
             this.converter = converter;
         }
-
-        private string GetValueAsString(object enumVal)
+    
+        private string GetValueAsString(object fieldValue)
         {
-            // get the field 
-            var field = enumVal.GetType().GetField(enumVal.ToString());
-            var attr = field.GetCustomAttribute<ValueAttribute>();
-
-            return attr != null ? convertMethods[converter](attr.sValue) : convertMethods[converter](enumVal.ToString());
+            var fieldStringValue = fieldValue.ToString();
+            var fieldType = fieldValue.GetType();
+            if (fieldType.IsEnum)
+            {
+                var members = fieldType.GetMember(fieldStringValue);
+                if (members.Length > 0)
+                {
+                    var attribute = (ValueAttribute)GetCustomAttribute(members[0], typeof(ValueAttribute));
+                    if (attribute != null) 
+                        return convertMethods[converter](attribute.sValue);
+                }
+            }
+            return convertMethods[converter](fieldStringValue);
         }
 
         public override object Convert(object parent, FieldInfo fieldInfo, object param)

package/Runtime/Klavar/KlavarEvent.cs

@@ -87,7 +87,7 @@ namespace Amanotes.Core
         {
             return this
                 .GetType()
-                .GetFields()
+                .GetFields(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)
                 .Where(field => field.GetCustomAttribute<IgnoreAttribute>() == null)
                 .Select(field => Validate(field))
                 .ToDictionary(

package/package.json

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