com.amanotes.gdk 0.1.9 → 0.1.10

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [0.1.10 - 2023-02-17]
+### Release AmaGDK v0.1.10
+### Support accumulated event within session
+
 ## [0.1.9 - 2023-02-15]
 ### Release AmaGDK v0.1.9
 ### Change Documentation URL

package/Editor/AmaGDKEditor.cs

@@ -108,7 +108,10 @@ namespace Amanotes.Core
         void DrawGUI_ConfigDetail()
         {
             CreateCachedEditor(configAsset, null, ref editor);
+            var lbWidth = EditorGUIUtility.labelWidth;
+            EditorGUIUtility.labelWidth = 200f;
             editor.OnInspectorGUI();
+            EditorGUIUtility.labelWidth = lbWidth;
         }
 
         void DrawGUI_ConfigAsset(){

package/Packages/IronsourceAdapter_v7.2.6.unitypackage

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:313276bb7dcfb6c5dc1a760945f89b413282c7329d1b4856e777c6aee75cc22e
+size 1635

package/{Runtime/Interfaces.meta → Packages/IronsourceAdapter_v7.2.6.unitypackage.meta}

@@ -1,6 +1,5 @@
 fileFormatVersion: 2
-guid: cfbb48f0167d74afa8a2099a218d698e
-folderAsset: yes
+guid: 1a3999539db3049c998b0c84b7f92f07
 DefaultImporter:
   externalObjects: {}
   userData: 

package/Runtime/AmaGDK.Ads.cs

@@ -0,0 +1,235 @@
+using System;
+using System.Collections;
+
+using UnityEngine;
+
+using Amanotes.Core.Internal;
+using static Amanotes.Core.Internal.Logging;
+
+namespace Amanotes.Core
+{
+    public interface IAds
+    {
+        bool IsAdReady(AdType Type);
+
+        #region Interstitial   
+        event Action InterstitialShowSucceededCallback;
+        event Action InterstitialShowFailedCallback;
+        event Action InterstitialClickedCallback;
+        void RequestInterstitial();
+        void ShowInterstitial();
+        void ShowInterstitial(string placementName);
+        #endregion FullAds
+
+        #region VideoAds     
+        event Action RewardedVideoShowFailedCallback;
+        event Action RewardedVideoClosedCallback;
+        event Action RewardedCallback;
+        event Action RewardedVideoClickCallback;
+        void RequestRewardedVideo();
+        void ShowRewardedVideo();
+        void ShowRewardedVideo(string placementName);
+        #endregion VideoAds
+
+        #region Banner
+        event Action BannerAdsClickCallback;
+        event Action BannerShowCallback;        
+        void RequestBanner(BannerPosition position = BannerPosition.TOP);
+        void RequestBanner(BannerPosition position, string placementName);
+        void ShowBanner();
+        void HideBanner();
+        #endregion Banner
+    }
+
+    public enum BannerPosition
+    {
+        TOP = 1,
+        BOTTOM = 2
+    };
+
+    public enum AdType : byte
+    {
+        Interstitial,
+        Reward,
+        Banner
+    };
+
+    public partial class AmaGDK // IAds module
+    {
+        public static class Ads
+        {
+            internal static IAds adsModule;
+            public static Action<string> OnInterstitalFailCallback;
+            public static Action<string> OnRewardedVideoFailCallback;
+
+            public static void Init()
+            {
+                var adsModules = Adapter.FindAll<IAds>();
+
+                if (adsModules == null || adsModules.Count < 1)
+                {
+                    LogError("Ads module not found!");
+                    return;
+                }
+                
+                if (adsModules.Count > 1)
+                {
+                    LogError("Multiple Ads modules is not supported!");
+                    return;
+                }
+                
+                adsModule = adsModules[0].GetAdapterApi<IAds>();
+            }
+
+            public static void RequestBanner(BannerPosition position)
+            {
+                if (adsModule == null)
+                {
+                    LogWarning("Ads module is not initialized");
+                    return;
+                }
+                adsModule.RequestBanner(position);
+            }
+
+            public static void ShowBanner()
+            {
+                adsModule.ShowBanner();
+            }
+
+            public static void HideBanner()
+            {
+                if (!adsModule.IsAdReady(AdType.Banner))
+                {
+                    LogWarning("Banner is not ready");
+                    return;
+                }
+
+                adsModule.HideBanner();
+            }
+
+            public static void RequestInterstitial()
+            {
+                if (adsModule == null)
+                {
+                    LogWarning("Ads module is not initialized");
+                    return;
+                }
+                adsModule.RequestInterstitial();
+            }
+
+            public static void ShowInterstitial()
+            {
+                if (!adsModule.IsAdReady(AdType.Interstitial))
+                {
+                    LogWarning("Interstitial is not ready");
+                    BeginCoroutine(IWaitShowInterstitial());
+                    return;
+                }
+                adsModule.ShowInterstitial();
+            }
+
+            public static void RequestRewardedVideo()
+            {
+                if (adsModule == null)
+                {
+                    LogWarning("Ads module is not initialized");
+                    return;
+                }
+                adsModule.RequestRewardedVideo();
+            }
+
+            public static void ShowRewardedVideo()
+            {
+                if (!adsModule.IsAdReady(AdType.Reward))
+                {
+                    LogWarning("Reward is not ready");
+                    BeginCoroutine(IWaitShowRewardedVideo());
+                    return;
+                }
+                adsModule.ShowRewardedVideo();
+            }
+
+            private static IEnumerator IWaitShowRewardedVideo()
+            {
+                LogWarning("Wait Show Rewarded Video");
+                if (adsModule == null)
+                {
+                    OnRewardedVideoFailCallback?.Invoke("Not found ads module");
+                    OnRewardedVideoFailCallback = null;
+                    yield break;
+                }
+
+                var startTime = Time.time;
+                float timeout = 5;
+                string error = null;
+                while (!adsModule.IsAdReady(AdType.Reward))
+                {
+                    if (Application.internetReachability == NetworkReachability.NotReachable)
+                    {
+                        error = Application.internetReachability.ToString();
+                        break;
+                    }
+
+                    if ((Time.time - startTime) > timeout)
+                    {
+                        error = "Timeout";
+                        break;
+                    }
+
+                    yield return null;
+                }
+
+                if (adsModule.IsAdReady(AdType.Reward))
+                {
+                    adsModule.ShowRewardedVideo();
+                }
+                else
+                {
+                    OnRewardedVideoFailCallback?.Invoke(error);
+                    OnRewardedVideoFailCallback = null;
+                }
+            }
+
+            private static IEnumerator IWaitShowInterstitial()
+            {
+                LogWarning("Wait Show Interstitial");
+                if (adsModule == null)
+                {
+                    OnInterstitalFailCallback?.Invoke("Not found ads module");
+                    OnInterstitalFailCallback = null;
+                    yield break;
+                }
+
+                var startTime = Time.time;
+                float timeout = 5;
+                string error = null;
+                while (!adsModule.IsAdReady(AdType.Interstitial))
+                {
+                    if (Application.internetReachability == NetworkReachability.NotReachable)
+                    {
+                        error = Application.internetReachability.ToString();
+                        break;
+                    }
+
+                    if ((Time.time - startTime) > timeout)
+                    {
+                        error = "Timeout";
+                        break;
+                    }
+
+                    yield return null;
+                }
+
+                if (adsModule.IsAdReady(AdType.Interstitial))
+                {
+                    adsModule.ShowInterstitial();
+                }
+                else
+                {
+                    OnInterstitalFailCallback?.Invoke(error);
+                    OnInterstitalFailCallback = null;
+                }
+            }
+        }
+    }
+}

package/Runtime/{Interfaces/Analytics/IAnalytics.cs.meta → AmaGDK.Ads.cs.meta}

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 653a76219edea423ca7f51c1c4c9b02b
+guid: 46425c80eac894185a5609143ace732f
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

package/Runtime/AmaGDK.Analytics.cs

@@ -22,6 +22,7 @@ namespace Amanotes.Core
                 public Dictionary<string, object> parameters = new Dictionary<string, object>();
                 public string funnelSignature;
                 public bool accumulated;
+                public bool withinSession;
                 public HashSet<string> ignoreAnalyticIds = new HashSet<string>();
                 public HashSet<string> allowAnalyticIds = new HashSet<string>();
 
@@ -51,15 +52,36 @@ namespace Amanotes.Core
                 return result;
             }
 
+            public static IEventParamsBuilder LogEvent(string eventName, params (string, object)[] parameters)
+            {
+                var result = new EventParams(eventName);
+                for (var i = 0;i < parameters.Length; i++)
+                {
+                    result.AddParam(parameters[i].Item1, parameters[i].Item2);
+                }
+                eventQueue.Enqueue(result);
+                return result;
+            }
+
             public static IEventParamsBuilder LogFunnelEvent(string eventName, string signature = "")
             {
                 return LogEvent(eventName).SetAsFunnel(signature);
             }
 
-            public static int GetAccumulatedCount(string eventName)
+            public static IEventParamsBuilder LogFunnelEvent(string eventName, Dictionary<string, object> parameters, string signature = "")
+            {
+                return LogEvent(eventName, parameters).SetAsFunnel(signature);
+            }
+
+            public static IEventParamsBuilder LogFunnelEvent(string eventName, string signature = "", params (string, object)[] parameters)
+            {
+                return LogEvent(eventName, parameters).SetAsFunnel(signature);
+            }
+
+            public static int GetAccumulatedCount(string eventName, bool withinSession = false)
             {
                 var eventDetail = localData.GetEventDetail(eventName);
-                return eventDetail != null ? eventDetail.count : 0;
+                return eventDetail != null ? (withinSession ? eventDetail.countInSession : eventDetail.totalCount) : 0;
             }
 
             public static void SetLogEventCondition(Predicate<EventDetail> condition)
