diff --git a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/12.2.1/firebase-analytics-unity-12.2.1.aar.meta b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/12.2.1/firebase-analytics-unity-12.2.1.aar.meta index 0e8076d..2b0c686 100644 --- a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/12.2.1/firebase-analytics-unity-12.2.1.aar.meta +++ b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/12.2.1/firebase-analytics-unity-12.2.1.aar.meta @@ -4,7 +4,7 @@ labels: - gpsr PluginImporter: externalObjects: {} - serializedVersion: 2 + serializedVersion: 3 iconMap: {} executionOrder: {} defineConstraints: [] @@ -13,19 +13,13 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - Android: Android - second: + Android: enabled: 0 settings: {} - - first: - Any: - second: + Any: enabled: 0 settings: {} - - first: - Editor: Editor - second: + Editor: enabled: 0 settings: DefaultValueInitialized: true diff --git a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/12.2.1/firebase-app-unity-12.2.1.aar.meta b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/12.2.1/firebase-app-unity-12.2.1.aar.meta index 8a63028..dad5068 100644 --- a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/12.2.1/firebase-app-unity-12.2.1.aar.meta +++ b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/12.2.1/firebase-app-unity-12.2.1.aar.meta @@ -4,7 +4,7 @@ labels: - gpsr PluginImporter: externalObjects: {} - serializedVersion: 2 + serializedVersion: 3 iconMap: {} executionOrder: {} defineConstraints: [] @@ -13,19 +13,13 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - Android: Android - second: + Android: enabled: 0 settings: {} - - first: - Any: - second: + Any: enabled: 0 settings: {} - - first: - Editor: Editor - second: + Editor: enabled: 0 settings: DefaultValueInitialized: true diff --git a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-auth-unity/12.2.1/firebase-auth-unity-12.2.1.aar.meta b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-auth-unity/12.2.1/firebase-auth-unity-12.2.1.aar.meta index c9cd90b..ee85ca4 100644 --- a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-auth-unity/12.2.1/firebase-auth-unity-12.2.1.aar.meta +++ b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-auth-unity/12.2.1/firebase-auth-unity-12.2.1.aar.meta @@ -4,7 +4,7 @@ labels: - gpsr PluginImporter: externalObjects: {} - serializedVersion: 2 + serializedVersion: 3 iconMap: {} executionOrder: {} defineConstraints: [] @@ -13,19 +13,13 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - Android: Android - second: + Android: enabled: 0 settings: {} - - first: - Any: - second: + Any: enabled: 0 settings: {} - - first: - Editor: Editor - second: + Editor: enabled: 0 settings: DefaultValueInitialized: true diff --git a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/12.2.1/firebase-crashlytics-unity-12.2.1.aar.meta b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/12.2.1/firebase-crashlytics-unity-12.2.1.aar.meta index afb79f0..82a8c2e 100644 --- a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/12.2.1/firebase-crashlytics-unity-12.2.1.aar.meta +++ b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/12.2.1/firebase-crashlytics-unity-12.2.1.aar.meta @@ -4,7 +4,7 @@ labels: - gpsr PluginImporter: externalObjects: {} - serializedVersion: 2 + serializedVersion: 3 iconMap: {} executionOrder: {} defineConstraints: [] @@ -13,19 +13,13 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - Android: Android - second: + Android: enabled: 0 settings: {} - - first: - Any: - second: + Any: enabled: 0 settings: {} - - first: - Editor: Editor - second: + Editor: enabled: 0 settings: DefaultValueInitialized: true diff --git a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-database-unity/12.2.1/firebase-database-unity-12.2.1.aar.meta b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-database-unity/12.2.1/firebase-database-unity-12.2.1.aar.meta index 382cd38..8baa088 100644 --- a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-database-unity/12.2.1/firebase-database-unity-12.2.1.aar.meta +++ b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-database-unity/12.2.1/firebase-database-unity-12.2.1.aar.meta @@ -4,7 +4,7 @@ labels: - gpsr PluginImporter: externalObjects: {} - serializedVersion: 2 + serializedVersion: 3 iconMap: {} executionOrder: {} defineConstraints: [] @@ -13,19 +13,13 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - Android: Android - second: + Android: enabled: 0 settings: {} - - first: - Any: - second: + Any: enabled: 0 settings: {} - - first: - Editor: Editor - second: + Editor: enabled: 0 settings: DefaultValueInitialized: true diff --git a/Assets/GeneratedLocalRepo/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.aar.meta b/Assets/GeneratedLocalRepo/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.aar.meta index c54bb2f..901d96e 100644 --- a/Assets/GeneratedLocalRepo/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.aar.meta +++ b/Assets/GeneratedLocalRepo/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.aar.meta @@ -4,7 +4,7 @@ labels: - gpsr PluginImporter: externalObjects: {} - serializedVersion: 2 + serializedVersion: 3 iconMap: {} executionOrder: {} defineConstraints: [] @@ -13,14 +13,10 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - Any: - second: + Any: enabled: 0 settings: {} - - first: - Editor: Editor - second: + Editor: enabled: 1 settings: DefaultValueInitialized: true diff --git a/Assets/GoogleMobileAds/Mediation.meta b/Assets/GoogleMobileAds/Mediation.meta new file mode 100644 index 0000000..0e0fe95 --- /dev/null +++ b/Assets/GoogleMobileAds/Mediation.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6131fd8c914d34454b8f8202222259ec +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GoogleMobileAds/Mediation/UnityAds.meta b/Assets/GoogleMobileAds/Mediation/UnityAds.meta new file mode 100644 index 0000000..5fe0084 --- /dev/null +++ b/Assets/GoogleMobileAds/Mediation/UnityAds.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4c07314f5c8334990997951b7ff92d9b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GoogleMobileAds/Mediation/UnityAds/Api.meta b/Assets/GoogleMobileAds/Mediation/UnityAds/Api.meta new file mode 100644 index 0000000..083ef67 --- /dev/null +++ b/Assets/GoogleMobileAds/Mediation/UnityAds/Api.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ddb08bcc3f4644dedb160ccf2ec5dbbb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GoogleMobileAds/Mediation/UnityAds/Api/GoogleMobileAds.Mediation.UnityAds.Api.asmdef b/Assets/GoogleMobileAds/Mediation/UnityAds/Api/GoogleMobileAds.Mediation.UnityAds.Api.asmdef new file mode 100644 index 0000000..49b3951 --- /dev/null +++ b/Assets/GoogleMobileAds/Mediation/UnityAds/Api/GoogleMobileAds.Mediation.UnityAds.Api.asmdef @@ -0,0 +1,20 @@ +{ + "name": "GoogleMobileAds.Mediation.UnityAds.Api", + "rootNamespace": "", + "references": [ + "GoogleMobileAds.Api.Mediation", + "GoogleMobileAds.Mediation.UnityAds.Common", + "GoogleMobileAds.Mediation.UnityAds.Android", + "GoogleMobileAds.Mediation.UnityAds.iOS" + ], + "references": [], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} diff --git a/Assets/GoogleMobileAds/Mediation/UnityAds/Api/GoogleMobileAds.Mediation.UnityAds.Api.asmdef.meta b/Assets/GoogleMobileAds/Mediation/UnityAds/Api/GoogleMobileAds.Mediation.UnityAds.Api.asmdef.meta new file mode 100644 index 0000000..0a9c37e --- /dev/null +++ b/Assets/GoogleMobileAds/Mediation/UnityAds/Api/GoogleMobileAds.Mediation.UnityAds.Api.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 86fc4e5d20f274576ac807a53a6cfce2 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GoogleMobileAds/Mediation/UnityAds/Api/UnityAds.cs b/Assets/GoogleMobileAds/Mediation/UnityAds/Api/UnityAds.cs new file mode 100644 index 0000000..6e07559 --- /dev/null +++ b/Assets/GoogleMobileAds/Mediation/UnityAds/Api/UnityAds.cs @@ -0,0 +1,42 @@ +// Copyright 2018 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +using GoogleMobileAds.Mediation.UnityAds.Common; + +namespace GoogleMobileAds.Mediation.UnityAds.Api +{ + public class UnityAds + { + internal static readonly IUnityAdsClient client = + UnityAdsClientFactory.CreateUnityAdsClient(); + + public static void SetConsentMetaData(string key, bool metaDataValue) + { + client.SetConsentMetaData(key, metaDataValue); + } + } +} + + +namespace GoogleMobileAds.Api.Mediation.UnityAds +{ + [System.Obsolete("Use `GoogleMobileAds.Mediation.UnityAds.Api.UnityAds` instead.")] + public class UnityAds + { + public static void SetConsentMetaData(string key, bool metaDataValue) + { + GoogleMobileAds.Mediation.UnityAds.Api.UnityAds.SetConsentMetaData(key, metaDataValue); + } + } +} diff --git a/Assets/GoogleMobileAds/Mediation/UnityAds/Api/UnityAds.cs.meta b/Assets/GoogleMobileAds/Mediation/UnityAds/Api/UnityAds.cs.meta new file mode 100644 index 0000000..0895c47 --- /dev/null +++ b/Assets/GoogleMobileAds/Mediation/UnityAds/Api/UnityAds.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: c4507aa403d4b46e581efaffd089125b +timeCreated: 1526597658 +licenseType: Pro +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GoogleMobileAds/Mediation/UnityAds/Api/UnityAdsClientFactory.cs b/Assets/GoogleMobileAds/Mediation/UnityAds/Api/UnityAdsClientFactory.cs new file mode 100644 index 0000000..5f44af9 --- /dev/null +++ b/Assets/GoogleMobileAds/Mediation/UnityAds/Api/UnityAdsClientFactory.cs @@ -0,0 +1,35 @@ +// Copyright 2018 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +using GoogleMobileAds.Mediation.UnityAds.Common; + +namespace GoogleMobileAds.Mediation.UnityAds +{ + public class UnityAdsClientFactory + { + public static IUnityAdsClient CreateUnityAdsClient() + { + #if UNITY_EDITOR + return new GoogleMobileAds.Mediation.UnityAds.Common.PlaceholderClient(); + #elif UNITY_ANDROID + return GoogleMobileAds.Mediation.UnityAds.Android.UnityAdsClient.Instance; + #elif UNITY_IOS + return GoogleMobileAds.Mediation.UnityAds.iOS.UnityAdsClient.Instance; + #else + return new GoogleMobileAds.Mediation.UnityAds.Common.PlaceholderClient(); + #endif + } + } +} + diff --git a/Assets/GoogleMobileAds/Mediation/UnityAds/Api/UnityAdsClientFactory.cs.meta b/Assets/GoogleMobileAds/Mediation/UnityAds/Api/UnityAdsClientFactory.cs.meta new file mode 100644 index 0000000..6c689a5 --- /dev/null +++ b/Assets/GoogleMobileAds/Mediation/UnityAds/Api/UnityAdsClientFactory.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: e0735edcd2cb14762811a3f496fb9ae3 +timeCreated: 1526600283 +licenseType: Pro +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GoogleMobileAds/Mediation/UnityAds/Common.meta b/Assets/GoogleMobileAds/Mediation/UnityAds/Common.meta new file mode 100644 index 0000000..91edd4b --- /dev/null +++ b/Assets/GoogleMobileAds/Mediation/UnityAds/Common.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c5c6758820da548d9b7a9a25d65b7d5f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GoogleMobileAds/Mediation/UnityAds/Common/GoogleMobileAds.Mediation.UnityAds.Common.asmdef b/Assets/GoogleMobileAds/Mediation/UnityAds/Common/GoogleMobileAds.Mediation.UnityAds.Common.asmdef new file mode 100644 index 0000000..ad0fba8 --- /dev/null +++ b/Assets/GoogleMobileAds/Mediation/UnityAds/Common/GoogleMobileAds.Mediation.UnityAds.Common.asmdef @@ -0,0 +1,14 @@ +{ + "name": "GoogleMobileAds.Mediation.UnityAds.Common", + "rootNamespace": "", + "references": [], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} diff --git a/Assets/GoogleMobileAds/Mediation/UnityAds/Common/GoogleMobileAds.Mediation.UnityAds.Common.asmdef.meta b/Assets/GoogleMobileAds/Mediation/UnityAds/Common/GoogleMobileAds.Mediation.UnityAds.Common.asmdef.meta new file mode 100644 index 0000000..3006e72 --- /dev/null +++ b/Assets/GoogleMobileAds/Mediation/UnityAds/Common/GoogleMobileAds.Mediation.UnityAds.Common.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9394f693c521349b193b0f6edab9d7dd +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GoogleMobileAds/Mediation/UnityAds/Common/IUnityAdsClient.cs b/Assets/GoogleMobileAds/Mediation/UnityAds/Common/IUnityAdsClient.cs new file mode 100644 index 0000000..b16f32f --- /dev/null +++ b/Assets/GoogleMobileAds/Mediation/UnityAds/Common/IUnityAdsClient.cs @@ -0,0 +1,21 @@ +// Copyright 2018 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +namespace GoogleMobileAds.Mediation.UnityAds.Common +{ + public interface IUnityAdsClient + { + void SetConsentMetaData(string key, bool metaDataValue); + } +} diff --git a/Assets/GoogleMobileAds/Mediation/UnityAds/Common/IUnityAdsClient.cs.meta b/Assets/GoogleMobileAds/Mediation/UnityAds/Common/IUnityAdsClient.cs.meta new file mode 100644 index 0000000..2c15e40 --- /dev/null +++ b/Assets/GoogleMobileAds/Mediation/UnityAds/Common/IUnityAdsClient.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 6198fac152078472d9a1e4565b028cd7 +timeCreated: 1526597908 +licenseType: Pro +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GoogleMobileAds/Mediation/UnityAds/Common/PlaceholderClient.cs b/Assets/GoogleMobileAds/Mediation/UnityAds/Common/PlaceholderClient.cs new file mode 100644 index 0000000..904d47f --- /dev/null +++ b/Assets/GoogleMobileAds/Mediation/UnityAds/Common/PlaceholderClient.cs @@ -0,0 +1,33 @@ +// Copyright 2018 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +using System.Reflection; + +using UnityEngine; + +namespace GoogleMobileAds.Mediation.UnityAds.Common +{ + public class PlaceholderClient : IUnityAdsClient + { + public PlaceholderClient () + { + Debug.Log ("Placeholder " + MethodBase.GetCurrentMethod ().Name); + } + + public void SetConsentMetaData(string key, bool metaDataValue) + { + Debug.Log ("Placeholder " + MethodBase.GetCurrentMethod ().Name); + } + } +} diff --git a/Assets/GoogleMobileAds/Mediation/UnityAds/Common/PlaceholderClient.cs.meta b/Assets/GoogleMobileAds/Mediation/UnityAds/Common/PlaceholderClient.cs.meta new file mode 100644 index 0000000..c713185 --- /dev/null +++ b/Assets/GoogleMobileAds/Mediation/UnityAds/Common/PlaceholderClient.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 6a8cdf5ebecd2467eb26aaaa539246c9 +timeCreated: 1526597900 +licenseType: Pro +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GoogleMobileAds/Mediation/UnityAds/Editor.meta b/Assets/GoogleMobileAds/Mediation/UnityAds/Editor.meta new file mode 100644 index 0000000..41b95ad --- /dev/null +++ b/Assets/GoogleMobileAds/Mediation/UnityAds/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: deba49fb09c5840909176634b673ea74 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GoogleMobileAds/Mediation/UnityAds/Editor/UnityMediationDependencies.xml b/Assets/GoogleMobileAds/Mediation/UnityAds/Editor/UnityMediationDependencies.xml new file mode 100644 index 0000000..463a863 --- /dev/null +++ b/Assets/GoogleMobileAds/Mediation/UnityAds/Editor/UnityMediationDependencies.xml @@ -0,0 +1,40 @@ + + + + + + + + https://repo.maven.apache.org/maven2/ + https://dl.google.com/dl/android/maven2/ + + + + + + + https://repo.maven.apache.org/maven2/ + + + + + + + + + diff --git a/Assets/GoogleMobileAds/Mediation/UnityAds/Editor/UnityMediationDependencies.xml.meta b/Assets/GoogleMobileAds/Mediation/UnityAds/Editor/UnityMediationDependencies.xml.meta new file mode 100644 index 0000000..7a067ab --- /dev/null +++ b/Assets/GoogleMobileAds/Mediation/UnityAds/Editor/UnityMediationDependencies.xml.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c4d84b9dedec547b5a6e97e0d1a804c9 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GoogleMobileAds/Mediation/UnityAds/Platforms.meta b/Assets/GoogleMobileAds/Mediation/UnityAds/Platforms.meta new file mode 100644 index 0000000..e01e294 --- /dev/null +++ b/Assets/GoogleMobileAds/Mediation/UnityAds/Platforms.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2ece3daf07d304630bfe929d6ff44b0d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GoogleMobileAds/Mediation/UnityAds/Platforms/Android.meta b/Assets/GoogleMobileAds/Mediation/UnityAds/Platforms/Android.meta new file mode 100644 index 0000000..7e67a09 --- /dev/null +++ b/Assets/GoogleMobileAds/Mediation/UnityAds/Platforms/Android.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c855340ddda014e2db66d2a15188a54f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GoogleMobileAds/Mediation/UnityAds/Platforms/Android/GoogleMobileAds.Mediation.UnityAds.Android.asmdef b/Assets/GoogleMobileAds/Mediation/UnityAds/Platforms/Android/GoogleMobileAds.Mediation.UnityAds.Android.asmdef new file mode 100644 index 0000000..305f021 --- /dev/null +++ b/Assets/GoogleMobileAds/Mediation/UnityAds/Platforms/Android/GoogleMobileAds.Mediation.UnityAds.Android.asmdef @@ -0,0 +1,19 @@ +{ + "name": "GoogleMobileAds.Mediation.UnityAds.Android", + "rootNamespace": "", + "references": [ + "GoogleMobileAds.Mediation.UnityAds.Common" + ], + "includePlatforms": [ + "Android", + "Editor" + ], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} diff --git a/Assets/GoogleMobileAds/Mediation/UnityAds/Platforms/Android/GoogleMobileAds.Mediation.UnityAds.Android.asmdef.meta b/Assets/GoogleMobileAds/Mediation/UnityAds/Platforms/Android/GoogleMobileAds.Mediation.UnityAds.Android.asmdef.meta new file mode 100644 index 0000000..e36691d --- /dev/null +++ b/Assets/GoogleMobileAds/Mediation/UnityAds/Platforms/Android/GoogleMobileAds.Mediation.UnityAds.Android.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 92810ba2910f14e8dab7dfc0537e652f +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GoogleMobileAds/Mediation/UnityAds/Platforms/Android/UnityAdsClient.cs b/Assets/GoogleMobileAds/Mediation/UnityAds/Platforms/Android/UnityAdsClient.cs new file mode 100644 index 0000000..6d85092 --- /dev/null +++ b/Assets/GoogleMobileAds/Mediation/UnityAds/Platforms/Android/UnityAdsClient.cs @@ -0,0 +1,60 @@ +// Copyright 2018 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#if UNITY_ANDROID + +using UnityEngine; + +using GoogleMobileAds.Mediation.UnityAds.Common; + +namespace GoogleMobileAds.Mediation.UnityAds.Android +{ + public class UnityAdsClient : IUnityAdsClient + { + private const string UNITY_PLAYER_CLASS_NAME = "com.unity3d.player.UnityPlayer"; + private const string UNITY_ADS_METADATA_CLASS_NAME = "com.unity3d.ads.metadata.MetaData"; + + private static UnityAdsClient instance = new UnityAdsClient(); + private UnityAdsClient() { } + + public static UnityAdsClient Instance + { + get + { + return instance; + } + } + + public void SetConsentMetaData(string key, bool metaDataValue) + { + AndroidJavaClass unityPlayer = new AndroidJavaClass(UNITY_PLAYER_CLASS_NAME); + AndroidJavaObject currentActivity = + unityPlayer.GetStatic ("currentActivity"); + + AndroidJavaObject unityAdsMetaData = + new AndroidJavaObject(UNITY_ADS_METADATA_CLASS_NAME, currentActivity); + bool success = unityAdsMetaData.Call("set", key, metaDataValue); + if (success) + { + unityAdsMetaData.Call("commit"); + } + else + { + MonoBehaviour.print("[UnityAds Plugin] Failed to update consent MetaData."); + } + } + } +} + +#endif diff --git a/Assets/GoogleMobileAds/Mediation/UnityAds/Platforms/Android/UnityAdsClient.cs.meta b/Assets/GoogleMobileAds/Mediation/UnityAds/Platforms/Android/UnityAdsClient.cs.meta new file mode 100644 index 0000000..cc7be36 --- /dev/null +++ b/Assets/GoogleMobileAds/Mediation/UnityAds/Platforms/Android/UnityAdsClient.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: c98936878987344338357027692b2499 +timeCreated: 1526600283 +licenseType: Pro +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GoogleMobileAds/Mediation/UnityAds/Platforms/iOS.meta b/Assets/GoogleMobileAds/Mediation/UnityAds/Platforms/iOS.meta new file mode 100644 index 0000000..146965f --- /dev/null +++ b/Assets/GoogleMobileAds/Mediation/UnityAds/Platforms/iOS.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1ec827bf20987408b9536a58b2921a0e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GoogleMobileAds/Mediation/UnityAds/Platforms/iOS/Externs.cs b/Assets/GoogleMobileAds/Mediation/UnityAds/Platforms/iOS/Externs.cs new file mode 100644 index 0000000..824dd46 --- /dev/null +++ b/Assets/GoogleMobileAds/Mediation/UnityAds/Platforms/iOS/Externs.cs @@ -0,0 +1,29 @@ +// Copyright 2018 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#if UNITY_IOS + +using System.Runtime.InteropServices; + +namespace GoogleMobileAds.Mediation.UnityAds.iOS +{ + // Externs used by the iOS component + internal class Externs + { + [DllImport("__Internal")] + internal static extern void GADUMSetConsentMetaData(string key, bool metaDataValue); + } +} + +#endif diff --git a/Assets/GoogleMobileAds/Mediation/UnityAds/Platforms/iOS/Externs.cs.meta b/Assets/GoogleMobileAds/Mediation/UnityAds/Platforms/iOS/Externs.cs.meta new file mode 100644 index 0000000..f573dc0 --- /dev/null +++ b/Assets/GoogleMobileAds/Mediation/UnityAds/Platforms/iOS/Externs.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: cec7e68a8408c45218e12932e45d8c60 +timeCreated: 1526600283 +licenseType: Pro +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GoogleMobileAds/Mediation/UnityAds/Platforms/iOS/GoogleMobileAds.Mediation.UnityAds.iOS.asmdef b/Assets/GoogleMobileAds/Mediation/UnityAds/Platforms/iOS/GoogleMobileAds.Mediation.UnityAds.iOS.asmdef new file mode 100644 index 0000000..d914ba0 --- /dev/null +++ b/Assets/GoogleMobileAds/Mediation/UnityAds/Platforms/iOS/GoogleMobileAds.Mediation.UnityAds.iOS.asmdef @@ -0,0 +1,19 @@ +{ + "name": "GoogleMobileAds.Mediation.UnityAds.iOS", + "rootNamespace": "", + "references": [ + "GoogleMobileAds.Mediation.UnityAds.Common" + ], + "includePlatforms": [ + "Editor", + "iOS" + ], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} diff --git a/Assets/GoogleMobileAds/Mediation/UnityAds/Platforms/iOS/GoogleMobileAds.Mediation.UnityAds.iOS.asmdef.meta b/Assets/GoogleMobileAds/Mediation/UnityAds/Platforms/iOS/GoogleMobileAds.Mediation.UnityAds.iOS.asmdef.meta new file mode 100644 index 0000000..263edbd --- /dev/null +++ b/Assets/GoogleMobileAds/Mediation/UnityAds/Platforms/iOS/GoogleMobileAds.Mediation.UnityAds.iOS.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: eaf70d0758c7f4fc7bf1eda4be97c072 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GoogleMobileAds/Mediation/UnityAds/Platforms/iOS/UnityAdsClient.cs b/Assets/GoogleMobileAds/Mediation/UnityAds/Platforms/iOS/UnityAdsClient.cs new file mode 100644 index 0000000..1219af9 --- /dev/null +++ b/Assets/GoogleMobileAds/Mediation/UnityAds/Platforms/iOS/UnityAdsClient.cs @@ -0,0 +1,41 @@ +// Copyright 2018 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#if UNITY_IOS + +using GoogleMobileAds.Mediation.UnityAds.Common; + +namespace GoogleMobileAds.Mediation.UnityAds.iOS +{ + public class UnityAdsClient : IUnityAdsClient + { + private static UnityAdsClient instance = new UnityAdsClient(); + private UnityAdsClient() {} + + public static UnityAdsClient Instance + { + get + { + return instance; + } + } + + public void SetConsentMetaData(string key, bool metaDataValue) + { + Externs.GADUMSetConsentMetaData(key, metaDataValue); + } + } +} + +#endif diff --git a/Assets/GoogleMobileAds/Mediation/UnityAds/Platforms/iOS/UnityAdsClient.cs.meta b/Assets/GoogleMobileAds/Mediation/UnityAds/Platforms/iOS/UnityAdsClient.cs.meta new file mode 100644 index 0000000..30be6a1 --- /dev/null +++ b/Assets/GoogleMobileAds/Mediation/UnityAds/Platforms/iOS/UnityAdsClient.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: ec9b8664065c14666a1737bc05fa2bc0 +timeCreated: 1526600283 +licenseType: Pro +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GoogleMobileAds/Mediation/UnityAds/Plugins.meta b/Assets/GoogleMobileAds/Mediation/UnityAds/Plugins.meta new file mode 100644 index 0000000..31645fd --- /dev/null +++ b/Assets/GoogleMobileAds/Mediation/UnityAds/Plugins.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a8d7eed8311a94ef698998d7aa08646c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GoogleMobileAds/Mediation/UnityAds/Plugins/iOS.meta b/Assets/GoogleMobileAds/Mediation/UnityAds/Plugins/iOS.meta new file mode 100644 index 0000000..ef44d33 --- /dev/null +++ b/Assets/GoogleMobileAds/Mediation/UnityAds/Plugins/iOS.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9acd492b6fd4a4363bdb52c9ee4d15b2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GoogleMobileAds/Mediation/UnityAds/Plugins/iOS/GADUMUnityAdsInterface.m b/Assets/GoogleMobileAds/Mediation/UnityAds/Plugins/iOS/GADUMUnityAdsInterface.m new file mode 100644 index 0000000..47f0ba7 --- /dev/null +++ b/Assets/GoogleMobileAds/Mediation/UnityAds/Plugins/iOS/GADUMUnityAdsInterface.m @@ -0,0 +1,21 @@ +// Copyright 2018 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#import + +void GADUMSetConsentMetaData(const char* key, BOOL consent) { + UADSMetaData* unityAdsMetaData = [[UADSMetaData alloc] init]; + [unityAdsMetaData set:@(key) value:@(consent)]; + [unityAdsMetaData commit]; +} diff --git a/Assets/GoogleMobileAds/Mediation/UnityAds/Plugins/iOS/GADUMUnityAdsInterface.m.meta b/Assets/GoogleMobileAds/Mediation/UnityAds/Plugins/iOS/GADUMUnityAdsInterface.m.meta new file mode 100644 index 0000000..24898a8 --- /dev/null +++ b/Assets/GoogleMobileAds/Mediation/UnityAds/Plugins/iOS/GADUMUnityAdsInterface.m.meta @@ -0,0 +1,31 @@ +fileFormatVersion: 2 +guid: 8d905e1f5a0d04ed281ce21e5d30f838 +timeCreated: 1526600286 +licenseType: Pro +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + isOverridable: 0 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + iPhone: iOS + second: + enabled: 1 + settings: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Memo.txt b/Assets/Memo.txt index 095b18c..7e7359a 100644 --- a/Assets/Memo.txt +++ b/Assets/Memo.txt @@ -28,6 +28,6 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// -앨범 수집 목록 서브 미션 +앨범 수집 목록 데이터 저장, 불러오기 (구글 플레이센터로 변경) \ No newline at end of file diff --git a/Assets/Plugins/Android/mainTemplate.gradle b/Assets/Plugins/Android/mainTemplate.gradle index 5e073ff..d725bc1 100644 --- a/Assets/Plugins/Android/mainTemplate.gradle +++ b/Assets/Plugins/Android/mainTemplate.gradle @@ -6,6 +6,7 @@ dependencies { // Android Resolver Dependencies Start implementation 'androidx.constraintlayout:constraintlayout:2.1.4' // Packages/com.google.ads.mobile/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml:12 implementation 'com.google.ads.mediation:facebook:6.18.0.0' // Packages/com.google.ads.mobile.mediation.metaaudiencenetwork/source/plugin/Assets/GoogleMobileAds/Mediation/MetaAudienceNetwork/Editor/MetaAudienceNetworkMediationDependencies.xml:24 + implementation 'com.google.ads.mediation:unity:4.12.3.0' // Assets/GoogleMobileAds/Mediation/UnityAds/Editor/UnityMediationDependencies.xml:25 implementation 'com.google.android.gms:play-services-ads:23.6.0' // Packages/com.google.ads.mobile/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml:7 implementation 'com.google.android.gms:play-services-auth:16+' // Assets/GoogleSignIn/Editor/GoogleSignInDependencies.xml:10 implementation 'com.google.android.gms:play-services-base:18.5.0' // Assets/Firebase/Editor/DatabaseDependencies.xml:17 @@ -23,6 +24,7 @@ dependencies { implementation 'com.google.signin:google-signin-support:1.0.4' // Assets/GoogleSignIn/Editor/GoogleSignInSupportDependencies.xml:9 implementation 'com.onestorecorp.sdk:sdk-iap:21.01.00' // Assets/OneStoreCorpPlugins/Purchase/Editor/PurchaseDependencies.xml:6 implementation 'com.onestorecorp.sdk:sdk-licensing:2.1.0' // Assets/OneStoreCorpPlugins/AppLicenseChecker/Editor/AppLicenseCheckerDependencies.xml:6 + implementation 'com.unity3d.ads:unity-ads:4.12.3' // Assets/GoogleMobileAds/Mediation/UnityAds/Editor/UnityMediationDependencies.xml:33 // Android Resolver Dependencies End **DEPS**} diff --git a/Assets/Plugins/Android/settingsTemplate.gradle b/Assets/Plugins/Android/settingsTemplate.gradle index 1f0fcaf..fb930f5 100644 --- a/Assets/Plugins/Android/settingsTemplate.gradle +++ b/Assets/Plugins/Android/settingsTemplate.gradle @@ -24,6 +24,9 @@ dependencyResolutionManagement { maven { url (unityProjectPath + "/Assets/GeneratedLocalRepo/Firebase/m2repository") // Assets/Firebase/Editor/AnalyticsDependencies.xml:18, Assets/Firebase/Editor/AppDependencies.xml:22, Assets/Firebase/Editor/AuthDependencies.xml:20, Assets/Firebase/Editor/CrashlyticsDependencies.xml:20, Assets/Firebase/Editor/DatabaseDependencies.xml:22 } + maven { + url "https://repo.maven.apache.org/maven2/" // Assets/GoogleMobileAds/Mediation/UnityAds/Editor/UnityMediationDependencies.xml:25, Assets/GoogleMobileAds/Mediation/UnityAds/Editor/UnityMediationDependencies.xml:33, Packages/com.google.ads.mobile.mediation.metaaudiencenetwork/source/plugin/Assets/GoogleMobileAds/Mediation/MetaAudienceNetwork/Editor/MetaAudienceNetworkMediationDependencies.xml:24 + } maven { url (unityProjectPath + "/Assets/GeneratedLocalRepo/GoogleSignIn/Editor/m2repository") // Assets/GoogleSignIn/Editor/GoogleSignInSupportDependencies.xml:9 } @@ -31,10 +34,7 @@ dependencyResolutionManagement { url "https://maven.google.com/" // Packages/com.google.ads.mobile/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml:7, Packages/com.google.ads.mobile/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml:12, Packages/com.google.ads.mobile/GoogleMobileAds/Editor/GoogleUmpDependencies.xml:7 } maven { - url "https://repo.maven.apache.org/maven2/" // Packages/com.google.ads.mobile.mediation.metaaudiencenetwork/source/plugin/Assets/GoogleMobileAds/Mediation/MetaAudienceNetwork/Editor/MetaAudienceNetworkMediationDependencies.xml:24 - } - maven { - url "https://dl.google.com/dl/android/maven2/" // Packages/com.google.ads.mobile.mediation.metaaudiencenetwork/source/plugin/Assets/GoogleMobileAds/Mediation/MetaAudienceNetwork/Editor/MetaAudienceNetworkMediationDependencies.xml:24 + url "https://dl.google.com/dl/android/maven2/" // Assets/GoogleMobileAds/Mediation/UnityAds/Editor/UnityMediationDependencies.xml:25, Packages/com.google.ads.mobile.mediation.metaaudiencenetwork/source/plugin/Assets/GoogleMobileAds/Mediation/MetaAudienceNetwork/Editor/MetaAudienceNetworkMediationDependencies.xml:24 } mavenLocal() // Android Resolver Repos End diff --git a/Assets/UI/Image/Popup/new pattern gray_shop.png.meta b/Assets/UI/Image/Popup/new pattern gray_shop.png.meta index 38dc62e..e2eaffc 100644 --- a/Assets/UI/Image/Popup/new pattern gray_shop.png.meta +++ b/Assets/UI/Image/Popup/new pattern gray_shop.png.meta @@ -147,7 +147,8 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + new pattern gray_shop_0: 3081027754296216552 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/UI/Image/Popup/new pattern.png.meta b/Assets/UI/Image/Popup/new pattern.png.meta index 582f110..2588a89 100644 --- a/Assets/UI/Image/Popup/new pattern.png.meta +++ b/Assets/UI/Image/Popup/new pattern.png.meta @@ -172,7 +172,9 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + new pattern_0: -2391564205269638067 + new pattern_1: -1791696199634534757 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/UI/Image/appreciate mode icon 1_appreciate.png.meta b/Assets/UI/Image/appreciate mode icon 1_appreciate.png.meta index 02bfea5..df42fa0 100644 --- a/Assets/UI/Image/appreciate mode icon 1_appreciate.png.meta +++ b/Assets/UI/Image/appreciate mode icon 1_appreciate.png.meta @@ -222,7 +222,11 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + appreciate mode icon 1_appreciate_0: -4827375958727606024 + appreciate mode icon 1_appreciate_1: 5122904073594135224 + appreciate mode icon 1_appreciate_2: 4049335300709093036 + appreciate mode icon 1_appreciate_3: -5073064126693387305 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/UI/Image/appreciate mode icon 2_appreciate.png.meta b/Assets/UI/Image/appreciate mode icon 2_appreciate.png.meta index 49177b7..bc48a4c 100644 --- a/Assets/UI/Image/appreciate mode icon 2_appreciate.png.meta +++ b/Assets/UI/Image/appreciate mode icon 2_appreciate.png.meta @@ -197,7 +197,10 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + appreciate mode icon 2_appreciate_0: -2707794079911118534 + appreciate mode icon 2_appreciate_1: -6123230295658172144 + appreciate mode icon 2_appreciate_2: -6897654018931877716 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/UI/Image/appreciate mode icon 3_appreciate.png.meta b/Assets/UI/Image/appreciate mode icon 3_appreciate.png.meta index 5f9e8e1..18c4a85 100644 --- a/Assets/UI/Image/appreciate mode icon 3_appreciate.png.meta +++ b/Assets/UI/Image/appreciate mode icon 3_appreciate.png.meta @@ -197,7 +197,10 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + appreciate mode icon 3_appreciate_0: -6217653986026246264 + appreciate mode icon 3_appreciate_1: -6513534917754953123 + appreciate mode icon 3_appreciate_2: 5011548085603476182 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/UI/Image/appreciate mode icon 4_appreciate.png.meta b/Assets/UI/Image/appreciate mode icon 4_appreciate.png.meta index cd8b794..26ed1f5 100644 --- a/Assets/UI/Image/appreciate mode icon 4_appreciate.png.meta +++ b/Assets/UI/Image/appreciate mode icon 4_appreciate.png.meta @@ -197,7 +197,10 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + appreciate mode icon 4_appreciate_0: 556952743225110250 + appreciate mode icon 4_appreciate_1: -1088961701379465513 + appreciate mode icon 4_appreciate_2: -4586248109324605298 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/UI/Image/appreciate mode window_appreciate.png.meta b/Assets/UI/Image/appreciate mode window_appreciate.png.meta index cef2403..01d7a3e 100644 --- a/Assets/UI/Image/appreciate mode window_appreciate.png.meta +++ b/Assets/UI/Image/appreciate mode window_appreciate.png.meta @@ -147,7 +147,8 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + appreciate mode window_appreciate_0: -5526449305923758817 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/UI/Image/top bar window.png.meta b/Assets/UI/Image/top bar window.png.meta index b1cb99f..3f64203 100644 --- a/Assets/UI/Image/top bar window.png.meta +++ b/Assets/UI/Image/top bar window.png.meta @@ -147,7 +147,8 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + top bar window_0: 109614433271098130 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/UI/Image/window 8_check.png.meta b/Assets/UI/Image/window 8_check.png.meta index 3dabf15..ca19d9e 100644 --- a/Assets/UI/Image/window 8_check.png.meta +++ b/Assets/UI/Image/window 8_check.png.meta @@ -147,7 +147,8 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + window 8_check_0: 6708604034496699412 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/UI/Setting/bar btn_setting.png.meta b/Assets/UI/Setting/bar btn_setting.png.meta index b6594c5..cdeb8c4 100644 --- a/Assets/UI/Setting/bar btn_setting.png.meta +++ b/Assets/UI/Setting/bar btn_setting.png.meta @@ -147,7 +147,8 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + bar btn_setting_0: 6655960543914195969 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/UI/Setting/bgn icon_setting.png.meta b/Assets/UI/Setting/bgn icon_setting.png.meta index 9d086d0..d4007e0 100644 --- a/Assets/UI/Setting/bgn icon_setting.png.meta +++ b/Assets/UI/Setting/bgn icon_setting.png.meta @@ -197,7 +197,10 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + bgn icon_setting_0: -6200370781686030543 + bgn icon_setting_1: 8361644090031060394 + bgn icon_setting_2: -724917889720686831 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/UI/Setting/setting icon_setting.png.meta b/Assets/UI/Setting/setting icon_setting.png.meta index 6e4faf3..63f55c8 100644 --- a/Assets/UI/Setting/setting icon_setting.png.meta +++ b/Assets/UI/Setting/setting icon_setting.png.meta @@ -147,7 +147,8 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + setting icon_setting_0: -4113974082301779102 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/UI/Setting/sound icon_setting.png.meta b/Assets/UI/Setting/sound icon_setting.png.meta index f999523..c497898 100644 --- a/Assets/UI/Setting/sound icon_setting.png.meta +++ b/Assets/UI/Setting/sound icon_setting.png.meta @@ -147,7 +147,8 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + sound icon_setting_0: 9086022433447240086 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/UI/Setting/speed icon_setting.png.meta b/Assets/UI/Setting/speed icon_setting.png.meta index 09b61e9..8ed5c4f 100644 --- a/Assets/UI/Setting/speed icon_setting.png.meta +++ b/Assets/UI/Setting/speed icon_setting.png.meta @@ -172,7 +172,9 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + speed icon_setting_0: -8754443223393191193 + speed icon_setting_1: -8483495356836366937 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/UI/Setting/square btn_setting.png.meta b/Assets/UI/Setting/square btn_setting.png.meta index ae97033..7a0d071 100644 --- a/Assets/UI/Setting/square btn_setting.png.meta +++ b/Assets/UI/Setting/square btn_setting.png.meta @@ -147,7 +147,8 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + square btn_setting_0: 201343265126578443 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/ProjectSettings/AndroidResolverDependencies.xml b/ProjectSettings/AndroidResolverDependencies.xml index 0e24555..846fef8 100644 --- a/ProjectSettings/AndroidResolverDependencies.xml +++ b/ProjectSettings/AndroidResolverDependencies.xml @@ -2,6 +2,7 @@ androidx.constraintlayout:constraintlayout:2.1.4 com.google.ads.mediation:facebook:6.18.0.0 + com.google.ads.mediation:unity:4.12.3.0 com.google.android.gms:play-services-ads:23.6.0 com.google.android.gms:play-services-auth:16+ com.google.android.gms:play-services-base:18.5.0 @@ -19,6 +20,7 @@ com.google.signin:google-signin-support:1.0.4 com.onestorecorp.sdk:sdk-iap:21.01.00 com.onestorecorp.sdk:sdk-licensing:2.1.0 + com.unity3d.ads:unity-ads:4.12.3 Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/12.2.1/firebase-analytics-unity-12.2.1.aar @@ -36,7 +38,7 @@ - + diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset index 70261a8..26d14b9 100644 --- a/ProjectSettings/PackageManagerSettings.asset +++ b/ProjectSettings/PackageManagerSettings.asset @@ -18,6 +18,7 @@ MonoBehaviour: m_SeeAllPackageVersions: 0 m_DismissPreviewPackagesInUse: 0 oneTimeWarningShown: 0 + oneTimeDeprecatedPopUpShown: 1 m_Registries: - m_Id: main m_Name: @@ -26,6 +27,9 @@ MonoBehaviour: m_IsDefault: 1 m_Capabilities: 7 m_ConfigSource: 0 + m_Compliance: + m_Status: 0 + m_Violations: [] - m_Id: scoped:project:OpenUPM m_Name: OpenUPM m_Url: https://package.openupm.com @@ -34,11 +38,14 @@ MonoBehaviour: m_IsDefault: 0 m_Capabilities: 0 m_ConfigSource: 4 + m_Compliance: + m_Status: 0 + m_Violations: [] m_UserSelectedRegistryName: OpenUPM m_UserAddingNewScopedRegistry: 0 m_RegistryInfoDraft: m_Modified: 0 m_ErrorMessage: - m_UserModificationsInstanceId: -834 - m_OriginalInstanceId: -836 + m_UserModificationsInstanceId: -872 + m_OriginalInstanceId: -876 m_LoadAssets: 0 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index b21d2b1..40c68e0 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -175,7 +175,7 @@ PlayerSettings: tvOS: 0 overrideDefaultApplicationIdentifier: 1 AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 23 + AndroidMinSdkVersion: 24 AndroidTargetSdkVersion: 35 AndroidPreferredInstallLocation: 1 aotOptions: