com.amanotes.gdk 0.2.71 → 0.2.73-1

package/Runtime/AmaGDK.Analytics.cs

@@ -6,7 +6,7 @@ using Amanotes.Core.Internal;
 using UnityEngine;
 using UnityEngine.Profiling;
 using static Amanotes.Core.AmaGDK.Analytics;
-using static Amanotes.Core.Internal.Logging;
+using static Amanotes.Core.GDKDebug;
 
 namespace Amanotes.Core
 {
@@ -25,9 +25,9 @@ namespace Amanotes.Core
                 get => Config.analytics.showAnalyticsLog;
             }
 
-            public interface IEventParamsBuilder { }
+            public interface IEventParamsBuilder { }            
 
-            public class EventParams : IEventParamsBuilder, GDKPool.IPoolItem
+            public class EventParams : IEventParamsBuilder, IPoolItem
             {
                 public string eventName { get; private set; }
                 public readonly Dictionary<string, object> parameters = new Dictionary<string, object>();
@@ -56,7 +56,6 @@ namespace Amanotes.Core
 
                 internal EventParams SetEventName(string eventName)
                 {
-	                // Debug.Log($"SetEventName --> {this} : {GetHashCode()}");
                     this.eventName = eventName;
                     return this;
                 }
@@ -74,8 +73,6 @@ namespace Amanotes.Core
                     
                     GDKPool.ReturnAndNullize(ref ignoreAdapterIds);
                     GDKPool.ReturnAndNullize(ref allowAdapterIds);
-                    
-                    //Debug.Log($"Reset --> {this} : {GetHashCode()}");
                     _detail = null;
                 }
                 
@@ -313,6 +310,7 @@ namespace Amanotes.Core
             internal static readonly List<AnalyticsAdapter> listAdapters = new List<AnalyticsAdapter>();
             internal static readonly AnalyticsData localData = new AnalyticsData().LoadJsonFromFile().BuildCache();
             internal static SessionStat sessionStat;
+            internal static readonly GDKPool.Pool<EventParams> epPool = new GDKPool.Pool<EventParams>(1);
             
             internal static readonly Dictionary<string, string> reservedPrefixes = new Dictionary<string, string>()
             {
@@ -377,7 +375,7 @@ namespace Amanotes.Core
             internal static EventParams PrepareEvent(string eventName)
             {
                 PrepareEventCheck(eventName);
-                var result = GDKPool.Take<EventParams>().SetEventName(eventName);
+                var result = epPool.Get().SetEventName(eventName);
                 PostPrepareEventProcess(result);
                 return result;
             }
@@ -386,7 +384,7 @@ namespace Amanotes.Core
             {
                 if (parameters == null) return PrepareEvent(eventName);
                 PrepareEventCheck(eventName);
-                var result = GDKPool.Take<EventParams>().SetEventName(eventName);
+                var result = epPool.Get().SetEventName(eventName);
                 result.AddParam(parameters);
                 PostPrepareEventProcess(result);
                 return result;
@@ -396,7 +394,7 @@ namespace Amanotes.Core
             {
                 if (parameters == null) return PrepareEvent(eventName);
                 PrepareEventCheck(eventName);
-                var result = GDKPool.Take<EventParams>().SetEventName(eventName);
+                var result = epPool.Get().SetEventName(eventName);
                 for (var i = 0; i < parameters.Length; i++)
                 {
                     result.AddParam(parameters[i].Item1, parameters[i].Item2);
@@ -417,11 +415,11 @@ 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);
-                    GDKPool.Return(eventData);
+                    epPool.Return(eventData);
                 }
 
                 localData.SaveIfDirty();
@@ -445,7 +443,7 @@ namespace Amanotes.Core
 
                 if (config.showAnalyticsLog)
                 {
-                    Debug.Log($"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);
@@ -476,7 +474,7 @@ namespace Amanotes.Core
             internal static void LogEventImmediately(EventParams eventParams)
 	        {
 	            LogEventActually(eventParams);
-                GDKPool.Return(eventParams);
+                epPool.Return(eventParams);
                 sessionStat?.Save();
                 localData.SaveIfDirty();
             }
@@ -495,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}");
@@ -519,7 +517,7 @@ namespace Amanotes.Core
             {
                 Profiler.BeginSample("AmaGDK.Analytics.NormalizeEventName()");
                 {
-                    var warningLog = GDKPool.TakeStringBuilder(8192);
+                    var warningLog = GDKPool.GetStringBuilder(8);
                     NormalizeKeyString(ref eventName, warningLog, dryRun);
                     if (reservedEvents.Contains(eventName))
                     {
@@ -541,9 +539,9 @@ namespace Amanotes.Core
                 
                 Profiler.BeginSample("AmaGDK.Analytics.NormalizeKeyString()");
                 {
-                    bool willLog = Config.common.logLevel != LogLevel.None;
-                    var tempLog = willLog ? GDKPool.TakeStringBuilder() : null;
-                    var tempKey = GDKPool.TakeStringBuilder();
+                    var willLog = Config.common.logLevel != LogLevel.None;
+                    var tempLog = willLog ? GDKPool.GetStringBuilder() : null;
+                    var tempKey = GDKPool.GetStringBuilder();
                     
                     var hasChanged = false;
                     var trimKey = key.Trim();
@@ -917,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;
@@ -929,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)
@@ -983,7 +1002,7 @@ namespace Amanotes.Core
             }
 
             eventData.overrideConfig = true;
-            eventData.ignoreAdapterIds ??= GDKPool.TakeHashSet();
+            eventData.ignoreAdapterIds ??= GDKPool.GetHashSet();
             
             foreach (string mId in analyticIds)
             {
@@ -1009,18 +1028,7 @@ namespace Amanotes.Core
             }
 
             eventData.overrideConfig = true;
-            if (eventData.allowAdapterIds != null)
-            {
-                LogWarning($"OnlyTo() why should allowAdapterIds != null? ({eventData.allowAdapterIds.Count})");
-                return ap;
-            }
-            
-            eventData.allowAdapterIds = GDKPool.TakeHashSet();
-            if (eventData.allowAdapterIds.Count != 0)
-            {
-                Debug.Break();
-                throw new Exception($"GDKPool.TakeHashSet() should return empty HashSet! ({eventData.GetHashCode()})");
-            }
+            eventData.allowAdapterIds ??= GDKPool.GetHashSet();
             
             foreach (string mId in analyticIds)
             {
@@ -1102,35 +1110,46 @@ namespace Amanotes.Core
         {
             string eventName = (ap as EventParams)?.eventName;
             
-            var sb = GDKPool.TakeStringBuilder();
-            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.Config.cs

@@ -84,13 +84,7 @@ namespace Amanotes.Core.Internal
 #endif
     }
     
-    public enum LogLevel
-    {
-        None,
-        Error,
-        Warning,
-        Verbose
-    }
+    
 
     [Serializable]
     public partial class SDKConfig

package/Runtime/AmaGDK.Consent.cs

@@ -1,6 +1,7 @@
 using System;
 using Amanotes.Core.Internal;
 using UnityEngine;
+using static Amanotes.Core.GDKDebug;
 
 namespace Amanotes.Core
 {
@@ -15,7 +16,7 @@ namespace Amanotes.Core
                 
                 if (_onGoingRequestAllConsents)
                 {
-                    Logging.LogWarning($"[Consent] RequestAllConsents is called multiple times.");
+                    LogWarning($"[Consent] RequestAllConsents is called multiple times.");
                     return;
                 }
                 
@@ -49,7 +50,7 @@ namespace Amanotes.Core
                     get
                     {
                         if (checkedATT) return allowedATT;
-                        Logging.LogWarning("[Consent] ATT has not completed yet");
+                        LogWarning("[Consent] ATT has not completed yet");
                         return false;
                     }
                 }
@@ -85,7 +86,7 @@ namespace Amanotes.Core
                         
                         if (!ConsentHook.IsRequiredCMP.HasValue)
                         {
-                            Logging.LogWarningOnce("[Consent] CMP is not available or not ready");
+                            LogWarningOnce("[Consent] CMP is not available or not ready");
                             return false;
                         }
     
@@ -169,7 +170,7 @@ namespace Amanotes.Core
                 var tmpAction = _onConsentComplete;
                 _onConsentComplete = null;
                 tmpAction?.Invoke();
-                Logging.Log("[Consent] End consent checking");
+                Log("[Consent] End consent checking");
             }
         }
     }
@@ -192,7 +193,7 @@ namespace Amanotes.Core
             {
                 if (_tryToShowCMP != null) return _tryToShowCMP;
                 
-                Logging.LogWarning("[Consent] ConsentHook.TryToShowCMP is null");
+                LogWarning("[Consent] ConsentHook.TryToShowCMP is null");
                 _tryToShowCMP = callback => callback(false);
                 return _tryToShowCMP;
             }
@@ -206,7 +207,7 @@ namespace Amanotes.Core
             {
                 if (_forceShowCMP != null) return _forceShowCMP;
                 
-                Logging.LogWarning("[Consent] ConsentHook.ForceShowCMP is null");
+                LogWarning("[Consent] ConsentHook.ForceShowCMP is null");
                 _forceShowCMP = callback => callback(false);
                 return _forceShowCMP;
             }
@@ -220,7 +221,7 @@ namespace Amanotes.Core
             {
                 if (_setNotRequiredCMP != null) return _setNotRequiredCMP;
                 
-                Logging.LogWarning("[Consent] ConsentHook.SetNotRequiredCMP is null");
+                LogWarning("[Consent] ConsentHook.SetNotRequiredCMP is null");
                 _setNotRequiredCMP = callback => callback(false);
                 return _setNotRequiredCMP;
             }
@@ -234,7 +235,7 @@ namespace Amanotes.Core
             {
                 if (_attRequest != null) return _attRequest;
                 
-                Logging.LogWarning("[Consent] ConsentHook.ATTRequest is null");
+                LogWarning("[Consent] ConsentHook.ATTRequest is null");
                 _attRequest = callback => callback(false);
                 return _attRequest;
             }

package/Runtime/AmaGDK.Context.cs

@@ -1,4 +1,4 @@
-using static Amanotes.Core.Internal.Logging;
+using static Amanotes.Core.GDKDebug;
 
 namespace Amanotes.Core
 {

package/Runtime/AmaGDK.Device.cs

@@ -2,6 +2,7 @@ using System;
 using System.Text;
 using Amanotes.Core.Internal;
 using UnityEngine;
+using static Amanotes.Core.GDKDebug;
 
 namespace Amanotes.Core
 {
@@ -67,14 +68,14 @@ namespace Amanotes.Core.Internal
             
             if (AmaGDK.Config.common.logLevel == LogLevel.Verbose)
             {
-                var stringBuilder = GDKPool.TakeStringBuilder();
+                var stringBuilder = GDKPool.GetStringBuilder();
                 stringBuilder.Append("Device info:");
                 stringBuilder.AppendLine("DeviceSpec: " + result);
                 stringBuilder.AppendLine("systemMemorySize: " + SystemInfo.systemMemorySize);
                 stringBuilder.AppendLine("processorCount: " + SystemInfo.processorCount);
                 stringBuilder.AppendLine("processorFrequency: " + SystemInfo.processorFrequency);
                 stringBuilder.AppendLine("graphicsMemorySize: " + SystemInfo.graphicsMemorySize);    
-                Logging.Log(GDKPool.ReturnAndStringify(stringBuilder));
+                Log(GDKPool.ReturnString(stringBuilder));
             }
             
             return result;

package/Runtime/AmaGDK.IAP.cs

@@ -6,7 +6,7 @@ using UnityEngine;
 using Amanotes.Core.Internal;
 
 using static Amanotes.Core.AmaGDK.IAP;
-using static Amanotes.Core.Internal.Logging;
+using static Amanotes.Core.GDKDebug;
 
 namespace Amanotes.Core
 {

package/Runtime/AmaGDK.RemoteConfig.cs

@@ -6,7 +6,7 @@ using UnityEngine;
 using Amanotes.Core.Internal;
 using UnityEngine.Profiling;
 using UnityEngine.Serialization;
-using static Amanotes.Core.Internal.Logging;
+using static Amanotes.Core.GDKDebug;
 
 #if UNITY_EDITOR
 using UnityEditor;
@@ -214,7 +214,7 @@ namespace Amanotes.Core
                 Profiler.BeginSample("AmaGDK.RemoteConfig.SaveCache()");
                 
                 _fetchState = FetchState.SaveCache;
-                StringBuilder sb = GDKPool.TakeStringBuilder(8192);
+                StringBuilder sb = GDKPool.GetStringBuilder(8);
                 
                 //Add embedded remote config version to force load from embedded config after app update
                 sb.AppendLine($"{VERSION_PREFIX}{EmbedVersion}");

package/Runtime/AmaGDK.Singleton.cs

@@ -1,6 +1,6 @@
 
 using System.Threading;
-using static Amanotes.Core.Internal.Logging;
+using static Amanotes.Core.GDKDebug;
 using static Amanotes.Core.Internal.Messsage;
 
 namespace Amanotes.Core

package/Runtime/AmaGDK.UserProfile.cs

@@ -3,6 +3,7 @@ using System.Text.RegularExpressions;
 using Amanotes.Core.Internal;
 using System.Collections.Generic;
 using UnityEngine;
+using static Amanotes.Core.GDKDebug;
 
 namespace Amanotes.Core
 {
@@ -70,7 +71,7 @@ namespace Amanotes.Core
                 {
                     if (_userId == value) return;
                     _userId = value;
-                    Logging.Log($"GDK UserID Updated: {_userId}");
+                    Log($"GDK UserID Updated: {_userId}");
                     dispatcher.Dispatch(Event.GDK_USER_ID_UPDATED, _userId);
                     _dirty = true;
                     if (isReady) SendMapUserId();
@@ -84,7 +85,7 @@ namespace Amanotes.Core
                 {
                     if (!ValidateId(value, ALPHANUMERIC_HYPHEN_PATTERN))
                     {
-                        Logging.LogError($"[UserProfile] Wrong format for GAId. Value: {value}");
+                        LogError($"[UserProfile] Wrong format for GAId. Value: {value}");
                         return;
                     }
                     _gaid = value;
@@ -99,7 +100,7 @@ namespace Amanotes.Core
                 {
                     if (!ValidateId(value, ALPHANUMERIC_HYPHEN_PATTERN))
                     {
-                        Logging.LogError($"[UserProfile] Wrong format for IDFA. Value: {value}");
+                        LogError($"[UserProfile] Wrong format for IDFA. Value: {value}");
                         return;
                     }
                     _idfa = value;
@@ -114,7 +115,7 @@ namespace Amanotes.Core
                 {
                     if (!ValidateId(value, ALPHANUMERIC_HYPHEN_PATTERN))
                     {
-                        Logging.LogError($"[UserProfile] Wrong format for IDFV. Value: {value}");
+                        LogError($"[UserProfile] Wrong format for IDFV. Value: {value}");
                         return;
                     }
                     _idfv = value;
@@ -129,7 +130,7 @@ namespace Amanotes.Core
                 {
                     if (!ValidateId(value, ALPHANUMERIC_PATTERN))
                     {
-                        Logging.LogError($"[UserProfile] Wrong format for AndroidId. Value: {value}");
+                        LogError($"[UserProfile] Wrong format for AndroidId. Value: {value}");
                         return;
                     }
                     _androidId = value;
@@ -144,7 +145,7 @@ namespace Amanotes.Core
                 {
                     if (!ValidateId(value, ALPHANUMERIC_PATTERN))
                     {
-                        Logging.LogError($"[UserProfile] Wrong format for PseudoId. Value: {value}");
+                        LogError($"[UserProfile] Wrong format for PseudoId. Value: {value}");
                         return;
                     }
                     _pseudoId = value;
@@ -163,7 +164,7 @@ namespace Amanotes.Core
 #endif
                     if (!ValidateId(value, pattern))
                     {
-                        Logging.LogError($"[UserProfile] Wrong format for AmaDeviceId. Value: {value}");
+                        LogError($"[UserProfile] Wrong format for AmaDeviceId. Value: {value}");
                         return;
                     }
                     _amaDeviceId = value;
@@ -179,7 +180,7 @@ namespace Amanotes.Core
                 {
                     if (!Application.isEditor && !ValidateId(value, NUMERIC_HYPHEN_PATTERN))
                     {
-                        Logging.LogError($"[UserProfile] Wrong format for AppsFlyerId. Value: {value}");
+                        LogError($"[UserProfile] Wrong format for AppsFlyerId. Value: {value}");
                         return;
                     }
                     _appsFlyerId = value;
@@ -194,7 +195,7 @@ namespace Amanotes.Core
                 {
                     if (!ValidateId(value, ALPHANUMERIC_PATTERN))
                     {
-                        Logging.LogError($"[UserProfile] Wrong format for InstallationId. Value: {value}");
+                        LogError($"[UserProfile] Wrong format for InstallationId. Value: {value}");
                         return;
                     }
                     _installationId = value;
@@ -325,7 +326,7 @@ namespace Amanotes.Core
             {
                 // Always get the latest advertising id
                 GetAdvertisingId();
-                Logging.Log($"[UserProfile] user_id: {_userId}");
+                Log($"[UserProfile] user_id: {_userId}");
                 GDKUtils.OnFrameUpdate(SaveIfDirty);
                 
                 var adsId = Application.platform == RuntimePlatform.Android ? GAId : IDFA;
@@ -394,7 +395,7 @@ namespace Amanotes.Core
                         AmaDeviceId = SystemInfo.deviceUniqueIdentifier;
                         break;
                 }
-                Logging.Log($"[UserProfile] Generate ama_device_id: {_amaDeviceId}");
+                Log($"[UserProfile] Generate ama_device_id: {_amaDeviceId}");
                 Save();
             }
 

package/Runtime/AmaGDK.asmdef

@@ -4,7 +4,7 @@
     "references": [],
     "includePlatforms": [],
     "excludePlatforms": [],
-    "allowUnsafeCode": false,
+    "allowUnsafeCode": true,
     "overrideReferences": false,
     "precompiledReferences": [],
     "autoReferenced": 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 static Amanotes.Core.Internal.Logging;
-using static Amanotes.Core.Internal.Messsage;
 using Debug = UnityEngine.Debug;
 
+using Amanotes.Core.Internal;
+using static Amanotes.Core.GDKDebug;
+using static Amanotes.Core.Internal.Messsage;
+
+#if UNITY_EDITOR
+using UnityEditor;
+using UnityEditor.PackageManager;
+#endif
+
 namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.71";
+        public const string VERSION = "0.2.73-1";
         
         internal static Status _status = Status.None;
         private static ConfigAsset _config = null;
@@ -47,7 +54,7 @@ namespace Amanotes.Core
             {
                 if (_config != null) return _config;
                 _config = Resources.Load<ConfigAsset>("AmaGDKConfig");
-                // if (_config == null) LogWarningOnce(CONFIG_NOT_FOUND);
+                GDKDebug.logLevel = _config.common.logLevel;
                 return _config;
             }
         }
@@ -176,7 +183,7 @@ namespace Amanotes.Core
             }
             
             var startTime = Time.realtimeSinceStartup;
-	        var sb = GDKPool.TakeStringBuilder(1024);
+            var sb = GDKPool.GetStringBuilder();
 
             InitModules();
             
@@ -210,7 +217,7 @@ namespace Amanotes.Core
             LogEvent_GDKInit(Mathf.RoundToInt(initDuration));
             
             sb.Append($"\nMapping UserId: {User.UserId}\n");
-            Debug.Log($"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);
         }
 
@@ -265,8 +272,8 @@ namespace Amanotes.Core
         
         public static LogLevel logLevel
         {
-            get => Config.common.logLevel;
-            set => Config.common.logLevel = value;
+            get => _config == null ? Config.common.logLevel : GDKDebug.logLevel;
+            set => GDKDebug.logLevel = value;
         }
         
         public static void Init(Action onReady = null)
@@ -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)