com.amanotes.gdk 0.2.86 → 0.2.87

package/Runtime/Fps/AmaFPSVisualizer.cs

@@ -124,40 +124,62 @@ namespace Amanotes.Core
                 var stIndex = vCount <= RESOLUTION ? 0 : (vCount % RESOLUTION);
                 var nVertex = vCount <= RESOLUTION ? vCount : RESOLUTION;
 
+                GenerateFPSVertices(vh, barW, barH, barX, stIndex, nVertex);
+                DrawReferenceLines(vh, rect.width, barH);
+            }
+
+            private void GenerateFPSVertices(VertexHelper vh, float barW, float barH, float barX, int stIndex, int nVertex)
+            {
                 for (var i = 0; i < nVertex; i++)
                 {
                     var idx = (i + stIndex) % RESOLUTION;
                     var fps = fpsHistory[idx];
-                    var h = fps <= lowerFPSBoundary ? 0 :
-                                fps >= upperFPSBoundary ? 1 : (fps - lowerFPSBoundary) / (upperFPSBoundary - lowerFPSBoundary);
-
-                    var v0 = new Vector3(barX, 0, 0);
-                    var v1 = new Vector3(barX, h * barH, 0);
-                    var c1 = colors[
-                                fps <= badFPS ? 0 :
-                                fps <= acceptableFPS ? 1 :
-                                fps <= goodFPS ? 2 : 3
-                            ];
-                    var c0 = c1;
-                    c0.a = 0;
-
-                    // Add 2 vertices
-                    vh.AddVert(v0, c0, Vector2.zero);
-                    vh.AddVert(v1, c1, Vector2.zero);
-
-                    if (i > 0)
-                    {
-                        var vIndex = vh.currentVertCount - 2;
-                        vh.AddTriangle(vIndex - 2, vIndex - 1, vIndex + 1);
-                        vh.AddTriangle(vIndex - 2, vIndex + 1, vIndex);
-                    }
+                    var h = GetNormalizedHeight(fps);
 
+                    AddFPSBar(vh, barX, h * barH, fps, i > 0);
                     barX += barW;
                 }
+            }
+
+            private void AddFPSBar(VertexHelper vh, float barX, float barHeight, float fps, bool connectToPrevious)
+            {
+                var v0 = new Vector3(barX, 0, 0);
+                var v1 = new Vector3(barX, barHeight, 0);
+                var c1 = GetFPSColor(fps);
+                var c0 = c1;
+                c0.a = 0;
+
+                vh.AddVert(v0, c0, Vector2.zero);
+                vh.AddVert(v1, c1, Vector2.zero);
+
+                if (connectToPrevious)
+                {
+                    var vIndex = vh.currentVertCount - 2;
+                    vh.AddTriangle(vIndex - 2, vIndex - 1, vIndex + 1);
+                    vh.AddTriangle(vIndex - 2, vIndex + 1, vIndex);
+                }
+            }
+
+            private void DrawReferenceLines(VertexHelper vh, float width, float barH)
+            {
+                AddHorzLine(vh, width, barH * ((goodFPS-lowerFPSBoundary) / (float)(upperFPSBoundary-lowerFPSBoundary)), colors[2], 2f);
+                AddHorzLine(vh, width, barH * ((acceptableFPS-lowerFPSBoundary) / (float)(upperFPSBoundary-lowerFPSBoundary)), colors[1], 2f);
+                AddHorzLine(vh, width, barH * ((badFPS-lowerFPSBoundary) / (float)(upperFPSBoundary-lowerFPSBoundary)), colors[0], 2f);
+            }
 
-                AddHorzLine(vh, rect.width, barH * ((goodFPS-lowerFPSBoundary) / (float)(upperFPSBoundary-lowerFPSBoundary)), colors[2], 2f);
-                AddHorzLine(vh, rect.width, barH * ((acceptableFPS-lowerFPSBoundary) / (float)(upperFPSBoundary-lowerFPSBoundary)), colors[1], 2f);
-                AddHorzLine(vh, rect.width, barH * ((badFPS-lowerFPSBoundary) / (float)(upperFPSBoundary-lowerFPSBoundary)), colors[0], 2f);
+            private float GetNormalizedHeight(float fps)
+            {
+                return fps <= lowerFPSBoundary ? 0 :
+                    fps >= upperFPSBoundary ? 1 : (fps - lowerFPSBoundary) / (upperFPSBoundary - lowerFPSBoundary);
+            }
+
+            private Color GetFPSColor(float fps)
+            {
+                return colors[
+                    fps <= badFPS ? 0 :
+                    fps <= acceptableFPS ? 1 :
+                    fps <= goodFPS ? 2 : 3
+                ];
             }
 
             void AddHorzLine(VertexHelper vh, float w, float h, Color color, float thickness = 1f)

package/Runtime/Internal/AmaGDK.Utils.cs

@@ -164,19 +164,32 @@ namespace Amanotes.Core.Internal
                 return;
             }
 
+            Action<Action> nextAction = FindNextValidAction();
+            ExecuteActionOrComplete(nextAction);
+        }
+
+        private Action<Action> FindNextValidAction()
+        {
             Action<Action> nextAction = null;
             while (queue.Count > 0)
             {
                 nextAction = queue.Dequeue();
-                if (nextAction != null)
-                {
-                    isProcessing = true;
-                    nextAction.Invoke(ActionCompleted);
-                    return;
-                }
+                if (nextAction != null) break;
             }
+            return nextAction;
+        }
 
-            if (nextAction == null) onComplete?.Invoke();
+        private void ExecuteActionOrComplete(Action<Action> nextAction)
+        {
+            if (nextAction != null)
+            {
+                isProcessing = true;
+                nextAction.Invoke(ActionCompleted);
+            }
+            else
+            {
+                onComplete?.Invoke();
+            }
         }
 
         public void StartQueue()
@@ -231,17 +244,9 @@ namespace Amanotes.Core.Internal
             
             foreach (DictionaryEntry entry in inputDict)
             {
-                if (entry.Key == null || string.IsNullOrEmpty(entry.Key.ToString())) continue;
-                string key = entry.Key.ToString();
-                object value = entry.Value;
-
-                if (isFirstElement)
-                    isFirstElement = false;
-                else
-                    jsonSb.Append(",");
-
-                jsonSb.AppendFormat("{0}\"{1}\":", format ? "\n" : "", key);
-                AppendJsonValue(ref jsonSb, key, value, format, checkJsonInString);
+                if (!IsValidDictionaryEntry(entry)) continue;
+                
+                AppendDictionaryEntry(ref jsonSb, entry, ref isFirstElement, format, checkJsonInString);
             }
             
             jsonSb.AppendFormat("{0}{1}", format ? "\n" : "", "}");
@@ -251,6 +256,25 @@ namespace Amanotes.Core.Internal
             return result;
         }
 
+        private static bool IsValidDictionaryEntry(DictionaryEntry entry)
+        {
+            return entry.Key != null && !string.IsNullOrEmpty(entry.Key.ToString());
+        }
+
+        private static void AppendDictionaryEntry(ref StringBuilder jsonSb, DictionaryEntry entry, ref bool isFirstElement, bool format, bool checkJsonInString)
+        {
+            string key = entry.Key.ToString();
+            object value = entry.Value;
+
+            if (isFirstElement)
+                isFirstElement = false;
+            else
+                jsonSb.Append(",");
+
+            jsonSb.AppendFormat("{0}\"{1}\":", format ? "\n" : "", key);
+            AppendJsonValue(ref jsonSb, key, value, format, checkJsonInString);
+        }
+
         private static void GetJsonIListValue(ref StringBuilder jsonSb, string key, IList list, bool format)
         {
             jsonSb.Append("[");
@@ -258,12 +282,7 @@ namespace Amanotes.Core.Internal
 
             foreach (object item in list)
             {
-                if (isFirstElement)
-                    isFirstElement = false;
-                else
-                    jsonSb.Append(",");
-
-                if (format) jsonSb.AppendLine();
+                AppendListSeparator(ref jsonSb, ref isFirstElement, format);
                 AppendJsonValue(ref jsonSb, key, item, format, false);
             }
 
@@ -271,6 +290,16 @@ namespace Amanotes.Core.Internal
             jsonSb.Append("]");
         }
 
