com.amanotes.gdk 0.2.41 → 0.2.43

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.2.43 - 2023-12-06]
+- [Fix] Support AmaDeviceId on Standalone
+
+## [0.2.42 - 2023-11-28]
+- [Fix] AdShowNotReady only trigger for 3 type of status
+- [Fix] WaitForSeconds can not be shared between different routines
+
 ## [0.2.41 - 2023-11-28]
 - Add more state callbacks for AdShowReadyStatus
 - Fix not wait for RewardCancel event (not exist any more)

package/Runtime/AmaGDK.Ads.cs

@@ -452,8 +452,6 @@ namespace Amanotes.Core.Internal
 
     public abstract class AdLogic
     {
-        private static readonly WaitForSecondsRealtime wait1Sec = new WaitForSecondsRealtime(1f);
-
         internal LoadAdsState _loadState = LoadAdsState.None;
         internal bool hasAd
         {
@@ -506,6 +504,7 @@ namespace Amanotes.Core.Internal
                 yield break;
             }
             
+            var wait1Sec = new WaitForSecondsRealtime(1f);
             Log("[Ad] LoadAdRoutine start(): isAdReady = " + isAdReady);
             while (true)
             {
@@ -654,6 +653,7 @@ namespace Amanotes.Core.Internal
                 bool? hasInternet = null;
                 _instance.StartCoroutine(WebUtils.CheckInternet(result => hasInternet = result));
                 
+                var wait1Sec = new WaitForSecondsRealtime(1f);
                 while (counter < timeout || timeout == -1)
                 {
                     yield return wait1Sec;
@@ -875,22 +875,21 @@ namespace Amanotes.Core.Internal
 
         protected void OnAdShowReadyStatus(bool isReady, AdShowReadyStatus status)
         {
-            if (Ads.context != null)
+            if (Ads.context == null)
             {
+                LogWarning("[Ad] OnAdOpen() Something wrong - No AdContext");
+                return;
+            }
+            
                 Ads.context.adCallback |= AdCallback.ShowReadyStatus;
-                if (!isReady)
-                {
                     Ads.context.onAdShowReadyStatus?.Invoke(status);
-                    OnAdShowNotReady(status);
-                } else
+            if (status == AdShowReadyStatus.Ready)
                 {
-                    Ads.context.onAdShowReadyStatus?.Invoke(AdShowReadyStatus.Ready);
                     OnAdShowReady();
                 }
-            }
-            else
+            else if (status == AdShowReadyStatus.NoInternet || status == AdShowReadyStatus.TimeOut || status == AdShowReadyStatus.Wifi3GDisabled)
             {
-                LogWarning("[Ad] OnAdOpen() Something wrong - No AdContext");
+                OnAdShowNotReady(status);    
             }
         }
         

package/Runtime/AmaGDK.UserProfile.cs

@@ -33,7 +33,11 @@ namespace Amanotes.Core
         {
             public string UserId
             {
-                get => _userId;
+                get
+                {
+                    if (string.IsNullOrWhiteSpace(_userId)) UpdateUserId();
+                    return _userId;
+                }
                 private set
                 {
                     _userId = value;
@@ -72,24 +76,20 @@ namespace Amanotes.Core
                 set => _pseudoId = ValidateId(value, ALPHANUMERIC_PATTERN);
             }
             
-            #if UNITY_IOS
+            #if UNITY_ANDROID
             public string AmaDeviceId
             {
                 get => _amaDeviceId;
-                set => _amaDeviceId = ValidateId(value, ALPHANUMERIC_HYPHEN_PATTERN);
+                set => _amaDeviceId = ValidateId(value, ALPHANUMERIC_PATTERN);
             }
-            #endif
-            
-            #if UNITY_ANDROID
+            #else
             public string AmaDeviceId
             {
                 get => _amaDeviceId;
-                set => _amaDeviceId = ValidateId(value, ALPHANUMERIC_PATTERN);
+                set => _amaDeviceId = ValidateId(value, ALPHANUMERIC_HYPHEN_PATTERN);
             }
             #endif
-            
-            
-            
+
             public string AppsFlyerId
             {
                 get => _appsFlyerId;

package/Runtime/AmaGDK.cs

@@ -15,7 +15,7 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.41";
+        public const string VERSION = "0.2.43";
 
         internal static AmaGDK _instance;
         internal static Status _status = Status.None;
@@ -120,12 +120,11 @@ namespace Amanotes.Core
                 adapterAnnounce.AppendLine(string.Format("[{0}] {1} (adapter v{2})", adapter.IsReady ? "OK" : "FAIL",
                     adapter.adapterId, adapter.adapterVersion));
 
-                if (adapter.adapterId == AdapterID.FIREBASE_ANALYTICS) User.UpdateUserId();
-
                 // Wait for postprocessing of each adapter
                 yield return null;
             }
             _onAdapterReadyCallback = null;
+            User.UpdateUserId();
 
             // Init modules (Adapter managers)
             Analytics.Init();
@@ -212,6 +211,13 @@ namespace Amanotes.Core
                 LogWarning("Cannot add a null callback!");
                 return;
             }
+
+            if (isReady)
+            {
+                onReady.Invoke();
+                return;
+            }
+            
             _onReadyCallback -= onReady;
             _onReadyCallback += onReady;
         }

package/package.json

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

package/Packages/AppsFlyerAdRevenuePlugin.unitypackage.meta

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