From 8ac862fa9ca4418656f1fb8a838f82874e8cc1cc Mon Sep 17 00:00:00 2001
From: SerjPaskhalov <s.paskhalov@gmail.com>
Date: Fri, 20 Sep 2019 20:29:36 +0300
Subject: [PATCH] =?UTF-8?q?AV-427.=20=D0=92=D0=B5=D1=80=D1=81=D0=B8=D1=8F?=
=?UTF-8?q?=20=D0=B7=D0=B0=D0=BB=D0=B8=D1=82=D0=B0=D1=8F=20=D0=B2=20Google?=
=?UTF-8?q?Play?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../firebase-analytics-unity-6.5.0.aar.meta | 2 +-
.../6.5.0/firebase-app-unity-6.5.0.aar.meta | 2 +-
.../6.5.0/firebase-auth-unity-6.5.0.aar.meta | 2 +-
.../firebase-crashlytics-unity-6.5.0.aar.meta | 2 +-
.../6.5.0/firebase-database-unity-6.5.0.aar.meta | 2 +-
.../firebase-functions-unity-6.5.0.aar.meta | 2 +-
.../6.5.0/firebase-storage-unity-6.5.0.aar.meta | 2 +-
.../Firebase/res/values/crashlytics_build_id.xml | 2 +-
Assets/Plugins/Android/mainTemplate.gradle | 2 +-
.../Res/Materials/Gamma/RingAura09.mat | 8 ++++----
DomidoKeyStore.keystore | Bin 0 -> 2028 bytes
ProjectSettings/AndroidResolverDependencies.xml | 2 +-
ProjectSettings/ProjectSettings.asset | 11 ++++++-----
ProjectSettings/QualitySettings.asset | 6 +-----
14 files changed, 21 insertions(+), 24 deletions(-)
create mode 100644 DomidoKeyStore.keystore
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 f98e0ecde..57487ef5d 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 ea921bc2e..bbc0166f8 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 9eb76e40d..7532f697c 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 9c1451ac9..263851c95 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 6ae8aa2a8..34b137c39 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 a365e90a8..1235897a4 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 d102db216..fbd079ffd 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 9f03ac57b..36b7dec32 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 75a53e3d4..df0935d61 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 04170581a..5fed65a70 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
GIT binary patch
literal 2028
zcmV<I2NU@I?f&fm00062000310003124rt-X=HBz00C`J9|t-B00jXsf&~3A4h9M<
z1_1;CDgqG!0R;dAf&}TLuKiNBFyncvKxG51Q-H*vbl#rUw(uv3&q4Dp_r2600<QAL
zC(BrZgH$`dzo(_FcoVS9ApxQt{h{&Vlt<02h$8FcdoU!R5wEhl4%4WUlm{(^Z)|T-
zGYivd=x5G93(Re1x_pK5fvAw4IUsEHSYiKCqp7~8)nB6v+juIEHhoU?-;nmsx=fU8
z%Rd#q*eP?z7$E!KV+3s6ys%~mXy+8*(Ic&<edVkI?pZ_)x!7DKy|Mw%YYKoXc#CGm
zI2!CM_K4_MoE)oD|Ls30gT9RoA<Z&;<;c|Xe<5D~E{t*liIME8Z)cDNtbQ5vo|Bw{
zop3z`Ui2zuot_=_7h%jbriFaqqA~U1aJ^eqrACCW6Zp{f=Fp9+X%M<%f(er%OR|I+
zu<M6@E<|sp$~A<HCf+i>=g0CZSloE3AIR}x!pR~{Z=yZ*0HR(*w@E9`fYHHxp0+82
zgsTze594L-y1k}T4ix;<l!D+C32;n86LQ$^7E&bY53}l*rc#hG|FMm2($2=52=SDG
zIxvD0JaH|v#|`+#Tk+hf`JoHO=q@4wkywy7EdFbNBO`wRSsAU<2hXy^8XpDj>c2J%
zS82D|uXLef=66Cg(RDarJ@C~;ZGRZ=AOC#J^WgO4CDdtOQpPvGI~=Uf(i>sqyPk4d
zdCU^k8lrl;O@(hui}^eq+T+K;s#6zs;RZ$eTIA~d-lmBQG1WP$z&$?MF@g0j-^whG
zghv^$djs*?j_rh_BzYFE!ZyZp%yT&BozlGdAJ%Cfh0AqK!Ap34WrB$Ma0<Q>aXybX
zv4&lcK%dBZLgQ(aFLGE|SIk$p>cIbG#SB!31fF=l#SHe6Wl@A@JB$sn!v8HIx3Hja
zqpkgO%7g#IZk2(=2z$3J&jzGj323n?-M6OGZpD6muI_sc1D(v~sw`an(MK|4q!|iZ
znmLi_)oN|Y)2#B&7&ZyCT%KvV7k85E*~5PM0ogeoxJ{RuXM5@Zj3LWvT6mBHCP~am
z{Eu8>*%Z{ox>se1AK$H>U;aaD&DyyUhVnzM5`CvlN2P3b1m5N}8#|*BXr=P9@JEr!
z1QIYf;0uV?OB6j{IC^#`5ZXbws=FFTARB*1o+Je7IVOFqT3cQ2p~+krCRpp4jz}J^
zn0DNO|7+bqv5R1nTRj-M1kX~$CnX#{D^ll)WHBP9y3TYw!V*<Xx-^*QW!0qw=>?%d
z96TcRF5WU0y!<S<=%0B#hxD8JIalG$r@T|?<zMZLJ05;h{!?zymR}Wx8>;sm8?0sr
z4Rxh6FFo7Tv)yFq{^o!&k-6P{n|VX&r7`muLxgDvaWek2=-L_XgU$|>QZ_pmv;UR*
zdvmcWx|;yo)SNMMM3GAfDb$Z0$|DU2KJ|cF22p_uk75YwM0Y<W_~^7sa$BR}#M62?
zuCiY^Pbm+?&V=3aW9c^K45Wh!2?tfu1kHkNUD}>Ud(|Lr9GMy<760@nIQ)4JUPvqf
zly~}>?wYzn|LxGRvd^ZBVHr^PHX4VA?X^z5hg~_)E6hnh9u}YvHXB&QS;LfJksST{
z3nR2945T8L<X$<?M$Q~Jhcy7@pGS0gnzGr)M*)hS$*-2e1eyRV++;<5b0_$-3$wFg
zt+`q@*WDfKh=TRM!x|;{P%?>RAa^^r0000100mesH842<00N{if&!p0f&qx20|Eg8
z0t8uh$?7l-1_>&LNQU<f0RaUC05B0T4=@b|162eH3<gARZD~YrFd!EVF*z_fGB7bT
zG%+(aS{M&9Fg7_bIWRXdG&C_YHd-(dF%K{e1_M<D3JeBBZ*6HrZ!m%ZA}|dG2`Yw2
zhW8Bt0RaU71A+k$05F093Ic)w0RWglw?3EmCDA_!B>$qv<B$nOYfFy~$}rO9X7ey)
z^hfc@-()1LbSGd;c)|SNE;4QMYSL%h>0h{RlfWdJ^pR(%BAn_hWh5(aIEMJy=q0i-
zLO2I?g;%zPR*qPg*x`T0E*-gHFKW8MT04%k5dx0jBaI&B#4V8}9RONuP}2K<om6Vw
zWr;e^B{yu}-Yl0}HYWOd_hfpFl#;6NeGX3dQBnn6(-FT~vJ6E=$hY<kAyV{F=jpXb
zn$$+N2N9chFcQgLc{MaYzQH-x{xcuoeL~ht?XOJquN&kmrxua&(3~3ma0v!Oy%Fiu
zTE|sv-rFe|I<Vt!Ej=@4`V#^J0RRCo4F(A+hDe6@4FLfK1potr0RaFtVZ@?4Lwzh9
zg*r)2*8UIK0B16p;53e-AbW1Of8<cXj`9gST|w<*FaJX!GYfIHrkE=m$H&ljW^n(<
zwvdC+5a-?b0XJf#7xu2M>a+SO3JnL8y21RVb!K?pf?eYBrfEHt&x-GnA+ox#9?r_a
zFAUo#OA)3#<n?bckqRn?7#^CQ8Ve;W>3A%;Vx<L28vk}Ox<aC?D#%;)2)42?oyz?R
z7PTP4@v5lcqOSP-scTH!?f9Um&3Z@to=-$S!m)Cuu=B}g@4nPDSM@r>TrLFM>K!;X
zB@k8sxc8;P{`fg@3AYaTMaMy}9k}G_=*B->&6#FuE{@jbmyP^}G-@Z6s%ihJ4nO(7
Ki!<8^BY5Y(+_4@2
literal 0
HcmV?d00001
diff --git a/ProjectSettings/AndroidResolverDependencies.xml b/ProjectSettings/AndroidResolverDependencies.xml
index adc51dea8..0b6cfb8d1 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 1070f44c3..16ba8594b 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 2837fa264..bcf910f7e 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: {}
--
GitLab