com.amanotes.gdk 0.2.49 → 0.2.51

package/Editor/Extra/GDKLocalBuild.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/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/Runtime/AmaGDK.Adapters.cs

@@ -13,7 +13,7 @@ namespace Amanotes.Core.Internal
         [HideInInspector] [SerializeField] internal bool enabled = true;
         [NonSerialized] internal string adapterId;
         [NonSerialized] internal string adapterVersion;
-        [NonSerialized] internal protected Status status = Status.None;
+        [NonSerialized] protected internal Status status = Status.None;
         
         protected abstract void Init(Action<bool> onComplete);
         

package/Runtime/AmaGDK.Ads.cs

@@ -196,11 +196,11 @@ namespace Amanotes.Core
             // internal use
             internal static readonly AdsData localData = new AdsData().LoadJsonFromFile();
 
-            internal protected static AdShowContext context;
-            internal protected static AdAdapter _adapter;
-            internal protected static float _savedVolume = -1;
-            internal protected static float _savedTimeScale = -1;
-            
+            protected internal static AdShowContext context;
+            protected internal static AdAdapter _adapter;
+            protected internal static float _savedVolume = -1;
+            protected internal static float _savedTimeScale = -1;
+
             public static void OnInter_Request(Action callback)
             {
                 dispatcher.AddListener(Event.INTER_REQUEST, callback, false);
@@ -258,8 +258,8 @@ namespace Amanotes.Core
                 }
             }
 
-            public static bool HasInterstitial => _adapter.interstitial.hasAd;
-            public static bool HasRewardedVideo => _adapter.rewardVideo.hasAd;
+            public static bool HasInterstitial => _adapter?.interstitial.hasAd ?? false;
+            public static bool HasRewardedVideo => _adapter?.rewardVideo.hasAd ?? false;
             public static bool IsBannerShowing => _isBannerShowing;
             public static bool IsAdShowing => context != null;
 
@@ -273,6 +273,7 @@ namespace Amanotes.Core
 
             public static IAdCallback ShowInterstitial(string placementName = null, Dictionary<string, object> userData = null)
             {
+                if (_adapter == null) return null;
                 if (!ClearPrevContext()) return null;
 
                 context = new AdShowContext(AdType.Interstitial, placementName, userData);
@@ -284,6 +285,7 @@ namespace Amanotes.Core
 
             public static IAdCallback ShowRewardedVideo(string placementName = null, Dictionary<string, object> userData = null)
             {
+                if (_adapter == null) return null;
                 if (!ClearPrevContext()) return null;
 
                 context = new AdShowContext(AdType.VideoReward, placementName, userData);
@@ -303,12 +305,8 @@ namespace Amanotes.Core
                 _isBannerShowing = true;
                 _showingBannerPosition = bannerPosition ?? Config.ad.bannerPosition;
 
-                if (_adapter == null)
-                {
-                    return;
-                }
-                
-                
+                if (_adapter == null) return;
+
                 dispatcher.Dispatch(Event.BANNER_SHOW);
                 _adapter.ShowBanner(_showingBannerPosition);
             }
@@ -317,11 +315,13 @@ namespace Amanotes.Core
             {
                 if (!_isBannerShowing) return;
                 _isBannerShowing = false;
+                if (_adapter == null) return;
                 _adapter.HideBanner();
             }
 
             public static void StopWaitForAd()
             {
+                if (_adapter == null) return;
                 if (context == null)
                     return;
                 
@@ -357,6 +357,7 @@ namespace Amanotes.Core
 
             public static void SetUserId(string userId)
             {
+                if (_adapter == null) return;
                 _adapter.SetUserId(userId);
             }
         }
@@ -373,6 +374,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;
@@ -396,14 +398,14 @@ namespace Amanotes.Core.Internal
         protected AdModuleConfig moduleConfig => Config.ad;
 
         // APIs
-        internal protected abstract AdLogic interstitial { get; }
-        internal protected abstract AdLogic rewardVideo { get; }
+        protected internal abstract AdLogic interstitial { get; }
+        protected internal abstract AdLogic rewardVideo { get; }
 
         public abstract void ShowBanner(BannerPosition bannerPosition);
         public abstract void HideBanner();
 
         // Internally used
-        internal protected abstract void SetUserId(string userId);
+        protected internal abstract void SetUserId(string userId);
     }
     
     public interface IAdCallback { }
@@ -503,7 +505,6 @@ namespace Amanotes.Core.Internal
 
     public abstract class AdLogic
     {
-        internal protected AdAdapter adapter => Ads._adapter;
         protected AdModuleConfig adConfig => Config.ad;
         protected AdShowContext context => Ads.context;
         
@@ -710,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)
@@ -719,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;