From 8ff0c5861307dee0e297f3fb725a7f6d91acd86c Mon Sep 17 00:00:00 2001 From: zhangaotian <8474238@qq.com> Date: Fri, 26 Jul 2024 12:39:18 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E3=80=90=E6=89=93=E5=8C=85=E3=80=91B?= =?UTF-8?q?ug=20UnityAds=E9=87=8D=E5=A4=8D"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 6678755854be224b25b7b41618e981eeb9ac4a40. --- Forest/Assets/Plugins/Android/mainTemplate.gradle | 1 + Forest/Assets/Plugins/Android/settingsTemplate.gradle | 4 ++-- Forest/Packages/manifest.json | 1 + Forest/ProjectSettings/ProjectSettings.asset | 10 +++++----- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Forest/Assets/Plugins/Android/mainTemplate.gradle b/Forest/Assets/Plugins/Android/mainTemplate.gradle index 5b1985e..b1c6600 100644 --- a/Forest/Assets/Plugins/Android/mainTemplate.gradle +++ b/Forest/Assets/Plugins/Android/mainTemplate.gradle @@ -13,6 +13,7 @@ dependencies { implementation 'com.facebook.android:facebook-gamingservices:[17.0.0,18)' // Assets/FacebookSDK/Plugins/Editor/Dependencies.xml:9 implementation 'com.facebook.android:facebook-login:[17.0.0,18)' // Assets/FacebookSDK/Plugins/Editor/Dependencies.xml:7 implementation 'com.facebook.android:facebook-share:[17.0.0,18)' // Assets/FacebookSDK/Plugins/Editor/Dependencies.xml:8 + implementation 'com.google.ads.mediation:facebook:6.14.0.0' // Assets/GoogleMobileAds/Mediation/MetaAudienceNetwork/Editor/MetaAudienceNetworkMediationDependencies.xml:24 implementation 'com.google.ads.mediation:unity:4.12.0.0' // Assets/GoogleMobileAds/Mediation/UnityAds/Editor/UnityMediationDependencies.xml:25 implementation 'com.google.android.gms:play-services-ads:22.6.0' // Assets/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml:7 implementation 'com.google.android.gms:play-services-base:18.4.0' // Assets/Firebase/Editor/AppDependencies.xml:17 diff --git a/Forest/Assets/Plugins/Android/settingsTemplate.gradle b/Forest/Assets/Plugins/Android/settingsTemplate.gradle index 62478aa..c59bead 100644 --- a/Forest/Assets/Plugins/Android/settingsTemplate.gradle +++ b/Forest/Assets/Plugins/Android/settingsTemplate.gradle @@ -25,10 +25,10 @@ dependencyResolutionManagement { url "https://maven.google.com/" // Assets/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml:7, Assets/GoogleMobileAds/Editor/GoogleUmpDependencies.xml:7 } maven { - url "https://repo.maven.apache.org/maven2/" // Assets/GoogleMobileAds/Mediation/UnityAds/Editor/UnityMediationDependencies.xml:25, Assets/GoogleMobileAds/Mediation/UnityAds/Editor/UnityMediationDependencies.xml:33 + url "https://repo.maven.apache.org/maven2/" // Assets/GoogleMobileAds/Mediation/MetaAudienceNetwork/Editor/MetaAudienceNetworkMediationDependencies.xml:24, Assets/GoogleMobileAds/Mediation/UnityAds/Editor/UnityMediationDependencies.xml:25, Assets/GoogleMobileAds/Mediation/UnityAds/Editor/UnityMediationDependencies.xml:33 } maven { - url "https://dl.google.com/dl/android/maven2/" // Assets/GoogleMobileAds/Mediation/UnityAds/Editor/UnityMediationDependencies.xml:25 + url "https://dl.google.com/dl/android/maven2/" // Assets/GoogleMobileAds/Mediation/MetaAudienceNetwork/Editor/MetaAudienceNetworkMediationDependencies.xml:24, Assets/GoogleMobileAds/Mediation/UnityAds/Editor/UnityMediationDependencies.xml:25 } mavenLocal() // Android Resolver Repos End diff --git a/Forest/Packages/manifest.json b/Forest/Packages/manifest.json index b54dcff..21fd922 100644 --- a/Forest/Packages/manifest.json +++ b/Forest/Packages/manifest.json @@ -3,6 +3,7 @@ "com.cysharp.unitask": "http://1.14.122.170:3000/PHXH/UniTask.git?path=src/UniTask/Assets/Plugins/UniTask", "com.unity.2d.sprite": "1.0.0", "com.unity.addressables": "1.21.19", + "com.unity.ads": "4.4.2", "com.unity.collab-proxy": "2.2.0", "com.unity.device-simulator.devices": "1.0.0", "com.unity.feature.development": "1.0.1", diff --git a/Forest/ProjectSettings/ProjectSettings.asset b/Forest/ProjectSettings/ProjectSettings.asset index ee76f03..a492904 100644 --- a/Forest/ProjectSettings/ProjectSettings.asset +++ b/Forest/ProjectSettings/ProjectSettings.asset @@ -249,18 +249,18 @@ PlayerSettings: clonedFromGUID: 3c72c65a16f0acb438eed22b8b16c24a templatePackageId: com.unity.template.urp-blank@3.0.2 templateDefaultScene: Assets/Scenes/SampleScene.unity - useCustomMainManifest: 1 + useCustomMainManifest: 0 useCustomLauncherManifest: 0 - useCustomMainGradleTemplate: 1 + useCustomMainGradleTemplate: 0 useCustomLauncherGradleManifest: 0 useCustomBaseGradleTemplate: 0 - useCustomGradlePropertiesTemplate: 1 + useCustomGradlePropertiesTemplate: 0 useCustomGradleSettingsTemplate: 0 useCustomProguardFile: 0 AndroidTargetArchitectures: 3 AndroidTargetDevices: 1 AndroidSplashScreenScale: 0 - androidSplashScreen: {fileID: 0} + androidSplashScreen: {fileID: 2800000, guid: 21dcf543011935f4d9ed45ea2c276936, type: 3} AndroidKeystoreName: '{inproject}: keystore.keystore' AndroidKeyaliasName: avery AndroidEnableArmv9SecurityFeatures: 0 @@ -816,7 +816,7 @@ PlayerSettings: webGLMemoryGeometricGrowthCap: 96 webGLPowerPreference: 2 scriptingDefineSymbols: - Android: ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;SDK_FIREBASE;USE_ADDRESSABLES;SDK_ADMOD + Android: ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;SDK_FIREBASE;USE_ADDRESSABLES;SDK_ADMOD;SDK_UNITYADS Standalone: ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;USE_ADDRESSABLES;SDK_FIREBASE;SDK_ADMOD;SDK_UNITYADS WebGL: ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1 iPhone: ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;SDK_FIREBASE;USE_ADDRESSABLES;SDK_ADMOD