Skip to content

Commit 0d237fc

Browse files
committed
- fix Advertising
null AOA and RewardInter when auto load IronSourceAd
1 parent 695c203 commit 0d237fc

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

Runtime/General/AdClient.cs

+10-3
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ protected virtual bool IsInterstitialReady()
3333

3434
public virtual void LoadInterstitial()
3535
{
36+
if (InterstitialAdUnit() == null) return;
3637
if (!IsInterstitialReady()) InterstitialAdUnit().Load();
3738
}
3839

@@ -57,6 +58,7 @@ protected virtual bool IsRewardedReady()
5758

5859
public virtual void LoadRewarded()
5960
{
61+
if (RewardAdUnit() == null) return;
6062
if (!IsRewardedReady()) RewardAdUnit().Load();
6163
}
6264

@@ -69,7 +71,8 @@ public AdUnit RewardedInterstitialAdUnit()
6971
return adSettings.CurrentAdNetwork switch
7072
{
7173
AdNetwork.Max => adSettings.MaxRewardedInterstitialAdUnit,
72-
_ => adSettings.AdmobRewardedInterstitialAdUnit,
74+
AdNetwork.Admob => adSettings.AdmobRewardedInterstitialAdUnit,
75+
_ => null
7376
};
7477
}
7578

@@ -80,6 +83,7 @@ protected virtual bool IsRewardedInterstitialReady()
8083

8184
public virtual void LoadRewardedInterstitial()
8285
{
86+
if (RewardedInterstitialAdUnit() == null) return;
8387
if (!IsRewardedInterstitialReady()) RewardedInterstitialAdUnit().Load();
8488
}
8589

@@ -92,7 +96,8 @@ public AdUnit AppOpenAdUnit()
9296
return adSettings.CurrentAdNetwork switch
9397
{
9498
AdNetwork.Max => adSettings.MaxAppOpenAdUnit,
95-
_ => adSettings.AdmobAppOpenAdUnit,
99+
AdNetwork.Admob => adSettings.AdmobAppOpenAdUnit,
100+
_ => null,
96101
};
97102
}
98103

@@ -103,6 +108,7 @@ protected virtual bool IsAppOpenReady()
103108

104109
public virtual void LoadAppOpen()
105110
{
111+
if (AppOpenAdUnit() == null) return;
106112
if (!IsAppOpenReady()) AppOpenAdUnit().Load();
107113
}
108114

@@ -121,7 +127,8 @@ public AdUnit BannerAdUnit()
121127
return adSettings.CurrentAdNetwork switch
122128
{
123129
AdNetwork.Max => adSettings.MaxBannerAdUnit,
124-
_ => adSettings.AdmobBannerAdUnit,
130+
AdNetwork.Admob => adSettings.AdmobBannerAdUnit,
131+
_ => adSettings.IronSourceBannerAdUnit
125132
};
126133
}
127134

Runtime/General/Advertising.cs

+1
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,7 @@ private void ShowPrivacyOptionsForm()
239239
#if VIRTUESKY_MAX
240240
private void OnApplicationPause(bool pauseStatus)
241241
{
242+
if (adSettings.CurrentAdNetwork != AdNetwork.Max) return;
242243
if (!pauseStatus && adSettings.MaxAppOpenAdUnit.autoShow && !AdStatic.isShowingAd)
243244
(currentAdClient as MaxAdClient)?.ShowAppOpen();
244245
}

0 commit comments

Comments
 (0)