@@ -116,20 +138,20 @@ namespace Amanotes.Core
                         localData.eventDetails.Add(new EventDetail
                         {
                             eventName = e.Key,
-                            count = e.Value
+                            totalCount = e.Value
                         });
                         flag |= IntegrityFlag.NewEvent;
                         continue;
                     }
 
-                    if (eventDetail.count != e.Value)
+                    if (eventDetail.totalCount != e.Value)
                     {
                         flag |= IntegrityFlag.DifferentCount;
                     }
 
                     if (sumEventCount)
                     {
-                        eventDetail.count += e.Value;
+                        eventDetail.totalCount += e.Value;
                     }
                 }
 
@@ -169,10 +191,13 @@ namespace Amanotes.Core
             internal static readonly List<AdapterInfo> listAdapters = new List<AdapterInfo>();
             internal static readonly AnalyticsData localData = new AnalyticsData().LoadJsonFromFile();
 
-            internal static void GetAnalyticAdapters()
+            internal static void Init()
             {
                 listAdapters.Clear();
                 listAdapters.AddRange(Adapter.FindAll<IAnalyticAdapter>());
+
+                _frameUpdate -= ProcessEventQueue;
+                _frameUpdate += ProcessEventQueue;
             }
 
             internal static void ProcessEventQueue()
@@ -187,14 +212,14 @@ namespace Amanotes.Core
                     if (!NormalizeEventName(ref eventData.eventName))
                         continue;
 
-                    var counter = localData.IncreaseCounter(eventData.eventName);
+                    var (countInSession, totalCount) = localData.IncreaseCounter(eventData.eventName);
 
                     if (!ShouldSendEvent(eventData))
                         continue;
 
                     if (eventData.accumulated)
                     {
-                        eventData.AddParam("accumulated_count", counter);
+                        eventData.AddParam("accumulated_count", eventData.withinSession ? countInSession : totalCount);
                     }
 
                     foreach (var m in listAdapters)
@@ -202,7 +227,7 @@ namespace Amanotes.Core
                         if (eventData.ignoreAnalyticIds.Contains(m.id))
                             continue;
                         m.GetAdapterApi<IAnalyticAdapter>().LogEvent(eventData);
-                        if (showAnalyticsLog) Debug.Log($"[{m.id}] Sent event <{eventData.eventName}> ({counter})");
+                        if (showAnalyticsLog) Debug.Log($"[{m.id}] Sent event <{eventData.eventName}> (in session: {countInSession}, total: {totalCount})");
                     }
                 }
 
@@ -264,7 +289,9 @@ namespace Amanotes.Core
             public class EventDetail
             {
                 public string eventName;
-                public int count;
+                public int totalCount;
+                [NonSerialized]
+                public int countInSession;
             }
 
             [Flags]
@@ -330,12 +357,13 @@ namespace Amanotes.Core
                     return true;
                 }
 
