com.amanotes.gdk 0.2.35 → 0.2.37

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [0.2.37 - 2023-11-21]
+- Improve GDK logs
+- Banner will not show when ad adapter is not ready
+- Fix ama_device_id on Android
+
+## [0.2.36 - 2023-11-15]
+- Add OnAdShowReadyStatus callback
+- Revamp AdEventTracking
+
 ## [0.2.35 - 2023-11-14]
 - [Fix] Save UserID
 

package/Runtime/AmaGDK.Ads.cs

@@ -58,7 +58,15 @@ namespace Amanotes.Core
             return ad;
         }
         
-        public static IAdCallback OnAdResult(this IAdCallback ad, Action<AdResult> callback)
+        public static IAdCallback OnAdShowReadyStatus(this IAdCallback ad, Action<AdShowReadyStatus> callback)
+        {
+            if (!MakeSureAdNotNull(ad)) return null;
+            Ads.context.onAdShowReadyStatus -= callback;
+            Ads.context.onAdShowReadyStatus += callback;
+            return ad;
+        }
+        
+        public static IAdCallback OnAdResult(this IAdCallback ad, Action<bool> callback)
         {
             if (!MakeSureAdNotNull(ad)) return null;
             Ads.context.onResult -= callback;
@@ -82,10 +90,15 @@ namespace Amanotes.Core
         [Serializable]
         internal class AdStat
         {
-            internal int lastSuccessTime;
+            // per session
+            internal float lastCallTime;
+            internal int callCount;
+            
+            internal float lastSuccessTime;
             internal int success;
             internal int failed;
-
+            
+            // persistent
             public int successTotal;
             public int failedTotal;
         }
@@ -96,11 +109,26 @@ namespace Amanotes.Core
             public AdStat interstitial = new AdStat();
             public AdStat reward = new AdStat();
 
-            internal int TimeSinceLastShow(AdType adType)
+            internal AdStat GetStat(AdType adType)
             {
-                return (int)(Time.realtimeSinceStartup - (adType == AdType.Interstitial ? interstitial.lastSuccessTime : reward.lastSuccessTime));
+                return adType == AdType.Interstitial ? interstitial : reward;
+            }
+            
+            internal int ShowCallCount(AdType adType)
+            {
+                return GetStat(adType).callCount;
+            }
+            
+            internal int TimeSinceLastShowCalled(AdType adType)
+            {
+                return (int)(Time.realtimeSinceStartup - GetStat(adType).lastCallTime);
             }
 
+            internal int TimeSinceLastShowSuccess(AdType adType)
+            {
+                return (int)(Time.realtimeSinceStartup - GetStat(adType).lastSuccessTime);
+            }
+            
             internal void Save()
             {
                 this.SaveJsonToFile();
@@ -110,12 +138,10 @@ namespace Amanotes.Core
         [Serializable]
         public class AdAdapterConfig
         {
-            public bool autoInit;
+            // public bool manualInit;
             public int adLoadTimeoutInSecs = 60;
             public int adShowTimeoutInSecs = 5;
             public BannerPosition bannerPosition = BannerPosition.BOTTOM;
-
-            public bool checkInternet = true;
             public bool autoLogEvent = true;
 
             public bool enableInterstitial = true;
@@ -149,6 +175,12 @@ namespace Amanotes.Core
                 _adConfig = ((AdapterContext)_adapter)?.GetAdapterConfig<AdAdapterConfig>();
                 _adapter?.interstitial.StartLoadAd();
                 _adapter?.rewardVideo.StartLoadAd();
+
+                if (_isBannerShowing)
+                {
+                    _isBannerShowing = false;
+                    ShowBanner(_showingBannerPosition);
+                }
             }
 
             public static bool HasInterstitial => _adapter.interstitial.hasAd;
@@ -219,19 +251,28 @@ namespace Amanotes.Core
             }
             
             private static bool _isBannerShowing;
+            private static BannerPosition? _showingBannerPosition = null;
+            
             public static void ShowBanner(BannerPosition? bannerPosition = null)
             {
                 if (_isBannerShowing) return;
                 _isBannerShowing = true;
-
-                if (bannerPosition.HasValue)
+                _showingBannerPosition = bannerPosition;
+                
+                if (_adapter == null)
                 {
-                    _adapter.ShowBanner(bannerPosition.Value);
+                    //Debug.LogWarning("Adapter not found???");
+                    return;
                 }
-                else
+
+                if (_adConfig == null)
                 {
-                    _adapter.ShowBanner(_adConfig.bannerPosition);
+                    //Debug.LogWarning("_adConfig not found???");
+                    return;
                 }
+
+                _showingBannerPosition = bannerPosition ?? _adConfig.bannerPosition;
+                _adapter.ShowBanner(_showingBannerPosition.Value);
             }
 
             public static void HideBanner()
@@ -252,12 +293,15 @@ namespace Amanotes.Core
                     _adapter.rewardVideo.StopShowAd();
             }
 
-            public static int TimeSinceLastInterstitial => localData.TimeSinceLastShow(AdType.Interstitial);
+            public static int TimeSinceLastInterstitialSucceed => localData.TimeSinceLastShowSuccess(AdType.Interstitial);
+            public static int TimeSinceLastVideoRewardSucceed => localData.TimeSinceLastShowSuccess(AdType.VideoReward);
+            public static int TimeSinceLastAdSucceed => Math.Min(TimeSinceLastInterstitialSucceed, TimeSinceLastVideoRewardSucceed) ;
+            public static int TimeSinceLastInterstitialShowCalled => localData.TimeSinceLastShowCalled(AdType.Interstitial);
+            public static int TimeSinceLastVideoRewardShowCalled => localData.TimeSinceLastShowCalled(AdType.VideoReward);
             
-            public static int TimeSinceLastVideoReward => localData.TimeSinceLastShow(AdType.VideoReward);
+            public static int InterstitialShowCalledInSession => localData.ShowCallCount(AdType.Interstitial);
+            public static int RewardVideoShowCalledInSession => localData.ShowCallCount(AdType.VideoReward);
             
-            public static int TimeSinceLastAd => Math.Min(TimeSinceLastInterstitial, TimeSinceLastVideoReward) ;
-
             public static void SetUserId(string userId)
             {
                 _adapter.SetUserId(userId);
@@ -305,13 +349,15 @@ namespace Amanotes.Core.Internal
     public enum AdCallback
     {
         None = 0,
-        Open = 1,
-        Reward = 2,
-        Click = 4,
-        Cancel = 8,
-        Close = 16,
-        Success = 32,
-        Fail = 64
+        ShowCalled = 1,
+        ShowReadyStatus = 2,
+        Open = 4,
+        Reward = 8,
+        Click = 16,
+        Cancel = 32,
+        Close = 64,
+        Success = 128,
+        Fail = 256
     }
     
     public enum BannerPosition
@@ -326,33 +372,30 @@ namespace Amanotes.Core.Internal
         VideoReward,
         Banner
     }
-
-    public enum AdResult
+    
+    public enum AdShowReadyStatus
     {
         None,
-        Success,
-        WifiAndCarrierDataDisable,
-        NoInternetAccess,
-        RequestTimeOut,
-        AdapterReturnError
+        Wifi3GDisabled,
+        NoInternet,
+        TimeOut
     }
-
+    
     public class ShowAdContext : IAdCallback
     {
         public readonly AdType adType;
         public readonly string placementName;
-        public AdResult result = AdResult.None;
         public readonly Dictionary<string, object> userData;
         public AdCallback adCallback;
-
+        
         internal Action onOpened;
         internal Action onRewardReceived;
         internal Action onClicked;
         internal Action onShowSuccess;
         internal Action onShowFailed;
         internal Action onClosed;
-        
-        internal Action<AdResult> onResult;
+        internal Action<AdShowReadyStatus> onAdShowReadyStatus;
+        internal Action<bool> onResult;
 
         // Stats
         public float showCallAt;
@@ -442,12 +485,12 @@ namespace Amanotes.Core.Internal
                     continue;
                 }
                 
