From 9ca710225676e813b7ad59d0e68c9a25e4b071c9 Mon Sep 17 00:00:00 2001
From: zhangaotian <8474238@qq.com>
Date: Wed, 31 Jul 2024 12:42:12 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=AE=89=E5=8D=93=E3=80=91=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E9=87=8D=E5=A4=8D=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../UnityAds/Editor/UnityMediationDependencies.xml        | 4 ++--
 Forest/Assets/Plugins/Android/mainTemplate.gradle         | 2 +-
 Forest/ProjectSettings/ProjectSettings.asset              | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Forest/Assets/GoogleMobileAds/Mediation/UnityAds/Editor/UnityMediationDependencies.xml b/Forest/Assets/GoogleMobileAds/Mediation/UnityAds/Editor/UnityMediationDependencies.xml
index 2276cce..4697eb5 100644
--- a/Forest/Assets/GoogleMobileAds/Mediation/UnityAds/Editor/UnityMediationDependencies.xml
+++ b/Forest/Assets/GoogleMobileAds/Mediation/UnityAds/Editor/UnityMediationDependencies.xml
@@ -26,11 +26,11 @@
 
     <!-- If using the Unity Ads Service from Unity3D, comment out this dependency to avoid
     including the Unity Android SDK twice. -->
-    <androidPackage spec="com.unity3d.ads:unity-ads:4.12.0">
+<!--    <androidPackage spec="com.unity3d.ads:unity-ads:4.12.0">
       <repositories>
         <repository>https://repo.maven.apache.org/maven2/</repository>
       </repositories>
-    </androidPackage>
+    </androidPackage>-->
 
   </androidPackages>
 
diff --git a/Forest/Assets/Plugins/Android/mainTemplate.gradle b/Forest/Assets/Plugins/Android/mainTemplate.gradle
index b1c6600..f11686f 100644
--- a/Forest/Assets/Plugins/Android/mainTemplate.gradle
+++ b/Forest/Assets/Plugins/Android/mainTemplate.gradle
@@ -27,7 +27,7 @@ dependencies {
     implementation 'com.google.firebase:firebase-crashlytics-ndk:19.0.0' // Assets/Firebase/Editor/CrashlyticsDependencies.xml:13
     implementation 'com.google.firebase:firebase-crashlytics-unity:12.0.0' // Assets/Firebase/Editor/CrashlyticsDependencies.xml:20
     implementation 'com.parse.bolts:bolts-android:1.4.0' // Assets/FacebookSDK/Plugins/Editor/Dependencies.xml:4
-    implementation 'com.unity3d.ads:unity-ads:4.12.0' // Assets/GoogleMobileAds/Mediation/UnityAds/Editor/UnityMediationDependencies.xml:33
+    //implementation 'com.unity3d.ads:unity-ads:4.12.0' // Assets/GoogleMobileAds/Mediation/UnityAds/Editor/UnityMediationDependencies.xml:33
 // Android Resolver Dependencies End
 **DEPS**}
 
diff --git a/Forest/ProjectSettings/ProjectSettings.asset b/Forest/ProjectSettings/ProjectSettings.asset
index 8f6abf8..a342743 100644
--- a/Forest/ProjectSettings/ProjectSettings.asset
+++ b/Forest/ProjectSettings/ProjectSettings.asset
@@ -249,12 +249,12 @@ PlayerSettings:
   clonedFromGUID: 3c72c65a16f0acb438eed22b8b16c24a
   templatePackageId: com.unity.template.urp-blank@3.0.2
   templateDefaultScene: Assets/Scenes/SampleScene.unity
-  useCustomMainManifest: 0
+  useCustomMainManifest: 1
   useCustomLauncherManifest: 0
-  useCustomMainGradleTemplate: 0
+  useCustomMainGradleTemplate: 1
   useCustomLauncherGradleManifest: 0
   useCustomBaseGradleTemplate: 0
-  useCustomGradlePropertiesTemplate: 0
+  useCustomGradlePropertiesTemplate: 1
   useCustomGradleSettingsTemplate: 0
   useCustomProguardFile: 0
   AndroidTargetArchitectures: 3
@@ -815,7 +815,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;SDK_UNITYADS
+    Android: ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;SDK_FIREBASE;USE_ADDRESSABLES;SDK_ADMOD
     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