diff --git a/Assets/Script/SDKManager/AdsSDKManager/AdsSDKManager.cs b/Assets/Script/SDKManager/AdsSDKManager/AdsSDKManager.cs index 825a8d1..6854cc7 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/AdsSDKManager.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/AdsSDKManager.cs @@ -27,9 +27,9 @@ namespace WZ private void InitializeAdNetworks() { + _adNetworks.Add(TpnAdsManager.Instance); _adNetworks.Add(AdmobAdsManager.Instance); _adNetworks.Add(BigoAdsManager.Instance); - _adNetworks.Add(TpnAdsManager.Instance); _adNetworks.Add(MaxAdsManager.Instance); _adNetworks.Add(KwaiAdsManager.Instance); foreach (var network in _adNetworks) diff --git a/Assets/Script/SDKManager/AdsSDKManager/KwaiAdsManager/KwaiAdsManager.cs b/Assets/Script/SDKManager/AdsSDKManager/KwaiAdsManager/KwaiAdsManager.cs index 1a91b25..716bc69 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/KwaiAdsManager/KwaiAdsManager.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/KwaiAdsManager/KwaiAdsManager.cs @@ -38,9 +38,7 @@ namespace WZ public void Initialize() { - LoggerUtils.Debug("KwaiAdsManager Initialize start" + _appId + " token:" + _token + " rewardAdUnitId:" + _rewardAdUnitId + " interstitialAdUnitId:" + _interstitialAdUnitId); - if (string.IsNullOrEmpty(_appId) || string.IsNullOrEmpty(_token) || _initialized) return; - + if (KwaiAdsConfigParser.GetKwaiRvFloorOpen()) { KwaiFloorRvManager.Instance.InitializeWithFloors(); @@ -51,15 +49,28 @@ namespace WZ KwaiFloorIvManager.Instance.InitializeWithFloors(); } - var kwaiAdConfig = new KwaiAds.Scripts.Api.KwaiAdConfig.Builder() - .SetAppId(_appId) - .SetToken(_token) - .SetDebugLog(false) - .Build(); + var useToponKwai = RushSDKManager.Instance.GetRemoteConfigStr("use_topon_kwai","1").Equals("1"); + LoggerUtils.Debug("KwaiAdsManager Initialize start" + _appId + " token:" + _token + " rewardAdUnitId:" + _rewardAdUnitId + " interstitialAdUnitId:" + _interstitialAdUnitId+ " useToponKwai:" + useToponKwai); - KwaiAds.Scripts.Api.KwaiAdsSdk.Initialize(kwaiAdConfig, new InitResultCallbackImpl()); + if (useToponKwai) + { + _initialized = true; + LoadInterstitial(); + LoadRewarded(); + } + else + { - _initialized = true; + if (string.IsNullOrEmpty(_appId) || string.IsNullOrEmpty(_token) || _initialized) return; + var kwaiAdConfig = new KwaiAds.Scripts.Api.KwaiAdConfig.Builder() + .SetAppId(_appId) + .SetToken(_token) + .SetDebugLog(false) + .Build(); + + KwaiAds.Scripts.Api.KwaiAdsSdk.Initialize(kwaiAdConfig, new InitResultCallbackImpl()); + _initialized = true; + } } @@ -77,19 +88,20 @@ namespace WZ #region 激励广告 public void LoadRewarded() { - AdsActionEvents.TrackAdStartLoad(Platfrom, AdsType.Rewarded); if (!KwaiAdsConfigParser.GetKwaiRvFloorOpen()) { LoadRewardedStandard(); return; } - + AdsActionEvents.TrackAdStartLoad(Platfrom, AdsType.Rewarded); KwaiFloorRvManager.Instance.LoadRewardedWithFloors(); } public void LoadRewardedStandard() { + LoggerUtils.Debug("kwai load rewarded standard"+_rewardAdUnitId); if (string.IsNullOrEmpty(_rewardAdUnitId)) return; + AdsActionEvents.TrackAdStartLoad(Platfrom, AdsType.Rewarded); if (_rewardAdController != null) { _rewardAdController.Destroy(); @@ -151,23 +163,26 @@ namespace WZ #region 插屏 public void LoadInterstitial() { - AdsActionEvents.TrackAdStartLoad(Platfrom, AdsType.Interstitial); + if (!KwaiAdsConfigParser.GetKwaiIvFloorOpen()) { LoadInterstitialStandard(); return; } + AdsActionEvents.TrackAdStartLoad(Platfrom, AdsType.Interstitial); KwaiFloorIvManager.Instance.LoadInterstitialWithFloors(); } private void LoadInterstitialStandard() { + LoggerUtils.Debug("kwai load interstitial standard:"+_interstitialAdUnitId); if (string.IsNullOrEmpty(_interstitialAdUnitId)) return; + AdsActionEvents.TrackAdStartLoad(Platfrom, AdsType.Interstitial); if (_interstitialAdController != null) { _interstitialAdController.Destroy(); _interstitialAdController = null; - + } _interstitiaAdRevenue = -1; _interstitialAdController = KwaiAds.Scripts.Api.KwaiAdsSdk.SDK.getInterstitialAdController(); diff --git a/Assets/Script/SDKManager/RushSDKManager.cs b/Assets/Script/SDKManager/RushSDKManager.cs index 172d66f..50b9301 100644 --- a/Assets/Script/SDKManager/RushSDKManager.cs +++ b/Assets/Script/SDKManager/RushSDKManager.cs @@ -21,7 +21,7 @@ public class RushSDKManager : D_MonoSingleton public static string GetSDKVersion() { - return "1.0.4.4"; + return "1.0.4.5"; } protected override void Initialized() { diff --git a/Assets/Script/Test.cs b/Assets/Script/Test.cs index 8768c1c..2ef45e9 100644 --- a/Assets/Script/Test.cs +++ b/Assets/Script/Test.cs @@ -16,17 +16,21 @@ public class Test : MonoBehaviour private void Start() { - - + + RushSDKManager.Instance.InitializeSdk(()=> { },true); } public void OnShowAd() { - + RushSDKManager.Instance.ShowRewardAd("test",(s,st)=> + { + LoggerUtils.Debug("onreward show callback revenue:"+st); + }); } public void OnShowInterstitial() { + RushSDKManager.Instance.ShowBanner(BannerType.Collapsible,BannerAlignType.CenterBottom); // KwaiAdsManager.Instance.OnInterstitialCallback(); // var small = gameObject.transform.Find("NativeAd-small").GetComponent(); @@ -73,7 +77,7 @@ public class Test : MonoBehaviour public void ToponDebug() { // ATSDKAPI.showDebuggerUI(); - RushSDKManager.Instance.HideBanner(BannerType.Standard); + } public void MaxDebug() @@ -84,28 +88,31 @@ public class Test : MonoBehaviour public void Native1Show() { - var adUnitId = StaticValue.AdmobSmallNativeId; - var nativeAdPosition = NativeAdPosition.Create(new NativeTemplateStyle - { - TemplateId = NativeTemplateId.Small - }, small); - Debug.Log($"luojian admob native ad ({adUnitId}) start show {small} medium {medium} X:{nativeAdPosition.X} Y:{nativeAdPosition.Y} Height :{nativeAdPosition.Height} Width:{nativeAdPosition.Width} Screen.dpi = {3.5}"); - if (AdsSDKManager.Instance.IsNativeAdReady(adUnitId)) - { - AdsSDKManager.Instance.ShowNativeAd("test", adUnitId, nativeAdPosition); - } - else - { - Debug.LogWarning($"luojian admob native ad ({adUnitId}) start show fail,not ready."); - } + RushSDKManager.Instance.HideBanner(BannerType.Collapsible); + // var adUnitId = StaticValue.AdmobSmallNativeId; + // var nativeAdPosition = NativeAdPosition.Create(new NativeTemplateStyle + // { + // TemplateId = NativeTemplateId.Small + // }, small); + // Debug.Log($"luojian admob native ad ({adUnitId}) start show {small} medium {medium} X:{nativeAdPosition.X} Y:{nativeAdPosition.Y} Height :{nativeAdPosition.Height} Width:{nativeAdPosition.Width} Screen.dpi = {3.5}"); + // if (AdsSDKManager.Instance.IsNativeAdReady(adUnitId)) + // { + // AdsSDKManager.Instance.ShowNativeAd("test", adUnitId, nativeAdPosition); + // } + // else + // { + // Debug.LogWarning($"luojian admob native ad ({adUnitId}) start show fail,not ready."); + // } } public void Native1Hide() { - var adUnitId = StaticValue.AdmobSmallNativeId; - AdsSDKManager.Instance.RemoveNativeAd(adUnitId); + RushSDKManager.Instance.HideBanner(BannerType.Standard); + // var adUnitId = StaticValue.AdmobSmallNativeId; + // AdsSDKManager.Instance.RemoveNativeAd(adUnitId); } + public void Native2Show() { var adUnitId = StaticValue.AdmobNativeId; diff --git a/Assets/Script/Version/Version.md b/Assets/Script/Version/Version.md index f2111e8..400e44f 100644 --- a/Assets/Script/Version/Version.md +++ b/Assets/Script/Version/Version.md @@ -1,3 +1,17 @@ +# Version 1.0.4.5 2025.9.29 + +## Bugs + +- None + +## Known issues + +- None + +## Changelog + +- 通过在线参数控制是否初始化kwai广告,可由topon初始化 + # Version 1.0.4.4 2025.9.28 ## Bugs