-                if (Ads._adConfig.checkInternet && !HasLocalNetworkConnection)
+                if (!HasLocalNetworkConnection)
                 {
                     Log("[Ad] LoadAdRoutine: hasInternet = " + HasLocalNetworkConnection);
                     continue;
                 }
-
+                
                 _loadState = LoadAdsState.Requesting;
                 _isRequesting = true;
                 Log("[Ad] LoadAdRoutine: RequestAd()");
@@ -505,6 +548,12 @@ namespace Amanotes.Core.Internal
             
             Log($"[Ad] {adType} StartShowAd");
             _showState = ShowAdsState.ShowCalled;
+            
+            AdStat stat = Ads.localData.GetStat(adType); 
+            stat.callCount++;
+            stat.lastCallTime = Time.realtimeSinceStartup;
+            OnAdShowCalled();
+            
             if (_showAdRoutine != null) _instance.StopCoroutine(_showAdRoutine);
             _showAdRoutine = _instance.StartCoroutine(ShowAdRoutine());
         }
@@ -518,6 +567,7 @@ namespace Amanotes.Core.Internal
                 _loadState = LoadAdsState.None;
                 StartLoadAd();
             }
+            
             HandleAfterAdShow();
             if (_showAdRoutine == null) return;
             _instance.StopCoroutine(_showAdRoutine);
@@ -546,31 +596,27 @@ namespace Amanotes.Core.Internal
                     LogWarning("[Ad] Inconsistent state report: isAdReady == false while _loadState == Ready");
                     _loadState = LoadAdsState.None;
                 }
+                
+                if (!HasLocalNetworkConnection)
+                {
+                    _showState = ShowAdsState.ShowFail;
+                    OnAdShowReadyStatus(false, AdShowReadyStatus.Wifi3GDisabled);
+                    ShowAdRoutineCompleted(false);
+                    yield break;
+                }
 
-                if (Ads._adConfig.checkInternet)
+                var hasInternet = false;
+                yield return WebUtils.CheckInternet(result => hasInternet = result);
+                if (!hasInternet)
                 {
-                    if (!HasLocalNetworkConnection)
-                    {
-                        _showState = ShowAdsState.ShowFail;
-                        Ads.context.result = AdResult.WifiAndCarrierDataDisable;
-                        ShowAdRoutineCompleted(false);
-                        yield break;
-                    }
-
-                    var hasInternet = false;
-                    yield return WebUtils.CheckInternet(result => hasInternet = result);
-                    if (!hasInternet)
-                    {
-                        _showState = ShowAdsState.ShowFail;
-                        Ads.context.result = AdResult.NoInternetAccess;
-                        ShowAdRoutineCompleted(false);
-                        yield break;
-                    }
+                    _showState = ShowAdsState.ShowFail;
+                    OnAdShowReadyStatus(false, AdShowReadyStatus.NoInternet);
+                    ShowAdRoutineCompleted(false);
+                    yield break;
                 }
 
                 if (_loadState != LoadAdsState.Requesting) StartLoadAd();
                 _showState = ShowAdsState.WaitForAd;
-
                 int timeout = Ads._adConfig.adShowTimeoutInSecs;
                 var counter = 0;
 
@@ -583,14 +629,15 @@ namespace Amanotes.Core.Internal
 
                 if (!isAdReady)
                 {
-                    Ads.context.result = AdResult.RequestTimeOut;
+                    OnAdShowReadyStatus(false, AdShowReadyStatus.TimeOut);
                     ShowAdRoutineCompleted(false);
                     yield break;
                 }
             }
             
             _showState = ShowAdsState.Showing;
-            // Ad should be ready here!
+            OnAdShowReadyStatus(true, AdShowReadyStatus.None);
+            
             ShowAd();
             HandleBeforeAdShow();
             
@@ -644,10 +691,10 @@ namespace Amanotes.Core.Internal
             }
             
             _showState = isSuccess ? ShowAdsState.ShowSuccess : ShowAdsState.ShowFail;
+            
             // Extra callback
-            if (isSuccess) Ads.context.result = AdResult.Success;
-            Ads.context.onResult?.Invoke(Ads.context.result);
             Ads.context.showFinishAt = Time.realtimeSinceStartup;
+            Ads.context.onResult?.Invoke(isSuccess);
             
             var localData = Ads.localData;
             var stat = _isInterstitial ? localData.interstitial : localData.reward;
@@ -759,7 +806,6 @@ namespace Amanotes.Core.Internal
             if (Ads.context != null)
             {
                 Ads.context.adCallback |= AdCallback.Fail;
-                Ads.context.result = AdResult.AdapterReturnError;
                 Ads.context.onShowFailed?.Invoke();
             }
             else
@@ -783,6 +829,30 @@ namespace Amanotes.Core.Internal
             }
         }
 
+        protected void OnAdShowReadyStatus(bool isReady, AdShowReadyStatus status)
+        {
+            if (Ads.context != null)
+            {
+                Ads.context.adCallback |= AdCallback.ShowReadyStatus;
+                if (!isReady)
+                {
+                    Ads.context.onAdShowReadyStatus?.Invoke(status);
+                    OnAdShowNotReady(status);
+                } else
+                {
+                    OnAdShowReady();
+                }
+            }
+            else
+            {
+                LogWarning("[Ad] OnAdOpen() Something wrong - No AdContext");
+            }
+        }
+        
+        protected virtual void OnAdShowCalled(){}
+        protected virtual void OnAdShowReady(){}
+        protected virtual void OnAdShowNotReady(AdShowReadyStatus status){}
+        
         protected void OnAdOpen()
         {
             Log($"[Ad] {adType} OnAdOpen");

package/Runtime/AmaGDK.Analytics.cs

@@ -289,7 +289,7 @@ namespace Amanotes.Core
                     string eventNameToSend = GetEventNameToSend(eventData.eventName, countInSession, totalCount);
                     if (common.normalizeEventName) NormalizeEventName(ref eventNameToSend);
 
-                    if (showAnalyticsLog) Debug.Log($"AmaGDK | Event <{eventNameToSend}> (in session: {countInSession}, total: {totalCount})\n{JsonUtils.DictionaryToJson(eventData.parameters, true)}");
+                    if (showAnalyticsLog) Debug.Log($"AmaGDK | [Analytics] Event <{eventNameToSend}> (in session: {countInSession}, total: {totalCount})\n{JsonUtils.DictionaryToJson(eventData.parameters, true)}");
                     
                     common.quality.CheckEventQuality(eventData.eventName, eventData.parameters);
 
@@ -721,7 +721,7 @@ namespace Amanotes.Core
 
         private static bool IsValidKeyValue(IEventParamsBuilder ap, string key, object value)
         {
-            string eventName = (ap as EventParams).eventName;
+            string eventName = (ap as EventParams)?.eventName;
             if (string.IsNullOrWhiteSpace(key))
             {
                 LogWarning($"Param key is empty. Event name: {eventName}!");
@@ -729,7 +729,7 @@ namespace Amanotes.Core
             }
             if (value == null)
             {
-                LogWarning($"Param value is null. Event name: {eventName}!");
+                LogWarning($"Param value of key <{key}> is null. Event name: {eventName}!");
                 return false;
             }
 

package/Runtime/AmaGDK.UserProfile.cs

@@ -72,11 +72,23 @@ namespace Amanotes.Core
                 set => _pseudoId = ValidateId(value, ALPHANUMERIC_PATTERN);
             }
             
+            #if UNITY_IOS
             public string AmaDeviceId
             {
                 get => _amaDeviceId;
                 set => _amaDeviceId = ValidateId(value, ALPHANUMERIC_HYPHEN_PATTERN);
             }
+            #endif
+            
+            #if UNITY_ANDROID
+            public string AmaDeviceId
+            {
+                get => _amaDeviceId;
+                set => _amaDeviceId = ValidateId(value, ALPHANUMERIC_PATTERN);
+            }
+            #endif
+            
+            
             
             public string AppsFlyerId
             {
@@ -132,7 +144,7 @@ namespace Amanotes.Core
                     yield return waitForDuration;
                     time += WAIT_TIME;
                     if (time <= TIME_OUT) continue;
-                    Logging.LogWarning($"User init time out: {TIME_OUT}");
+                    Logging.LogWarning($"| UserProfile <init> timeout: {TIME_OUT} (ama_device_id not exist)");
                     break;
                 }
             }