+        private static void AppendListSeparator(ref StringBuilder jsonSb, ref bool isFirstElement, bool format)
+        {
+            if (isFirstElement)
+                isFirstElement = false;
+            else
+                jsonSb.Append(",");
+
+            if (format) jsonSb.AppendLine();
+        }
+
         private static void AppendJsonValue(ref StringBuilder jsonSb, string key, object value, bool format, bool checkJsonInString)
         {
             if (value == null)
@@ -281,31 +310,11 @@ namespace Amanotes.Core.Internal
 
             if (value is string)
             {
-                var s = value.ToString();
-                if (checkJsonInString)
-                {
-                    if (s.StartsWith("{") && s.EndsWith("}"))
-                    {
-                        jsonSb.Append(s);
-                        return;
-                    }
-                    if (s.StartsWith("[") && s.EndsWith("]"))
-                    {
-                        jsonSb.Append(s);
-                        return;
-                    }
-                }
-                jsonSb.Append($"\"");
-                AppendEscapeJsonString(jsonSb, s);
-                jsonSb.Append($"\"");
+                AppendStringValue(ref jsonSb, value.ToString(), checkJsonInString);
                 return;
             }
 
-            if (value is int || value is float || value is double || value is long)
-            {
-                jsonSb.Append($"{value}");
-                return;
-            }
+            if (AppendNumericValue(ref jsonSb, value)) return;
 
             if (value is bool b)
             {
@@ -313,6 +322,11 @@ namespace Amanotes.Core.Internal
                 return;
             }
 
+            AppendComplexValue(ref jsonSb, key, value, format);
+        }
+
+        private static void AppendComplexValue(ref StringBuilder jsonSb, string key, object value, bool format)
+        {
             if (value is IDictionary dictionary)
             {
                 jsonSb.Append($"{DictionaryToJson(dictionary, format)}");
@@ -328,6 +342,36 @@ namespace Amanotes.Core.Internal
             jsonSb.Append($"{JsonUtility.ToJson(value, format)}");
         }
 
+        private static void AppendStringValue(ref StringBuilder jsonSb, string s, bool checkJsonInString)
+        {
+            if (checkJsonInString && IsJsonLikeString(s))
+            {
+                jsonSb.Append(s);
+                return;
+            }
+            
+            jsonSb.Append($"\"");
+            AppendEscapeJsonString(jsonSb, s);
+            jsonSb.Append($"\"");
+        }
+
+        private static bool IsJsonLikeString(string s)
+        {
+            return (s.StartsWith("{") && s.EndsWith("}"))
+                || (s.StartsWith("[") && s.EndsWith("]"));
+        }
+
+        private static bool AppendNumericValue(ref StringBuilder jsonSb, object value)
+        {
+            if (value.IsNumeric())
+            {
+                jsonSb.Append($"{value}");
+                return true;
+            }
+            
+            return false;
+        }
+
         /// <summary>
         /// Escapes a string for inclusion in a JSON document according to RFC 8259.
         /// For more details, see <a href="https://www.rfc-editor.org/rfc/rfc8259.txt">RFC 8259</a>.

package/Runtime/Internal/ForceQuitMonitor.cs

@@ -40,10 +40,22 @@ namespace Amanotes.Core.Internal
         }
         private readonly Lazy<ForceQuitData> _localData = new Lazy<ForceQuitData>(() => new ForceQuitData());
         private ForceQuitData localData => _localData.Value;
+
+        private readonly Dictionary<string, System.Action<Dictionary<string, object>>> _eventHandlers;
         
 	    public ForceQuitMonitor()
 	    {
 	    	AmaGDK.Analytics.OnEventSent += OnLogEvent;
+            _eventHandlers = new Dictionary<string, System.Action<Dictionary<string, object>>>
+            {
+                { "videoads_show_called", _ => HandleAdsShowCalled("watch_videoads") },
+                { "fullads_show_called", _ => HandleAdsShowCalled("watch_fullads") },
+                { "ad_impression", HandleAdImpression },
+                { "videoads_show_notready", _ => HandleAdsEnd() },
+                { "videoads_finish", _ => HandleAdsEnd() },
+                { "fullads_show_notready", _ => HandleAdsEnd() },
+                { "fullads_finish", _ => HandleAdsEnd() }
+            };
 	    }
 		
         private string GetStringValueOrDefault(Dictionary<string, object> dict, string key, string defaultValue = "")
