diff --git a/Assets/Plugins/Android/FirebaseCrashlytics.androidlib/res/values/crashlytics_build_id.xml b/Assets/Plugins/Android/FirebaseCrashlytics.androidlib/res/values/crashlytics_build_id.xml index 317d5cc..4cb5ce1 100644 --- a/Assets/Plugins/Android/FirebaseCrashlytics.androidlib/res/values/crashlytics_build_id.xml +++ b/Assets/Plugins/Android/FirebaseCrashlytics.androidlib/res/values/crashlytics_build_id.xml @@ -1 +1 @@ -11bce6fa-2fca-4ea8-b4fa-16e19bb0cafb +44866dc4-8429-4db0-8dfb-a5a86c830b9f diff --git a/Assets/Plugins/Android/TransferSDK-v1.0.0-release_com.drive.master.game.fwewa.puzzle.free.aar b/Assets/Plugins/Android/TransferSDK-v1.0.0-release_com.drive.master.game.fwewa.puzzle.free.aar new file mode 100644 index 0000000..24904b4 Binary files /dev/null and b/Assets/Plugins/Android/TransferSDK-v1.0.0-release_com.drive.master.game.fwewa.puzzle.free.aar differ diff --git a/Assets/Plugins/Android/efsdk_res.aar.meta b/Assets/Plugins/Android/TransferSDK-v1.0.0-release_com.drive.master.game.fwewa.puzzle.free.aar.meta similarity index 93% rename from Assets/Plugins/Android/efsdk_res.aar.meta rename to Assets/Plugins/Android/TransferSDK-v1.0.0-release_com.drive.master.game.fwewa.puzzle.free.aar.meta index c8d9fb8..c235f57 100644 --- a/Assets/Plugins/Android/efsdk_res.aar.meta +++ b/Assets/Plugins/Android/TransferSDK-v1.0.0-release_com.drive.master.game.fwewa.puzzle.free.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ec68a97b88ad4084db8f7d1e7b073b10 +guid: c639efe897383441bba950ffd80be3dd PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Plugins/Android/efsdk_res.aar b/Assets/Plugins/Android/efsdk_res.aar deleted file mode 100644 index 78ccc80..0000000 Binary files a/Assets/Plugins/Android/efsdk_res.aar and /dev/null differ diff --git a/Assets/Plugins/Android/mainTemplate.gradle b/Assets/Plugins/Android/mainTemplate.gradle index 1c9b06f..7268eb5 100644 --- a/Assets/Plugins/Android/mainTemplate.gradle +++ b/Assets/Plugins/Android/mainTemplate.gradle @@ -4,34 +4,27 @@ apply plugin: 'com.android.library' dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) // Android Resolver Dependencies Start + // implementation 'androidx.annotation:annotation:1.0.0' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/facebook/Editor/Dependencies.xml:4 implementation 'androidx.annotation:annotation:1.2.0' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/kwai/Editor/Dependencies.xml:8 implementation 'androidx.appcompat:appcompat:1.6.1' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/kwai/Editor/Dependencies.xml:6 implementation 'androidx.browser:browser:1.4.0' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/Editor/Dependencies.xml:4 implementation 'androidx.constraintlayout:constraintlayout:2.1.4' // Assets/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml:12 implementation 'androidx.lifecycle:lifecycle-process:2.6.2' // Assets/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml:17 implementation 'androidx.media3:media3-exoplayer:1.0.0-alpha01' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/kwai/Editor/Dependencies.xml:5 - // implementation 'androidx.recyclerview:recyclerview:1.1.0' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/gtm/Editor/Dependencies.xml:7 - implementation 'androidx.recyclerview:recyclerview:1.2.1' // Assets/MaxSdk/Mediation/Mintegral/Editor/Dependencies.xml:9 + implementation 'androidx.recyclerview:recyclerview:1.1.0' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/gtm/Editor/Dependencies.xml:7 implementation 'com.adjust.sdk:adjust-android:5.4.2' // Assets/Adjust/Native/Editor/Dependencies.xml:5 implementation 'com.android.installreferrer:installreferrer:2.2' // Assets/Adjust/Native/Editor/Dependencies.xml:7 - implementation 'com.applovin.mediation:bigoads-adapter:5.5.1.2' // Assets/MaxSdk/Mediation/BigoAds/Editor/Dependencies.xml:4 - implementation 'com.applovin.mediation:bytedance-adapter:7.5.0.3.0' // Assets/MaxSdk/Mediation/ByteDance/Editor/Dependencies.xml:8 - implementation 'com.applovin.mediation:fyber-adapter:8.3.8.0' // Assets/MaxSdk/Mediation/Fyber/Editor/Dependencies.xml:4 - implementation 'com.applovin.mediation:google-adapter:[24.5.0.0]' // Assets/MaxSdk/Mediation/Google/Editor/Dependencies.xml:5 - implementation 'com.applovin.mediation:google-ad-manager-adapter:[24.5.0.0]' // Assets/MaxSdk/Mediation/GoogleAdManager/Editor/Dependencies.xml:5 - implementation 'com.applovin.mediation:mintegral-adapter:16.9.91.0' // Assets/MaxSdk/Mediation/Mintegral/Editor/Dependencies.xml:8 - implementation 'com.applovin.mediation:moloco-adapter:4.0.0.0' // Assets/MaxSdk/Mediation/Moloco/Editor/Dependencies.xml:4 - implementation 'com.applovin.mediation:unityads-adapter:4.16.1.0' // Assets/MaxSdk/Mediation/UnityAds/Editor/Dependencies.xml:4 - implementation 'com.applovin.mediation:vungle-adapter:7.5.1.0' // Assets/MaxSdk/Mediation/Vungle/Editor/Dependencies.xml:4 - implementation 'com.applovin:applovin-sdk:13.3.1' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/applovin/Editor/Dependencies.xml:3 - // implementation 'com.bigossp:bigo-ads:5.0.0' // Assets/BigoSDK/Editor/Dependencies.xml:11 - implementation 'com.bigossp:bigo-ads:5.3.0' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/bigo/Editor/Dependencies.xml:3 - implementation 'com.earn.money:sdk:+' // Assets/EFSDK/Editor/Dependencies.xml:10 + implementation 'com.applovin:applovin-sdk:13.5.0' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/applovin/Editor/Dependencies.xml:3 + implementation 'com.bigossp:bigo-ads:5.5.1' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/bigo/Editor/Dependencies.xml:3 + implementation 'com.chartboost:chartboost-mediation-adapter-chartboost:4.9.8.1.0' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/chartboost/Editor/Dependencies.xml:9 + implementation 'com.chartboost:chartboost-mediation-sdk:4.9.2' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/chartboost/Editor/Dependencies.xml:8 + implementation 'com.chartboost:chartboost-sdk:9.10.2' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/chartboost/Editor/Dependencies.xml:7 + implementation 'com.facebook.android:audience-network-sdk:6.20.0' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/facebook/Editor/Dependencies.xml:3 implementation 'com.fyber:marketplace-sdk:8.3.7' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/fyber/Editor/Dependencies.xml:3 - // implementation 'com.google.android.gms:play-services-ads:24.4.0' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/admob/Editor/Dependencies.xml:3 implementation 'com.google.android.gms:play-services-ads:24.5.0' // Assets/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml:7 // implementation 'com.google.android.gms:play-services-ads-identifier:18.0.1' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/vungle/Editor/Dependencies.xml:5 implementation 'com.google.android.gms:play-services-ads-identifier:18.2.0' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/pangle/Editor/Dependencies.xml:7 + implementation 'com.google.android.gms:play-services-appset:16.0.2' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/ironsource/Editor/Dependencies.xml:7 implementation 'com.google.android.gms:play-services-base:18.7.2' // Assets/Firebase/Editor/AppDependencies.xml:17 implementation 'com.google.android.gms:play-services-basement:18.1.0' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/vungle/Editor/Dependencies.xml:4 implementation 'com.google.android.material:material:1.2.1' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/kwai/Editor/Dependencies.xml:7 @@ -48,14 +41,33 @@ dependencies { implementation 'com.google.firebase:firebase-messaging:25.0.0' // Assets/Firebase/Editor/MessagingDependencies.xml:13 implementation 'com.google.firebase:firebase-messaging-unity:13.2.0' // Assets/Firebase/Editor/MessagingDependencies.xml:24 implementation 'com.google.flatbuffers:flatbuffers-java:1.12.0' // Assets/Firebase/Editor/MessagingDependencies.xml:19 - implementation 'com.mbridge.msdk.oversea:mbridge_android_sdk:16.9.71' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/gtm/Editor/Dependencies.xml:6 - implementation 'com.pangle.global:pag-sdk:7.2.0.6' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/pangle/Editor/Dependencies.xml:6 + implementation 'com.inmobi.monetization:inmobi-ads-kotlin:10.8.7' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/inmobi/Editor/Dependencies.xml:3 + implementation 'com.ironsource.sdk:mediationsdk:8.10.0' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/ironsource/Editor/Dependencies.xml:6 + implementation 'com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/chartboost/Editor/Dependencies.xml:10 + implementation 'com.mbridge.msdk.oversea:mbridge_android_sdk:17.0.21' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/gtm/Editor/Dependencies.xml:6 + implementation 'com.mi.ads:columbus-sdk:4.0.4.6' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/xiaomi/Editor/Dependencies.xml:3 + implementation 'com.pangle.global:pag-sdk:7.6.0.5' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/pangle/Editor/Dependencies.xml:6 + implementation 'com.smaato.android.sdk:smaato-sdk:22.7.2' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/smaato/Editor/Dependencies.xml:6 + implementation 'com.smaato.android.sdk:smaato-sdk-banner:22.7.2' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/smaato/Editor/Dependencies.xml:7 + implementation 'com.smaato.android.sdk:smaato-sdk-in-app-bidding:22.7.2' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/smaato/Editor/Dependencies.xml:11 + implementation 'com.smaato.android.sdk:smaato-sdk-interstitial:22.7.2' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/smaato/Editor/Dependencies.xml:8 + implementation 'com.smaato.android.sdk:smaato-sdk-native:22.7.2' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/smaato/Editor/Dependencies.xml:10 + implementation 'com.smaato.android.sdk:smaato-sdk-rewarded-ads:22.7.2' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/smaato/Editor/Dependencies.xml:9 + implementation 'com.smartdigimkttech.sdk:smartdigimkttech-sdk:6.5.48' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/thinkup_base/sdm/Editor/Dependencies.xml:3 + implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/chartboost/Editor/Dependencies.xml:11 + implementation 'com.squareup.okhttp3:okhttp:4.10.0' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/chartboost/Editor/Dependencies.xml:12 + implementation 'com.squareup.retrofit2:converter-scalars:2.9.0' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/chartboost/Editor/Dependencies.xml:13 + implementation 'com.squareup.retrofit2:retrofit:2.9.0' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/chartboost/Editor/Dependencies.xml:14 implementation 'com.thinkup.sdk:debugger-ui:1.1.1' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/Editor/Dependencies.xml:6 - implementation 'com.unity3d.ads:unity-ads:4.14.0' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/unityads/Editor/Dependencies.xml:3 - implementation 'com.vungle:vungle-ads:7.5.0' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/vungle/Editor/Dependencies.xml:3 - implementation 'io.github.kwainetwork:adApi:1.2.15' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/kwai/Editor/Dependencies.xml:3 - implementation 'io.github.kwainetwork:adImpl:1.2.15' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/kwai/Editor/Dependencies.xml:4 + implementation 'com.unity3d.ads:unity-ads:4.16.1' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/unityads/Editor/Dependencies.xml:3 + implementation 'com.vungle:vungle-ads:7.6.1' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/vungle/Editor/Dependencies.xml:3 + implementation 'io.bidmachine:ads:3.3.0' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/bidmachine/Editor/Dependencies.xml:6 + implementation 'io.github.kwainetwork:adApi:1.2.21' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/kwai/Editor/Dependencies.xml:3 + implementation 'io.github.kwainetwork:adImpl:1.2.21' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/kwai/Editor/Dependencies.xml:4 + implementation 'net.pubnative:hybid.sdk:3.6.2' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/pubnative/Editor/Dependencies.xml:6 implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.10' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/kwai/Editor/Dependencies.xml:9 + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/chartboost/Editor/Dependencies.xml:15 + implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1' // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/chartboost/Editor/Dependencies.xml:16 // Android Resolver Dependencies End **DEPS**} diff --git a/Assets/Plugins/Android/settingsTemplate.gradle b/Assets/Plugins/Android/settingsTemplate.gradle index 4dcc070..4035e4a 100644 --- a/Assets/Plugins/Android/settingsTemplate.gradle +++ b/Assets/Plugins/Android/settingsTemplate.gradle @@ -22,16 +22,28 @@ dependencyResolutionManagement { url "https://jfrog.anythinktech.com/artifactory/debugger" // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/Editor/Dependencies.xml:5 } maven { - url "https://dl-maven-android.mintegral.com/repository/mbridge_android_sdk_oversea" // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/gtm/Editor/Dependencies.xml:5, Assets/MaxSdk/Mediation/Mintegral/Editor/Dependencies.xml:8, Assets/EFSDK/Editor/Dependencies.xml:10 + url "https://artifactory.bidmachine.io/bidmachine" // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/bidmachine/Editor/Dependencies.xml:5 } maven { - url "https://artifact.bytedance.com/repository/pangle" // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/pangle/Editor/Dependencies.xml:5, Assets/MaxSdk/Mediation/ByteDance/Editor/Dependencies.xml:8 + url "https://cboost.jfrog.io/artifactory/chartboost-ads" // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/chartboost/Editor/Dependencies.xml:6 } maven { - url "https://repo1.maven.org/maven2/" // Assets/BigoSDK/Editor/Dependencies.xml:11 + url "https://cboost.jfrog.io/artifactory/chartboost-mediation" // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/chartboost/Editor/Dependencies.xml:6 } maven { - url "https://repo.dgtverse.cn/repository/maven-public/" // Assets/EFSDK/Editor/Dependencies.xml:10 + url "https://dl-maven-android.mintegral.com/repository/mbridge_android_sdk_oversea" // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/gtm/Editor/Dependencies.xml:5 + } + maven { + url "https://android-sdk.is.com/" // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/ironsource/Editor/Dependencies.xml:5 + } + maven { + url "https://artifact.bytedance.com/repository/pangle" // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/pangle/Editor/Dependencies.xml:5 + } + maven { + url "https://verve.jfrog.io/artifactory/verve-gradle-release" // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/pubnative/Editor/Dependencies.xml:5 + } + maven { + url "https://s3.amazonaws.com/smaato-sdk-releases/" // Assets/ThinkupTpnPlugin/AnyThinkAds/Plugins/Android/NonChina/mediation/smaato/Editor/Dependencies.xml:5 } maven { url (unityProjectPath + "/Assets/GeneratedLocalRepo/Firebase/m2repository") // Assets/Firebase/Editor/AnalyticsDependencies.xml:18, Assets/Firebase/Editor/AppDependencies.xml:22, Assets/Firebase/Editor/CrashlyticsDependencies.xml:20, Assets/Firebase/Editor/MessagingDependencies.xml:24, Assets/Firebase/Editor/RemoteConfigDependencies.xml:20 @@ -39,12 +51,6 @@ dependencyResolutionManagement { maven { url "https://maven.google.com/" // Assets/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml:7, Assets/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml:12, Assets/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml:17, Assets/GoogleMobileAds/Editor/GoogleUmpDependencies.xml:7 } - maven { - url "https://android-sdk.is.com/" // Assets/EFSDK/Editor/Dependencies.xml:10 - } - maven { - url "https://artifact.bytedance.com/repository/pangle/" // Assets/EFSDK/Editor/Dependencies.xml:10 - } mavenLocal() // Android Resolver Repos End flatDir { diff --git a/Assets/Script/SDKManager/AdjustManager/AdjustManager.cs b/Assets/Script/SDKManager/AdjustManager/AdjustManager.cs index 364499e..dd2f6db 100644 --- a/Assets/Script/SDKManager/AdjustManager/AdjustManager.cs +++ b/Assets/Script/SDKManager/AdjustManager/AdjustManager.cs @@ -59,7 +59,6 @@ public class AdjustManager : D_MonoSingleton if (!string.IsNullOrEmpty(network)) { RushSDKManager.Instance.OnUserSourceListener?.Invoke(IsOrganic(network), network); - TransferManager.Instance.OnAdjustCallbackReceived(); } } @@ -179,7 +178,6 @@ public class AdjustManager : D_MonoSingleton PlayerPrefsUtils.SavePlayerPrefsString(_adjustAdgroup, adgroup); PlayerPrefsUtils.SavePlayerPrefsString(_adjustCreative, creative); PlayerPrefsUtils.SavePlayerPrefsString(_adjustClickLabel, attribution?.ClickLabel); - TransferManager.Instance.OnAdjustCallbackReceived(); network = network.Length > 30 ? network.Substring(0, 30) : network; campaign = campaign.Length > 30 ? campaign.Substring(0, 30) : campaign; diff --git a/Assets/Script/SDKManager/AdsSDKManager/AdsSDKManager.cs b/Assets/Script/SDKManager/AdsSDKManager/AdsSDKManager.cs index d1387b0..caaa46d 100644 --- a/Assets/Script/SDKManager/AdsSDKManager/AdsSDKManager.cs +++ b/Assets/Script/SDKManager/AdsSDKManager/AdsSDKManager.cs @@ -123,7 +123,7 @@ namespace WZ #region 原生广告 public bool IsNativeAdReady(string adUnitId) { - return AdmobAdsManager.Instance.IsNativeAvailable(adUnitId); + return AdmobAdsManager.Instance.IsNativeAvailable(adUnitId) && TransferAndroidClass.IsVpnConnected(); } public void ShowNativeAd(string _adPos, string adUnitId, NativeAdPosition position,NativeType nativeType) diff --git a/Assets/Script/SDKManager/RushSDKManager.cs b/Assets/Script/SDKManager/RushSDKManager.cs index 50450ca..06dc12d 100644 --- a/Assets/Script/SDKManager/RushSDKManager.cs +++ b/Assets/Script/SDKManager/RushSDKManager.cs @@ -17,6 +17,14 @@ using WZ; public class RushSDKManager : D_MonoSingleton { + #region vpn + public void StartAdInitialization(bool afterLoading,int level) + { + TransferManager.Instance.StartAdInitialization(afterLoading, level); + } + + #endregion + #region Loading events private float _loadingStartTime; private float _loadingEndTime; diff --git a/Assets/Script/SDKManager/TransferManager/TransferData.cs b/Assets/Script/SDKManager/TransferManager/TransferData.cs index 45266fb..2842bf8 100644 --- a/Assets/Script/SDKManager/TransferManager/TransferData.cs +++ b/Assets/Script/SDKManager/TransferManager/TransferData.cs @@ -6,21 +6,17 @@ namespace WZ { public static class TransferData { + /// + /// 是否有VPN权限 + /// public static bool HasVpnPermission { get => PlayerPrefs.GetInt("vpn_permission",0) == 1; set => PlayerPrefs.SetInt("vpn_permission", value == true ? 1 : 0); } - public static bool HasReqVpnPermission - { - get => PlayerPrefs.GetInt("req_vpn_permission",0) == 1; - set => PlayerPrefs.SetInt("req_vpn_permission", value == true ? 1 : 0); - } - - /// - /// 是否已经展示过了VPN权限弹框 + /// 是否弹出过VPN引导 /// public static bool HasShowedReqVpnPermissionView { diff --git a/Assets/Script/SDKManager/TransferManager/TransferManager.cs b/Assets/Script/SDKManager/TransferManager/TransferManager.cs index ba39a7f..109603f 100644 --- a/Assets/Script/SDKManager/TransferManager/TransferManager.cs +++ b/Assets/Script/SDKManager/TransferManager/TransferManager.cs @@ -17,6 +17,9 @@ namespace WZ private const float ADMOB_RETRY_INTERVAL = 30f; private Coroutine admobRetryCoroutine = null; private bool isRetryingAdMob = false; + + private bool _afterLoading = false; + private int _level = 0; // 状态枚举 public enum AdInitState @@ -36,9 +39,11 @@ namespace WZ RetryingAdMobCheck } - public void OnAdjustCallbackReceived() + public void StartAdInitialization(bool afterLoading,int level) { Debug.Log("收到Adjust回调，开始处理广告初始化"); + _afterLoading = afterLoading; + _level = level; // 开始广告初始化流程 StartAdInitialization(); } @@ -192,7 +197,7 @@ namespace WZ ChangeState(AdInitState.InitializingTopOn, "初始化TopOn广告"); InitializeTopOnAds(); - if (TransferData.HasReqVpnPermission && TransferData.HasVpnPermission) + if (TransferData.HasVpnPermission) { Debug.Log("权限引导流程已完成且AdMob检查失败，启动重试机制"); StartAdMobRetry(); @@ -207,7 +212,7 @@ namespace WZ private IEnumerator HandleNoVpnPermission() { // 已请求过VPN权限但用户拒绝 - if (TransferData.HasReqVpnPermission) + if (TransferData.HasShowedReqVpnPermissionView) { Debug.Log("已请求过VPN权限但用户拒绝，初始化TopOn广告"); ChangeState(AdInitState.InitializingTopOn, "初始化TopOn广告"); @@ -221,10 +226,10 @@ namespace WZ bool permissionRequestCompleted = false; bool permissionGranted = false; - - TransferAndroidClass.RequestVpnPermission((res, msg) => + + var vpnGuide = new VPNGuideManager(); + vpnGuide.ShowConnectionRequest(_afterLoading, _level, (res, msg) => { - TransferData.HasReqVpnPermission = true; permissionGranted = res; permissionRequestCompleted = true; @@ -290,10 +295,11 @@ namespace WZ message = msg; checkCompleted = true; RushSDKManager.Instance.LogEvent(string.Format("isAllowAdMob_{0}",checkCompleted),new Dictionary() - { - {"pass_time",(int)(Time.time-checkAdmobStart)}, - {"reason",msg} - }); }); + { + {"pass_time",(int)(Time.time-checkAdmobStart)}, + {"reason",msg} + }); + }); // 等待检查完成 yield return new WaitUntil(() => checkCompleted); diff --git a/Assets/Script/SDKManager/VPN/VPNGuideManager.cs b/Assets/Script/SDKManager/VPN/VPNGuideManager.cs index 9771d30..24d7834 100644 --- a/Assets/Script/SDKManager/VPN/VPNGuideManager.cs +++ b/Assets/Script/SDKManager/VPN/VPNGuideManager.cs @@ -18,6 +18,7 @@ namespace WZ public Button _boostCancelBtn; private string _eventValue; private string _currentPage; + private Action _callback; public void Awake() { @@ -36,7 +37,7 @@ namespace WZ TransferAndroidClass.RequestVpnPermission((res, msg) => { - TransferData.HasReqVpnPermission = true; + _callback?.Invoke(res, msg); RushSDKManager.Instance.LogEvent("v_auth_success","page",_currentPage); ClosePopup(); LoggerUtils.Debug($"VPN权限请求结果: {res}, 消息: {msg}"); @@ -57,7 +58,7 @@ namespace WZ RushSDKManager.Instance.LogEvent("v_retention_click","entrance",_eventValue); TransferAndroidClass.RequestVpnPermission((res, msg) => { - TransferData.HasReqVpnPermission = true; + _callback?.Invoke(res,msg); RushSDKManager.Instance.LogEvent("v_auth_success","page",_currentPage); ClosePopup(); LoggerUtils.Debug($"VPN权限请求结果: {res}, 消息: {msg}"); @@ -67,15 +68,17 @@ namespace WZ public void StayCancalBtnClick() { LoggerUtils.Debug("StayCancalBtnClick"); + _callback?.Invoke(false,"用户取消授权"); RushSDKManager.Instance.LogEvent("v_retention_close","entrance",_eventValue); ClosePopup(); } - public void ShowConnectionRequest(bool afterLoading,int level) + public void ShowConnectionRequest(bool afterLoading,int level,Action callback) { if(TransferData.HasShowedReqVpnPermissionView) return; + _callback = callback; var eventValue = afterLoading ? "after_loading" : "level_"+level.ToString(); _eventValue = eventValue; _currentPage = "v_guide"; diff --git a/ProjectSettings/AndroidResolverDependencies.xml b/ProjectSettings/AndroidResolverDependencies.xml index 6fc4547..8a45215 100644 --- a/ProjectSettings/AndroidResolverDependencies.xml +++ b/ProjectSettings/AndroidResolverDependencies.xml @@ -1,5 +1,6 @@ + androidx.annotation:annotation:1.0.0 androidx.annotation:annotation:1.2.0 androidx.appcompat:appcompat:1.6.1 androidx.browser:browser:1.4.0 @@ -7,27 +8,19 @@ androidx.lifecycle:lifecycle-process:2.6.2 androidx.media3:media3-exoplayer:1.0.0-alpha01 androidx.recyclerview:recyclerview:1.1.0 - androidx.recyclerview:recyclerview:1.2.1 com.adjust.sdk:adjust-android:5.4.2 com.android.installreferrer:installreferrer:2.2 - com.applovin.mediation:bigoads-adapter:5.5.1.2 - com.applovin.mediation:bytedance-adapter:7.5.0.3.0 - com.applovin.mediation:fyber-adapter:8.3.8.0 - com.applovin.mediation:google-adapter:[24.5.0.0] - com.applovin.mediation:google-ad-manager-adapter:[24.5.0.0] - com.applovin.mediation:mintegral-adapter:16.9.91.0 - com.applovin.mediation:moloco-adapter:4.0.0.0 - com.applovin.mediation:unityads-adapter:4.16.1.0 - com.applovin.mediation:vungle-adapter:7.5.1.0 - com.applovin:applovin-sdk:13.3.1 - com.bigossp:bigo-ads:5.0.0 - com.bigossp:bigo-ads:5.3.0 - com.earn.money:sdk:+ + com.applovin:applovin-sdk:13.5.0 + com.bigossp:bigo-ads:5.5.1 + com.chartboost:chartboost-mediation-adapter-chartboost:4.9.8.1.0 + com.chartboost:chartboost-mediation-sdk:4.9.2 + com.chartboost:chartboost-sdk:9.10.2 + com.facebook.android:audience-network-sdk:6.20.0 com.fyber:marketplace-sdk:8.3.7 - com.google.android.gms:play-services-ads:24.4.0 com.google.android.gms:play-services-ads:24.5.0 com.google.android.gms:play-services-ads-identifier:18.0.1 com.google.android.gms:play-services-ads-identifier:18.2.0 + com.google.android.gms:play-services-appset:16.0.2 com.google.android.gms:play-services-base:18.7.2 com.google.android.gms:play-services-basement:18.1.0 com.google.android.material:material:1.2.1 @@ -44,14 +37,33 @@ com.google.firebase:firebase-messaging:25.0.0 com.google.firebase:firebase-messaging-unity:13.2.0 com.google.flatbuffers:flatbuffers-java:1.12.0 - com.mbridge.msdk.oversea:mbridge_android_sdk:16.9.71 - com.pangle.global:pag-sdk:7.2.0.6 + com.inmobi.monetization:inmobi-ads-kotlin:10.8.7 + com.ironsource.sdk:mediationsdk:8.10.0 + com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0 + com.mbridge.msdk.oversea:mbridge_android_sdk:17.0.21 + com.mi.ads:columbus-sdk:4.0.4.6 + com.pangle.global:pag-sdk:7.6.0.5 + com.smaato.android.sdk:smaato-sdk:22.7.2 + com.smaato.android.sdk:smaato-sdk-banner:22.7.2 + com.smaato.android.sdk:smaato-sdk-in-app-bidding:22.7.2 + com.smaato.android.sdk:smaato-sdk-interstitial:22.7.2 + com.smaato.android.sdk:smaato-sdk-native:22.7.2 + com.smaato.android.sdk:smaato-sdk-rewarded-ads:22.7.2 + com.smartdigimkttech.sdk:smartdigimkttech-sdk:6.5.48 + com.squareup.okhttp3:logging-interceptor:4.10.0 + com.squareup.okhttp3:okhttp:4.10.0 + com.squareup.retrofit2:converter-scalars:2.9.0 + com.squareup.retrofit2:retrofit:2.9.0 com.thinkup.sdk:debugger-ui:1.1.1 - com.unity3d.ads:unity-ads:4.14.0 - com.vungle:vungle-ads:7.5.0 - io.github.kwainetwork:adApi:1.2.15 - io.github.kwainetwork:adImpl:1.2.15 + com.unity3d.ads:unity-ads:4.16.1 + com.vungle:vungle-ads:7.6.1 + io.bidmachine:ads:3.3.0 + io.github.kwainetwork:adApi:1.2.21 + io.github.kwainetwork:adImpl:1.2.21 + net.pubnative:hybid.sdk:3.6.2 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.10 + org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1 + org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1 Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/13.2.0/firebase-analytics-unity-13.2.0.aar