com.amanotes.gdk 0.2.54 → 0.2.56

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## [0.2.56 - 2024-04-03]
+- Release AmaGDK v0.2.56
+
+## [0.2.55 - 2024-03-28]
+- Send af_inters_displayed & af_rewarded_displayed to AppsFlyer
+- Use Sqlite for analytics
+- Fix IRS callback for RW not working properly in Editor
+- Split google sheet name by platform for SDK version tracking
+- Track version of ACM, Facebook, Build number, build time
+
 ## [0.2.54 - 2024-03-20]
 - Update temp total count after accumulated count change
 - Update FirebaseHook

package/Editor/AmaGDKExtra.cs

@@ -18,6 +18,11 @@ namespace Amanotes.Editor
             {
                 dicThirdParty.Add(adapter.name, adapter.version);
             }
+
+            dicThirdParty["AdQuality"] = ExtractVersion.IronSourceAdQuality();
+            dicThirdParty["AdRevenue"] = ExtractVersion.AppsFlyerAdRevenue();
+            dicThirdParty["ACM"] = ExtractVersion.Acm();
+            dicThirdParty["FacebookSDK"] = ExtractVersion.Facebook();
             
             return dicThirdParty;
         }

package/Editor/Utils/AmaGDKEditor.ExtractVersion.cs

@@ -131,16 +131,19 @@ namespace Amanotes.Editor
         
         static string GetPackageVersion(string packageName)
         {
-#if UNITY_2021_1_OR_NEWER
-            foreach (var package in UnityEditor.PackageManager.PackageInfo.GetAllRegisteredPackages())
+            try
             {
-                if(package.name != packageName) continue;
-                return package.version;
-            }
-            
+#if UNITY_2021_1_OR_NEWER
+                UnityEditor.PackageManager.PackageInfo[] packages = UnityEditor.PackageManager.PackageInfo.GetAllRegisteredPackages();
+                foreach (var package in packages)
+                {
+                    if(package.name != packageName) continue;
+                    return package.version;
+                }
+
 #else
             if (listRequest == null || !listRequest.IsCompleted) return "";
-            
+
             if (listRequest.Status != StatusCode.Success)
             {
                 Debug.LogWarning($"Failed to list packages: {listRequest.Error.message}");
@@ -156,10 +159,15 @@ namespace Amanotes.Editor
             foreach (var package in listRequest.Result)
             {
                 if(package.name != packageName) continue;
-                
+
                 return package.version;
             }
 #endif
+            }
+            catch (Exception exception)
+            {
+                Debug.LogWarning($"Can not get package version of {packageName}, error:  {exception.Message}");
+            }
             return "";
         }
 
@@ -227,26 +235,18 @@ namespace Amanotes.Editor
 
         internal static string AppsFlyer()
         {
-            var version = "";
-            List<Assembly> assemblies = AppDomain.CurrentDomain.GetAssemblies().ToList();
-            foreach (var assembly in assemblies)
-            {
-                foreach (var oType in assembly.GetTypes())
-                {
-                    if (oType.Name.Equals("AppsFlyer"))
-                    {
-                        version = oType.GetField("kAppsFlyerPluginVersion").GetValue(null).ToString();
-                    }
-                }
-            }
+            return GetVersionFromAssembly("AppsFlyer", "kAppsFlyerPluginVersion");
+        }
 
