From 004f3afe122518a5a5aaf7cd0bf65764c9f478b5 Mon Sep 17 00:00:00 2001 From: zhangaotian <8474238@qq.com> Date: Tue, 27 Aug 2024 16:23:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E5=95=86=E5=BA=97=E3=80=91?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=95=86=E5=BA=97=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IAP/UnityPurchasing/generated/GooglePlayTangle.cs | 8 ++++---- .../UnityPurchasing/generated/GooglePlayTangle.cs.meta | 2 +- .../StreamingAssets/google-services-desktop.json.meta | 2 +- Forest/ProjectSettings/GvhProjectSettings.xml | 3 +++ 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Forest/Assets/Scripts/Framework/Shop/IAP/UnityPurchasing/generated/GooglePlayTangle.cs b/Forest/Assets/Scripts/Framework/Shop/IAP/UnityPurchasing/generated/GooglePlayTangle.cs index 10037dc..d774281 100644 --- a/Forest/Assets/Scripts/Framework/Shop/IAP/UnityPurchasing/generated/GooglePlayTangle.cs +++ b/Forest/Assets/Scripts/Framework/Shop/IAP/UnityPurchasing/generated/GooglePlayTangle.cs @@ -3,11 +3,11 @@ namespace UnityEngine.Purchasing.Security { public class GooglePlayTangle { - private static byte[] data = System.Convert.FromBase64String("V9Ta1eVX1N/XV9TU1SVM6OLDtUR17XM6XaZtt8NeFyzx/KWlGBhD90hi8BiUts3SEdUJ/M7MorD6d21TN84jYvUM883CkEuLsxPC49HAuw5fKhdvOxSCrXUhutXeqTrHOD++KVUgWzaDSAzmU6UvTjJn2SlWAGNwiFubMlLoUGNWoGQe+tWmeqc28i6quNIJPp1aP6q1nDNEavIR9pv0ABesozuzHq3W5BpXWh7AxmjjqUhnNW4TrVdfiQMsjsqBOHGn07NUdc3CZ0CH0NuPc2Ccfn1ZTmaSs1/Z+wL/Qc5K5tEhcAdriAhZc1gjDEhHq1tcNxN5eozqdNE0NYnvCqZAMzblV9T35djT3P9TnVMi2NTU1NDV1uponMuXVw8frtfW1NXU"); - private static int[] order = new int[] { 1,6,12,13,12,12,9,12,11,10,12,11,13,13,14 }; - private static int key = 213; + private static byte[] data = System.Convert.FromBase64String(""); + private static int[] order = new int[] { 0 }; + private static int key = 46; - public static readonly bool IsPopulated = true; + public static readonly bool IsPopulated = false; public static byte[] Data() { if (IsPopulated == false) diff --git a/Forest/Assets/Scripts/Framework/Shop/IAP/UnityPurchasing/generated/GooglePlayTangle.cs.meta b/Forest/Assets/Scripts/Framework/Shop/IAP/UnityPurchasing/generated/GooglePlayTangle.cs.meta index 452dc8f..e716cf6 100644 --- a/Forest/Assets/Scripts/Framework/Shop/IAP/UnityPurchasing/generated/GooglePlayTangle.cs.meta +++ b/Forest/Assets/Scripts/Framework/Shop/IAP/UnityPurchasing/generated/GooglePlayTangle.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3a2497ce3d173458dbe359215c6eaa60 +guid: b8c5b3e454f6249aab27613ce8120561 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Forest/Assets/StreamingAssets/google-services-desktop.json.meta b/Forest/Assets/StreamingAssets/google-services-desktop.json.meta index e447f2d..0b38aa8 100644 --- a/Forest/Assets/StreamingAssets/google-services-desktop.json.meta +++ b/Forest/Assets/StreamingAssets/google-services-desktop.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8a48bce82d435444d932529df3936562 +guid: 1bd0e5755a5904cea98d947ef8aabe5d TextScriptImporter: externalObjects: {} userData: diff --git a/Forest/ProjectSettings/GvhProjectSettings.xml b/Forest/ProjectSettings/GvhProjectSettings.xml index 47fce63..bc9a15c 100644 --- a/Forest/ProjectSettings/GvhProjectSettings.xml +++ b/Forest/ProjectSettings/GvhProjectSettings.xml @@ -3,4 +3,7 @@ + + + \ No newline at end of file From 52b6af3b22a0f1e76a019cb23d65244d0cca7bb0 Mon Sep 17 00:00:00 2001 From: zhangaotian <8474238@qq.com> Date: Tue, 27 Aug 2024 16:36:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E5=AE=89=E5=8D=93=E3=80=91?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BE=9D=E8=B5=96=E5=8F=8A=E5=8C=85=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Forest/Assets/Plugins/Android/mainTemplate.gradle | 1 - Forest/Assets/Plugins/Android/settingsTemplate.gradle | 2 +- Forest/ProjectSettings/AndroidResolverDependencies.xml | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Forest/Assets/Plugins/Android/mainTemplate.gradle b/Forest/Assets/Plugins/Android/mainTemplate.gradle index f11686f..f063b78 100644 --- a/Forest/Assets/Plugins/Android/mainTemplate.gradle +++ b/Forest/Assets/Plugins/Android/mainTemplate.gradle @@ -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-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 // Android Resolver Dependencies End **DEPS**} diff --git a/Forest/Assets/Plugins/Android/settingsTemplate.gradle b/Forest/Assets/Plugins/Android/settingsTemplate.gradle index c59bead..ccb90c7 100644 --- a/Forest/Assets/Plugins/Android/settingsTemplate.gradle +++ b/Forest/Assets/Plugins/Android/settingsTemplate.gradle @@ -25,7 +25,7 @@ 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/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 { url "https://dl.google.com/dl/android/maven2/" // Assets/GoogleMobileAds/Mediation/MetaAudienceNetwork/Editor/MetaAudienceNetworkMediationDependencies.xml:24, Assets/GoogleMobileAds/Mediation/UnityAds/Editor/UnityMediationDependencies.xml:25 diff --git a/Forest/ProjectSettings/AndroidResolverDependencies.xml b/Forest/ProjectSettings/AndroidResolverDependencies.xml index 5ea3938..d1b13d9 100644 --- a/Forest/ProjectSettings/AndroidResolverDependencies.xml +++ b/Forest/ProjectSettings/AndroidResolverDependencies.xml @@ -23,7 +23,6 @@ com.google.firebase:firebase-crashlytics-ndk:19.0.0 com.google.firebase:firebase-crashlytics-unity:12.0.0 com.parse.bolts:bolts-android:1.4.0 - com.unity3d.ads:unity-ads:4.12.0 Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/12.0.0/firebase-analytics-unity-12.0.0.aar @@ -37,7 +36,7 @@ - +