-                internal int IncreaseCounter(string eventName)
+                internal (int countInSession, int totalCount) IncreaseCounter(string eventName)
                 {
                     var result = GetEventDetail(eventName, true);
-                    result.count++;
+                    result.totalCount++;
+                    result.countInSession++;
                     _dirty = true;
-                    return result.count;
+                    return (result.countInSession, result.totalCount);
                 }
 
                 internal void SaveIfDirty()
@@ -383,11 +411,13 @@ namespace Amanotes.Core
             data.funnelSignature = string.IsNullOrEmpty(signature) ? data.eventName : signature;
             return ap;
         }
-        public static IEventParamsBuilder SetAsAccumulated(this IEventParamsBuilder ap)
+        public static IEventParamsBuilder SetAsAccumulated(this IEventParamsBuilder ap, bool withinSession = false)
         {
             if (ap == null) return null;
 
-            (ap as EventParams).accumulated = true;
+            EventParams data = ap as EventParams;
+            data.accumulated = true;
+            if (withinSession) data.withinSession = true;
             return ap;
         }
 

package/Runtime/AmaGDK.Internal.cs

@@ -39,6 +39,7 @@ namespace Amanotes.Core.Internal
         {
             "FirebaseAnalyticsAdapter_v9.1.0",
             //"AppsflyerAdapter_v6.5.4",
+            // "IronsourceAdapter_v7.2.6",
         };
     }
 

package/Runtime/AmaGDK.cs

@@ -12,9 +12,10 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.1.9";
+        public const string VERSION = "0.1.10";
 
         internal static AmaGDK _instance;
+        internal static event Action _frameUpdate;
         private static ConfigAsset _config = null;
         internal static ConfigAsset Config {
             get {
@@ -24,7 +25,7 @@ namespace Amanotes.Core
                 return _config;
             }
         }
-
+        
         internal static Status _status = Status.None;
         internal static Action _onReadyCallback;
         internal static bool _allowInit = false;
@@ -97,9 +98,10 @@ namespace Amanotes.Core
                 Log($"Adapter {adapter.id} inited!");
             }
 
-            // Init adapters
-            Analytics.GetAnalyticAdapters();
-
+            // Init modules (Adapter managers)
+            Analytics.Init();
+            Ads.Init();
+            
             _status = Status.Ready;
             _onReadyCallback?.Invoke();
             _onReadyCallback = null;
@@ -109,7 +111,7 @@ namespace Amanotes.Core
         private void Update()
         {
             if (!isReady) return;
-            Analytics.ProcessEventQueue();
+            _frameUpdate?.Invoke();
         }
     }
 
@@ -145,6 +147,16 @@ namespace Amanotes.Core
             _instance = sdk.AddComponent<AmaGDK>();
         }
 
+        public static void BeginCoroutine(IEnumerator enumerator)
+        {
+            _instance.StartCoroutine(enumerator);
+        }
+
+        public static void EndCoroutine(IEnumerator enumerator)
+        {
+            _instance.StopCoroutine(enumerator);
+        }
+
         public static void AddCallback(Action onReady)
         {
             if (onReady == null)

package/Tests/Runtime/MigrationTest.cs

@@ -123,7 +123,7 @@ public class MigrationTest
             analyticsData.eventDetails.Add(new EventDetail
             {
                 eventName = e.Key,
-                count = e.Value
+                totalCount = e.Value
             });
         }
 
@@ -132,7 +132,7 @@ public class MigrationTest
             analyticsData.eventDetails.Add(new EventDetail
             {
                 eventName = "migration_error",
-                count = migrationError
+                totalCount = migrationError
             });
         }
 
@@ -154,7 +154,7 @@ public class MigrationTest
         var eventDetail = analyticsData.GetEventDetail(errEventName);
         if (eventDetail != null)
         {
-            Assert.IsTrue(eventDetail.count == 1);
+            Assert.IsTrue(eventDetail.totalCount == 1);
         }
         else
         {

package/package.json

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

package/Runtime/Interfaces/Analytics/IAnalytics.cs

@@ -1,6 +0,0 @@
-using System.Collections.Generic;
-
-namespace Amanotes.Core
-{
-    
-}

package/Runtime/Interfaces/Analytics.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: d1a686515ec7946df9492f35e9638fea
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: