com.amanotes.gdk 0.2.72 → 0.2.73

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [0.2.73] - 2024-09-09
+- [Fix] Disable incorrect in-editor warning for AdLogic
+- [Dev] Remove AdEventTracking dependency on AppsFlyer
+- [Dev] Rename Utils to GDKUtils
+- [Dev] Automatically convert Enum value to string for analytics
+- [Dev] Show less analytics error and warning log
+- [Fix] Cannot create AmaGDKConfig
+- [Fix] Change to dev mode should automatically refresh packages & recompile
+- [Fix] Screen.currentResolution.refreshRate obsoleted on Unity 2022.2 and newer versions
+- [Dev] Disable auto update adapter
+- [Fix] Show all related adapters of each product
+
 ## [0.2.72] - 2024-08-29
 - Revert "[Dev] Improve GDKPool performance main thread by using non-locking structure"
 - This reverts commit 5857ea9cb05adf9e96a747216da8acd48e39f93e.

package/Editor/AmaGDKEditor.cs

@@ -1,18 +1,20 @@
 using System;
-using Amanotes.Core;
-using Amanotes.Core.Internal;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
+
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.Profiling;
-using static Amanotes.Core.GDKDebug;
-using static Amanotes.Core.AmaGDK.AdapterID;
 using UnityObject = UnityEngine.Object;
 using UnityEvent = UnityEngine.Event;
 
+using Amanotes.Core;
+using Amanotes.Core.Internal;
+using static Amanotes.Core.GDKDebug;
+using static Amanotes.Core.AmaGDK.AdapterID;
+
 namespace Amanotes.Editor
 {
     [CustomEditor(typeof(AmaGDK))]
@@ -35,11 +37,8 @@ namespace Amanotes.Editor
 
         // DO NOT PUT [NonSerialized]
         private static bool adapterScanned = false;
-        private static bool searchedForConfig = false;
-        
         private static bool extraScanned = false;
         private static readonly List<string> extraPackages = new List<string>();
-
         private static readonly List<string> adapterPackages = new List<string>();
 
         public static Color btnColor;
@@ -62,64 +61,42 @@ namespace Amanotes.Editor
             if (sdk != null) sdk.transform.hideFlags = HideFlags.HideInInspector;
 
             SDKStatus.ClearCache();
-            TryLoadConfigAsset();
+            RefreshConfigStatus();
             RefreshListAdapters();
         }
 
-        private void TryLoadConfigAsset()
+        internal enum ConfigAssetStatus
         {
-            if (configAsset != null) return;
-            if (EditorApplication.isCompiling) return;
-            if (EditorApplication.isUpdating) return;
-
-            searchedForConfig = true;
-            Resources.UnloadUnusedAssets();
-
-            configAsset = Resources.Load<ConfigAsset>("AmaGDKConfig");
-            invalidConfigAsset = configAsset == null ? Resources.Load("AmaGDKConfig") : null;
-
-            RefreshListAdapters();
-            SDKStatus.ClearCache();
-            Repaint();
+            None,
+            ScriptNotFound,
+            AssetNotFound,
+            AssetIsInvalid,
+            AssetOk
         }
+        
+        [NonSerialized] internal static ConfigAssetStatus cfgStatus = ConfigAssetStatus.None;
 
-        private void DrawGUI_ConfigMissing()
+        void RefreshConfigStatus()
         {
-            EditorGUI.indentLevel--;
-            if (invalidConfigAsset != null)
+            string[] scriptGUIDs = AssetDatabase.FindAssets("t:MonoScript AmaGDKConfigAsset");
+            if (scriptGUIDs.Length == 0)
             {
-                EditorGUILayout.HelpBox($" INVALID <Resources/AmaGDKConfig.asset> found!", MessageType.Warning);
-                if (AmaGUI.BigButton("RE-IMPORT GDK Config", 40f, ORANGE))
-                {
-                    AssetDatabase.ImportPackage(Res.AMAGDK_CONFIG_PACKAGE, false);
-                    searchedForConfig = false;
-                }
-            } else
+                cfgStatus = ConfigAssetStatus.ScriptNotFound;
+                return;
+            }
+            
+            string[] assetGUIDs = AssetDatabase.FindAssets("t:ConfigAsset");
+            if (assetGUIDs.Length == 0)
             {
-                EditorGUILayout.HelpBox("[Warning] <Resources/AmaGDKConfig.asset> NOT FOUND!\nYou need to create one to control all the adapter's configurations!", MessageType.Warning);
-                GUILayout.BeginHorizontal();
-                {
-                    if (AmaGUI.BigButton("CREATE", 40f, BLUE))
-                    {
-                        AssetDatabase.ImportPackage(Res.AMAGDK_CONFIG_PACKAGE, false);
-
-                        ScriptableObject config = CreateInstance("Amanotes.Core.AmaGDKConfigAsset");
-                        AssetDatabase.CreateAsset(config, "Assets/AmaGDK/Resources/AmaGDKConfig.asset");
-                        AssetDatabase.SaveAssets();
-                        TryLoadConfigAsset();
-                        adapterScanned = false;
-                    }
-
-                    if (GUILayout.Button(EditorGUIUtility.IconContent("d_Refresh@2x"), GUILayout.Width(40f), GUILayout.Height(40f)))
-                    {
-                        TryLoadConfigAsset();
-                    }
-                }
-                GUILayout.EndHorizontal();
+                cfgStatus = ConfigAssetStatus.AssetNotFound;
+                return;
             }
