com.amanotes.gdk 0.2.30 → 0.2.31-2

package/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog
 
-## [0.2.30 - 2023-11-06]
+## [0.2.31-2 - 2024-08-21]
+- [Fix] Exception while loading / parsing LoadJsonFromFile
+
+## [0.2.31 - 2023-11-06]
+- [Fix] False alarm when video reward ready
+- [Fix] Callbacks should trigger earlier (being delayed like 1s)
+
+## [0.2.3 - 2023-11-06]
 - [Fix] GDK should base on realtime instead of game time (which may be pause due to timescale)
 
 ## [0.2.29 - 2023-11-03]

package/Runtime/AmaGDK.Ads.cs

@@ -216,7 +216,7 @@ namespace Amanotes.Core
                     return context.adType == AdType.VideoReward;
                 }
             }
-
+            
             private static bool _isBannerShowing;
             public static void ShowBanner(BannerPosition? bannerPosition = null)
             {
@@ -589,7 +589,7 @@ namespace Amanotes.Core.Internal
             ShowAdContext context = Ads.context;
             while (!context.potentiallyCompleted)
             {
-                yield return wait1Sec;
+                yield return null; // callback as quickly as possible
             }
 
             if (adType == AdType.Interstitial)
@@ -601,7 +601,7 @@ namespace Amanotes.Core.Internal
             if (context.hasFailedOrCancelled)
             {
                 Log($"[Ad] {adType} Waiting for [close]");
-                yield return wait1Sec; // wait for close (1s)
+                yield return null;
                 ShowAdRoutineCompleted(false);
                 yield break;
             }
@@ -611,17 +611,17 @@ namespace Amanotes.Core.Internal
                 while (!context.hasFailedOrCancelled && !context.hasReward)
                 {
                     Log($"[Ad] {adType} Waiting for [cancel] or [reward]");
-                    yield return wait1Sec;
+                    yield return null;
                 }
 
                 ShowAdRoutineCompleted(!context.hasFailedOrCancelled);
                 yield break;
             }
-
+            
             while (!context.hasClosed)
             {
                 Log($"[Ad] {adType} Waiting for [close]");
-                yield return wait1Sec;
+                yield return null;
             }
 
             ShowAdRoutineCompleted(true);
@@ -809,7 +809,7 @@ namespace Amanotes.Core.Internal
         {
             Log($"[Ad] {adType} OnAdLoadSuccess");
             
-            if (!_isRequesting)
+            if (!_isRequesting && adType == AdType.Interstitial)
             {
                 LogWarning("[Ad] Something wrong? OnAdReady called when no ad is loading! AdType=" + adType);
             }

package/Runtime/AmaGDK.Utils.cs

@@ -253,14 +253,21 @@ namespace Amanotes.Core.Internal
     {
         public static T LoadJsonFromFile<T>(this T instance) where T : IJsonFile, new()
         {
-            if (instance == null)
-            {
-                var result = new T();
-                instance = result;
-            }
+            instance ??= new T();
+            
             string fileName = instance.GetType().Name;
             string json = GDKFileUtils.Load(fileName);
-            JsonUtility.FromJsonOverwrite(json, instance);
+            if (!string.IsNullOrEmpty(json))
+            {
+                try
+                {
+                    JsonUtility.FromJsonOverwrite(json, instance);
+                } catch (Exception e)
+                {
+                    LogWarning("LoadJsonFromFile error: " + fileName + "\n" + e);
+                }
+            }
+            
             return instance;
         }
 

package/Runtime/AmaGDK.cs

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

package/package.json

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