com.amanotes.gdk 0.2.48 → 0.2.50

package/Editor/Extra/GDKAutoBuild.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 7f55e6986cd4437685e4bff21bf6ae7a
+timeCreated: 1706774721

package/Editor/Extra/GDKProjectCP.cs

@@ -0,0 +1,158 @@
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+using System.Linq;
+using UnityEditor.SceneManagement;
+
+namespace Amanotes
+{
+	internal class GDKProjectCP : EditorWindow
+	{
+		private static GDKProjectCP _window;
+		static Texture2D iconScene;
+		static Texture2D iconPlay;
+		static Texture2D iconFolder;
+		static GUIStyle productNameStyle;
+		static string projectPath;
+
+		private static int activeSceneIndex;
+
+
+		[MenuItem("Window/AmaGDK/Project Control Panel")]
+		private static void ShowWindow()
+		{
+			if (_window != null) return;
+			
+			iconScene = AssetPreview.GetMiniTypeThumbnail(typeof(SceneAsset));
+			_window = CreateInstance<GDKProjectCP>();
+			_window.titleContent = new GUIContent("Project CP", iconScene, "GDK Project Control Panel");
+			_window.Show();
+		}
+
+		void Init()
+		{
+			if (iconScene == null) iconScene = AssetPreview.GetMiniTypeThumbnail(typeof(SceneAsset));
+			iconPlay = EditorGUIUtility.FindTexture("PlayButton");
+			iconFolder = EditorGUIUtility.FindTexture("Folder Icon");
+
+
+			productNameStyle = new GUIStyle(EditorStyles.largeLabel)
+			{
+				alignment = TextAnchor.MiddleCenter,
+				fontSize = 32
+			};
+
+			projectPath = Application.dataPath;
+			List<string> arr = projectPath.Split('/').ToList();
+			arr.RemoveAt(arr.Count - 1);
+
+			if (arr.Count > 3)
+			{
+				arr.RemoveRange(0, arr.Count - 3);
+			}
+
+			projectPath = string.Join("/", arr);
+		}
+
+		static void DrawBigPlayButton()
+		{
+			EditorBuildSettingsScene[] scenes = EditorBuildSettings.scenes;
+			if (scenes.Length == 0)
+			{
+				EditorGUILayout.HelpBox("No scene in Build Setting!", MessageType.Warning);
+				return;
+			}
+			
+			EditorBuildSettingsScene scene = scenes[activeSceneIndex];
+
+			GUILayout.BeginHorizontal();
+			{
+				EditorGUILayout.Space();
+				GUILayout.BeginVertical();
+				{
+					GUILayout.Space(16);
+					GUILayout.Label(scene.path);
+					activeSceneIndex = EditorGUILayout.IntSlider(activeSceneIndex, 0, scenes.Length - 1);
+				}
+				GUILayout.EndVertical();
+				if (GUILayout.Button(iconPlay, GUILayout.Width(64f), GUILayout.Height(64f)))
+				{
+					OpenScene(scene.path, true);
+				}
+			}
+			GUILayout.EndHorizontal();
+		}
+
+		static void OpenScene(string scenePath, bool play)
+		{
+			if (EditorApplication.isPlaying)
+			{
+				EditorApplication.isPlaying = false;
+			} 
+			else
+			{
+				EditorSceneManager.SaveCurrentModifiedScenesIfUserWantsTo();
+				EditorSceneManager.OpenScene(scenePath, OpenSceneMode.Single);
+				if (play) EditorApplication.isPlaying = true;	
+			}
+		}
+		
+		static void DrawProjectInfo()
+		{
+			GUILayout.Label(PlayerSettings.productName, productNameStyle);
+
+			var projectPathContent = new GUIContent(projectPath, iconFolder, "click to open folder");
+
+			if (GUILayout.Button(projectPathContent, EditorStyles.toolbarButton))
+			{
+				EditorUtility.RevealInFinder(Application.dataPath);
+			}
+		}
+
+		static void DrawListScenes()
+		{
+			EditorBuildSettingsScene[] listScenes = EditorBuildSettings.scenes;
+			int n = Mathf.Min(listScenes.Length, listScenes.Length);
+
+			GUILayout.BeginVertical();
+			{
+				for (var i = 0; i < n; i++)
+				{
+					EditorBuildSettingsScene scene = listScenes[i];
+					if (!scene.enabled) continue;
+
+					GUILayout.BeginHorizontal();
+					{
+						var asset = AssetDatabase.LoadAssetAtPath<SceneAsset>(scene.path);
+
+						if (GUILayout.Button(iconScene, EditorStyles.toolbarButton, GUILayout.Width(25f)))
+						{
+							OpenScene(scene.path, false);
+						}
+
+						EditorGUILayout.ObjectField(asset, typeof(SceneAsset), false);
+
+						if (GUILayout.Button(iconPlay, EditorStyles.toolbarButton, GUILayout.Width(25f)))
+						{
+							OpenScene(scene.path, true);
+						}
+					}
+					GUILayout.EndHorizontal();
+				}
+			}
+			GUILayout.EndVertical();
+		}
+
+
+		public void OnGUI()
+		{
+			if (productNameStyle == null) Init();
+
+			DrawProjectInfo();
+			EditorGUILayout.Space();
+			DrawBigPlayButton();
+			EditorGUILayout.Space();
+			DrawListScenes();
+		}
+	}
+}

