From 5237a32bb4759c43104e9397cb43b328a99b7c62 Mon Sep 17 00:00:00 2001 From: Nicolas Date: Thu, 11 Jan 2024 16:18:35 +0100 Subject: [PATCH] ajout de la keystore de debug (user) + changement de la target version d'android --- Assets/Plugins/Android.meta | 8 ++ .../Android/AndroidManifest.xml.DISABLED | 16 +++ .../Android/AndroidManifest.xml.DISABLED.meta | 7 + Assets/Scenes/Fusion.unity | 2 +- ProjectSettings/ProjectSettings.asset | 135 +++++++++--------- user.keystore | Bin 0 -> 2517 bytes 6 files changed, 100 insertions(+), 68 deletions(-) create mode 100644 Assets/Plugins/Android.meta create mode 100644 Assets/Plugins/Android/AndroidManifest.xml.DISABLED create mode 100644 Assets/Plugins/Android/AndroidManifest.xml.DISABLED.meta create mode 100644 user.keystore diff --git a/Assets/Plugins/Android.meta b/Assets/Plugins/Android.meta new file mode 100644 index 0000000..655eadb --- /dev/null +++ b/Assets/Plugins/Android.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 98e8ceb007504d649afcfd69464a8339 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Android/AndroidManifest.xml.DISABLED b/Assets/Plugins/Android/AndroidManifest.xml.DISABLED new file mode 100644 index 0000000..cb2c54a --- /dev/null +++ b/Assets/Plugins/Android/AndroidManifest.xml.DISABLED @@ -0,0 +1,16 @@ + + + + + + + + + + + + diff --git a/Assets/Plugins/Android/AndroidManifest.xml.DISABLED.meta b/Assets/Plugins/Android/AndroidManifest.xml.DISABLED.meta new file mode 100644 index 0000000..95cbb80 --- /dev/null +++ b/Assets/Plugins/Android/AndroidManifest.xml.DISABLED.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5781459c0cb4a2441b8e32633a11f2c7 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Fusion.unity b/Assets/Scenes/Fusion.unity index b32a2a8..da026d3 100644 --- a/Assets/Scenes/Fusion.unity +++ b/Assets/Scenes/Fusion.unity @@ -234,7 +234,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 909, y: 113} + m_AnchoredPosition: {x: 866, y: 113} m_SizeDelta: {x: 300, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &436501312 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index b071884..e002a24 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -135,7 +135,7 @@ PlayerSettings: vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 - bundleVersion: 1.0 + bundleVersion: 1.1 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -157,16 +157,17 @@ PlayerSettings: androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: + Android: com.DefaultCompany.TVIR901 Standalone: com.DefaultCompany.com.unity.template.ar buildNumber: Standalone: 0 VisionOS: 0 iPhone: 0 tvOS: 0 - overrideDefaultApplicationIdentifier: 1 - AndroidBundleVersionCode: 1 + overrideDefaultApplicationIdentifier: 0 + AndroidBundleVersionCode: 2 AndroidMinSdkVersion: 26 - AndroidTargetSdkVersion: 0 + AndroidTargetSdkVersion: 33 AndroidPreferredInstallLocation: 1 aotOptions: stripEngineCode: 1 @@ -258,8 +259,8 @@ PlayerSettings: AndroidTargetDevices: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} - AndroidKeystoreName: - AndroidKeyaliasName: + AndroidKeystoreName: '{inproject}: user.keystore' + AndroidKeyaliasName: user AndroidEnableArmv9SecurityFeatures: 0 AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 0 @@ -267,7 +268,7 @@ PlayerSettings: AndroidEnableTango: 0 androidEnableBanner: 1 androidUseLowAccuracyLocation: 0 - androidUseCustomKeystore: 0 + androidUseCustomKeystore: 1 m_AndroidBanners: - width: 320 height: 180 @@ -282,6 +283,66 @@ PlayerSettings: m_BuildTargetPlatformIcons: - m_BuildTarget: Android m_Icons: + - m_Textures: [] + m_Width: 192 + m_Height: 192 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 144 + m_Height: 144 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 96 + m_Height: 96 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 72 + m_Height: 72 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 48 + m_Height: 48 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 36 + m_Height: 36 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 192 + m_Height: 192 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 144 + m_Height: 144 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 96 + m_Height: 96 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 72 + m_Height: 72 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 48 + m_Height: 48 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 36 + m_Height: 36 + m_Kind: 1 + m_SubKind: - m_Textures: [] m_Width: 432 m_Height: 432 @@ -312,66 +373,6 @@ PlayerSettings: m_Height: 81 m_Kind: 2 m_SubKind: - - m_Textures: [] - m_Width: 192 - m_Height: 192 - m_Kind: 0 - m_SubKind: - - m_Textures: [] - m_Width: 144 - m_Height: 144 - m_Kind: 0 - m_SubKind: - - m_Textures: [] - m_Width: 96 - m_Height: 96 - m_Kind: 0 - m_SubKind: - - m_Textures: [] - m_Width: 72 - m_Height: 72 - m_Kind: 0 - m_SubKind: - - m_Textures: [] - m_Width: 48 - m_Height: 48 - m_Kind: 0 - m_SubKind: - - m_Textures: [] - m_Width: 36 - m_Height: 36 - m_Kind: 0 - m_SubKind: - - m_Textures: [] - m_Width: 192 - m_Height: 192 - m_Kind: 1 - m_SubKind: - - m_Textures: [] - m_Width: 144 - m_Height: 144 - m_Kind: 1 - m_SubKind: - - m_Textures: [] - m_Width: 96 - m_Height: 96 - m_Kind: 1 - m_SubKind: - - m_Textures: [] - m_Width: 72 - m_Height: 72 - m_Kind: 1 - m_SubKind: - - m_Textures: [] - m_Width: 48 - m_Height: 48 - m_Kind: 1 - m_SubKind: - - m_Textures: [] - m_Width: 36 - m_Height: 36 - m_Kind: 1 - m_SubKind: m_BuildTargetBatching: [] m_BuildTargetShaderSettings: [] m_BuildTargetGraphicsJobs: [] diff --git a/user.keystore b/user.keystore new file mode 100644 index 0000000000000000000000000000000000000000..d00f065b045d0104085f43a1f5f8635e5087e66c GIT binary patch literal 2517 zcma)+c{mh`8pda5EE8iUBioG1zKpFSO9&}rD?`@oWNcB45n*f*i4n!ga_kgk%a+kh zI%+J1WH;7yY+14uZqIY?bIx=By7!Oo`JV6he((F|i>Jarf`DK=6`l-(%O+e**x?0o z01K$_+Yl<8{0ra2Q=ygrB|&o`RA}}uO#3xyFz)}jc({O|0xDGR7u3dk{q2DA;_dJn z|C~H{IS9&Ak-&k86Z~GPn)63=7c=SDJ{<)DN%4VzSUeAm^WTXeI23>vg~44CE&@Hl z5TGoC57)aI$-Z0p-QNINJLzM*0HH!Y5rs<{Joa*sH4f??1SHhS+$wUm)|S}p z)z%d?oQIdDA^Kp1oQbH1xeZmh@))E8-jd4nmiS_f{JgQdjoSX5sZ`IPtZyNHEjXY? zW8c-2gI!Oxa2v&yC0c&lmgl>=vk7ctT*oLo^Js=R9Ev**zuwA6Ha{yCWLV|HH{nNy z$X-elqf4glKA0&FAUeF(yd1p$zKnf-zJ)9Wc}SF&R~33{8VE8gdvY@lWBmJ~|)mv=5<~W6ZIMQRF2#2wK4X)abJ}d#tgg z6l@AQLW$Pj0CF-!oN$sF&8ZkUA(vJ1H5tnvYwV?W+{EGJxNlUkOTg3IV039)qZrt; zW@JUe-?a=sEE}U1BG|8Ges(Nhv?yj0Geo&;$`2*Ecr%1>S-q~J;OqOoHcDth!tA#|=t$KL z%`4VQyzRt!{oVv?SnqO1MA7bM_o8lvufvLpm2Run?b5csCoh>^tbk`HHldpdFxiVbKtWPY9`VT}z6;oeyu(=&Vy#;gwTrX)7mzaQvBzeiiz*rZj73UeSCM=B}!$2YA z8RJ`GlQG+B3fE#&`e$HLbZXljJ7_9~p*!BzlwkQ2F_-sc&@*xsAcAe3saQsq4Ji5S zzk^y=QluPNb!4u9xze0mpyG?`30%E{yQL59jks;CH^~Nijak>)3FG?qr%579zY8D<6x0#1^=%X5kU?`<1UM`G?+Hj$aJI73BA*r?fyKH*WF~Xw>$V?USD>` zL~7~MdSb2=p;jpom@NY)5q)D-PFmsLLbRsbQ~Dztv;F+FW3mS!hFUeMLMek z=KM$rl5Y@lD!IrD^qud=DG4V<-HY+eMPHl5mw8-Q8!@Ty2<_ibn``QAN=zknRebuA z@YKfXhLl~{+vSM(ittxIxMv)^>BOahfWiF;V|0Oxgrn_LkhJ1(drUi`yl!lGw2}~q z);g9=rH(|XotqCTsuW+&4bE4mw`j3E}` zrkG-Jg%$3Ga@xDWGu&`|E zjh{a^LaUT_`f~$o&1#O2ClBvT8>lM@@YO}!x^Q{CkaRLMb9C}grdmNbEr{ssQ~NDk zCOsc@_+pJD93uHHE9}O3riDOm{p_X6@{0NA(-MXBe6dOb)Q<7oq|@y!%V}8M=r3w5 zd+TR~x3e6?^eyA)bDpDfzZ~f_@9269QX^UYlu>-4cSkl4eWiH#Ln=0@74b+agHSUN zu!>e=v+`H4)Y@gE`AJ!va@hUtIPa7vik>oorY?_&1?rPir}a0F$D`ByV^6XA9QYK3 zhk^+RSx5=0(l{;s5_5Ku%e+m3k%ejBs7R-``yJRWPweG7$NIjn=VpmBZYwA zJ9x~=Ih-5R+4HPMeJ=Yjv62LeWz-CC2yW9-1V?)jgK0La9jXE0$-5Ijyv`O}=AP#_ z=~-@=GNQ!1GXw=_(Ji`Hc?H*2`D<_i){}toOW?>a)q@?8bs^(1-@1S5+@GtARcTCV zu7I3%yBXS^Hf!7GjVjrWl+jQ0@YuB_gt}|Aj=uOrh86zw`I4Ni@>;FN@Gb#=4v)jb zVNf{)7<2*(fS}N~KM!`STz5AOy~2^P%gXD3YV|@;sj~VH^!QzWzrydl!}3BZ5$!TK KKww}(!M_02PIOcN literal 0 HcmV?d00001