com.amanotes.gdk 0.2.50 → 0.2.52

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);
             }
         }
@@ -397,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 { }
@@ -504,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;