package/Editor/Extra/GDKProjectCP.cs.meta

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

package/Editor/Extra.meta

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

package/Editor/Utils/AmaGDKEditor.ExtractVersion.cs

@@ -35,7 +35,7 @@ namespace Amanotes.Editor
         public SemVer sdkVersion;
 
         public bool sdkInstalled => sdkVersion > SemVer.ZERO;
-        public bool adapterInstalled => sdkVersion > SemVer.ZERO;
+        public bool adapterInstalled => adapterVersion > SemVer.ZERO;
 
         public string ToTSVString()
         {

package/Extra/{AmaGDKProject.unitypackage.meta → AndroidPostProcessor.unitypackage.meta}

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 26e42be832082494fb3eb94a4d9cd300
+guid: e331d1b8f5c1d49bc8ef6ea5239e4ca4
 DefaultImporter:
   externalObjects: {}
   userData: 

package/Extra/CheckDiskSpace.unitypackage.meta

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

package/Extra/SDKVersionTracking.unitypackage.meta

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

package/Runtime/AmaGDK.Adapters.cs

@@ -27,15 +27,11 @@ namespace Amanotes.Core.Internal
                 return;
             }
             
-            #if UNITY_EDITOR
-            status = Status.Ready;
-            #else
             status = Status.Initialize;
             Init(success =>
             {
                 status = success ? Status.Ready : Status.Failed;
             });
-            #endif
         }
     }
     

package/Runtime/AmaGDK.Ads.cs

@@ -9,6 +9,8 @@ using static Amanotes.Core.AmaGDK;
 
 namespace Amanotes.Core
 {
+    
+    
     public static class AdExtension
     {
         public static IAdCallback OnAdOpened(this IAdCallback ad, Action callback)
@@ -18,7 +20,7 @@ namespace Amanotes.Core
             Ads.context.onOpened += callback;
             return ad;
         }
-
+        
         public static IAdCallback OnRewardReceived(this IAdCallback ad, Action callback)
         {
             if (!MakeSureAdNotNull(ad)) return null;
@@ -26,7 +28,7 @@ namespace Amanotes.Core
             Ads.context.onRewardReceived += callback;
             return ad;
         }
-
+        
         public static IAdCallback OnAdClicked(this IAdCallback ad, Action callback)
         {
             if (!MakeSureAdNotNull(ad)) return null;
@@ -34,7 +36,7 @@ namespace Amanotes.Core
             Ads.context.onClicked += callback;
             return ad;
         }
-
+        
         public static IAdCallback OnAdShowFailed(this IAdCallback ad, Action callback)
         {
             if (!MakeSureAdNotNull(ad)) return null;
@@ -42,7 +44,7 @@ namespace Amanotes.Core
             Ads.context.onShowFailed += callback;
             return ad;
         }
-
+        
         public static IAdCallback OnAdShowSuccess(this IAdCallback ad, Action callback)
         {
             if (!MakeSureAdNotNull(ad)) return null;
@@ -50,7 +52,7 @@ namespace Amanotes.Core
             Ads.context.onShowSuccess += callback;
             return ad;
         }
-
+        
         public static IAdCallback OnAdClosed(this IAdCallback ad, Action callback)
         {
             if (!MakeSureAdNotNull(ad)) return null;
@@ -99,6 +101,27 @@ namespace Amanotes.Core
     }
     public partial class AmaGDK // Ads module
     {
+        public static partial class Event
+        {
+            public const string INTER_REQUEST = nameof(INTER_REQUEST);
+            public const string INTER_SHOW_CALLED = nameof(INTER_SHOW_CALLED);
+            public const string INTER_SHOW_READY = nameof(INTER_SHOW_READY);
+            public const string INTER_SHOW_NOT_READY = nameof(INTER_SHOW_NOT_READY); // reason: string
+            public const string INTER_SHOW_BEGIN = nameof(INTER_SHOW_BEGIN); // always call result: true / false
+            public const string INTER_SHOW_END = nameof(INTER_SHOW_END); // always call result: true / false
+        
+            public const string REWARD_REQUEST = nameof(REWARD_REQUEST);
+            public const string REWARD_VIDEO_SHOW_CALLED = nameof(REWARD_VIDEO_SHOW_CALLED);
+            public const string REWARD_VIDEO_SHOW_READY = nameof(REWARD_VIDEO_SHOW_READY);
+            public const string REWARD_VIDEO_SHOW_NOT_READY = nameof(REWARD_VIDEO_SHOW_NOT_READY); // reason: string
+            // public const string REWARD_VIDEO_REWARD_GRANTED = nameof(REWARD_VIDEO_REWARD_GRANTED);
+            public const string REWARD_VIDEO_SHOW_BEGIN = nameof(REWARD_VIDEO_SHOW_BEGIN); // always call result: true / false
+            public const string REWARD_VIDEO_SHOW_END = nameof(REWARD_VIDEO_SHOW_END); // always call result: true / false
+
+            public const string BANNER_SHOW = nameof(BANNER_SHOW);
+        }
+        
+        
         [Serializable]
         internal class AdStat
         {
@@ -177,6 +200,41 @@ namespace Amanotes.Core
             internal protected static AdAdapter _adapter;
             internal protected static float _savedVolume = -1;
             internal protected static float _savedTimeScale = -1;
+            
+            public static void OnInter_Request(Action callback)
+            {
+                dispatcher.AddListener(Event.INTER_REQUEST, callback, false);
+            }
+
+            public static void OnInter_ShowCalled(Action callback)
+            {
+                dispatcher.AddListener(Event.INTER_SHOW_CALLED, callback, false);
+            }
+        
+            public static void OnReward_ShowCalled(Action callback)
+            {
+                dispatcher.AddListener(Event.REWARD_VIDEO_SHOW_CALLED, callback, false);
+            }
+            
+            public static void OnInter_ShowReady(Action callback)
+            {
+                dispatcher.AddListener(Event.INTER_SHOW_READY, callback, false);
+            }
+        
+            public static void OnReward_ShowReady(Action callback)
+            {
+                dispatcher.AddListener(Event.REWARD_VIDEO_SHOW_READY, callback, false);
+            }
+        
+            public static void OnInter_ShowNotReady(Action<AdShowReadyStatus> callback)
+            {
+                dispatcher.AddListener(Event.INTER_SHOW_NOT_READY, callback, false);
+            }
+        
+            public static void OnReward_ShowNotReady(Action<AdShowReadyStatus> callback)
+            {
+                dispatcher.AddListener(Event.REWARD_VIDEO_SHOW_NOT_READY, callback, false);
+            }
         }
 
         public partial class Ads // Public
@@ -247,10 +305,11 @@ namespace Amanotes.Core
 
                 if (_adapter == null)
                 {
-                    //Debug.LogWarning("Adapter not found???");
                     return;
                 }
                 
+                
+                dispatcher.Dispatch(Event.BANNER_SHOW);
                 _adapter.ShowBanner(_showingBannerPosition);
             }
 
@@ -314,6 +373,7 @@ namespace Amanotes.Core.Internal
         public int adShowTimeoutInSecs = 5;
         public BannerPosition bannerPosition = BannerPosition.BOTTOM;
         public bool autoLogEvent = true;
+        public bool checkInternet = true;
 
         public bool enableInterstitial = true;
         public bool enableRewarded = true;
@@ -344,8 +404,6 @@ namespace Amanotes.Core.Internal
         public abstract void HideBanner();
 
         // Internally used
-        internal protected abstract void HandleBeforeAdShow();
-        internal protected abstract void HandleAfterAdShow();
         internal protected abstract void SetUserId(string userId);
     }
     
@@ -524,6 +582,9 @@ namespace Amanotes.Core.Internal
                 _isRequesting = true;
                 Log("[Ad] LoadAdRoutine: RequestAd()");
                 RequestAd();
+                dispatcher.Dispatch(
+                    _isInterstitial ? AmaGDK.Event.INTER_REQUEST : AmaGDK.Event.REWARD_REQUEST
+                );
 
                 int timeout = Config.ad.adLoadTimeoutInSecs;
                 var counter = 0;
@@ -581,7 +642,9 @@ namespace Amanotes.Core.Internal
             AdStat stat = Ads.localData.GetStat(adType);
             stat.callCount++;
             stat.lastCallTime = Time.realtimeSinceStartup;
-            OnAdShowCalled();
+            dispatcher.Dispatch(
+                _isInterstitial ? AmaGDK.Event.INTER_SHOW_CALLED : AmaGDK.Event.REWARD_VIDEO_SHOW_CALLED
+            );
 
             if (_showAdRoutine != null) _instance.StopCoroutine(_showAdRoutine);
             _showAdRoutine = _instance.StartCoroutine(ShowAdRoutine());
@@ -597,7 +660,7 @@ namespace Amanotes.Core.Internal
                 StartLoadAd();
             }
 
-            HandleAfterAdShow();
+            TriggerOnAfterAdShow();
             if (_showAdRoutine == null) return;
             _instance.StopCoroutine(_showAdRoutine);
             _showAdRoutine = null;
@@ -648,7 +711,7 @@ namespace Amanotes.Core.Internal
                 if (_loadState != LoadAdsState.Requesting) StartLoadAd();
                 var counter = 0;
                 bool? hasInternet = null;
-                _instance.StartCoroutine(WebUtils.CheckInternet(result => hasInternet = result));
+                if (adConfig.checkInternet) _instance.StartCoroutine(WebUtils.CheckInternet(result => hasInternet = result));
 
                 var wait1Sec = new WaitForSecondsRealtime(1f);
                 while (counter < timeout || timeout == -1)
@@ -657,7 +720,7 @@ namespace Amanotes.Core.Internal
                     counter++;
 
                     // finish checking internet & result is false
-                    if (hasInternet == false)
+                    if (adConfig.checkInternet && hasInternet == false)
                     {
                         Log("[Ad] Stop WaitForAd : No internet!");
                         _showState = ShowAdsState.ShowFail;
@@ -682,10 +745,9 @@ namespace Amanotes.Core.Internal
 
             _showState = ShowAdsState.Showing;
             OnAdShowReadyStatus(true, AdShowReadyStatus.Ready);
-            HandleBeforeAdShow();
+            TriggerBeforeAdShow();
             ShowAd();
-
-            AdShowContext context = Ads.context;
+            
             while (!context.potentiallyCompleted)
             {
                 yield return null; // callback as quickly as possible
@@ -750,14 +812,14 @@ namespace Amanotes.Core.Internal
             }
 
             localData.Save();
-            HandleAfterAdShow();
+            TriggerOnAfterAdShow();
 
             Log($"[Ad] {adType} ShowAdRoutineCompleted: {isSuccess}\n{JsonUtility.ToJson(Ads.context)}");
             Ads.context = null;
             _showState = ShowAdsState.None;
         }
 
-        private void HandleBeforeAdShow()
+        private void TriggerBeforeAdShow()
         {
             bool willSaveVolume = Config.ad.autoMute
                 && AudioListener.volume > 0
@@ -779,11 +841,11 @@ namespace Amanotes.Core.Internal
                 Time.timeScale = 0;
             }
 
+            dispatcher.Dispatch(_isInterstitial ? AmaGDK.Event.INTER_SHOW_BEGIN : AmaGDK.Event.REWARD_VIDEO_SHOW_BEGIN);
             Ads.context.onBeforeAdOpen?.Invoke();
-            Ads._adapter.HandleBeforeAdShow();
         }
 
-        private void HandleAfterAdShow()
+        private void TriggerOnAfterAdShow()
         {
             bool willRestoreVolume = Config.ad.autoMute
                 && AudioListener.volume == 0
@@ -804,8 +866,9 @@ namespace Amanotes.Core.Internal
                 Time.timeScale = Ads._savedTimeScale;
                 Ads._savedTimeScale = -1;
             }
-
-            Ads._adapter.HandleAfterAdShow();
+            
+            bool isSuccess = _showState == ShowAdsState.ShowSuccess;
+            dispatcher.Dispatch(_isInterstitial ? AmaGDK.Event.INTER_SHOW_END : AmaGDK.Event.REWARD_VIDEO_SHOW_END, isSuccess);
         }
 
         // Default implementation
@@ -877,20 +940,18 @@ namespace Amanotes.Core.Internal
             Ads.context.onAdShowReadyStatus?.Invoke(status);
             if (status == AdShowReadyStatus.Ready)
             {
-                OnAdShowReady();
+                dispatcher.Dispatch(
+                    _isInterstitial ? AmaGDK.Event.INTER_SHOW_READY : AmaGDK.Event.REWARD_VIDEO_SHOW_READY
+                );
             } else if (status == AdShowReadyStatus.NoInternet || status == AdShowReadyStatus.TimeOut || status == AdShowReadyStatus.Wifi3GDisabled)
             {
-                OnAdShowNotReady(status);
+                dispatcher.Dispatch(
+                    _isInterstitial ? AmaGDK.Event.INTER_SHOW_NOT_READY : AmaGDK.Event.REWARD_VIDEO_SHOW_NOT_READY,
+                    status
+                );
             }
         }
-
-        protected virtual void OnAdShowCalled()
-        { }
-        protected virtual void OnAdShowReady()
-        { }
-        protected virtual void OnAdShowNotReady(AdShowReadyStatus status)
-        { }
-
+        
         protected void OnAdOpen()
         {
             Log($"[Ad] {adType} OnAdOpen");