-            EditorGUI.indentLevel++;
+            
+            configAsset = Resources.Load<ConfigAsset>("AmaGDKConfig");
+            cfgStatus = configAsset != null ? ConfigAssetStatus.AssetOk : ConfigAssetStatus.AssetIsInvalid;
+            if (cfgStatus == ConfigAssetStatus.AssetOk) adapterScanned = false;
         }
-
+        
         private void DrawGUI_AutoInitDisabled()
         {
             if (sdk.autoInit) return;
@@ -130,21 +107,7 @@ namespace Amanotes.Editor
                 EditorUtility.SetDirty(sdk);
             }
         }
-
-        private void DrawGUI_ConfigDetail()
-        {
-            CreateCachedEditor(configAsset, null, ref editor);
-            float lbWidth = EditorGUIUtility.labelWidth;
-            EditorGUIUtility.labelWidth = 220f;
-            editor.OnInspectorGUI();
-            EditorGUIUtility.labelWidth = lbWidth;
-        }
-
-        private void DrawGUI_ConfigAsset()
-        {
-            EditorGUILayout.ObjectField(configAsset, configAsset.GetType(), false, GUILayout.Width(EditorGUIUtility.currentViewWidth - 414), GUILayout.ExpandWidth(true));
-        }
-
+        
         private void ScanForAdapterPackages()
         {
             adapterScanned = true;
@@ -193,26 +156,26 @@ namespace Amanotes.Editor
             }
         }
 
-        private void DrawGUI_ExampleScene()
-        {
-            var examplePackageName = "AmaGDKExample";
-            if (GUILayout.Button(ObjectNames.NicifyVariableName(examplePackageName)))
-            {
-                var package = $"{Res.PACKAGE_PATH}{examplePackageName}.unitypackage";
-                AssetDatabase.ImportPackage(package, false);
-            }
-        }
-
-        private void DrawGUI_ColorPicker()
-        {
-            GUILayout.BeginHorizontal();
-            {
-                btnColor = EditorGUILayout.ColorField(btnColor);
-                btnLerp = EditorGUILayout.Slider(btnLerp, -1f, 1f);
-            }
-            GUILayout.EndHorizontal();
-        }
-
+        // private void DrawGUI_ExampleScene()
+        // {
+        //     var examplePackageName = "AmaGDKExample";
+        //     if (GUILayout.Button(ObjectNames.NicifyVariableName(examplePackageName)))
+        //     {
+        //         var package = $"{Res.PACKAGE_PATH}{examplePackageName}.unitypackage";
+        //         AssetDatabase.ImportPackage(package, false);
+        //     }
+        // }
+        
+        // private void DrawGUI_ColorPicker()
+        // {
+        //     GUILayout.BeginHorizontal();
+        //     {
+        //         btnColor = EditorGUILayout.ColorField(btnColor);
+        //         btnLerp = EditorGUILayout.Slider(btnLerp, -1f, 1f);
+        //     }
+        //     GUILayout.EndHorizontal();
+        // }
+        
         // public void CopyVersion()
         // {
         //     var sb = new StringBuilder();
@@ -236,7 +199,7 @@ namespace Amanotes.Editor
         //     EditorGUIUtility.systemCopyBuffer = tsv;
         //     Debug.Log($"Content of version_info.tsv copied to clipboard!\n\n{tsv}\n\n");
         // }
-
+        
         void ShowAmaGDKContext()
         {
             var menu = new GenericMenu();
@@ -286,11 +249,6 @@ namespace Amanotes.Editor
             AmaGUI.SectionLabel(bannerTitle);
             var rect = GUILayoutUtility.GetLastRect();
             var btnRect = rect;
-            
-            // btnRect.x = 4f;
-            // btnRect.width = 24f; //btnRect.xMax - 
-            // btnRect.yMin = btnRect.yMax - 32f;
-            
             btnRect.xMin = btnRect.xMax - 24f; 
             btnRect.yMin = btnRect.yMax - 32f;
             
@@ -301,6 +259,55 @@ namespace Amanotes.Editor
             }
         }
 
+        void DrawGUI_GDKConfig()
+        {
+            if (cfgStatus == ConfigAssetStatus.None) RefreshConfigStatus();
+            if (cfgStatus == ConfigAssetStatus.ScriptNotFound
+                || cfgStatus == ConfigAssetStatus.AssetIsInvalid)
+            {
+                // Automatically import GDKConfigAsset
+                AssetDatabase.ImportPackage(Res.AMAGDK_CONFIG_PACKAGE, false);
+                return;
+            }
+            
+            if (cfgStatus == ConfigAssetStatus.AssetNotFound)
+            {
+                EditorGUILayout.HelpBox("[Warning] <Resources/AmaGDKConfig.asset> NOT FOUND!\nYou need to create one to control all the adapter's configurations!", MessageType.Warning);
+                GUILayout.BeginHorizontal();
+                {
+                    if (AmaGUI.BigButton("CREATE", 40f, BLUE))
+                    {
+                        ScriptableObject config = CreateInstance("Amanotes.Core.AmaGDKConfigAsset");
+                        var resourcePath = "Assets/AmaGDK/Resources";
+                        Directory.CreateDirectory(resourcePath);
+                        
+                        AssetDatabase.CreateAsset(config, Path.Combine(resourcePath, "AmaGDKConfig.asset"));
+                        AssetDatabase.SaveAssets();
+                        RefreshConfigStatus();
+                    }
+
+                    if (GUILayout.Button(EditorGUIUtility.IconContent("d_Refresh@2x"), GUILayout.Width(40f), GUILayout.Height(40f)))
+                    {
+                        RefreshConfigStatus();
+                    }
+                }
+                GUILayout.EndHorizontal();
+                return;
+            }
+            
+            if (configAsset == null)
+            {
+                Debug.LogWarning("Have you just deleted AmaGDKConfig.asset?" + cfgStatus);
+                cfgStatus = ConfigAssetStatus.None;
+                Repaint();
+                return;
+            }
+            
+            EditorGUILayout.ObjectField(configAsset, configAsset.GetType(), false, 
+                GUILayout.Width(EditorGUIUtility.currentViewWidth - 414), 
+                GUILayout.ExpandWidth(true));
+        }
+
         public override void OnInspectorGUI()
         {
             Profiler.BeginSample("GDKEditor.OnInspectorGUI()");
@@ -322,7 +329,6 @@ namespace Amanotes.Editor
                 return;
             }
             
-            
             // DrawGUI_ColorPicker();
             DrawGUI_AmaGDKBanner();
             EditorGUILayout.Space();
@@ -330,23 +336,23 @@ namespace Amanotes.Editor
 
             if (EditorApplication.isCompiling || EditorApplication.isUpdating)
             {
+                cfgStatus = ConfigAssetStatus.None;
                 EditorGUILayout.HelpBox("Please wait for UnityEditor to finish compiling or importing", MessageType.Warning);
                 Profiler.EndSample();
                 return;
             }
-
-            if (!searchedForConfig) TryLoadConfigAsset();
-            if (!adapterScanned) ScanForAdapterPackages();
-            if (!extraScanned) ScanForAdapterPackages();
-
+            
+            DrawGUI_GDKConfig();
+            
             if (configAsset == null)
             {
-                DrawGUI_ConfigMissing();
-                Repaint();
                 Profiler.EndSample();
                 return;
             }
-
+            
+            if (!adapterScanned) ScanForAdapterPackages();
+            if (!extraScanned) ScanForAdapterPackages();
+            
             configSO = new SerializedObject(configAsset);
             configSO.Update();
             DrawProperty(configSO, "common", true);