-            return version.Trim();
+        internal static string AppsFlyerAdRevenue()
+        {
+            return GetVersionFromAssembly("AppsFlyerAdRevenue", "kAppsFlyerAdRevenueVersion");
         }
         
         internal static string Adjust()
         {
             var version = "";
-            List<Assembly> assemblies = AppDomain.CurrentDomain.GetAssemblies().ToList();
+            Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies();
             foreach (var assembly in assemblies)
             {
                 foreach (var oType in assembly.GetTypes())
@@ -275,6 +275,28 @@ namespace Amanotes.Editor
             return version?.Trim();
         }
 
+        internal static string IronSourceAdQuality()
+        {
+            var version = "";
+            try
+            {
+                string[] adQualityXmls = Directory.GetFiles("Assets", "IronSourceAdQualityDependencies.xml",
+                    SearchOption.AllDirectories);
+                if (adQualityXmls.Length <= 0) return version.Trim();
+
+                var xmlDocument = new XmlDocument();
+                xmlDocument.Load(adQualityXmls[0]);
+                var root = xmlDocument.DocumentElement;
+                var dataVersion = root?.SelectSingleNode("unityversion");
+                version = dataVersion?.InnerText;
+            }
+            catch(Exception exception)
+            {
+                Debug.LogWarning($"Can not get IronSource AdQuality Version : {exception.Message}");
+            }
+            return version?.Trim();
+        }
+
         internal static string RevenueCat()
         {
             string[] files = Directory.GetFiles("Assets", "PurchasesWrapper.java", SearchOption.AllDirectories);
@@ -330,5 +352,42 @@ namespace Amanotes.Editor
 
             return listAdapter;
         }
+
+        internal static string Acm()
+        {
+            return GetVersionFromAssembly("ACMVersion", "VERSION");
+        }
+
+        internal static string Facebook()
+        {
+            return GetVersionFromAssembly("FacebookSdkVersion", "Build");
+        }
+
+        private static string GetVersionFromAssembly(string assemblyType, string versionName)
+        {
+            var version = "";
+            try
+            {
+                Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies();
+                version = assemblies
+                    .SelectMany(assembly => assembly.GetTypes())
+                    .Where(type => type.Name.Equals(assemblyType))
+                    .Select(type =>
+                    {
+                        var extractVersion = type.GetField(versionName)?.GetValue(null).ToString();
+                        if (string.IsNullOrEmpty(extractVersion))
+                        {
+                            extractVersion = type.GetProperty(versionName)?.GetValue(null, null).ToString();
+                        }
+                        return extractVersion;
+                    })
+                    .FirstOrDefault(value => !string.IsNullOrEmpty(value));
+            }
+            catch (Exception exception)
+            {
+                Debug.LogWarning($"Can not get {assemblyType} Version by {versionName}, Exception: {exception.Message}");
+            }
+            return version;
+        }
     }
 }

package/Packages/SqliteAnalyticsAdapter.unitypackage.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 668c7755be4bf44fab65894fe05f82fa
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/AmaGDK.Ads.cs

@@ -196,10 +196,10 @@ namespace Amanotes.Core
             // internal use
             internal static readonly AdsData localData = new AdsData().LoadJsonFromFile();
 