@@ -55,41 +67,41 @@ namespace Amanotes.Core.Internal
         
         public void OnLogEvent(string eventNameToSend, Dictionary<string, object> parameters)
         {
-            switch (eventNameToSend)
+            if (_eventHandlers.TryGetValue(eventNameToSend, out var handler))
+            {
+                handler(parameters);
+            }
+        }
+
+        private void HandleAdsShowCalled(string reason)
+        {
+            localData.adsEvent = new AdsEvent { reason = reason };
+            localData.isDirty = true;
+        }
+
+        private void HandleAdImpression(Dictionary<string, object> parameters)
+        {
+            string adFormat = GetStringValueOrDefault(parameters, "ad_format");
+            if (adFormat == "rewarded_video" || adFormat == "interstitial") return;
+            
+            if (localData.adsEvent != null)
             {
-                case "videoads_show_called":
-                    localData.adsEvent = new AdsEvent { reason = "watch_videoads" };
-                    localData.isDirty = true;
-                    break;
-                case "fullads_show_called":
-                    localData.adsEvent = new AdsEvent { reason = "watch_fullads" };
-                    localData.isDirty = true;
-                    break;
-                case "ad_impression":
-                    string adFormat = GetStringValueOrDefault(parameters, "ad_format");
-                    if (adFormat == "rewarded_video" || adFormat == "interstitial") break;
-                    
-                    if (localData.adsEvent != null)
-                    {
-                        var detailParams = new Dictionary<string, object>
-                        {
-                            ["ad_source"] = GetStringValueOrDefault(parameters, "ad_source"),
-                            ["ad_unit_name"] = GetStringValueOrDefault(parameters, "ad_unit_name") 
-                        };
-                        localData.adsEvent.detail = JsonUtils.DictionaryToJson(detailParams);
-                        localData.SaveIfDirty(true);
-                    }
-                    break;
-                case "videoads_show_notready":
-                case "videoads_finish":
-                case "fullads_show_notready": 
-                case "fullads_finish":
-                    localData.adsEvent = null;
-                    localData.isDirty = true;
-                    break;
+                var detailParams = new Dictionary<string, object>
+                {
+                    ["ad_source"] = GetStringValueOrDefault(parameters, "ad_source"),
+                    ["ad_unit_name"] = GetStringValueOrDefault(parameters, "ad_unit_name") 
+                };
+                localData.adsEvent.detail = JsonUtils.DictionaryToJson(detailParams);
+                localData.SaveIfDirty(true);
             }
         }
 
+        private void HandleAdsEnd()
+        {
+            localData.adsEvent = null;
+            localData.isDirty = true;
+        }
+        
         public void Init()
         {
             GDKUtils.AddUnityCallbacks(this);

package/Runtime/Klavar/Attributes/MinMaxAttribute.cs

@@ -47,17 +47,26 @@ namespace Amanotes.Core
                 return;
             }
 
+            ValidateRange(parent, fieldInfo, param);
+        }
+
+        private void ValidateRange(object parent, FieldInfo fieldInfo, object param)
+        {
             double val = Convert.ToDouble(param);
             bool isMinValid = inclusiveMin ? val >= min : val > min;
             bool isMaxValid = inclusiveMax ? val <= max : val < max;
 
             if (isMinValid && isMaxValid) return;
 
+            string rangeDescription = GetRangeDescription();
+            KlavarException.ThrowErrorOnField(parent, fieldInfo, $"Field '{fieldInfo.Name}' must be in the {rangeDescription}. Current value: {param}");
+        }
+
+        private string GetRangeDescription()
+        {
             string minBracket = inclusiveMin ? "[" : "(";
             string maxBracket = inclusiveMax ? "]" : ")";
-            string rangeDescription = $"{minBracket}{min}, {max}{maxBracket}";
-
-            KlavarException.ThrowErrorOnField(parent, fieldInfo, $"Field '{fieldInfo.Name}' must be in the {rangeDescription}. Current value: {param}");
+            return $"{minBracket}{min}, {max}{maxBracket}";
         }
     }
     

package/Runtime/UI/ScrollView/GDKScrollView.cs

@@ -179,11 +179,16 @@ namespace Amanotes.Core.Internal
 
         private void EnsureItemRect(int index)
         {
-            if (!_managedItems[index].rectDirty)
-            {
-                return;
-            }
+            if (!_managedItems[index].rectDirty) return;
+
+            EnsureFirstItemRect();
+            int nearestClean = FindNearestCleanItem(index);
+            CalculateItemRects(nearestClean, index);
+            UpdateContentSize(index);
+        }
 
+        private void EnsureFirstItemRect()
+        {
             var firstItem = _managedItems[0];
             if (firstItem.rectDirty)
             {
@@ -191,29 +196,42 @@ namespace Amanotes.Core.Internal
                 firstItem.rect = CreateWithLeftTopAndSize(Vector2.zero, firstSize);
                 firstItem.rectDirty = false;
             }
+        }
 
+        private int FindNearestCleanItem(int index)
+        {
             var nearestClean = 0;
             for (var i = index; i >= 0; --i)
             {
-                if (_managedItems[i].rectDirty)
-                    continue;
+                if (_managedItems[i].rectDirty) continue;
                 nearestClean = i;
                 break;
             }
+            return nearestClean;
+        }
 
+        private void CalculateItemRects(int nearestClean, int targetIndex)
+        {
             Rect nearestCleanRect = _managedItems[nearestClean].rect;
             Vector2 curPos = GetLeftTop(nearestCleanRect);
             Vector2 size = nearestCleanRect.size;
             MovePos(ref curPos, size);
 
-            for (var i = nearestClean + 1; i <= index; i++)
+            for (var i = nearestClean + 1; i <= targetIndex; i++)
             {
                 size = GetItemSize(i);
                 _managedItems[i].rect = CreateWithLeftTopAndSize(curPos, size);
                 _managedItems[i].rectDirty = false;
                 MovePos(ref curPos, size);
             }
+        }
 
+        private void UpdateContentSize(int index)
+        {
+            var lastRect = _managedItems[index].rect;
+            Vector2 curPos = GetLeftTop(lastRect);
+            Vector2 size = lastRect.size;
+            
             var range = new Vector2(Mathf.Abs(curPos.x), Mathf.Abs(curPos.y));
             switch (layoutType)
             {
@@ -227,7 +245,6 @@ namespace Amanotes.Core.Internal
                     {
                         range.y += size.y;
                     }
-
                     break;
             }
 
@@ -328,58 +345,76 @@ namespace Amanotes.Core.Internal
 
             if (newDataCount != _managedItems.Count)
             {
-                if (_managedItems.Count < newDataCount)
-                {
-                    if (!keepOldItems)
-                    {
-                        foreach (var itemWithRect in _managedItems)
-                        {
-                            itemWithRect.rectDirty = true;
-                        }
-                    }
+                HandleDataCountChange(newDataCount, keepOldItems);
+            }
+            else
+            {
+                HandleSameDataCount(keepOldItems);
+            }
 
-                    while (_managedItems.Count < newDataCount)
-                    {
-                        _managedItems.Add(new ScrollItemWithRect());
-                    }
-                }
-                else
+            _dataCount = newDataCount;
+        }
+
+        private void HandleDataCountChange(int newDataCount, bool keepOldItems)
+        {
+            if (_managedItems.Count < newDataCount)
+            {
+                HandleDataCountIncrease(newDataCount, keepOldItems);
+            }
+            else
+            {
+                HandleDataCountDecrease(newDataCount, keepOldItems);
+            }
+        }
+
+        private void HandleDataCountIncrease(int newDataCount, bool keepOldItems)
+        {
+            if (!keepOldItems)
+            {
+                foreach (var itemWithRect in _managedItems)
                 {
-                    for (int i = 0, count = _managedItems.Count; i < count; ++i)
-                    {
-                        if (i < newDataCount)
-                        {
-                            if (!keepOldItems)
-                            {
-                                _managedItems[i].rectDirty = true;
-                            }
-
-                            if (i == newDataCount - 1)
-                            {
-                                _managedItems[i].rectDirty = true;
-                            }
-                        }
-
-                        if (i < newDataCount) continue;
-                        _managedItems[i].rectDirty = true;
-                        if (_managedItems[i].item == null) continue;
-                        RecycleOldItem(_managedItems[i].item);
-                        _managedItems[i].item = null;
-                    }
+                    itemWithRect.rectDirty = true;
                 }
             }
-            else
+
+            while (_managedItems.Count < newDataCount)
+            {
+                _managedItems.Add(new ScrollItemWithRect());
+            }
+        }
+
+        private void HandleDataCountDecrease(int newDataCount, bool keepOldItems)
+        {
+            for (int i = 0, count = _managedItems.Count; i < count; ++i)
             {
-                if (!keepOldItems)
+                if (i < newDataCount)
                 {
-                    for (int i = 0, count = _managedItems.Count; i < count; ++i)
+                    if (!keepOldItems)
+                    {
+                        _managedItems[i].rectDirty = true;
+                    }
+
+                    if (i == newDataCount - 1)
                     {
                         _managedItems[i].rectDirty = true;
                     }
                 }
+
+                if (i < newDataCount) continue;
+                _managedItems[i].rectDirty = true;
+                if (_managedItems[i].item == null) continue;
+                RecycleOldItem(_managedItems[i].item);
+                _managedItems[i].item = null;
             }
+        }
 
-            _dataCount = newDataCount;
+        private void HandleSameDataCount(bool keepOldItems)
+        {
+            if (keepOldItems) return;
+            for (int i = 0, count = _managedItems.Count; i < count; ++i)
+            {
+                _managedItems[i].rectDirty = true;
+            }
         }
 
         private void ResetCriticalItems()

package/Runtime/Utils/GDKFileUtils.cs

@@ -254,14 +254,9 @@ namespace Amanotes.Core.Internal
                     try
                     {
                         var operation = request.SendWebRequest();
-                        while (!operation.isDone)
-                        {
-                            await Task.Yield();
-                        }
+                        while (!operation.isDone) await Task.Yield();
 
-                        return request.result != UnityWebRequest.Result.Success
-                            ? null
-                            : request.downloadHandler.text;
+                        return request.result != UnityWebRequest.Result.Success ? null : request.downloadHandler.text;
                     } catch (Exception ex)
                     {
                         LogError($"[GDKFileUtils] StreamingAssets load error: {ex.Message}");

package/Runtime/Utils/GDKUtils.cs

@@ -105,6 +105,12 @@ namespace Amanotes.Core.Internal
                 yield return new WaitForSecondsRealtime(duration);
                 yield break;
             }
+            
+            yield return WaitForSecondsWithFocusHandling(duration);
+        }
+
+        private static IEnumerator WaitForSecondsWithFocusHandling(float duration)
+        {
             float elapsedTime = 0f;
             float lastTimeStamp = Time.realtimeSinceStartup;
             bool focusChangedSinceLastFrame = false;
@@ -115,19 +121,25 @@ namespace Amanotes.Core.Internal
             {
                 if (Application.isFocused)
                 {
-                    if (focusChangedSinceLastFrame)
-                    {
-                        lastTimeStamp = Time.realtimeSinceStartup;
-                        focusChangedSinceLastFrame = false;
-                    }
-                    
-                    elapsedTime += Time.realtimeSinceStartup - lastTimeStamp;
-                    lastTimeStamp = Time.realtimeSinceStartup;
+                    elapsedTime = UpdateElapsedTime(elapsedTime, ref lastTimeStamp, ref focusChangedSinceLastFrame);
                 }
                 
                 yield return null;
             }
             Application.focusChanged -= onApplicationFocusCallback;
         }
+
+        private static float UpdateElapsedTime(float elapsedTime, ref float lastTimeStamp, ref bool focusChangedSinceLastFrame)
+        {
+            if (focusChangedSinceLastFrame)
+            {
+                lastTimeStamp = Time.realtimeSinceStartup;
+                focusChangedSinceLastFrame = false;
+            }
+            
+            elapsedTime += Time.realtimeSinceStartup - lastTimeStamp;
+            lastTimeStamp = Time.realtimeSinceStartup;
+            return elapsedTime;
+        }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.amanotes.gdk",
-  "version": "0.2.86",
+  "version": "0.2.87",
   "displayName": "AmaGDK",
   "description": "Amanotes Game Development Kit",
   "unity": "2020.3",