@@ -354,6 +360,7 @@ namespace Amanotes.Editor
             DrawProperty(configSO, "enableServerTime", false);
             DrawProperty(configSO, "enableGeoLocation", false);
             GUILayout.Space(8f);
+            
             for (var i = 0; i < allAdapters.Count; i++)
             {
                 var item = allAdapters[i];
@@ -364,6 +371,13 @@ namespace Amanotes.Editor
             AmaGUI.Foldout("Adapters", ref showAdapterInstaller, DrawGUI_AdapterList);
             AmaGUI.Foldout("Extras", ref showExtra, DrawGUI_ExtraList);
             EditorGUILayout.ObjectField("Config", configAsset, typeof(ScriptableObject), false);
+    
+            EditorGUILayout.Space();
+            if (GUILayout.Button("Reimport Adapters", GUILayout.Height(30)))
+            {
+                GDKAutoUpdateAdapter.ImportAdapters();
+            }
+            
             Profiler.EndSample();
         }
 
@@ -378,22 +392,6 @@ namespace Amanotes.Editor
             return result;
         }
         
-
-        private static List<Type> FindSubClassesOf(Type baseType)
-        {
-            List<Type> result = new List<Type>();
-
-            Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies();
-            foreach (Assembly assembly in assemblies)
-            {
-                if (!assembly.FullName.Contains("Assembly-CSharp")) continue;
-                if (!assembly.FullName.Contains("Editor")) continue;
-                Debug.Log(assembly.FullName);
-            }
-
-            return result;
-        }
-
         private static void RefreshListAdapters()
         {
             allAdapters = SDK_IDS
@@ -405,12 +403,12 @@ namespace Amanotes.Editor
                 .ToList();
         }
 
-        private static string FindBestAdapterFor(string adapterId)
+        private static List<string> FindPackagesFor(string adapterId)
         {
-            var matched = adapterPackages
-                .Where(item => item.ToLower().Contains(adapterId.ToLower()));
-
-            return matched.First();
+            return adapterPackages
+                .Where(item => item.ToLower().Contains(adapterId.ToLower()))
+                .OrderBy(item => item.Length)
+                .ToList();
         }
 
         private static void DrawAdapterDetail(string adapterId, Adapter2 adapter)
@@ -431,19 +429,21 @@ namespace Amanotes.Editor
                 if (adapter != null)
                 {
                     DrawSDKConfig(adapter, adapterId, status);
-                } else
+                }
+                
+                var packages = FindPackagesFor(adapterId);
+                EditorGUI.BeginDisabledGroup(!status.sdkInstalled);
                 {
-                    string adapterName = FindBestAdapterFor(adapterId);
-                    var package = $"{Res.PACKAGE_PATH}{adapterName}";
-                    EditorGUI.BeginDisabledGroup(!status.sdkInstalled);
+                    foreach (var package in packages)
                     {
-                        if (GUILayout.Button(GetGUIContent($"Import {adapterId} Adapter"), GUILayout.Height(24f)))
+                        var packagePath = $"{Res.PACKAGE_PATH}{package}";
+                        if (GUILayout.Button(GetGUIContent($"Import {package.Replace(".unitypackage", "")}"), GUILayout.Height(24f)))
                         {
-                            AssetDatabase.ImportPackage(package, false);
-                        }    
+                            AssetDatabase.ImportPackage(packagePath, false);
+                        }
                     }
-                    EditorGUI.EndDisabledGroup();
                 }
+                EditorGUI.EndDisabledGroup();
 
             }, () =>
             {
@@ -484,8 +484,6 @@ namespace Amanotes.Editor
                 }
             });
             
-
-
             if (changed) configOpen[adapterId] = isOpen;
         }
 

package/Editor/Extra/GDKAutoUpdateAdapter.cs

@@ -28,32 +28,32 @@ namespace Amanotes.Editor
             { "AndroidPostProcessor", $"{Res.EXTRA_PATH}PostProcessor.unitypackage" }
         };
         
-        private static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAssets, string[] movedAssets, string[] movedFromAssetPaths)
-        {
-            #if AMAGDK_DEV
-            return;
-            #endif
-            
-            #pragma warning disable CS0162
-            CheckImportedAssets(importedAssets);
-            #pragma warning restore CS0162
-        }
-
-        private static void CheckImportedAssets(string[] importedAssets)
-        {
-            if (importedAssets.Length == 0) return;
-            // Debug.LogWarning($"importedAssets: {string.Join("\n", importedAssets)}");
-            
-            foreach (string path in importedAssets)
-            {
-                if (!path.EndsWith("AmaGDK.cs", StringComparison.InvariantCulture)) continue;
-                ImportAdapters();
-                break;
-            }
-        }
+        // private static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAssets, string[] movedAssets, string[] movedFromAssetPaths)
+        // {
+        //     #if AMAGDK_DEV
+        //     return;
+        //     #endif
+        //     
+        //     #pragma warning disable CS0162
+        //     CheckImportedAssets(importedAssets);
+        //     #pragma warning restore CS0162
+        // }
+        //
+        // private static void CheckImportedAssets(string[] importedAssets)
+        // {
+        //     if (importedAssets.Length == 0) return;
+        //     // Debug.LogWarning($"importedAssets: {string.Join("\n", importedAssets)}");
+        //     
+        //     foreach (string path in importedAssets)
+        //     {
+        //         if (!path.EndsWith("AmaGDK.cs", StringComparison.InvariantCulture)) continue;
+        //         ImportAdapters();
+        //         break;
+        //     }
+        // }
         
         [MenuItem("Window/AmaGDK/Reimport Adapters")]
-        private static void ImportAdapters()
+        public static void ImportAdapters()
         {
             var packages = new List<string>();
             foreach (KeyValuePair<string, string> kvp in packageMap)

package/Packages/AppsFlyerAdapter.AdRevenue.unitypackage.meta

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

package/Runtime/Ad/AdLogic.cs

@@ -131,7 +131,11 @@ namespace Amanotes.Core.Internal
         private Coroutine _showAdRoutine;
         protected bool _isRequesting;
         protected bool _isInterstitial => adType == AdType.Interstitial;
+        
+        // Do not warn unused variable, it's been use outside of Editor (Runtime)
+        #pragma warning disable
         private bool isFocus;
+        #pragma warning enable
         
         public void StartShowAd()
         {
@@ -285,7 +289,7 @@ namespace Amanotes.Core.Internal
             while (!isFocus) yield return null; 
             #endif
             
-            int wait4CallbackCounter = 0;
+            var wait4CallbackCounter = 0;
             while (!context.potentiallyCompleted && wait4CallbackCounter <= MAX_FRAMES_WAIT_FOR_CALLBACK)
             {
                 wait4CallbackCounter++;

package/Runtime/Ad/AmaGDK.Ads.cs

@@ -157,7 +157,7 @@ namespace Amanotes.Core
             {
                 if (Adapter2.GetAllAdapter<AdAdapter>().Count > 1)
                 {
-                    Utils.ThrowExceptionIfEditor("Multiple AdAdapters is not supported!");                    
+                    GDKUtils.ThrowExceptionIfEditor("Multiple AdAdapters is not supported!");                    
                 }
                 _adapter = Adapter2.GetAdapter<AdAdapter>();
                 return _adapter != null;

package/Runtime/AmaGDK.Adapters.cs

@@ -6,9 +6,7 @@ using static Amanotes.Core.GDKDebug;
 
 namespace Amanotes.Core.Internal
 {
-    
-    
-    public abstract partial class Adapter2
+    public abstract class GDKInternal
     {
         protected internal enum ConfigStatus
         {
@@ -17,6 +15,11 @@ namespace Amanotes.Core.Internal
             Warning
         }
         
+        internal protected static Action<string, string, double> _onAdImpression;
+    }
+    
+    public abstract partial class Adapter2 : GDKInternal
+    {
         // internal use
         [HideInNormalInspector] [SerializeField] internal int initOrder;
         [HideInNormalInspector] [SerializeField] internal bool enabled = true;

package/Runtime/AmaGDK.Analytics.cs

@@ -415,7 +415,7 @@ namespace Amanotes.Core
                 {
                     if (eventData.isLoggedImmediately) continue;
 	                if (Config.analytics.immediatelyLoggedEvents.Contains(eventData.eventName)){
-	                	Utils.ThrowExceptionIfEditor($"This event '{eventData.eventName}' must be sent immediately by AmaGDK.Analytics.LogEvent(eventName).LogImmediately()");
+	                	GDKUtils.ThrowExceptionIfEditor($"This event '{eventData.eventName}' must be sent immediately by AmaGDK.Analytics.LogEvent(eventName).LogImmediately()");
 	                }
                     
 	                LogEventActually(eventData);
@@ -443,7 +443,7 @@ namespace Amanotes.Core
 
                 if (config.showAnalyticsLog)
                 {
-                    ForceLog($"AmaGDK [Analytics] Event <{eventNameToSend}> (in session: {countInSession}, total: {totalCount})\n{JsonUtils.DictionaryToJson(eventParams.parameters, true)}");
+                    ForceLog($"[Analytics] Event <{eventNameToSend}> (in session: {countInSession}, total: {totalCount})\n{JsonUtils.DictionaryToJson(eventParams.parameters, true)}");
                 }
                 
 	            config.quality.CheckEventQuality(eventParams.eventName, eventParams.parameters);
@@ -493,7 +493,7 @@ namespace Amanotes.Core
                 int.TryParse(eventData.parameters[ACCUMULATED_COUNT].ToString(), out int oriAccCount);
                 if (oriAccCount != countByGDK)
                 {
-                    LogWarning($"[Analytics] event <{eventData.eventName}> has difference in accumulated count. Original count: {oriAccCount}. AmaGDK count: {countByGDK}");
+                    // Log($"[Analytics] event <{eventData.eventName}>, game count: {oriAccCount}, AmaGDK count: {countByGDK}");
                     if (Config.analytics.migrateAccumulatedCount && !eventData.withinSession)
                     {
                         Log($"[Analytics] Update event count of event <{eventData.eventName}> from {countByGDK} to {oriAccCount}");
@@ -915,6 +915,27 @@ namespace Amanotes.Core
 
     public static class EventParamsExtension
     {
+        internal static string AppendEventErrorDetail(this string message, string eventName, string eventParamName, string eventParamValue)
+        {
+            return $"{message}\n{GetEventErrorDetail(eventName, eventParamName, eventParamValue)}";
+        }
+        
+        internal static string GetEventErrorDetail(string eventName, string eventParamName, string eventParamValue)
+        {
+            string key = eventParamName == null 
+                ? "null" : string.IsNullOrWhiteSpace(eventParamName)
+                ? "\"\"" 
+                : eventParamName;
+            
+            string value = eventParamValue == null
+                ? "null" : string.IsNullOrWhiteSpace(eventParamValue) 
+                ? "\"\""
+                : eventParamValue;
+            
+            return $"Event <{eventName}> {{ {key} : {value}, ... }}\n";
+        }
+        
+        
         public static void LogImmediately(this IEventParamsBuilder ap)
         {
             if (ap == null) return;
@@ -927,7 +948,7 @@ namespace Amanotes.Core
         public static IEventParamsBuilder AttachParam_TimeDiffLastFire(this IEventParamsBuilder ap)
         {
             var data = ap as EventParams;
-            return data?.AddParam("time_diff_last_fire", Utils.GetTimeDiffLastFire(data.eventName));
+            return data?.AddParam("time_diff_last_fire", GDKUtils.GetTimeDiffLastFire(data.eventName));
         }
         
         public static IEventParamsBuilder AttachParam_InternetConnectionStatus(this IEventParamsBuilder ap)
@@ -1089,35 +1110,46 @@ namespace Amanotes.Core
         {
             string eventName = (ap as EventParams)?.eventName;
             
-            var sb = GDKPool.GetStringBuilder();
-            sb.Clear();
-            NormalizeKeyString(ref key, sb, AmaGDK.Config.analytics.normalizeEventName);
-            
-            if (sb.Length > 0) LogWarningOnce($"Warning for event <{eventName}>, param <{key}>:\n{sb}", $"NormalizeParamKey <{eventName}>");
-            GDKPool.Return(sb);
-            
-            if (string.IsNullOrWhiteSpace(key))
-            {
-                LogWarning($"Param key is empty. Event name: {eventName}!");
-                return false;
-            }
-            
             if (value == null)
             {
-                LogWarning($"Param value is null. Event name: {eventName}, key: {key}!");
+                LogWarning($"[Analytics] parameter value should not be null!"
+                    .AppendEventErrorDetail(eventName, key, null)
+                );
                 return false;
             }
-
+            
             if (value is string stringValue)
             {
                 var strLimit = 100;
                 if (stringValue.Length > strLimit)
                 {
                     value = stringValue.Substring(0, strLimit);
-                    LogWarning($"Param value exceeds the length limit ({strLimit}). Event name: {eventName}, key: {key}!");    
+                    LogWarning($"[Analytics] parameter value length = {stringValue.Length} > {strLimit} chars!"
+                        .AppendEventErrorDetail(eventName, key, stringValue));
                 }
             }
 
+            string valueString;
+            if (string.IsNullOrWhiteSpace(key))
+            {
+                valueString = (string)Convert.ChangeType(value, typeof(string));
+                LogWarning($"[Analytics] parameter name should not be null or empty!"
+                        .AppendEventErrorDetail(eventName, key, valueString));
+                return false;
+            }
+            
+            StringBuilder sb = GDKPool.GetStringBuilder();
+            sb.Clear();
+            NormalizeKeyString(ref key, sb, AmaGDK.Config.analytics.normalizeEventName);
+            if (sb.Length > 0)
+            {
+                valueString = (string)Convert.ChangeType(value, typeof(string));
+                var onceKey = $"NormalizeParamKey <{eventName}>";
+                var onceMessage = $"[Analytics] normalized KeyValue applied for {GetEventErrorDetail(eventName, key, valueString)}\n{sb}";
+                LogWarningOnce(onceMessage, onceKey);
+            }
+            
+            GDKPool.Return(sb);
             return true;
         }
     }

package/Runtime/AmaGDK.cs

@@ -1,23 +1,30 @@
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Text;
-using System.Text.RegularExpressions;
-using Amanotes.Core.Internal;
 using System.Linq;
+using System.Diagnostics;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+
 using UnityEngine;
 using UnityEngine.Profiling;
+using Debug = UnityEngine.Debug;
+
+using Amanotes.Core.Internal;
 using static Amanotes.Core.GDKDebug;
 using static Amanotes.Core.Internal.Messsage;
-using Debug = UnityEngine.Debug;
+
+#if UNITY_EDITOR
+using UnityEditor;
+using UnityEditor.PackageManager;
+#endif
 
 namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.72";
+        public const string VERSION = "0.2.73";
         
         internal static Status _status = Status.None;
         private static ConfigAsset _config = null;
@@ -210,7 +217,7 @@ namespace Amanotes.Core
             LogEvent_GDKInit(Mathf.RoundToInt(initDuration));
             
             sb.Append($"\nMapping UserId: {User.UserId}\n");
-            ForceLog($"AmaGDK v{VERSION} | {READY} in {initDuration:#0.00}s\n\n{sb}");
+            ForceLog($"v{VERSION} | {READY} in {initDuration:#0.00}s\n\n{sb}");
             GDKPool.Return(sb);
         }
 
@@ -437,8 +444,8 @@ namespace Amanotes.Core
                 const string manifestPath = "Packages/manifest.json";
                 string manifestJson = File.ReadAllText(manifestPath);
 
-                string pattern = "\"com\\.amanotes\\.gdk\": \"(.*)\"";
-                string devModeEntry = $"\"com.amanotes.gdk\": \"{strDesired}\"";
+                var pattern = "\"com\\.amanotes\\.gdk\": \"(.*)\"";
+                var devModeEntry = $"\"com.amanotes.gdk\": \"{strDesired}\"";
                 
                 manifestJson = Regex.Replace(manifestJson, pattern, devModeEntry);
                 File.WriteAllText(manifestPath, manifestJson);
@@ -448,6 +455,9 @@ namespace Amanotes.Core
                     Debug.LogWarning($"AmaGDK changes to dev mode failed. The expected value is: {devModeEntry}");
                     return;
                 }
+                
+                AssetDatabase.Refresh();
+                Client.Resolve();
                 Debug.Log("AmaGDK changes to dev mode successfully");
             }
             catch (Exception e)

package/Runtime/Core/GDKDebug.cs

@@ -89,7 +89,7 @@ namespace Amanotes.Core
         {
             using (NoStackTrace.Log)
             {
-                Debug.Log($"AmaGDK {message}");   
+                Debug.Log($"AmaGDK {message}");
             }
         }
     }

package/Runtime/Fps/AmaFPS.Utils.cs

@@ -33,7 +33,11 @@ namespace Amanotes.Core
                 dictionary.Add("processor_frequency", SystemInfo.processorFrequency);
                 dictionary.Add("screen_width", resolution.width);
                 dictionary.Add("screen_height", resolution.height);
+                #if UNITY_2022_2_OR_NEWER
+                dictionary.Add("screen_refresh_rate", resolution.refreshRateRatio.value);
+                #else
                 dictionary.Add("screen_refresh_rate", resolution.refreshRate);
+                #endif
             }
             internal static void InjectDeviceStatus(Dictionary<string, object> dictionary)
             {

package/Runtime/Fps/AmaFPSVisualizer.cs

@@ -197,8 +197,13 @@ namespace Amanotes.Core
             {
                 graphic = GetComponent<Graphic>()
             };
-            
+
+            #if UNITY_2022_2_OR_NEWER
+            Application.targetFrameRate = (int)Screen.currentResolution.refreshRateRatio.value;
+            #else
             Application.targetFrameRate = Screen.currentResolution.refreshRate;
+            #endif
+
             Log($"Target FrameRate: {Application.targetFrameRate}");
         }
 

package/Runtime/GDKAudio/GDKAudio.cs

@@ -24,7 +24,7 @@ namespace Amanotes.Core
             GDKAudio.EnsureDecompressOnLoad(legacyAudioSource.clip);
             if (legacyAudioSource.gameObject.GetComponents<AudioSource>().Length > 1)
             {
-                Utils.ThrowExceptionIfEditor("GDKAudio only allows the GameObject to contain a single AudioSource component.");
+                GDKUtils.ThrowExceptionIfEditor("GDKAudio only allows the GameObject to contain a single AudioSource component.");
             }
             var instance = legacyAudioSource.gameObject.AddComponent<GDKAudio>();
             if (legacyAudioSource.clip != null)
@@ -101,7 +101,7 @@ namespace Amanotes.Core
             }
             catch (Exception ex)
             {
-                Utils.ThrowExceptionIfEditor(ex.ToString());
+                GDKUtils.ThrowExceptionIfEditor(ex.ToString());
             }
             return this;
         }
@@ -121,12 +121,12 @@ namespace Amanotes.Core
             }
             if (gameObject.GetComponents<AudioSource>().Length > 1)
             {
-                Utils.ThrowExceptionIfEditor("GDKAudio only allows the GameObject to contain a single AudioSource component.");
+                GDKUtils.ThrowExceptionIfEditor("GDKAudio only allows the GameObject to contain a single AudioSource component.");
             }
 
             if (gameObject.GetComponents<GDKAudio>().Length > 1)
             {
-                Utils.ThrowExceptionIfEditor("GDKAudio only allows the GameObject to contain a single GDKAudio component.");
+                GDKUtils.ThrowExceptionIfEditor("GDKAudio only allows the GameObject to contain a single GDKAudio component.");
             }
         }
 
@@ -140,7 +140,7 @@ namespace Amanotes.Core
         {
             if (clip != null && clip.loadType != AudioClipLoadType.DecompressOnLoad)
             {
-                Utils.ThrowExceptionIfEditor("GDKAudio only supports AudioClips with Load Type set to Decompress On Load.");
+                GDKUtils.ThrowExceptionIfEditor("GDKAudio only supports AudioClips with Load Type set to Decompress On Load.");
             }
         }
     }