-            protected internal static AdShowContext context;
-            protected internal static AdAdapter _adapter;
-            protected internal static float _savedVolume = -1;
-            protected internal static float _savedTimeScale = -1;
+            internal protected static AdShowContext context;
+            internal protected static AdAdapter _adapter;
+            internal protected static float _savedVolume = -1;
+            internal protected static float _savedTimeScale = -1;
 
             public static void OnInter_Request(Action callback)
             {
@@ -248,8 +248,9 @@ namespace Amanotes.Core
             internal static void StartModule()
             {
                 if (_adapter == null) return;
-                _adapter.interstitial.StartLoadAd();
-                _adapter.rewardVideo.StartLoadAd();
+                
+                if (Config.ad.enableInterstitial) _adapter.interstitial.StartLoadAd();
+                if (Config.ad.enableRewarded) _adapter.rewardVideo.StartLoadAd();
 
                 if (_isBannerShowing)
                 {
@@ -445,7 +446,8 @@ namespace Amanotes.Core.Internal
     public enum BannerPosition
     {
         TOP = 1,
-        BOTTOM = 2
+        BOTTOM = 2,
+        RECTANGLE = 3
     }
 
     public enum AdType

package/Runtime/AmaGDK.UserProfile.cs

@@ -3,6 +3,7 @@ using System.Text.RegularExpressions;
 using Amanotes.Core.Internal;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.Serialization;
 
 namespace Amanotes.Core
 {
@@ -13,10 +14,19 @@ namespace Amanotes.Core
         [Serializable]
         public partial class UserProfile : IJsonFile
         {
+            [NonSerialized]
+            private bool _dirty = false;
             private void Save()
             {
                 this.SaveJsonToFile();
             }
+            
+            private void SaveIfDirty()
+            {
+                if (!_dirty) return;
+                _dirty = false;
+                this.SaveJsonToFile();
+            }
         }
 
         public partial class UserProfile //PUBLIC
@@ -105,6 +115,11 @@ namespace Amanotes.Core
                 get => _installationId;
                 set => _installationId = ValidateId(value, ALPHANUMERIC_PATTERN);
             }
+
+            public int Session
+            {
+                get => _session;
+            }
             
             public void UpdateUserId()
             {
@@ -184,6 +199,8 @@ namespace Amanotes.Core
             private string _appsFlyerId;
             [SerializeField] 
             private string _installationId;
+            [SerializeField] 
+            private int _session;
 
             private const string ALPHANUMERIC_HYPHEN_PATTERN = @"^(?=.*\d)(?=.*[a-zA-Z])(?=.*-).+$";
             private const string ALPHANUMERIC_PATTERN = @"^(?=.*\d)(?=.*[a-zA-Z])[a-zA-Z\d]+$";
@@ -202,6 +219,8 @@ namespace Amanotes.Core
 #endif
                 GetAmaDeviceId();
                 UpdateUserId();
+                _session = _session + 1;
+                _dirty = true;
             }
             
             internal void StartModule()
@@ -209,6 +228,8 @@ namespace Amanotes.Core
                 // Always get the latest advertising id
                 GetAdvertisingId();
                 Logging.Log($"[UserProfile] user_id: {_userId}");
+                onFrameUpdate -= SaveIfDirty;
+                onFrameUpdate += SaveIfDirty;
             }
 
             private void SetAdvertisingID(string id)

package/Runtime/AmaGDK.cs

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

package/Runtime/Internal/AmaGDK.Utils.cs

@@ -142,7 +142,7 @@ namespace Amanotes.Core.Internal
     public static class GDKFileUtils
     {
         private static string _basePath;
-        private static string basePath
+        public static string basePath
         {
             get
             {
@@ -405,7 +405,7 @@ namespace Amanotes.Core.Internal
         }
     }
 
-    internal static class JsonUtils
+    public static class JsonUtils
     {
         public static string TupleToJson(params (string key, object value)[] parameters)
         {

package/Runtime/Klavar/KlavarContainer.cs

@@ -0,0 +1,27 @@
+using System;
+using Amanotes.Core.Internal;
+using UnityEngine;
+using GUID = System.Guid;
+
+namespace Amanotes.Core
+{
+    public class KlavarContainer
+    {
+        public readonly string ctnUUID = GUID.NewGuid().ToString();
+        public string lastEventName;
+
+        public static void LogEventError(string message)
+        {
+            if (!Application.isBatchMode)
+                Logging.LogError(message);
+            throw new KlavarException(message);
+        }
+    }
+
+    public class KlavarException : Exception
+    {
+        public KlavarException() { }
+        public KlavarException(string message) : base(message) { }
+    }
+}
+

package/Runtime/Klavar/KlavarContainer.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 9d36fe04b538e4580902f417f4cf88c6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Klavar/KlavarEvent.cs

@@ -11,6 +11,8 @@ namespace Amanotes.Core
     /// </summary>
     public abstract class KlavarEvent
     {
+        private Dictionary<string, object> additionalParameters = new Dictionary<string, object>();
+        
         /// <summary>
         /// LogEvent
         /// </summary>
@@ -25,6 +27,12 @@ namespace Amanotes.Core
             
             var @params = this.ToDict();
             var eventName = eventNameAttr.name;
+            
+            foreach (var kvp in additionalParameters)
+            {
+                @params[kvp.Key] = kvp.Value;
+            }
+            
             AmaGDK.Analytics.LogEvent(eventName, @params);
         }
 
@@ -87,5 +95,17 @@ namespace Amanotes.Core
                     field => Convert(field)
                 );
         }
+        
+        /// <summary>
+        /// AttachContainerParameters method attaches container parameters to the event.
+        /// </summary>
+        /// <param name="parameters">The container parameters to attach.</param>
+        public void AttachContainerParameters(Dictionary<string, object> parameters)
+        {
+            foreach (var kvp in parameters)
+            {
+                additionalParameters[kvp.Key] = kvp.Value;
+            }
+        }
     }
 }

package/package.json

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