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

Merge branch 'Android_Dev' into Android_release

Android_release
zhangaotian 2024-08-27 16:55:05 +08:00
parent 16b0c582d1 52b6af3b22
commit 031144d934
7 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,7 +27,6 @@ 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
// Android Resolver Dependencies End // Android Resolver Dependencies End
**DEPS**} **DEPS**}

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

@ -25,7 +25,7 @@ dependencyResolutionManagement {
url "https://maven.google.com/" // Assets/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml:7, Assets/GoogleMobileAds/Editor/GoogleUmpDependencies.xml:7 url "https://maven.google.com/" // Assets/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml:7, Assets/GoogleMobileAds/Editor/GoogleUmpDependencies.xml:7
} }
maven { maven {
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 url "https://repo.maven.apache.org/maven2/" // Assets/GoogleMobileAds/Mediation/MetaAudienceNetwork/Editor/MetaAudienceNetworkMediationDependencies.xml:24, Assets/GoogleMobileAds/Mediation/UnityAds/Editor/UnityMediationDependencies.xml:25
} }
maven { maven {
url "https://dl.google.com/dl/android/maven2/" // Assets/GoogleMobileAds/Mediation/MetaAudienceNetwork/Editor/MetaAudienceNetworkMediationDependencies.xml:24, 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

8
Forest/Assets/Scripts/Framework/Shop/IAP/UnityPurchasing/generated/GooglePlayTangle.cs
View File

@ -3,11 +3,11 @@
namespace UnityEngine.Purchasing.Security { namespace UnityEngine.Purchasing.Security {
public class GooglePlayTangle public class GooglePlayTangle
{ {
private static byte[] data = System.Convert.FromBase64String("V9Ta1eVX1N/XV9TU1SVM6OLDtUR17XM6XaZtt8NeFyzx/KWlGBhD90hi8BiUts3SEdUJ/M7MorD6d21TN84jYvUM883CkEuLsxPC49HAuw5fKhdvOxSCrXUhutXeqTrHOD++KVUgWzaDSAzmU6UvTjJn2SlWAGNwiFubMlLoUGNWoGQe+tWmeqc28i6quNIJPp1aP6q1nDNEavIR9pv0ABesozuzHq3W5BpXWh7AxmjjqUhnNW4TrVdfiQMsjsqBOHGn07NUdc3CZ0CH0NuPc2Ccfn1ZTmaSs1/Z+wL/Qc5K5tEhcAdriAhZc1gjDEhHq1tcNxN5eozqdNE0NYnvCqZAMzblV9T35djT3P9TnVMi2NTU1NDV1uponMuXVw8frtfW1NXU"); private static byte[] data = System.Convert.FromBase64String("");
private static int[] order = new int[] { 1,6,12,13,12,12,9,12,11,10,12,11,13,13,14 }; private static int[] order = new int[] { 0 };
private static int key = 213; private static int key = 46;
public static readonly bool IsPopulated = true; public static readonly bool IsPopulated = false;
public static byte[] Data() { public static byte[] Data() {
if (IsPopulated == false) if (IsPopulated == false)

2
Forest/Assets/Scripts/Framework/Shop/IAP/UnityPurchasing/generated/GooglePlayTangle.cs.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 3a2497ce3d173458dbe359215c6eaa60 guid: b8c5b3e454f6249aab27613ce8120561
MonoImporter: MonoImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 2 serializedVersion: 2

2
Forest/Assets/StreamingAssets/google-services-desktop.json.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 8a48bce82d435444d932529df3936562 guid: 1bd0e5755a5904cea98d947ef8aabe5d
TextScriptImporter: TextScriptImporter:
externalObjects: {} externalObjects: {}
userData: userData:

3
Forest/ProjectSettings/AndroidResolverDependencies.xml
View File

@ -23,7 +23,6 @@
<package>com.google.firebase:firebase-crashlytics-ndk:19.0.0</package> <package>com.google.firebase:firebase-crashlytics-ndk:19.0.0</package>
<package>com.google.firebase:firebase-crashlytics-unity:12.0.0</package> <package>com.google.firebase:firebase-crashlytics-unity:12.0.0</package>
<package>com.parse.bolts:bolts-android:1.4.0</package> <package>com.parse.bolts:bolts-android:1.4.0</package>
<package>com.unity3d.ads:unity-ads:4.12.0</package>
</packages> </packages>
<files> <files>
<file>Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/12.0.0/firebase-analytics-unity-12.0.0.aar</file> <file>Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/12.0.0/firebase-analytics-unity-12.0.0.aar</file>
@ -37,7 +36,7 @@
</files> </files>
<settings> <settings>
<setting name="androidAbis" value="arm64-v8a,armeabi-v7a" /> <setting name="androidAbis" value="arm64-v8a,armeabi-v7a" />
<setting name="bundleId" value="com.woodfire.nutsbolts" /> <setting name="bundleId" value="com.woodfire.androidnutsbolts" />
<setting name="explodeAars" value="True" /> <setting name="explodeAars" value="True" />
<setting name="gradleBuildEnabled" value="True" /> <setting name="gradleBuildEnabled" value="True" />
<setting name="gradlePropertiesTemplateEnabled" value="True" /> <setting name="gradlePropertiesTemplateEnabled" value="True" />

3
Forest/ProjectSettings/GvhProjectSettings.xml
View File

@ -3,4 +3,7 @@
<projectSetting name="Google.IOSResolver.VerboseLoggingEnabled" value="False" /> <projectSetting name="Google.IOSResolver.VerboseLoggingEnabled" value="False" />
<projectSetting name="Google.PackageManagerResolver.VerboseLoggingEnabled" value="False" /> <projectSetting name="Google.PackageManagerResolver.VerboseLoggingEnabled" value="False" />
<projectSetting name="Google.VersionHandler.VerboseLoggingEnabled" value="False" /> <projectSetting name="Google.VersionHandler.VerboseLoggingEnabled" value="False" />
<projectSetting name="GooglePlayServices.AutoResolverEnabled" value="False" />
<projectSetting name="GooglePlayServices.PromptBeforeAutoResolution" value="False" />
<projectSetting name="GooglePlayServices.UseJetifier" value="True" />
</projectSettings> </projectSettings>