PHXH
/
Forest_Client
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【安卓】去掉重复依赖

Android_release
zhangaotian 2024-07-31 12:42:12 +08:00
parent 5fe3254e65
commit 9ca7102256
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Forest/Assets/GoogleMobileAds/Mediation/UnityAds/Editor/UnityMediationDependencies.xml
View File

@ -26,11 +26,11 @@
<!-- If using the Unity Ads Service from Unity3D, comment out this dependency to avoid <!-- If using the Unity Ads Service from Unity3D, comment out this dependency to avoid
including the Unity Android SDK twice. --> 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> <repositories>
<repository>https://repo.maven.apache.org/maven2/</repository> <repository>https://repo.maven.apache.org/maven2/</repository>
</repositories> </repositories>
</androidPackage> </androidPackage>-->
</androidPackages> </androidPackages>

2
Forest/Assets/Plugins/Android/mainTemplate.gradle
View File

@ -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-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.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.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 // Android Resolver Dependencies End
**DEPS**} **DEPS**}

8
Forest/ProjectSettings/ProjectSettings.asset
View File

@ -249,12 +249,12 @@ PlayerSettings:
clonedFromGUID: 3c72c65a16f0acb438eed22b8b16c24a clonedFromGUID: 3c72c65a16f0acb438eed22b8b16c24a
templatePackageId: com.unity.template.urp-blank@3.0.2 templatePackageId: com.unity.template.urp-blank@3.0.2
templateDefaultScene: Assets/Scenes/SampleScene.unity templateDefaultScene: Assets/Scenes/SampleScene.unity
useCustomMainManifest: 0 useCustomMainManifest: 1
useCustomLauncherManifest: 0 useCustomLauncherManifest: 0
useCustomMainGradleTemplate: 0 useCustomMainGradleTemplate: 1
useCustomLauncherGradleManifest: 0 useCustomLauncherGradleManifest: 0
useCustomBaseGradleTemplate: 0 useCustomBaseGradleTemplate: 0
useCustomGradlePropertiesTemplate: 0 useCustomGradlePropertiesTemplate: 1
useCustomGradleSettingsTemplate: 0 useCustomGradleSettingsTemplate: 0
useCustomProguardFile: 0 useCustomProguardFile: 0
AndroidTargetArchitectures: 3 AndroidTargetArchitectures: 3
@ -815,7 +815,7 @@ PlayerSettings:
webGLMemoryGeometricGrowthCap: 96 webGLMemoryGeometricGrowthCap: 96
webGLPowerPreference: 2 webGLPowerPreference: 2
scriptingDefineSymbols: 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 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 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 iPhone: ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;SDK_FIREBASE;USE_ADDRESSABLES;SDK_ADMOD