package/Runtime/Internal/AmaGDK.Internal.cs

@@ -48,6 +48,7 @@ namespace Amanotes.Core.Internal
         [MenuItem("GameObject/AmaGDK/Add AmaGDK Prefab", false, 10)]
         private static void AddAmaGDKPrefab()
         {
+            AssetDatabase.ImportPackage(Res.AMAGDK_CONFIG_PACKAGE, false);
             var prefab = AssetDatabase.LoadAssetAtPath<GameObject>(AMAGDK_PREFAB);
             if (prefab == null)
             {
@@ -171,7 +172,7 @@ namespace Amanotes.Core.Internal
         }
     }
     
-    public static class Utils // Hidden Utils
+    public static partial class GDKUtils // Hidden Utils
     {
         private static readonly Dictionary<string, float> LastFireInSessions = new Dictionary<string, float>();
 

package/Runtime/Klavar/Attributes/TimeDiffLastFireAttribute.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Reflection;
+using Amanotes.Core.Internal;
 using UnityEngine;
 
 namespace Amanotes.Core
@@ -9,7 +10,7 @@ namespace Amanotes.Core
         public override object Convert(object parent, FieldInfo fieldInfo, object param)
         {
             string name = parent.GetType().FullName;
-            return Internal.Utils.GetTimeDiffLastFire(name);
+            return GDKUtils.GetTimeDiffLastFire(name);
         }
     }
 

package/package.json

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