diff --git a/Assets/Script/Common/IAdService.cs b/Assets/Script/Common/IAdService.cs index c429bb0..b93deb6 100644 --- a/Assets/Script/Common/IAdService.cs +++ b/Assets/Script/Common/IAdService.cs @@ -66,7 +66,7 @@ namespace WZ /// /// 显示插页广告 /// - void DisplayInterstitial(string _adPos, IvType _IvType = IvType.IV1, Action _closeCallback = null); + void DisplayInterstitial(string _adPos, IvType _IvType = IvType.IV1, Action _closeCallback = null); /// /// 获取插页广告收益信息 @@ -90,7 +90,7 @@ namespace WZ /// /// 显示激励广告 /// - void DisplayRewarded(string _adPos, Action _rewardCallback = null, Action _showFailedCallback = null); + void DisplayRewarded(string _adPos, Action _rewardCallback = null, Action _showFailedCallback = null); /// /// 获取激励广告收益信息 diff --git a/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobAdsManager.cs b/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobAdsManager.cs index 4fceed1..4f5954a 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobAdsManager.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobAdsManager.cs @@ -24,8 +24,8 @@ namespace WZ private List _bannerAdUnits = new List(); private string _rvPos; private string _ivPos; - private Action _rvCloseCallback = null; - private Action _ivCloseCallback = null; + private Action _rvCloseCallback = null; + private Action _ivCloseCallback = null; private Action _rvShowFailedCallback = null; private bool _initialized = false; private float _rvStartLoadTime = 0; @@ -77,7 +77,7 @@ namespace WZ _rvStartLoadTime = Time.realtimeSinceStartup; AdsActionEvents.TrackAdStartLoad(Platfrom, "", "", AdsType.Rewarded); } - public void DisplayRewarded(string adPos, Action rewardCallback = null, Action showFailedCallback = null) + public void DisplayRewarded(string adPos, Action rewardCallback = null, Action showFailedCallback = null) { _rvPos = adPos; _rvCloseCallback = rewardCallback; @@ -114,7 +114,7 @@ namespace WZ private void OnRewardedAdDismissed(string adSource,string adUnitId,double revenue) { AdsActionEvents.TrackAdClosed(Platfrom,adSource,adUnitId,AdsType.Rewarded,_rvPos,revenue); - _rvCloseCallback?.Invoke(true); + _rvCloseCallback?.Invoke(true,revenue); _rvCloseCallback = null; LoadRewarded(); } @@ -162,7 +162,7 @@ namespace WZ return _admobInterstitialAdManager.GetHighestPayingAdRevenue(); } - public void DisplayInterstitial(string ivPos, IvType _IvType = IvType.IV1, Action closeCallback = null) + public void DisplayInterstitial(string ivPos, IvType _IvType = IvType.IV1, Action closeCallback = null) { _ivPos = ivPos; _ivCloseCallback = closeCallback; @@ -201,7 +201,7 @@ namespace WZ private void OnInterstitialAdDismissed(string adSource,string adUnitId,double revenue) { AdsActionEvents.TrackAdClosed(Platfrom, adSource, adUnitId, AdsType.Interstitial, "", revenue); - _ivCloseCallback?.Invoke(); + _ivCloseCallback?.Invoke(revenue); _ivCloseCallback = null; LoadInterstitial(); } @@ -209,7 +209,7 @@ namespace WZ private void OnInterstitialAdError(string adUnitId, int errorCode, string errorMsg) { AdsActionEvents.TrackAdFailToShow(Platfrom,AdsType.Interstitial,errorMsg,""); - _ivCloseCallback?.Invoke(); + _ivCloseCallback?.Invoke(0); _ivCloseCallback = null; LoadInterstitial(); } diff --git a/Assets/Script/SDKManager/AdsSDKManager/AdsSDKManager.cs b/Assets/Script/SDKManager/AdsSDKManager/AdsSDKManager.cs index 43d1b75..c887112 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/AdsSDKManager.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/AdsSDKManager.cs @@ -63,7 +63,7 @@ namespace WZ /// 展示激励广告 /// /// - public void ShowRewardAd(string _adPos, Action _rewardCallback = null, Action _showFailedCallback = null) + public void ShowRewardAd(string _adPos, Action _rewardCallback = null, Action _showFailedCallback = null) { AdsActionEvents.TrackAdPosition(AdsType.Rewarded, _adPos); if (!IsRewardAdReady()) @@ -110,12 +110,12 @@ namespace WZ /// 展示激励广告 /// /// - public void ShowInterstitialAd(string _adPos, IvType _IvType = IvType.IV1, Action _closeCallback = null) + public void ShowInterstitialAd(string _adPos, IvType _IvType = IvType.IV1, Action _closeCallback = null) { AdsActionEvents.TrackAdPosition(AdsType.Interstitial, _adPos); if (!IsRewardAdReady()) { - _closeCallback?.Invoke(); + _closeCallback?.Invoke(0); _closeCallback = null; return; } @@ -144,7 +144,7 @@ namespace WZ } else { - _closeCallback?.Invoke(); + _closeCallback?.Invoke(0); } AdPlayCountManager.IncrementAdPlayCount(AdsType.Interstitial); diff --git a/Assets/Script/SDKManager/AdsSDKManager/BigoAdsManager/BigoAdsManager.cs b/Assets/Script/SDKManager/AdsSDKManager/BigoAdsManager/BigoAdsManager.cs index c4643df..dd4f631 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/BigoAdsManager/BigoAdsManager.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/BigoAdsManager/BigoAdsManager.cs @@ -19,8 +19,8 @@ namespace WZ private bool _initialized; private string _rvPos; private string _IvPos; - private Action _rvCloseCallback = null; - private Action _ivCloseCallback = null; + private Action _rvCloseCallback = null; + private Action _ivCloseCallback = null; private Action _rvShowFailedCallback = null; private float _rvStartLoadTime = 0; @@ -56,7 +56,7 @@ namespace WZ // 各个回调处理方法 private void OnRewardedAdLoaded(string adUnitId) { - + AdsActionEvents.TrackAdLoaded(Platfrom,ClientName, adUnitId, AdsType.Rewarded,Time.realtimeSinceStartup - _rvStartLoadTime); } private void OnRewardedAdLoadFailed(string adUnitId, int code, string msg) @@ -68,10 +68,10 @@ namespace WZ { } - private void OnRewardedAdDismissed(string adUnitId) + private void OnRewardedAdDismissed(string adUnitId,double revenue) { - AdsActionEvents.TrackAdClosed(Platfrom,ClientName, adUnitId, AdsType.Rewarded, _rvPos, GetRewardedRevenue()); - _rvCloseCallback?.Invoke(true); + AdsActionEvents.TrackAdClosed(Platfrom,ClientName, adUnitId, AdsType.Rewarded, _rvPos, revenue); + _rvCloseCallback?.Invoke(true,revenue); _rvCloseCallback = null; LoadRewarded(); @@ -85,9 +85,9 @@ namespace WZ LoadRewarded(); } - private void OnRewardedAdClicked(string adUnitId) + private void OnRewardedAdClicked(string adUnitId,double revenue) { - AdsActionEvents.TrackAdClicked(Platfrom,ClientName,adUnitId,AdsType.Rewarded,_rvPos,GetRewardedRevenue()); + AdsActionEvents.TrackAdClicked(Platfrom,ClientName,adUnitId,AdsType.Rewarded,_rvPos,revenue); } public void LoadRewarded() @@ -117,7 +117,7 @@ namespace WZ return _rewardedAdManager.GetAvailableAdUnits().Count > 0; } - public void DisplayRewarded(string adPos, Action rewardCallback = null, Action showFailedCallback = null) + public void DisplayRewarded(string adPos, Action rewardCallback = null, Action showFailedCallback = null) { _rvPos = adPos; _rvCloseCallback = rewardCallback; @@ -133,7 +133,7 @@ namespace WZ #region 插页广告功能 private void OnInterstitialAdLoaded(string adUnitId) { - + AdsActionEvents.TrackAdLoaded(Platfrom,ClientName, adUnitId, AdsType.Interstitial,Time.realtimeSinceStartup - _ivStartLoadTime); } private void OnInterstitialAdLoadFailed(string adUnitId, int code, string msg) @@ -145,10 +145,10 @@ namespace WZ { } - private void OnInterstitialAdDismissed(string adUnitId) + private void OnInterstitialAdDismissed(string adUnitId,double revenue) { AdsActionEvents.TrackAdClosed(Platfrom,ClientName, adUnitId, AdsType.Interstitial, "", GetInterstitialRevenue()); - _ivCloseCallback?.Invoke(); + _ivCloseCallback?.Invoke(revenue); _ivCloseCallback = null; LoadInterstitial(); } @@ -156,7 +156,7 @@ namespace WZ private void OnInterstitialAdError(string adUnitId, int code, string msg) { AdsActionEvents.TrackAdFailToShow(Platfrom, AdsType.Interstitial, msg, ""); - _ivCloseCallback?.Invoke(); + _ivCloseCallback?.Invoke(0); _ivCloseCallback = null; LoadInterstitial(); @@ -194,7 +194,7 @@ namespace WZ return _interstitialAdManager.GetAvailableAdUnits().Count > 0; } - public void DisplayInterstitial(string ivPos, IvType _IvType = IvType.IV1, Action closeCallback = null) + public void DisplayInterstitial(string ivPos, IvType _IvType = IvType.IV1, Action closeCallback = null) { _IvPos = ivPos; _ivCloseCallback = closeCallback; diff --git a/Assets/Script/SDKManager/AdsSDKManager/BigoAdsManager/BigoInterstitialAdManager.cs b/Assets/Script/SDKManager/AdsSDKManager/BigoAdsManager/BigoInterstitialAdManager.cs index ad6afed..a6b918d 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/BigoAdsManager/BigoInterstitialAdManager.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/BigoAdsManager/BigoInterstitialAdManager.cs @@ -17,7 +17,7 @@ namespace WZ public void InitializeAdUnits(List adUnitIds, Action onAdLoaded = null, Action onAdLoadFailed = null, Action onAdShowed = null, - Action onAdDismissed = null, + Action onAdDismissed = null, Action onAdError = null, Action onAdClicked = null) { @@ -30,7 +30,7 @@ namespace WZ private void CreateRewardedAd(string adUnitId, Action onAdLoaded, Action onAdLoadFailed, Action onAdShowed, - Action onAdDismissed, + Action onAdDismissed, Action onAdError, Action onAdClicked) { @@ -76,7 +76,7 @@ namespace WZ interstitialAd.OnAdDismissed += (() => { LoggerUtils.Debug($"[Bigo] Interstitial -[interaction]: {adUnitId} dismiss"); - onAdDismissed?.Invoke(adUnitId); + onAdDismissed?.Invoke(adUnitId,GetAdRevenue(interstitialAd)); }); interstitialAd.OnAdError += ((code, msg) => diff --git a/Assets/Script/SDKManager/AdsSDKManager/BigoAdsManager/BigoRewardedAdManager.cs b/Assets/Script/SDKManager/AdsSDKManager/BigoAdsManager/BigoRewardedAdManager.cs index 6039762..3ba3eb7 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/BigoAdsManager/BigoRewardedAdManager.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/BigoAdsManager/BigoRewardedAdManager.cs @@ -17,9 +17,9 @@ namespace WZ public void InitializeAdUnits(List adUnitIds, Action onAdLoaded = null, Action onAdLoadFailed = null, Action onAdShowed = null, - Action onAdDismissed = null, + Action onAdDismissed = null, Action onAdError = null, - Action onAdClicked = null) + Action onAdClicked = null) { foreach (var adUnitId in adUnitIds) { @@ -30,9 +30,9 @@ namespace WZ private void CreateRewardedAd(string adUnitId, Action onAdLoaded, Action onAdLoadFailed, Action onAdShowed, - Action onAdDismissed, + Action onAdDismissed, Action onAdError, - Action onAdClicked) + Action onAdClicked) { if (_rewardedAds.ContainsKey(adUnitId)) { @@ -76,7 +76,7 @@ namespace WZ rewardedAd.OnAdDismissed += (() => { LoggerUtils.Debug($"[Bigo] Rewarded-[interaction]: {adUnitId} dismiss"); - onAdDismissed?.Invoke(adUnitId); + onAdDismissed?.Invoke(adUnitId,GetAdRevenue(rewardedAd)); }); rewardedAd.OnAdError += ((code, msg) => @@ -87,7 +87,7 @@ namespace WZ rewardedAd.OnAdClicked += () => { - onAdClicked?.Invoke(adUnitId); + onAdClicked?.Invoke(adUnitId,GetAdRevenue(rewardedAd)); }; LoadAd(adUnitId); } diff --git a/Assets/Script/SDKManager/AdsSDKManager/MaxAdsManager/MaxAdsManager.cs b/Assets/Script/SDKManager/AdsSDKManager/MaxAdsManager/MaxAdsManager.cs index 5aa587a..dc985db 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/MaxAdsManager/MaxAdsManager.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/MaxAdsManager/MaxAdsManager.cs @@ -23,8 +23,8 @@ namespace WZ private float _ivStartLoadTime = 0; private string _rvPos; private string _ivPos; - private Action _rvCloseCallback = null; - private Action _ivCloseCallback = null; + private Action _rvCloseCallback = null; + private Action _ivCloseCallback = null; private Action _rvShowFailedCallback = null; public void Initialize() @@ -77,7 +77,7 @@ namespace WZ AdsActionEvents.TrackAdStartLoad(Platfrom, "", "", AdsType.Rewarded); _rvStartLoadTime = Time.realtimeSinceStartup; } - public void DisplayRewarded(string adPos, Action rewardCallback = null, Action showFailedCallback = null) + public void DisplayRewarded(string adPos, Action rewardCallback = null, Action showFailedCallback = null) { _rvPos = adPos; _rvCloseCallback = rewardCallback; @@ -150,7 +150,7 @@ namespace WZ private void OnRewardedAdHiddenEvent(string adUnitId, MaxSdkBase.AdInfo adInfo) { - _rvCloseCallback?.Invoke(true); + _rvCloseCallback?.Invoke(true,adInfo.Revenue); _rvCloseCallback = null; LoadRewarded(); LoggerUtils.Debug("[Max] OnRewardedAdHiddenEvent"); @@ -192,7 +192,7 @@ namespace WZ } } - public void DisplayInterstitial(string ivPos, IvType _IvType = IvType.IV1, Action closeCallback = null) + public void DisplayInterstitial(string ivPos, IvType _IvType = IvType.IV1, Action closeCallback = null) { _ivPos = ivPos; _ivCloseCallback = closeCallback; @@ -226,7 +226,7 @@ namespace WZ private void OnInterstitialAdFailedToDisplayEvent(string adUnitId, MaxSdkBase.ErrorInfo errorInfo, MaxSdkBase.AdInfo arg3) { LoggerUtils.Debug("[Max] OnInterstitialAdFailedToDisplayEvent :" + errorInfo.Message + " " + errorInfo.Code + " " + errorInfo.MediatedNetworkErrorMessage + " " + errorInfo.MediatedNetworkErrorCode); - _ivCloseCallback?.Invoke(); + _ivCloseCallback?.Invoke(0); _ivCloseCallback = null; LoadInterstitial(); AdsActionEvents.TrackAdFailToShow(Platfrom,AdsType.Interstitial,errorInfo.Message,""); @@ -242,7 +242,7 @@ namespace WZ { LoggerUtils.Debug($"[Max] OnInterstitialHiddenEvent"); AdsActionEvents.TrackAdClosed(Platfrom,adInfo.NetworkName,adInfo.AdUnitIdentifier,AdsType.Interstitial,"",adInfo.Revenue); - _ivCloseCallback?.Invoke(); + _ivCloseCallback?.Invoke(adInfo.Revenue); _ivCloseCallback = null; LoadInterstitial(); } diff --git a/Assets/Script/SDKManager/AdsSDKManager/TpnAdsManager/TpnAdsManager.cs b/Assets/Script/SDKManager/AdsSDKManager/TpnAdsManager/TpnAdsManager.cs index 1b32b22..b9b079b 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/TpnAdsManager/TpnAdsManager.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/TpnAdsManager/TpnAdsManager.cs @@ -19,8 +19,8 @@ namespace WZ public string _topon_rewarded_units; private string _rvPos; private string _ivPos; - private Action _rvCloseCallback = null; - private Action _ivCloseCallback = null; + private Action _rvCloseCallback = null; + private Action _ivCloseCallback = null; private Action _rvShowFailedCallback = null; public void Initialize() @@ -60,7 +60,7 @@ namespace WZ } public void LoadRewarded() { } - public void DisplayRewarded(string adPos, Action rewardCallback = null, Action showFailedCallback = null) + public void DisplayRewarded(string adPos, Action rewardCallback = null, Action showFailedCallback = null) { _rvPos = adPos; _rvCloseCallback = rewardCallback; @@ -94,7 +94,7 @@ namespace WZ public void LoadInterstitial() { } public double GetInterstitialRevenue() { return 0; } - public void DisplayInterstitial(string ivPos, IvType _IvType = IvType.IV1, Action closeCallback = null) + public void DisplayInterstitial(string ivPos, IvType _IvType = IvType.IV1, Action closeCallback = null) { _ivPos = ivPos; _ivCloseCallback = closeCallback; @@ -176,7 +176,7 @@ namespace WZ } else if (erg.placementId.Equals(_topon_interstitial_units)) { - _ivCloseCallback?.Invoke(); + _ivCloseCallback?.Invoke(0); _ivCloseCallback = null; } }, ""); @@ -198,12 +198,12 @@ namespace WZ { if (erg.placementId.Equals(_topon_rewarded_units)) { - _rvCloseCallback?.Invoke(true); + _rvCloseCallback?.Invoke(true,erg.callbackInfo.publisher_revenue); _rvCloseCallback = null; } else if (erg.placementId.Equals(_topon_interstitial_units)) { - _ivCloseCallback?.Invoke(); + _ivCloseCallback?.Invoke(erg.callbackInfo.publisher_revenue); _ivCloseCallback = null; } }, ""); diff --git a/Assets/Script/SDKManager/AppSDKManager.cs b/Assets/Script/SDKManager/AppSDKManager.cs index ca62cad..a26bf32 100644 --- a/Assets/Script/SDKManager/AppSDKManager.cs +++ b/Assets/Script/SDKManager/AppSDKManager.cs @@ -46,13 +46,21 @@ public class AppSDKManager : D_MonoSingleton bool isInterstitialReady = AdsSDKManager.Instance.IsInterstitialReady(); if (isInterstitialReady) { - AdsSDKManager.Instance.ShowInterstitialAd(position, ivadType, () => + AdsSDKManager.Instance.ShowInterstitialAd(position, ivadType, (revenue) => { //展示完一个插屏之后调用 IvRulesConst.CurrentOverLevel = 0; IvRulesConst.CurrentInterval = TimeUtils.GetLocalTimestamp(); }); } + else + { + callback?.Invoke(0); + } + } + else + { + callback?.Invoke(0); } } @@ -107,16 +115,17 @@ public class AppSDKManager : D_MonoSingleton - public void ShowRewardAd(string position, Action callback = null) + public void ShowRewardAd(string position, Action callback = null) { bool isRewardAdReady = AdsSDKManager.Instance.IsRewardAdReady(); if (isRewardAdReady) { - AdsSDKManager.Instance.ShowRewardAd(position, (isReward) => + AdsSDKManager.Instance.ShowRewardAd(position, (isReward, revenue) => { if (isReward) { //callback?.Invoke(); + callback?.Invoke(true, revenue); } }); }