package/Runtime/AmaGDK.cs

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

package/package.json

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

package/Runtime/AmaGDK.AdEvents.cs

@@ -1,297 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using Amanotes.Core.Internal;
-using UnityEngine;
-
-namespace Amanotes.Core
-{
-    public partial class AmaGDK // Ad events
-    {
-        public static class AdEventContext
-        {
-            public delegate void UpdateAdEventContext (string eventName);
-            /// <summary>
-            /// Update AdEventContext's variables for ad event tracking
-            /// </summary>
-            public static event UpdateAdEventContext Update;
-
-            public static string connection;
-            public static string location;
-            public static string songACMid;
-            public static string songName;
-            public static string songUnlockType;
-            public static string reward;
-            public static string mediation;
-            public static Dictionary<string, object> customData = new Dictionary<string, object>();
-
-            internal static void UpdateFor(string eventName)
-            {
-                connection = null;
-                location = null;
-                songACMid = null;
-                songName = null;
-                songUnlockType = null;
-                reward = null;
-                mediation = null;
-                customData.Clear();
-                Update?.Invoke(eventName);
-            }
-        }
-        
-        public partial class AdEvents //Event name
-        {
-            const string FULLADS_REQUEST = "fullads_request";
-            const string FULLADS_REQUEST_FAILED = "fullads_request_failed";
-            const string FULLADS_REQUEST_SUCCESS = "fullads_request_success";
-            const string FULLADS_SHOW_READY = "fullads_show_ready";       
-            const string FULLADS_SHOW_NOTREADY = "fullads_show_notready";        
-            const string FULLADS_SHOW = "fullads_show";        
-            const string FULLADS_SHOW_FAILED = "fullads_show_failed";
-            const string FULLADS_FINISH = "fullads_finish";        
-            const string FULLADS_CLICK = "fullads_click";
-        
-            const string VIDEOADS_SHOW_READY = "videoads_show_ready";
-            const string VIDEOADS_SHOW_NOTREADY = "videoads_show_notready";
-            const string VIDEOADS_SHOW = "videoads_show";
-            const string VIDEOADS_SHOW_FAILED = "videoads_show_failed";
-            const string VIDEOADS_FINISH = "videoads_finish";
-            const string VIDEOADS_CLICK = "videoads_click";
-            
-            const string BANNER_CLICK = "bannerads_click";
-            
-            //Parameter name
-            const string PARAM_CONNECTION = "connection";
-            const string PARAM_LOCATION = "location";
-            const string PARAM_SONG_ACM_ID = "song_acm_id";
-            const string PARAM_SONG_NAME = "song_name";
-            const string PARAM_SONG_UNLOCK_TYPE = "song_unlock_type";
-            const string PARAM_REWARD = "reward";
-            const string PARAM_MEDIATION = "mediation";
-        }
-        
-        public partial class AdEvents //Impression
-        {
-            public static Action<Dictionary<string, object>> onAdImpression;
-
-            public static void LogAdImpression(Dictionary<string, object> impressionData)
-            {
-                Analytics.LogEvent("ad_impression", impressionData)
-                    .OnlyTo(AmaGDK.AdapterID.FIREBASE_ANALYTICS);
-                Analytics.LogEvent("ad_impression_ama", impressionData)
-                    .OnlyTo(AmaGDK.AdapterID.FIREBASE_ANALYTICS);
-            }
-        }
-        
-        public partial class AdEvents //Full ads
-        {
-            public static void LogFullAdsRequest()
-            {
-                AdEventContext.UpdateFor(FULLADS_REQUEST);
-                var dic = AdEventContext.customData;
-                dic[PARAM_CONNECTION] = AdEventContext.connection;
-                dic[PARAM_LOCATION] = AdEventContext.location;
-                dic[PARAM_MEDIATION] = AdEventContext.mediation;
-                Analytics.LogEvent(FULLADS_REQUEST, dic).SetAsAccumulated();
-            }
-            
-            public static void LogFullAdsRequestFailed()
-            {
-                AdEventContext.UpdateFor(FULLADS_REQUEST_FAILED);
-                var dic = AdEventContext.customData;
-                dic[PARAM_CONNECTION] = AdEventContext.connection;
-                dic[PARAM_LOCATION] = AdEventContext.location;
-                dic[PARAM_MEDIATION] = AdEventContext.mediation;
-                Analytics.LogEvent(FULLADS_REQUEST_FAILED, dic).SetAsAccumulated();
-            }
-            
-            public static void LogFullAdsRequestSuccess()
-            {
-                AdEventContext.UpdateFor(FULLADS_REQUEST_SUCCESS);
-                var dic = AdEventContext.customData;
-                dic[PARAM_CONNECTION] = AdEventContext.connection;
-                dic[PARAM_LOCATION] = AdEventContext.location;
-                dic[PARAM_MEDIATION] = AdEventContext.mediation;
-                Analytics.LogEvent(FULLADS_REQUEST_SUCCESS, dic).SetAsAccumulated();
-            }
-            
-            public static void LogFullAdsShowReady()
-            {
-                AdEventContext.UpdateFor(FULLADS_SHOW_READY);
-                var dic = AdEventContext.customData;
-                dic[PARAM_CONNECTION] = AdEventContext.connection;
-                dic[PARAM_LOCATION] = AdEventContext.location;
-                dic[PARAM_SONG_ACM_ID] = AdEventContext.songACMid;
-                dic[PARAM_SONG_NAME] = AdEventContext.songName;
-                dic[PARAM_SONG_UNLOCK_TYPE] = AdEventContext.songUnlockType;
-                dic[PARAM_MEDIATION] = AdEventContext.mediation;
-                Analytics.LogEvent(FULLADS_SHOW_READY, dic).SetAsAccumulated();
-            }
-            
-            public static void LogFullAdsShowNotReady()
-            {
-                AdEventContext.UpdateFor(FULLADS_SHOW_NOTREADY);
-                var dic = AdEventContext.customData;
-                dic[PARAM_CONNECTION] = AdEventContext.connection;
-                dic[PARAM_LOCATION] = AdEventContext.location;
-                dic[PARAM_SONG_ACM_ID] = AdEventContext.songACMid;
-                dic[PARAM_SONG_NAME] = AdEventContext.songName;
-                dic[PARAM_SONG_UNLOCK_TYPE] = AdEventContext.songUnlockType;
-                dic[PARAM_MEDIATION] = AdEventContext.mediation;
-                Analytics.LogEvent(FULLADS_SHOW_NOTREADY, dic).SetAsAccumulated();
-            }
-            
-            public static void LogFullAdsShow()
-            {
-                AdEventContext.UpdateFor(FULLADS_SHOW);
-                var dic = AdEventContext.customData;
-                dic[PARAM_CONNECTION] = AdEventContext.connection;
-                dic[PARAM_LOCATION] = AdEventContext.location;
-                dic[PARAM_SONG_ACM_ID] = AdEventContext.songACMid;
-                dic[PARAM_SONG_NAME] = AdEventContext.songName;
-                dic[PARAM_SONG_UNLOCK_TYPE] = AdEventContext.songUnlockType;
-                dic[PARAM_MEDIATION] = AdEventContext.mediation;
-                Analytics.LogEvent(FULLADS_SHOW, dic).SetAsAccumulated();
-            }
-            
-            public static void LogFullAdsShowFailed()
-            {
-                AdEventContext.UpdateFor(FULLADS_SHOW_FAILED);
-                var dic = AdEventContext.customData;
-                dic[PARAM_CONNECTION] = AdEventContext.connection;
-                dic[PARAM_LOCATION] = AdEventContext.location;
-                dic[PARAM_SONG_ACM_ID] = AdEventContext.songACMid;
-                dic[PARAM_SONG_NAME] = AdEventContext.songName;
-                dic[PARAM_SONG_UNLOCK_TYPE] = AdEventContext.songUnlockType;
-                dic[PARAM_MEDIATION] = AdEventContext.mediation;
-                Analytics.LogEvent(FULLADS_SHOW_FAILED, dic).SetAsAccumulated();
-            }
-            
-            public static void LogFullAdsFinish()
-            {
-                AdEventContext.UpdateFor(FULLADS_FINISH);
-                var dic = AdEventContext.customData;
-                dic[PARAM_CONNECTION] = AdEventContext.connection;
-                dic[PARAM_LOCATION] = AdEventContext.location;
-                dic[PARAM_SONG_ACM_ID] = AdEventContext.songACMid;
-                dic[PARAM_SONG_NAME] = AdEventContext.songName;
-                dic[PARAM_SONG_UNLOCK_TYPE] = AdEventContext.songUnlockType;
-                dic[PARAM_MEDIATION] = AdEventContext.mediation;
-                Analytics.LogEvent(FULLADS_FINISH, dic).SetAsAccumulated();
-            }
-            
-            public static void LogFullAdsClick()
-            {
-                AdEventContext.UpdateFor(FULLADS_CLICK);
-                var dic = AdEventContext.customData;
-                dic[PARAM_CONNECTION] = AdEventContext.connection;
-                dic[PARAM_LOCATION] = AdEventContext.location;
-                dic[PARAM_SONG_ACM_ID] = AdEventContext.songACMid;
-                dic[PARAM_SONG_NAME] = AdEventContext.songName;
-                dic[PARAM_SONG_UNLOCK_TYPE] = AdEventContext.songUnlockType;
-                dic[PARAM_MEDIATION] = AdEventContext.mediation;
-                Analytics.LogEvent(FULLADS_CLICK, dic).SetAsAccumulated();
-            }
-        }
-        
-        public partial class AdEvents //Rewarded
-        {
-            public static void LogVideoAdsShowReady()
-            {
-                AdEventContext.UpdateFor(VIDEOADS_SHOW_READY);
-                var dic = AdEventContext.customData;
-                dic[PARAM_CONNECTION] = AdEventContext.connection;
-                dic[PARAM_LOCATION] = AdEventContext.location;
-                dic[PARAM_SONG_ACM_ID] = AdEventContext.songACMid;
-                dic[PARAM_SONG_NAME] = AdEventContext.songName;
-                dic[PARAM_SONG_UNLOCK_TYPE] = AdEventContext.songUnlockType;
-                dic[PARAM_REWARD] = AdEventContext.reward;
-                dic[PARAM_MEDIATION] = AdEventContext.mediation;
-                Analytics.LogEvent(VIDEOADS_SHOW_READY, dic).SetAsAccumulated();
-            }
-            
-            public static void LogVideoAdsShowNotReady()
-            {
-                AdEventContext.UpdateFor(VIDEOADS_SHOW_NOTREADY);
-                var dic = AdEventContext.customData;
-                dic[PARAM_CONNECTION] = AdEventContext.connection;
-                dic[PARAM_LOCATION] = AdEventContext.location;
-                dic[PARAM_SONG_ACM_ID] = AdEventContext.songACMid;
-                dic[PARAM_SONG_NAME] = AdEventContext.songName;
-                dic[PARAM_SONG_UNLOCK_TYPE] = AdEventContext.songUnlockType;
-                dic[PARAM_REWARD] = AdEventContext.reward;
-                dic[PARAM_MEDIATION] = AdEventContext.mediation;
-                Analytics.LogEvent(VIDEOADS_SHOW_NOTREADY, dic).SetAsAccumulated();
-            }
-            
-            public static void LogVideoAdsShow()
-            {
-                AdEventContext.UpdateFor(VIDEOADS_SHOW);
-                var dic = AdEventContext.customData;
-                dic[PARAM_CONNECTION] = AdEventContext.connection;
-                dic[PARAM_LOCATION] = AdEventContext.location;
-                dic[PARAM_SONG_ACM_ID] = AdEventContext.songACMid;
-                dic[PARAM_SONG_NAME] = AdEventContext.songName;
-                dic[PARAM_SONG_UNLOCK_TYPE] = AdEventContext.songUnlockType;
-                dic[PARAM_REWARD] = AdEventContext.reward;
-                dic[PARAM_MEDIATION] = AdEventContext.mediation;
-                Analytics.LogEvent(VIDEOADS_SHOW, dic).SetAsAccumulated();
-            }
-            
-            public static void LogVideoAdsShowFailed()
-            {
-                AdEventContext.UpdateFor(VIDEOADS_SHOW_FAILED);
-                var dic = AdEventContext.customData;
-                dic[PARAM_CONNECTION] = AdEventContext.connection;
-                dic[PARAM_LOCATION] = AdEventContext.location;
-                dic[PARAM_SONG_ACM_ID] = AdEventContext.songACMid;
-                dic[PARAM_SONG_NAME] = AdEventContext.songName;
-                dic[PARAM_SONG_UNLOCK_TYPE] = AdEventContext.songUnlockType;
-                dic[PARAM_REWARD] = AdEventContext.reward;
-                dic[PARAM_MEDIATION] = AdEventContext.mediation;
-                Analytics.LogEvent(VIDEOADS_SHOW_FAILED, dic).SetAsAccumulated();
-            }
-            
-            public static void LogVideoAdsFinish()
-            {
-                AdEventContext.UpdateFor(VIDEOADS_FINISH);
-                var dic = AdEventContext.customData;
-                dic[PARAM_CONNECTION] = AdEventContext.connection;
-                dic[PARAM_LOCATION] = AdEventContext.location;
-                dic[PARAM_SONG_ACM_ID] = AdEventContext.songACMid;
-                dic[PARAM_SONG_NAME] = AdEventContext.songName;
-                dic[PARAM_SONG_UNLOCK_TYPE] = AdEventContext.songUnlockType;
-                dic[PARAM_REWARD] = AdEventContext.reward;
-                dic[PARAM_MEDIATION] = AdEventContext.mediation;
-                Analytics.LogEvent(VIDEOADS_FINISH, dic).SetAsAccumulated();
-            }
-            
-            public static void LogVideoAdsClick()
-            {
-                AdEventContext.UpdateFor(VIDEOADS_CLICK);
-                var dic = AdEventContext.customData;
-                dic[PARAM_CONNECTION] = AdEventContext.connection;
-                dic[PARAM_LOCATION] = AdEventContext.location;
-                dic[PARAM_SONG_ACM_ID] = AdEventContext.songACMid;
-                dic[PARAM_SONG_NAME] = AdEventContext.songName;
-                dic[PARAM_SONG_UNLOCK_TYPE] = AdEventContext.songUnlockType;
-                dic[PARAM_REWARD] = AdEventContext.reward;
-                dic[PARAM_MEDIATION] = AdEventContext.mediation;
-                Analytics.LogEvent(VIDEOADS_CLICK, dic).SetAsAccumulated();
-            }
-        }
-        
-        public partial class AdEvents //Banner
-        {
-            public static void LogBannerClick()
-            {
-                AdEventContext.UpdateFor(BANNER_CLICK);
-                var dic = AdEventContext.customData;
-                dic[PARAM_CONNECTION] = AdEventContext.connection;
-                dic[PARAM_LOCATION] = AdEventContext.location;
-                dic[PARAM_MEDIATION] = AdEventContext.mediation;
-                Analytics.LogEvent(BANNER_CLICK, dic).SetAsAccumulated();
-            }
-        }
-    }
-}

package/Runtime/AmaGDK.AdEvents.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: d65e821f5d1ce4c05aead50ca80d5b12
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: