From 6e3974c78f9e8d4827141afda1d91dd88b797d86 Mon Sep 17 00:00:00 2001 From: juncong lee Date: Tue, 2 Sep 2025 23:25:00 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=88=B0=E5=9C=A8=E7=BA=BF?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=90=8E=E5=88=B7=E6=96=B0=E5=B9=BF=E5=91=8A?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Script/Common/IAdService.cs | 1 - .../AdsSDKManager/AdmobAdsManager/AdmobAdsManager.cs | 3 +-- Assets/Script/SDKManager/AdsSDKManager/AdsSDKManager.cs | 3 ++- .../AdsSDKManager/BigoAdsManager/BigoAdsManager.cs | 6 +++--- .../AdsSDKManager/BigoAdsManager/BigoRewardedAdManager.cs | 2 +- .../KwaiAdsManager/InterstitialAdLoadListener.cs | 2 +- .../AdsSDKManager/KwaiAdsManager/KwaiAdsManager.cs | 7 +++++-- .../AdsSDKManager/KwaiAdsManager/RewardAdLoadListener.cs | 2 +- .../AdsSDKManager/MaxAdsManager/MaxAdsManager.cs | 5 +++-- .../AdsSDKManager/TpnAdsManager/TpnAdsManager.cs | 4 +++- .../FirebaseManager/FireBaseRemoteConfigManager.cs | 2 +- .../AnyThinkAds/Plugins/Android/Editor.meta | 8 ++++++++ .../AnyThinkAds/Plugins/Android/Editor/Dependencies.xml | 8 ++++++++ .../Plugins/Android/Editor/Dependencies.xml.meta | 7 +++++++ 14 files changed, 44 insertions(+), 16 deletions(-) create mode 100644 Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/Editor.meta create mode 100644 Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/Editor/Dependencies.xml create mode 100644 Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/Editor/Dependencies.xml.meta diff --git a/Assets/Script/Common/IAdService.cs b/Assets/Script/Common/IAdService.cs index 4b8741b..408117b 100644 --- a/Assets/Script/Common/IAdService.cs +++ b/Assets/Script/Common/IAdService.cs @@ -17,7 +17,6 @@ namespace WZ string ClientName { get; } PlatformType Platfrom { get; } - void RefreshAdsData(); /// diff --git a/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobAdsManager.cs b/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobAdsManager.cs index 86f4080..07f0988 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobAdsManager.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/AdmobAdsManager/AdmobAdsManager.cs @@ -27,14 +27,13 @@ namespace WZ private Action _rvCloseCallback = null; private Action _ivCloseCallback = null; private Action _rvShowFailedCallback = null; - private bool _initialized = false; private float _rvStartLoadTime = 0; private float _ivStartLoadTime = 0; private float _nvStartLoadTime = 0; private float _bvStartLoadTime = 0; private float _spStartLoadTime = 0; - public bool _splashLoaded = false; + public bool _initialized { get; private set; } = false; public void Initialize() { diff --git a/Assets/Script/SDKManager/AdsSDKManager/AdsSDKManager.cs b/Assets/Script/SDKManager/AdsSDKManager/AdsSDKManager.cs index 6b3dbf3..39db4d5 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/AdsSDKManager.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/AdsSDKManager.cs @@ -43,7 +43,6 @@ namespace WZ foreach (var network in _adNetworks) { LoggerUtils.Debug("init ads sdk network:"+network.ToString()); - network.RefreshAdsData(); network.Initialize(); } } @@ -52,7 +51,9 @@ namespace WZ { foreach (var network in _adNetworks) { + LoggerUtils.Debug("init ads sdk network:"+network.ToString()); network.RefreshAdsData(); + network.Initialize(); } } #region 激励视频广告 diff --git a/Assets/Script/SDKManager/AdsSDKManager/BigoAdsManager/BigoAdsManager.cs b/Assets/Script/SDKManager/AdsSDKManager/BigoAdsManager/BigoAdsManager.cs index 354b65b..d7014d1 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/BigoAdsManager/BigoAdsManager.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/BigoAdsManager/BigoAdsManager.cs @@ -16,7 +16,7 @@ namespace WZ private List _interstitialAdUnits = new List(); private List _rewardedAdUnits = new List(); public string _bigo_app_id; - private bool _initialized; + public bool _initialized { get; private set; } = false; private string _rvPos; private string _IvPos; private Action _rvCloseCallback = null; @@ -28,8 +28,8 @@ namespace WZ public void Initialize() { - - if (string.IsNullOrEmpty(_bigo_app_id)) return; + LoggerUtils.Debug("[Bigo] sdk init start"+_bigo_app_id+" rvid:"+_rewardedAdUnits+" ivid:"+_interstitialAdUnits); + if (string.IsNullOrEmpty(_bigo_app_id)|| _initialized) return; BigoAdSdk.OnInitFinish += () => { LoggerUtils.Debug($"[Bigo] sdk init success"); diff --git a/Assets/Script/SDKManager/AdsSDKManager/BigoAdsManager/BigoRewardedAdManager.cs b/Assets/Script/SDKManager/AdsSDKManager/BigoAdsManager/BigoRewardedAdManager.cs index 3ba3eb7..0947ea9 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/BigoAdsManager/BigoRewardedAdManager.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/BigoAdsManager/BigoRewardedAdManager.cs @@ -49,7 +49,7 @@ namespace WZ { _retryCounters[adUnitId] = 0; _adRevenueCache[adUnitId] = GetAdRevenue(rewardedAd); - LoggerUtils.Debug($"[Bigo] Rewarded-[Load]: {adUnitId} successfully"); + LoggerUtils.Debug($"[Bigo] Rewarded-[Load]: {adUnitId} successfully revenue:"+GetAdRevenue(rewardedAd)); AdsKeyEvents.Instance.LogAdFPUEvents(AdsType.Rewarded); onAdLoaded?.Invoke(adUnitId); }; diff --git a/Assets/Script/SDKManager/AdsSDKManager/KwaiAdsManager/InterstitialAdLoadListener.cs b/Assets/Script/SDKManager/AdsSDKManager/KwaiAdsManager/InterstitialAdLoadListener.cs index 73b6738..c75ad46 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/KwaiAdsManager/InterstitialAdLoadListener.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/KwaiAdsManager/InterstitialAdLoadListener.cs @@ -34,7 +34,7 @@ namespace WZ LoggerUtils.Debug($"[kwai] InterstitialAdLoadListener#OnAdLoadSuccess , trackId:{trackId}, price:{price}"); AdsKeyEvents.Instance.LogAdFPUEvents(AdsType.Interstitial); KwaiAdsManager.Instance._interRetryAttempt = 0; - KwaiAdsManager.Instance._interstitiaAdRevenue = DataUtils.StringToDouble(price); + KwaiAdsManager.Instance._interstitiaAdRevenue = DataUtils.StringToDouble(price)/1000; AdsActionEvents.TrackAdLoaded(KwaiAdsManager.Instance.Platfrom, KwaiAdsManager.Instance.ClientName, trackId, diff --git a/Assets/Script/SDKManager/AdsSDKManager/KwaiAdsManager/KwaiAdsManager.cs b/Assets/Script/SDKManager/AdsSDKManager/KwaiAdsManager/KwaiAdsManager.cs index 02f51d1..873d5e3 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/KwaiAdsManager/KwaiAdsManager.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/KwaiAdsManager/KwaiAdsManager.cs @@ -29,12 +29,14 @@ namespace WZ public float _rvStartLoadTime = 0; public float _ivStartLoadTime = 0; public string ClientName => "Kwai"; - public PlatformType Platfrom => PlatformType.Kwai; + + public bool _initialized { get; private set; } = false; public void Initialize() { - if (string.IsNullOrEmpty(_appId) || string.IsNullOrEmpty(_token)) return; + LoggerUtils.Debug("KwaiAdsManager Initialize start" + _appId + " token:" + _token + " rewardAdUnitId:" + _rewardAdUnitId + " interstitialAdUnitId:" + _interstitialAdUnitId); + if (string.IsNullOrEmpty(_appId) || string.IsNullOrEmpty(_token)|| _initialized) return; var kwaiAdConfig = new KwaiAds.Scripts.Api.KwaiAdConfig.Builder() .SetAppId(_appId) .SetToken(_token) @@ -42,6 +44,7 @@ namespace WZ .Build(); KwaiAds.Scripts.Api.KwaiAdsSdk.Initialize(kwaiAdConfig, new InitResultCallbackImpl()); + _initialized = true; } public void RefreshAdsData() diff --git a/Assets/Script/SDKManager/AdsSDKManager/KwaiAdsManager/RewardAdLoadListener.cs b/Assets/Script/SDKManager/AdsSDKManager/KwaiAdsManager/RewardAdLoadListener.cs index f6e2222..e635b8b 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/KwaiAdsManager/RewardAdLoadListener.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/KwaiAdsManager/RewardAdLoadListener.cs @@ -33,7 +33,7 @@ namespace WZ LoggerUtils.Debug($"[kwai] RewardAdLoadListener#OnAdLoadSuccess , trackId:{trackId}, price:{price}"); AdsKeyEvents.Instance.LogAdFPUEvents(AdsType.Rewarded); KwaiAdsManager.Instance._rewardRetryAttempt = 0; - KwaiAdsManager.Instance._rewardAdRevenue = DataUtils.StringToDouble(price); + KwaiAdsManager.Instance._rewardAdRevenue = DataUtils.StringToDouble(price)/1000; AdsActionEvents.TrackAdLoaded(KwaiAdsManager.Instance.Platfrom, KwaiAdsManager.Instance.ClientName, trackId, diff --git a/Assets/Script/SDKManager/AdsSDKManager/MaxAdsManager/MaxAdsManager.cs b/Assets/Script/SDKManager/AdsSDKManager/MaxAdsManager/MaxAdsManager.cs index a65921e..8953cf6 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/MaxAdsManager/MaxAdsManager.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/MaxAdsManager/MaxAdsManager.cs @@ -26,11 +26,11 @@ namespace WZ private Action _rvCloseCallback = null; private Action _ivCloseCallback = null; private Action _rvShowFailedCallback = null; - + public bool _initialized { get; private set; } = false; public void Initialize() { - if (string.IsNullOrEmpty(_max_app_key)) return; + if (string.IsNullOrEmpty(_max_app_key) || _initialized) return; LoggerUtils.Debug("[Max] init max"); // 关闭反转debug面板 MaxSdk.SetCreativeDebuggerEnabled(false); @@ -48,6 +48,7 @@ namespace WZ MaxSdk.InitializeSdk(); LoadRewarded(); LoadInterstitial(); + _initialized = true; } public void RefreshAdsData() diff --git a/Assets/Script/SDKManager/AdsSDKManager/TpnAdsManager/TpnAdsManager.cs b/Assets/Script/SDKManager/AdsSDKManager/TpnAdsManager/TpnAdsManager.cs index 4e5e6a3..668c0ea 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/TpnAdsManager/TpnAdsManager.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/TpnAdsManager/TpnAdsManager.cs @@ -22,17 +22,19 @@ namespace WZ private Action _rvCloseCallback = null; private Action _ivCloseCallback = null; private Action _rvShowFailedCallback = null; - + public bool _initialized { get; private set; } = false; public void Initialize() { LoggerUtils.Debug("[Tpn] 初始化 Tpn 广告 SDK appid:" + _topon_app_id + " appkey:" + _topon_app_key + " ivId:" + _topon_interstitial_units + " rvId:" + _topon_rewarded_units); + if(_initialized )return; if (!string.IsNullOrEmpty(_topon_app_id) && !string.IsNullOrEmpty(_topon_app_key)) { ATSDKAPI.initSDK(_topon_app_id, _topon_app_key); ATSDKAPI.setLogDebug(false); InitRewarded(); InitInterstitial(); + _initialized = true; } } diff --git a/Assets/Script/SDKManager/FirebaseManager/FireBaseRemoteConfigManager.cs b/Assets/Script/SDKManager/FirebaseManager/FireBaseRemoteConfigManager.cs index bda7e40..b2d125f 100644 --- a/Assets/Script/SDKManager/FirebaseManager/FireBaseRemoteConfigManager.cs +++ b/Assets/Script/SDKManager/FirebaseManager/FireBaseRemoteConfigManager.cs @@ -29,7 +29,7 @@ namespace WZ AdjustTrackEvent.Instance.UpdateEventToken(); AdsKeyEvents.Instance.InitData(); // 获取广告位信息 - AdConfigParser.Parse(GetRemoteConfigString("ad_config")); + AdConfigParser.Parse(GetRemoteConfigString("ad_bid_set")); // 刷新广告位信息 AdsSDKManager.Instance.RefreshAdsData(); //AB测试分组参数 diff --git a/Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/Editor.meta b/Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/Editor.meta new file mode 100644 index 0000000..53c2469 --- /dev/null +++ b/Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 85071a22d9da24115bb224b21e4eab67 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/Editor/Dependencies.xml b/Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/Editor/Dependencies.xml new file mode 100644 index 0000000..54820a0 --- /dev/null +++ b/Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/Editor/Dependencies.xml @@ -0,0 +1,8 @@ + + + + https://jfrog.anythinktech.com/artifactory/debugger + + + + diff --git a/Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/Editor/Dependencies.xml.meta b/Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/Editor/Dependencies.xml.meta new file mode 100644 index 0000000..8d788ad --- /dev/null +++ b/Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/Editor/Dependencies.xml.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3656986a4732b4fc8a4b297462f61cf0 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: