diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/6.5.0/firebase-analytics-unity-6.5.0.aar.meta b/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/6.5.0/firebase-analytics-unity-6.5.0.aar.meta index f98e0ecdecae602391eb5fcd59807df528bb0242..57487ef5d51beac5dbf7e8a05ad0ecda8e0920aa 100644 --- a/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/6.5.0/firebase-analytics-unity-6.5.0.aar.meta +++ b/Assets/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/6.5.0/firebase-analytics-unity-6.5.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5e5cf893316ec4aeab641ca8fe79ab6f +guid: ff4b6c15a21454dfc8a4af3d9025e0c5 labels: - gpsr - gvh diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/6.5.0/firebase-app-unity-6.5.0.aar.meta b/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/6.5.0/firebase-app-unity-6.5.0.aar.meta index ea921bc2e5083442da90275eafc738ab7481392d..bbc0166f8aeeeaf61a1a9e60572e8aa7c53945ea 100644 --- a/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/6.5.0/firebase-app-unity-6.5.0.aar.meta +++ b/Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/6.5.0/firebase-app-unity-6.5.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5edadcb314766489d9516cd093b33735 +guid: 0d0b06c019bb643bfb599aba7c17608f labels: - gpsr - gvh diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/6.5.0/firebase-auth-unity-6.5.0.aar.meta b/Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/6.5.0/firebase-auth-unity-6.5.0.aar.meta index 9eb76e40d53dfe81127f676b6529d12edc2bb8b9..7532f697c8e4c62428d16a137f9a209a2e62100b 100644 --- a/Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/6.5.0/firebase-auth-unity-6.5.0.aar.meta +++ b/Assets/Firebase/m2repository/com/google/firebase/firebase-auth-unity/6.5.0/firebase-auth-unity-6.5.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 67e71c81c78cc4fce8690282b08a7f8b +guid: bcfc8c00c242b44f0a3f892c91eb767a labels: - gpsr - gvh diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/6.5.0/firebase-crashlytics-unity-6.5.0.aar.meta b/Assets/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/6.5.0/firebase-crashlytics-unity-6.5.0.aar.meta index 9c1451ac94da0c57353237a6f9af0c7642953e9b..263851c95554c7e01d171ce7bd02b4b46e883563 100644 --- a/Assets/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/6.5.0/firebase-crashlytics-unity-6.5.0.aar.meta +++ b/Assets/Firebase/m2repository/com/google/firebase/firebase-crashlytics-unity/6.5.0/firebase-crashlytics-unity-6.5.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 63cc75f3b08f144dcb6750915d78e226 +guid: 55333e0df62e844a58e7a5bc40bb66d2 labels: - gpsr - gvh diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/6.5.0/firebase-database-unity-6.5.0.aar.meta b/Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/6.5.0/firebase-database-unity-6.5.0.aar.meta index 6ae8aa2a86c8d8e471231401740a023ecb32a7e9..34b137c3906cc67a8ac754609e4ea8f299727070 100644 --- a/Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/6.5.0/firebase-database-unity-6.5.0.aar.meta +++ b/Assets/Firebase/m2repository/com/google/firebase/firebase-database-unity/6.5.0/firebase-database-unity-6.5.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a5d29ea81bed14f60bf3568005d08e33 +guid: 8211875e11b724c22ae8535008481048 labels: - gpsr - gvh diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-functions-unity/6.5.0/firebase-functions-unity-6.5.0.aar.meta b/Assets/Firebase/m2repository/com/google/firebase/firebase-functions-unity/6.5.0/firebase-functions-unity-6.5.0.aar.meta index a365e90a8140f52c6c34cc46402d30bcccfe42a9..1235897a4194887b80a35fdfbe64638d1205ee8e 100644 --- a/Assets/Firebase/m2repository/com/google/firebase/firebase-functions-unity/6.5.0/firebase-functions-unity-6.5.0.aar.meta +++ b/Assets/Firebase/m2repository/com/google/firebase/firebase-functions-unity/6.5.0/firebase-functions-unity-6.5.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 035fd1de63b3e44ab8fb93f2a677621c +guid: c09e551dfb8604db3bee0fc948c81829 labels: - gpsr - gvh diff --git a/Assets/Firebase/m2repository/com/google/firebase/firebase-storage-unity/6.5.0/firebase-storage-unity-6.5.0.aar.meta b/Assets/Firebase/m2repository/com/google/firebase/firebase-storage-unity/6.5.0/firebase-storage-unity-6.5.0.aar.meta index d102db2161e25559f59bf3e82434457ced7db500..fbd079ffd31bab97f498f0ec40ad5814c684d848 100644 --- a/Assets/Firebase/m2repository/com/google/firebase/firebase-storage-unity/6.5.0/firebase-storage-unity-6.5.0.aar.meta +++ b/Assets/Firebase/m2repository/com/google/firebase/firebase-storage-unity/6.5.0/firebase-storage-unity-6.5.0.aar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b0df7cdeaa3bb4ab591468fb521f80af +guid: a2ac1c75cbdb54ac985a6593e3d7869c labels: - gpsr - gvh diff --git a/Assets/Plugins/Android/Firebase/res/values/crashlytics_build_id.xml b/Assets/Plugins/Android/Firebase/res/values/crashlytics_build_id.xml index 9f03ac57bb147e39fc78a4d201813a20e51d1043..36b7dec3219c928cb8bb191aa59fa48b699ebc01 100644 --- a/Assets/Plugins/Android/Firebase/res/values/crashlytics_build_id.xml +++ b/Assets/Plugins/Android/Firebase/res/values/crashlytics_build_id.xml @@ -1 +1 @@ -<?xml version="1.0" encoding="utf-8"?><resources><string name="com.crashlytics.android.build_id" translatable="false">03033607-e81a-4cb4-9a38-d528368071f8</string></resources> +<?xml version="1.0" encoding="utf-8"?><resources><string name="com.crashlytics.android.build_id" translatable="false">969242c0-3394-46ca-a72a-f65d2c16c41c</string></resources> diff --git a/Assets/Plugins/Android/mainTemplate.gradle b/Assets/Plugins/Android/mainTemplate.gradle index 75a53e3d4e07a07be38c1a404b6dd32f9c383f40..df0935d61d9f00ec5f75ab9d22b6d9ab44726eb8 100755 --- a/Assets/Plugins/Android/mainTemplate.gradle +++ b/Assets/Plugins/Android/mainTemplate.gradle @@ -79,10 +79,10 @@ dependencies { // Android Resolver Exclusions Start android { packagingOptions { - exclude ('/lib/arm64-v8a/*' + '*') exclude ('/lib/armeabi/*' + '*') exclude ('/lib/mips/*' + '*') exclude ('/lib/mips64/*' + '*') + exclude ('/lib/x86/*' + '*') exclude ('/lib/x86_64/*' + '*') } } diff --git a/Assets/ThirdPartyAssets/SineVFX/AuraAndGroundEffects/Res/Materials/Gamma/RingAura09.mat b/Assets/ThirdPartyAssets/SineVFX/AuraAndGroundEffects/Res/Materials/Gamma/RingAura09.mat index 04170581ad44a81bb693a370a19332aab9085742..5fed65a70db8cd0b7a9fa71644ec99f25bdf9f9b 100644 --- a/Assets/ThirdPartyAssets/SineVFX/AuraAndGroundEffects/Res/Materials/Gamma/RingAura09.mat +++ b/Assets/ThirdPartyAssets/SineVFX/AuraAndGroundEffects/Res/Materials/Gamma/RingAura09.mat @@ -55,15 +55,15 @@ Material: m_Floats: - _Cutoff: 0.5 - _Distance: 1 - - _FinalPower: 1.1 + - _FinalPower: 0.5 - _Float3: -8.6 - _MaskAdd: 0.629 - _MaskConstantThickness: 1 - - _MaskDistance: 9.1438465 - - _MaskExp: 1 + - _MaskDistance: 25 + - _MaskExp: 10 - _MaskMultiply: 1 - _MaskTextureEnabled: 1 - - _MaskThickness: 10 + - _MaskThickness: 0 - _Noise01Falloff: 1 - _Noise01ScrollSpeed: 0.25 - _Noise01Tiling: 0.25 diff --git a/DomidoKeyStore.keystore b/DomidoKeyStore.keystore new file mode 100644 index 0000000000000000000000000000000000000000..f5394fd2aada066cec89c120d0c31d193e497e99 Binary files /dev/null and b/DomidoKeyStore.keystore differ diff --git a/ProjectSettings/AndroidResolverDependencies.xml b/ProjectSettings/AndroidResolverDependencies.xml index adc51dea8ca075d488cc9057ffbb1a29259a376b..0b6cfb8d1ac4f611286766ba330e1256ddab412a 100644 --- a/ProjectSettings/AndroidResolverDependencies.xml +++ b/ProjectSettings/AndroidResolverDependencies.xml @@ -26,7 +26,7 @@ <file>Assets/Firebase/m2repository/com/google/firebase/firebase-storage-unity/6.5.0/firebase-storage-unity-6.5.0.aar</file> </files> <settings> - <setting name="androidAbis" value="armeabi-v7a,x86" /> + <setting name="androidAbis" value="arm64-v8a,armeabi-v7a" /> <setting name="bundleId" value="com.domido.avvy" /> <setting name="explodeAars" value="True" /> <setting name="gradleBuildEnabled" value="True" /> diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 1070f44c35179e164a68e1d1cc3cc1c0f27db529..16ba8594b2c7fe9fda6822c52bdb355ea203c614 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -262,18 +262,18 @@ PlayerSettings: clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea templatePackageId: com.unity.template.3d@1.0.4 templateDefaultScene: Assets/Scenes/SampleScene.unity - AndroidTargetArchitectures: 5 + AndroidTargetArchitectures: 3 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} - AndroidKeystoreName: '{inproject}: ' - AndroidKeyaliasName: + AndroidKeystoreName: '{inproject}: DomidoKeyStore.keystore' + AndroidKeyaliasName: domido AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 1 AndroidIsGame: 1 AndroidEnableTango: 0 androidEnableBanner: 1 androidUseLowAccuracyLocation: 0 - androidUseCustomKeystore: 0 + androidUseCustomKeystore: 1 m_AndroidBanners: - width: 320 height: 180 @@ -756,7 +756,8 @@ PlayerSettings: 1: platformArchitecture: iPhone: 1 - scriptingBackend: {} + scriptingBackend: + Android: 1 il2cppCompilerConfiguration: {} managedStrippingLevel: {} incrementalIl2cppBuild: {} diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 2837fa264aa4b34bb21409f21c4e6e3a29d772ea..bcf910f7e8c97f9d0156b0855f16122e8d19b31e 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -216,8 +216,4 @@ QualitySettings: asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 excludedTargetPlatforms: [] - m_PerPlatformDefaultQuality: - Android: 3 - Standalone: 3 - WebGL: 3 - iPhone: 3 + m_PerPlatformDefaultQuality: {}