From c4d386d7b6acc400273392cbbcacf2337fd8a563 Mon Sep 17 00:00:00 2001 From: Enzo Degraeve Date: Mon, 18 Apr 2022 19:17:56 +0200 Subject: [PATCH] Rework menu and gameplay --- .../AdaptivePerformanceGeneralSettings.asset | 3 +- Assets/Adaptive Performance/Provider.meta | 8 + .../Samsung Android Provider Loader.asset | 14 + ...Samsung Android Provider Loader.asset.meta | 8 + .../Samsung Android Provider Settings.asset | 263 ++++ ...msung Android Provider Settings.asset.meta | 8 + Assets/Icons/combo.png | Bin 0 -> 1105 bytes Assets/Icons/combo.png.meta | 96 ++ Assets/Icons/miss.png | Bin 0 -> 837 bytes Assets/Icons/miss.png.meta | 96 ++ Assets/Prefabs/Item.prefab | 2 +- Assets/Prefabs/ItemUserInfo.prefab | 764 +++++++++++ Assets/Prefabs/ItemUserInfo.prefab.meta | 7 + Assets/Scenes/Login.unity | 93 +- Assets/Scenes/Menu.unity | 1133 +++++++++++++++-- Assets/Scenes/Play.unity | 7 +- Assets/Scripts/{ => Game}/Bullet.cs | 0 Assets/Scripts/{ => Game}/Bullet.cs.meta | 0 Assets/Scripts/{ => Game}/BulletMove.cs | 0 Assets/Scripts/{ => Game}/BulletMove.cs.meta | 0 Assets/Scripts/{ => Game}/FailCollider.cs | 0 .../Scripts/{ => Game}/FailCollider.cs.meta | 0 Assets/Scripts/Game/GameRanking.cs | 7 + Assets/Scripts/{ => Game}/GameSubTitle.cs | 0 .../Scripts/{ => Game}/GameSubTitle.cs.meta | 0 Assets/Scripts/Login.meta | 8 + Assets/Scripts/{ => Login}/LoginSystem.cs | 0 .../Scripts/{ => Login}/LoginSystem.cs.meta | 0 Assets/Scripts/Menu/Menu.cs | 37 +- Assets/Scripts/Menu/MenuLogin.cs | 17 +- Assets/Scripts/{ => Menu}/MenuNetwork.cs | 0 Assets/Scripts/{ => Menu}/MenuNetwork.cs.meta | 0 Assets/Scripts/{ => Menu}/MenuNetworkItem.cs | 0 .../{ => Menu}/MenuNetworkItem.cs.meta | 0 Assets/Scripts/{ => Menu}/MenuPanel.cs | 0 Assets/Scripts/{ => Menu}/MenuPanel.cs.meta | 0 Assets/Scripts/{ => Menu}/MenuScores.cs | 2 +- Assets/Scripts/{ => Menu}/MenuScores.cs.meta | 0 Assets/Scripts/{ => Menu}/MenuUserinfo.cs | 35 +- .../Scripts/{ => Menu}/MenuUserinfo.cs.meta | 0 Assets/Sprites/bullet.png | Bin 6617 -> 6642 bytes Assets/Sprites/bullet1.png | Bin 6617 -> 6642 bytes Assets/Sprites/bullet2.png | Bin 0 -> 6617 bytes Assets/Sprites/bullet2.png.meta | 96 ++ Assets/Sprites/bullet3.png | Bin 0 -> 6617 bytes Assets/Sprites/bullet3.png.meta | 96 ++ Packages/manifest.json | 1 + Packages/packages-lock.json | 9 + ProjectSettings/EditorBuildSettings.asset | 1 + ProjectSettings/ProjectSettings.asset | 96 +- 50 files changed, 2677 insertions(+), 230 deletions(-) create mode 100644 Assets/Adaptive Performance/Provider.meta create mode 100644 Assets/Adaptive Performance/Provider/Samsung Android Provider Loader.asset create mode 100644 Assets/Adaptive Performance/Provider/Samsung Android Provider Loader.asset.meta create mode 100644 Assets/Adaptive Performance/Settings/Samsung Android Provider Settings.asset create mode 100644 Assets/Adaptive Performance/Settings/Samsung Android Provider Settings.asset.meta create mode 100644 Assets/Icons/combo.png create mode 100644 Assets/Icons/combo.png.meta create mode 100644 Assets/Icons/miss.png create mode 100644 Assets/Icons/miss.png.meta create mode 100644 Assets/Prefabs/ItemUserInfo.prefab create mode 100644 Assets/Prefabs/ItemUserInfo.prefab.meta rename Assets/Scripts/{ => Game}/Bullet.cs (100%) rename Assets/Scripts/{ => Game}/Bullet.cs.meta (100%) rename Assets/Scripts/{ => Game}/BulletMove.cs (100%) rename Assets/Scripts/{ => Game}/BulletMove.cs.meta (100%) rename Assets/Scripts/{ => Game}/FailCollider.cs (100%) rename Assets/Scripts/{ => Game}/FailCollider.cs.meta (100%) rename Assets/Scripts/{ => Game}/GameSubTitle.cs (100%) rename Assets/Scripts/{ => Game}/GameSubTitle.cs.meta (100%) create mode 100644 Assets/Scripts/Login.meta rename Assets/Scripts/{ => Login}/LoginSystem.cs (100%) rename Assets/Scripts/{ => Login}/LoginSystem.cs.meta (100%) rename Assets/Scripts/{ => Menu}/MenuNetwork.cs (100%) rename Assets/Scripts/{ => Menu}/MenuNetwork.cs.meta (100%) rename Assets/Scripts/{ => Menu}/MenuNetworkItem.cs (100%) rename Assets/Scripts/{ => Menu}/MenuNetworkItem.cs.meta (100%) rename Assets/Scripts/{ => Menu}/MenuPanel.cs (100%) rename Assets/Scripts/{ => Menu}/MenuPanel.cs.meta (100%) rename Assets/Scripts/{ => Menu}/MenuScores.cs (99%) rename Assets/Scripts/{ => Menu}/MenuScores.cs.meta (100%) rename Assets/Scripts/{ => Menu}/MenuUserinfo.cs (68%) rename Assets/Scripts/{ => Menu}/MenuUserinfo.cs.meta (100%) create mode 100644 Assets/Sprites/bullet2.png create mode 100644 Assets/Sprites/bullet2.png.meta create mode 100644 Assets/Sprites/bullet3.png create mode 100644 Assets/Sprites/bullet3.png.meta diff --git a/Assets/Adaptive Performance/AdaptivePerformanceGeneralSettings.asset b/Assets/Adaptive Performance/AdaptivePerformanceGeneralSettings.asset index 14a0c10..1e20b90 100644 --- a/Assets/Adaptive Performance/AdaptivePerformanceGeneralSettings.asset +++ b/Assets/Adaptive Performance/AdaptivePerformanceGeneralSettings.asset @@ -44,7 +44,8 @@ MonoBehaviour: m_EditorClassIdentifier: m_AutomaticLoading: 0 m_AutomaticRunning: 0 - m_Loaders: [] + m_Loaders: + - {fileID: 11400000, guid: a09ad41fef087954e9d8570e0cb2bc98, type: 2} --- !u!114 &1855353484288796327 MonoBehaviour: m_ObjectHideFlags: 2 diff --git a/Assets/Adaptive Performance/Provider.meta b/Assets/Adaptive Performance/Provider.meta new file mode 100644 index 0000000..14bbc21 --- /dev/null +++ b/Assets/Adaptive Performance/Provider.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3ec9ff2483810a5498c2e0827fbe92fc +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Adaptive Performance/Provider/Samsung Android Provider Loader.asset b/Assets/Adaptive Performance/Provider/Samsung Android Provider Loader.asset new file mode 100644 index 0000000..8d8e1bd --- /dev/null +++ b/Assets/Adaptive Performance/Provider/Samsung Android Provider Loader.asset @@ -0,0 +1,14 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 12368ffd90e3c4ac4889486ab7b2aa78, type: 3} + m_Name: Samsung Android Provider Loader + m_EditorClassIdentifier: diff --git a/Assets/Adaptive Performance/Provider/Samsung Android Provider Loader.asset.meta b/Assets/Adaptive Performance/Provider/Samsung Android Provider Loader.asset.meta new file mode 100644 index 0000000..1cf6e52 --- /dev/null +++ b/Assets/Adaptive Performance/Provider/Samsung Android Provider Loader.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a09ad41fef087954e9d8570e0cb2bc98 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Adaptive Performance/Settings/Samsung Android Provider Settings.asset b/Assets/Adaptive Performance/Settings/Samsung Android Provider Settings.asset new file mode 100644 index 0000000..6e87f6d --- /dev/null +++ b/Assets/Adaptive Performance/Settings/Samsung Android Provider Settings.asset @@ -0,0 +1,263 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 02a364304553d4fe797810bd5c88f9d8, type: 3} + m_Name: Samsung Android Provider Settings + m_EditorClassIdentifier: + m_Logging: 1 + m_AutomaticPerformanceModeEnabled: 1 + m_StatsLoggingFrequencyInFrames: 50 + m_IndexerSettings: + m_Active: 1 + m_ThermalActionDelay: 10 + m_PerformanceActionDelay: 4 + m_ScalerSettings: + m_AdaptiveFramerate: + m_Name: Adaptive Framerate + m_Enabled: 0 + m_Scale: 1 + m_VisualImpact: 2 + m_Target: 7 + m_MaxLevel: 45 + m_MinBound: 15 + m_MaxBound: 60 + m_AdaptiveResolution: + m_Name: Adaptive Resolution + m_Enabled: 0 + m_Scale: 1 + m_VisualImpact: 0 + m_Target: 6 + m_MaxLevel: 9 + m_MinBound: 0.5 + m_MaxBound: 1 + m_AdaptiveBatching: + m_Name: Adaptive Batching + m_Enabled: 0 + m_Scale: 1 + m_VisualImpact: 1 + m_Target: 1 + m_MaxLevel: 1 + m_MinBound: 0 + m_MaxBound: 1 + m_AdaptiveLOD: + m_Name: Adaptive LOD + m_Enabled: 0 + m_Scale: 1 + m_VisualImpact: 2 + m_Target: 2 + m_MaxLevel: 3 + m_MinBound: 0.4 + m_MaxBound: 1 + m_AdaptiveLut: + m_Name: Adaptive Lut + m_Enabled: 0 + m_Scale: 1 + m_VisualImpact: 1 + m_Target: 3 + m_MaxLevel: 1 + m_MinBound: 0 + m_MaxBound: 1 + m_AdaptiveMSAA: + m_Name: Adaptive MSAA + m_Enabled: 0 + m_Scale: 1 + m_VisualImpact: 1 + m_Target: 6 + m_MaxLevel: 2 + m_MinBound: 0 + m_MaxBound: 1 + m_AdaptiveShadowCascade: + m_Name: Adaptive Shadow Cascade + m_Enabled: 0 + m_Scale: 1 + m_VisualImpact: 1 + m_Target: 3 + m_MaxLevel: 2 + m_MinBound: 0 + m_MaxBound: 1 + m_AdaptiveShadowDistance: + m_Name: Adaptive Shadow Distance + m_Enabled: 0 + m_Scale: 1 + m_VisualImpact: 0 + m_Target: 2 + m_MaxLevel: 3 + m_MinBound: 0.15 + m_MaxBound: 1 + m_AdaptiveShadowmapResolution: + m_Name: Adaptive Shadowmap Resolution + m_Enabled: 0 + m_Scale: 1 + m_VisualImpact: 0 + m_Target: 2 + m_MaxLevel: 3 + m_MinBound: 0.15 + m_MaxBound: 1 + m_AdaptiveShadowQuality: + m_Name: Adaptive Shadow Quality + m_Enabled: 0 + m_Scale: 1 + m_VisualImpact: 2 + m_Target: 3 + m_MaxLevel: 3 + m_MinBound: 0 + m_MaxBound: 1 + m_AdaptiveSorting: + m_Name: Adaptive Sorting + m_Enabled: 0 + m_Scale: 1 + m_VisualImpact: 1 + m_Target: 1 + m_MaxLevel: 1 + m_MinBound: 0 + m_MaxBound: 1 + m_AdaptiveTransparency: + m_Name: Adaptive Transparency + m_Enabled: 0 + m_Scale: 1 + m_VisualImpact: 2 + m_Target: 2 + m_MaxLevel: 1 + m_MinBound: 0 + m_MaxBound: 1 + m_AdaptiveViewDistance: + m_Name: Adaptive View Distance + m_Enabled: 0 + m_Scale: 1 + m_VisualImpact: 2 + m_Target: 2 + m_MaxLevel: 40 + m_MinBound: 50 + m_MaxBound: 1000 + m_scalerProfileList: + - m_AdaptiveFramerate: + m_Name: Adaptive Framerate + m_Enabled: 0 + m_Scale: 1 + m_VisualImpact: 2 + m_Target: 7 + m_MaxLevel: 45 + m_MinBound: 15 + m_MaxBound: 60 + m_AdaptiveResolution: + m_Name: Adaptive Resolution + m_Enabled: 0 + m_Scale: 1 + m_VisualImpact: 0 + m_Target: 6 + m_MaxLevel: 9 + m_MinBound: 0.5 + m_MaxBound: 1 + m_AdaptiveBatching: + m_Name: Adaptive Batching + m_Enabled: 0 + m_Scale: 1 + m_VisualImpact: 1 + m_Target: 1 + m_MaxLevel: 1 + m_MinBound: 0 + m_MaxBound: 1 + m_AdaptiveLOD: + m_Name: Adaptive LOD + m_Enabled: 0 + m_Scale: 1 + m_VisualImpact: 2 + m_Target: 2 + m_MaxLevel: 3 + m_MinBound: 0.4 + m_MaxBound: 1 + m_AdaptiveLut: + m_Name: Adaptive Lut + m_Enabled: 0 + m_Scale: 1 + m_VisualImpact: 1 + m_Target: 3 + m_MaxLevel: 1 + m_MinBound: 0 + m_MaxBound: 1 + m_AdaptiveMSAA: + m_Name: Adaptive MSAA + m_Enabled: 0 + m_Scale: 1 + m_VisualImpact: 1 + m_Target: 6 + m_MaxLevel: 2 + m_MinBound: 0 + m_MaxBound: 1 + m_AdaptiveShadowCascade: + m_Name: Adaptive Shadow Cascade + m_Enabled: 0 + m_Scale: 1 + m_VisualImpact: 1 + m_Target: 3 + m_MaxLevel: 2 + m_MinBound: 0 + m_MaxBound: 1 + m_AdaptiveShadowDistance: + m_Name: Adaptive Shadow Distance + m_Enabled: 0 + m_Scale: 1 + m_VisualImpact: 0 + m_Target: 2 + m_MaxLevel: 3 + m_MinBound: 0.15 + m_MaxBound: 1 + m_AdaptiveShadowmapResolution: + m_Name: Adaptive Shadowmap Resolution + m_Enabled: 0 + m_Scale: 1 + m_VisualImpact: 0 + m_Target: 2 + m_MaxLevel: 3 + m_MinBound: 0.15 + m_MaxBound: 1 + m_AdaptiveShadowQuality: + m_Name: Adaptive Shadow Quality + m_Enabled: 0 + m_Scale: 1 + m_VisualImpact: 2 + m_Target: 3 + m_MaxLevel: 3 + m_MinBound: 0 + m_MaxBound: 1 + m_AdaptiveSorting: + m_Name: Adaptive Sorting + m_Enabled: 0 + m_Scale: 1 + m_VisualImpact: 1 + m_Target: 1 + m_MaxLevel: 1 + m_MinBound: 0 + m_MaxBound: 1 + m_AdaptiveTransparency: + m_Name: Adaptive Transparency + m_Enabled: 0 + m_Scale: 1 + m_VisualImpact: 2 + m_Target: 2 + m_MaxLevel: 1 + m_MinBound: 0 + m_MaxBound: 1 + m_AdaptiveViewDistance: + m_Name: Adaptive View Distance + m_Enabled: 0 + m_Scale: 1 + m_VisualImpact: 2 + m_Target: 2 + m_MaxLevel: 40 + m_MinBound: 50 + m_MaxBound: 1000 + m_Name: Default Scaler Profile + m_DefaultScalerProfilerIndex: 0 + k_AssetVersion: 2 + m_SamsungProviderLogging: 0 + m_HighSpeedVRR: 0 + m_AutomaticVRR: 1 diff --git a/Assets/Adaptive Performance/Settings/Samsung Android Provider Settings.asset.meta b/Assets/Adaptive Performance/Settings/Samsung Android Provider Settings.asset.meta new file mode 100644 index 0000000..3ebb942 --- /dev/null +++ b/Assets/Adaptive Performance/Settings/Samsung Android Provider Settings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 71637656f43e7ec49a73283c6a49f5a3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Icons/combo.png b/Assets/Icons/combo.png new file mode 100644 index 0000000000000000000000000000000000000000..8892b684aa9b0a03aee49afd84be2765695a7f1a GIT binary patch literal 1105 zcmV-X1g`suP)^N>$pNNzDXLpgNd_j5^iM}q=w@Z1fL5_JW5&)ZDSP!8@RE{_2maBU{98(~C^ zvCR*)1sl?5(LvBwBzP;70z^KB4x>W3gJmB)iGsCiCG@q`Dy3I%zoBbL zncMNfu9*7ohr6pa{5gLQzhv{M*b?6lC9tzgulG}W#>tyS9J{=Tg>tQNvOvs;_8g*= zj$!x0+rt5T_xdh;{9?Q*Ib%meS7W|;wIAVthM;RGFaB0vFTQ@I-+vwH?9=HcNrEhW z5FaJtbx(dK>rc)XVY|lk1Os@xzZVBzh~cGe5qxOI@Yz3C>qOnuzjvpBPj)|rJ|l=j zq~x*7`9^*rlRBwyN|#}KpYB%eUnK8Om+~IN-y_n#Xb?YMTqHwu3_aJ4J@Kd_uxgGP zvq0N(rC3ph@HXxr*yb@nIKtHZZn$Tn>)xNum*9tY$n!)`7+E67ELzHdW?OaTUPZO> zuG@^fv3ufOs=ZaJ`u6Mmm~g9* zzP_yX?tPN3ShF#A+rkR942#ImkTSgR(6c=#()aX@Woqq)6A+*PeB=3Eyh%aGn7dEBt3`~eESFj~Rwaur|9T}NTfZsZp- zqY-(=J%PO(J9Se9p*#B597mn`FaN(mCnS%>O06j|2PBXA{J(1+@(l|z;=qXuqomdk zcoGnDR0~CdQyd3)0|X7Nb?g(hzWEE zltm`e8_%+OA_|7|aS542o539AvNgW>T{nPZ!I92LJB{GAnd8A4p&=EsEFn!CZif+S zOtq4pGxKg<^m~K)dKD0PpS0gY+ z14q#+1Sp;`DW!ch{iwyM8(d68BaswDV3<-jUtT6@8`~tL-yD5sY$0b?DZ|aSSf1Yp XHpr}ep58V@00000NkvXXu0mjfL@xLD literal 0 HcmV?d00001 diff --git a/Assets/Icons/combo.png.meta b/Assets/Icons/combo.png.meta new file mode 100644 index 0000000..1db8362 --- /dev/null +++ b/Assets/Icons/combo.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 68771e829a9c7cf4a8721ae52e2e3a1e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Icons/miss.png b/Assets/Icons/miss.png new file mode 100644 index 0000000000000000000000000000000000000000..8592738d061c90b1414fec0eb9cb21050dddfc8b GIT binary patch literal 837 zcmV-L1G@Z)P)=N*575xsL1&?n>+GPo#N@7! z;)=tHoLT&_?2hkE+zl@KV_3mYLKv2}^L_K?&Ab@}BM%^^cTA|$@NIUQ{>Pu|uFdKRpjrE{tF#m(!hLNAKI3Wh~YkNEI|Kn8z<}h+U z6Or&75OZ!>ojHnoPGC+H+??>HKqTD!#R*;0w5t0?4 zgY0uBC&K>2%1W47MQFMX;JjDEESEMmfN7fO_{-s8q!Z&d)YjJ4LTyuzk7B^=2In5X z%VCCh7Z)(Py`2z<5+|&FAO4@8Lnw@uJEc;FS-8DI1k};rgM&yXg2cz)2_dtjY2O&` z-$jTa%87*H0tcX^{Mp&*aDY5W5F~~*B9Sc4xzoVmx z=lyzpD)ARGY|0nJs6X%TPdv|7DpLD|A4Z1>S>vD_kXfP;3>aoYPsTDV+vApK6gd4o zhAW^OXBf5AWcGrHm7&k^9Aoz+yy(s;U-dl9-rq!{M+HBu>O%PHBlUR>k6726+Z3 z+^{+S5hg6{fD0WUKQ1mBDS#q6LnkO5KN(LDFC6&ka@%eXA0Ap^mr*~@#1YEt3BSye P00000NkvXXu0mjfo#T3d literal 0 HcmV?d00001 diff --git a/Assets/Icons/miss.png.meta b/Assets/Icons/miss.png.meta new file mode 100644 index 0000000..d74039c --- /dev/null +++ b/Assets/Icons/miss.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 5575c185756a92a4fb00a21d1dcc6261 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Item.prefab b/Assets/Prefabs/Item.prefab index 6048450..e53326e 100644 --- a/Assets/Prefabs/Item.prefab +++ b/Assets/Prefabs/Item.prefab @@ -91,7 +91,7 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 0} + m_TargetGraphic: {fileID: 6910564527048028989} m_OnClick: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Prefabs/ItemUserInfo.prefab b/Assets/Prefabs/ItemUserInfo.prefab new file mode 100644 index 0000000..1263551 --- /dev/null +++ b/Assets/Prefabs/ItemUserInfo.prefab @@ -0,0 +1,764 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7941130843092364448 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7941130843092364451} + - component: {fileID: 7941130843092364453} + - component: {fileID: 7941130843092364450} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7941130843092364451 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7941130843092364448} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7941130843564753131} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 13.999996, y: 0} + m_SizeDelta: {x: -28.000008, y: 32} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7941130843092364453 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7941130843092364448} + m_CullTransparentMesh: 1 +--- !u!114 &7941130843092364450 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7941130843092364448} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 9b2eb8cf9fd09fd4c9ecf71fd46e4095, type: 3} + m_FontSize: 20 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 1 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 32210 +--- !u!1 &7941130843116869662 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7941130843116869633} + - component: {fileID: 7941130843116869635} + - component: {fileID: 7941130843116869632} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7941130843116869633 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7941130843116869662} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7941130843564753131} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 12, y: 0} + m_SizeDelta: {x: 24, y: 24} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7941130843116869635 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7941130843116869662} + m_CullTransparentMesh: 1 +--- !u!114 &7941130843116869632 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7941130843116869662} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 5575c185756a92a4fb00a21d1dcc6261, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7941130843212467130 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7941130843212467133} + - component: {fileID: 7941130843212467135} + - component: {fileID: 7941130843212467132} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7941130843212467133 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7941130843212467130} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7941130844932052040} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 12, y: 0} + m_SizeDelta: {x: 24, y: 24} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7941130843212467135 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7941130843212467130} + m_CullTransparentMesh: 1 +--- !u!114 &7941130843212467132 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7941130843212467130} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 68771e829a9c7cf4a8721ae52e2e3a1e, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7941130843355779155 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7941130843355779154} + - component: {fileID: 7941130843355779156} + - component: {fileID: 7941130843355779157} + m_Layer: 5 + m_Name: ItemUserInfo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7941130843355779154 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7941130843355779155} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7941130844402368994} + - {fileID: 7941130843613368919} + - {fileID: 7941130843955094706} + - {fileID: 7941130844402899841} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -20, y: 95} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7941130843355779156 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7941130843355779155} + m_CullTransparentMesh: 1 +--- !u!114 &7941130843355779157 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7941130843355779155} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.078431375, g: 0.078431375, b: 0.078431375, a: 0.7529412} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 9146820930390495848, guid: 7c830c554f7e68949a917101a0f02c3d, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7941130843564753128 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7941130843564753131} + m_Layer: 5 + m_Name: Miss + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7941130843564753131 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7941130843564753128} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7941130843116869633} + - {fileID: 7941130843092364451} + m_Father: {fileID: 7941130844402899841} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 92, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &7941130843613368916 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7941130843613368919} + - component: {fileID: 7941130843613368921} + - component: {fileID: 7941130843613368918} + m_Layer: 5 + m_Name: Score + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7941130843613368919 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7941130843613368916} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7941130843355779154} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -30, y: -30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7941130843613368921 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7941130843613368916} + m_CullTransparentMesh: 1 +--- !u!114 &7941130843613368918 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7941130843613368916} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: fa50019d790cb4b43b3edb4f165e8237, type: 3} + m_FontSize: 26 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 6 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: score +--- !u!1 &7941130843955094707 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7941130843955094706} + - component: {fileID: 7941130843955094708} + - component: {fileID: 7941130843955094709} + m_Layer: 5 + m_Name: Date + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7941130843955094706 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7941130843955094707} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7941130843355779154} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -30, y: -30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7941130843955094708 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7941130843955094707} + m_CullTransparentMesh: 1 +--- !u!114 &7941130843955094709 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7941130843955094707} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: fa50019d790cb4b43b3edb4f165e8237, type: 3} + m_FontSize: 23 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 2 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 1970-01-01 +--- !u!1 &7941130844006703185 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7941130844006703184} + - component: {fileID: 7941130844006703186} + - component: {fileID: 7941130844006703187} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7941130844006703184 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7941130844006703185} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7941130844932052040} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 13.999996, y: 0} + m_SizeDelta: {x: -28.000008, y: 32} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7941130844006703186 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7941130844006703185} + m_CullTransparentMesh: 1 +--- !u!114 &7941130844006703187 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7941130844006703185} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 9b2eb8cf9fd09fd4c9ecf71fd46e4095, type: 3} + m_FontSize: 20 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 1 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 32210 +--- !u!1 &7941130844402368995 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7941130844402368994} + - component: {fileID: 7941130844402368996} + - component: {fileID: 7941130844402368997} + m_Layer: 5 + m_Name: MapName + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7941130844402368994 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7941130844402368995} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7941130843355779154} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -30, y: -30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7941130844402368996 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7941130844402368995} + m_CullTransparentMesh: 1 +--- !u!114 &7941130844402368997 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7941130844402368995} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 9b2eb8cf9fd09fd4c9ecf71fd46e4095, type: 3} + m_FontSize: 31 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 44 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Mapname +--- !u!1 &7941130844402899870 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7941130844402899841} + - component: {fileID: 7941130844402899840} + m_Layer: 5 + m_Name: Detail + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7941130844402899841 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7941130844402899870} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7941130843564753131} + - {fileID: 7941130844932052040} + m_Father: {fileID: 7941130843355779154} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -329.21, y: 31} + m_SizeDelta: {x: 629.23, y: 32} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &7941130844402899840 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7941130844402899870} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 5 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!1 &7941130844932052041 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7941130844932052040} + m_Layer: 5 + m_Name: Combo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7941130844932052040 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7941130844932052041} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7941130843212467133} + - {fileID: 7941130844006703184} + m_Father: {fileID: 7941130844402899841} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 92, y: 0} + m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Prefabs/ItemUserInfo.prefab.meta b/Assets/Prefabs/ItemUserInfo.prefab.meta new file mode 100644 index 0000000..65624f6 --- /dev/null +++ b/Assets/Prefabs/ItemUserInfo.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4e6a385e28ff8344298029f5fa8574c6 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Login.unity b/Assets/Scenes/Login.unity index 79c3686..7f87bbc 100644 --- a/Assets/Scenes/Login.unity +++ b/Assets/Scenes/Login.unity @@ -441,12 +441,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 1280, y: 720} m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 + m_MatchWidthOrHeight: 0.5 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 @@ -1019,6 +1019,7 @@ RectTransform: - {fileID: 1869137099} - {fileID: 1378455119} - {fileID: 936579381} + - {fileID: 1963550107} m_Father: {fileID: 65117016} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1967,6 +1968,7 @@ MonoBehaviour: skipLogin: {fileID: 824757144} CGU: {fileID: 4712086} DebugMessage: {fileID: 936579382} + Version: {fileID: 1963550108} --- !u!4 &890798388 Transform: m_ObjectHideFlags: 0 @@ -2013,9 +2015,9 @@ RectTransform: m_Father: {fileID: 463701406} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -192} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 160} m_SizeDelta: {x: 0, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &936579382 @@ -3716,6 +3718,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1957064642} m_CullTransparentMesh: 0 +--- !u!1 &1963550106 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1963550107} + - component: {fileID: 1963550109} + - component: {fileID: 1963550108} + m_Layer: 5 + m_Name: Version + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1963550107 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1963550106} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 463701406} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 450} + m_SizeDelta: {x: 720, y: 130.79999} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1963550108 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1963550106} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: fa50019d790cb4b43b3edb4f165e8237, type: 3} + m_FontSize: 24 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Version +--- !u!222 &1963550109 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1963550106} + m_CullTransparentMesh: 1 --- !u!1 &1980776058 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Menu.unity b/Assets/Scenes/Menu.unity index 3299ad2..a122994 100644 --- a/Assets/Scenes/Menu.unity +++ b/Assets/Scenes/Menu.unity @@ -202,6 +202,69 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 120817901} m_CullTransparentMesh: 0 +--- !u!1 &148605266 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 148605267} + - component: {fileID: 148605268} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &148605267 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 148605266} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 192896214} + m_Father: {fileID: 1894819434} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0.00002148581} + m_SizeDelta: {x: 0, y: 300} + m_Pivot: {x: 0, y: 1} +--- !u!114 &148605268 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 148605266} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 5 + m_Right: 5 + m_Top: 70 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 10 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &191540181 GameObject: m_ObjectHideFlags: 0 @@ -292,6 +355,43 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 191540181} m_CullTransparentMesh: 1 +--- !u!1 &192896213 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 192896214} + m_Layer: 5 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &192896214 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 192896213} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1838756982} + - {fileID: 1470400693} + m_Father: {fileID: 148605267} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 200} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &223901899 GameObject: m_ObjectHideFlags: 0 @@ -699,7 +799,7 @@ MonoBehaviour: m_Padding: m_Left: 0 m_Right: 0 - m_Top: 0 + m_Top: 70 m_Bottom: 0 m_ChildAlignment: 0 m_Spacing: 10 @@ -708,7 +808,7 @@ MonoBehaviour: m_ChildControlWidth: 1 m_ChildControlHeight: 0 m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 + m_ChildScaleHeight: 1 m_ReverseArrangement: 0 --- !u!114 &289320776 MonoBehaviour: @@ -1093,6 +1193,11 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 387100653} m_CullTransparentMesh: 1 +--- !u!224 &397688547 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7941130843355779154, guid: 4e6a385e28ff8344298029f5fa8574c6, type: 3} + m_PrefabInstance: {fileID: 7941130843180412593} + m_PrefabAsset: {fileID: 0} --- !u!1 &424104323 GameObject: m_ObjectHideFlags: 0 @@ -2043,6 +2148,42 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 636774938} m_CullTransparentMesh: 1 +--- !u!1 &672325757 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 672325758} + m_Layer: 5 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &672325758 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 672325757} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1570782493} + m_Father: {fileID: 895852264} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -20, y: -20} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &673314234 GameObject: m_ObjectHideFlags: 0 @@ -2097,7 +2238,7 @@ MonoBehaviour: m_Content: {fileID: 1942423434} m_Horizontal: 0 m_Vertical: 1 - m_MovementType: 2 + m_MovementType: 1 m_Elasticity: 0.1 m_Inertia: 1 m_DecelerationRate: 0.135 @@ -2181,12 +2322,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 1280, y: 720} m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 + m_MatchWidthOrHeight: 0.5 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 @@ -2470,6 +2611,132 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 761089528} m_CullTransparentMesh: 0 +--- !u!1 &818000798 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 818000799} + - component: {fileID: 818000802} + - component: {fileID: 818000801} + - component: {fileID: 818000800} + m_Layer: 5 + m_Name: Scrollbar Vertical + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &818000799 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 818000798} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1366737885} + m_Father: {fileID: 1072537679} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 0} + m_Pivot: {x: 1, y: 1} +--- !u!114 &818000800 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 818000798} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1315648537} + m_HandleRect: {fileID: 1315648536} + m_Direction: 2 + m_Value: 0 + m_Size: 1 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &818000801 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 818000798} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &818000802 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 818000798} + m_CullTransparentMesh: 1 --- !u!1 &854609750 GameObject: m_ObjectHideFlags: 0 @@ -2778,7 +3045,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 894096702} m_CullTransparentMesh: 1 ---- !u!1 &958562101 +--- !u!1 &895852263 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2786,53 +3053,179 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 958562102} - - component: {fileID: 958562103} - - component: {fileID: 958562104} + - component: {fileID: 895852264} + - component: {fileID: 895852267} + - component: {fileID: 895852266} + - component: {fileID: 895852265} m_Layer: 5 - m_Name: SpawnList + m_Name: Scrollbar Horizontal m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &958562102 +--- !u!224 &895852264 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 958562101} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 895852263} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1125098015} - m_RootOrder: 0 + m_Children: + - {fileID: 672325758} + m_Father: {fileID: 1072537679} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &958562103 + m_SizeDelta: {x: 0, y: 20} + m_Pivot: {x: 0, y: 0} +--- !u!114 &895852265 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 958562101} + m_GameObject: {fileID: 895852263} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f229085cd15520848aa90604e5b4c604, type: 3} + m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &958562104 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1570782494} + m_HandleRect: {fileID: 1570782493} + m_Direction: 0 + m_Value: 0 + m_Size: 1 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &895852266 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 895852263} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &895852267 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 895852263} + m_CullTransparentMesh: 1 +--- !u!1 &958562101 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 958562102} + - component: {fileID: 958562103} + - component: {fileID: 958562104} + m_Layer: 5 + m_Name: SpawnList + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &958562102 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 958562101} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1125098015} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &958562103 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 958562101} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f229085cd15520848aa90604e5b4c604, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &958562104 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 958562101} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3128,6 +3521,84 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1071862966} m_CullTransparentMesh: 1 +--- !u!1 &1072537678 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1072537679} + - component: {fileID: 1072537682} + - component: {fileID: 1072537680} + m_Layer: 5 + m_Name: Scroll View + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1072537679 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1072537678} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1894819434} + - {fileID: 895852264} + - {fileID: 818000799} + m_Father: {fileID: 1917542722} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1072537680 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1072537678} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 148605267} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 1894819434} + m_HorizontalScrollbar: {fileID: 895852265} + m_VerticalScrollbar: {fileID: 818000800} + m_HorizontalScrollbarVisibility: 2 + m_VerticalScrollbarVisibility: 2 + m_HorizontalScrollbarSpacing: -3 + m_VerticalScrollbarSpacing: -3 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!222 &1072537682 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1072537678} + m_CullTransparentMesh: 1 --- !u!1 &1090415206 GameObject: m_ObjectHideFlags: 0 @@ -3377,8 +3848,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 26d4fe37e48992d4e936477356b8aab6, type: 3} m_Name: m_EditorClassIdentifier: + TableContent: {fileID: 148605266} + ItemPlayerInfo: {fileID: 7941130843355779155, guid: 4e6a385e28ff8344298029f5fa8574c6, type: 3} Username: {fileID: 1470400694} - Result: {fileID: 1649253810} --- !u!114 &1112705977 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3912,8 +4384,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -32.500008} - m_SizeDelta: {x: 0, y: -64.999985} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1225715278 MonoBehaviour: @@ -4550,6 +5022,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1299371892} m_CullTransparentMesh: 0 +--- !u!1 &1315648535 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1315648536} + - component: {fileID: 1315648538} + - component: {fileID: 1315648537} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1315648536 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1315648535} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1366737885} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1315648537 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1315648535} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1315648538 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1315648535} + m_CullTransparentMesh: 1 --- !u!1 &1319581694 GameObject: m_ObjectHideFlags: 0 @@ -4885,7 +5432,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] ---- !u!1 &1396859954 +--- !u!1 &1366737884 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4893,11 +5440,47 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1396859955} - - component: {fileID: 1396859957} - - component: {fileID: 1396859956} + - component: {fileID: 1366737885} m_Layer: 5 - m_Name: Text + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1366737885 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1366737884} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1315648536} + m_Father: {fileID: 818000799} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -20, y: -20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1396859954 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1396859955} + - component: {fileID: 1396859957} + - component: {fileID: 1396859956} + m_Layer: 5 + m_Name: Text m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -5090,17 +5673,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1470400692} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1917542722} - m_RootOrder: 0 + m_Father: {fileID: 192896214} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} + m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 10, y: -120} - m_SizeDelta: {x: -20, y: 80} + m_AnchoredPosition: {x: 120, y: -10.000002} + m_SizeDelta: {x: -240, y: -19.999996} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1470400694 MonoBehaviour: @@ -5126,9 +5709,9 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 9b2eb8cf9fd09fd4c9ecf71fd46e4095, type: 3} m_FontSize: 50 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 10 - m_MaxSize: 55 + m_MaxSize: 50 m_Alignment: 0 m_AlignByGeometry: 0 m_RichText: 1 @@ -5337,6 +5920,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1548673618} m_CullTransparentMesh: 1 +--- !u!1 &1570782492 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1570782493} + - component: {fileID: 1570782495} + - component: {fileID: 1570782494} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1570782493 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1570782492} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 672325758} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1570782494 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1570782492} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1570782495 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1570782492} + m_CullTransparentMesh: 1 --- !u!1001 &1572546794 PrefabInstance: m_ObjectHideFlags: 0 @@ -5949,85 +6607,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1646778161} m_CullTransparentMesh: 0 ---- !u!1 &1649253808 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1649253809} - - component: {fileID: 1649253811} - - component: {fileID: 1649253810} - m_Layer: 5 - m_Name: Data - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1649253809 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1649253808} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1917542722} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -715} - m_SizeDelta: {x: 620, y: 1130} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1649253810 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1649253808} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: fa50019d790cb4b43b3edb4f165e8237, type: 3} - m_FontSize: 30 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 65 - m_Alignment: 0 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Result ---- !u!222 &1649253811 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1649253808} - m_CullTransparentMesh: 1 --- !u!1 &1674880600 GameObject: m_ObjectHideFlags: 0 @@ -6415,6 +6994,171 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1838756981 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1838756982} + - component: {fileID: 1838756984} + - component: {fileID: 1838756983} + m_Layer: 5 + m_Name: ImageProfil + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1838756982 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1838756981} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 192896214} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 120, y: 0} + m_SizeDelta: {x: 200, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1838756983 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1838756981} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 7c76f5080c5e1164ead83bbeafab9416, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1838756984 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1838756981} + m_CullTransparentMesh: 1 +--- !u!1 &1894819433 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1894819434} + - component: {fileID: 1894819437} + - component: {fileID: 1894819436} + - component: {fileID: 1894819435} + m_Layer: 5 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1894819434 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1894819433} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 148605267} + m_Father: {fileID: 1072537679} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1894819435 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1894819433} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 +--- !u!114 &1894819436 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1894819433} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1894819437 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1894819433} + m_CullTransparentMesh: 1 --- !u!1 &1906405402 GameObject: m_ObjectHideFlags: 0 @@ -6556,7 +7300,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1917542722 RectTransform: m_ObjectHideFlags: 0 @@ -6568,8 +7312,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1470400693} - - {fileID: 1649253809} + - {fileID: 1072537679} + - {fileID: 397688547} m_Father: {fileID: 1320292910} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -7438,3 +8182,136 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2131446278} m_CullTransparentMesh: 0 +--- !u!1001 &7941130843180412593 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1917542722} + m_Modifications: + - target: {fileID: 7941130843355779154, guid: 4e6a385e28ff8344298029f5fa8574c6, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7941130843355779154, guid: 4e6a385e28ff8344298029f5fa8574c6, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7941130843355779154, guid: 4e6a385e28ff8344298029f5fa8574c6, type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 7941130843355779154, guid: 4e6a385e28ff8344298029f5fa8574c6, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7941130843355779154, guid: 4e6a385e28ff8344298029f5fa8574c6, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7941130843355779154, guid: 4e6a385e28ff8344298029f5fa8574c6, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7941130843355779154, guid: 4e6a385e28ff8344298029f5fa8574c6, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7941130843355779154, guid: 4e6a385e28ff8344298029f5fa8574c6, type: 3} + propertyPath: m_SizeDelta.x + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 7941130843355779154, guid: 4e6a385e28ff8344298029f5fa8574c6, type: 3} + propertyPath: m_SizeDelta.y + value: 95 + objectReference: {fileID: 0} + - target: {fileID: 7941130843355779154, guid: 4e6a385e28ff8344298029f5fa8574c6, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7941130843355779154, guid: 4e6a385e28ff8344298029f5fa8574c6, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7941130843355779154, guid: 4e6a385e28ff8344298029f5fa8574c6, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7941130843355779154, guid: 4e6a385e28ff8344298029f5fa8574c6, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7941130843355779154, guid: 4e6a385e28ff8344298029f5fa8574c6, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7941130843355779154, guid: 4e6a385e28ff8344298029f5fa8574c6, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7941130843355779154, guid: 4e6a385e28ff8344298029f5fa8574c6, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7941130843355779154, guid: 4e6a385e28ff8344298029f5fa8574c6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7941130843355779154, guid: 4e6a385e28ff8344298029f5fa8574c6, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7941130843355779154, guid: 4e6a385e28ff8344298029f5fa8574c6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7941130843355779154, guid: 4e6a385e28ff8344298029f5fa8574c6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7941130843355779154, guid: 4e6a385e28ff8344298029f5fa8574c6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7941130843355779155, guid: 4e6a385e28ff8344298029f5fa8574c6, type: 3} + propertyPath: m_Name + value: ItemUserInfo + objectReference: {fileID: 0} + - target: {fileID: 7941130843355779155, guid: 4e6a385e28ff8344298029f5fa8574c6, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7941130843564753131, guid: 4e6a385e28ff8344298029f5fa8574c6, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7941130843564753131, guid: 4e6a385e28ff8344298029f5fa8574c6, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7941130843564753131, guid: 4e6a385e28ff8344298029f5fa8574c6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 491.22998 + objectReference: {fileID: 0} + - target: {fileID: 7941130843564753131, guid: 4e6a385e28ff8344298029f5fa8574c6, type: 3} + propertyPath: m_AnchoredPosition.y + value: -16 + objectReference: {fileID: 0} + - target: {fileID: 7941130844932052040, guid: 4e6a385e28ff8344298029f5fa8574c6, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7941130844932052040, guid: 4e6a385e28ff8344298029f5fa8574c6, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7941130844932052040, guid: 4e6a385e28ff8344298029f5fa8574c6, type: 3} + propertyPath: m_AnchoredPosition.x + value: 583.23 + objectReference: {fileID: 0} + - target: {fileID: 7941130844932052040, guid: 4e6a385e28ff8344298029f5fa8574c6, type: 3} + propertyPath: m_AnchoredPosition.y + value: -16 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4e6a385e28ff8344298029f5fa8574c6, type: 3} diff --git a/Assets/Scenes/Play.unity b/Assets/Scenes/Play.unity index 268eb75..0342f95 100644 --- a/Assets/Scenes/Play.unity +++ b/Assets/Scenes/Play.unity @@ -7387,12 +7387,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 1280, y: 720} m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 + m_MatchWidthOrHeight: 0.5 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 @@ -7773,6 +7773,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b4bccd103bb3c14c8da5c0a609ef77f, type: 3} m_Name: m_EditorClassIdentifier: + ScoreAbove: {fileID: 1680505688} rankNumber: {fileID: 747164908} username: {fileID: 1176737516} score: {fileID: 1046098992} diff --git a/Assets/Scripts/Bullet.cs b/Assets/Scripts/Game/Bullet.cs similarity index 100% rename from Assets/Scripts/Bullet.cs rename to Assets/Scripts/Game/Bullet.cs diff --git a/Assets/Scripts/Bullet.cs.meta b/Assets/Scripts/Game/Bullet.cs.meta similarity index 100% rename from Assets/Scripts/Bullet.cs.meta rename to Assets/Scripts/Game/Bullet.cs.meta diff --git a/Assets/Scripts/BulletMove.cs b/Assets/Scripts/Game/BulletMove.cs similarity index 100% rename from Assets/Scripts/BulletMove.cs rename to Assets/Scripts/Game/BulletMove.cs diff --git a/Assets/Scripts/BulletMove.cs.meta b/Assets/Scripts/Game/BulletMove.cs.meta similarity index 100% rename from Assets/Scripts/BulletMove.cs.meta rename to Assets/Scripts/Game/BulletMove.cs.meta diff --git a/Assets/Scripts/FailCollider.cs b/Assets/Scripts/Game/FailCollider.cs similarity index 100% rename from Assets/Scripts/FailCollider.cs rename to Assets/Scripts/Game/FailCollider.cs diff --git a/Assets/Scripts/FailCollider.cs.meta b/Assets/Scripts/Game/FailCollider.cs.meta similarity index 100% rename from Assets/Scripts/FailCollider.cs.meta rename to Assets/Scripts/Game/FailCollider.cs.meta diff --git a/Assets/Scripts/Game/GameRanking.cs b/Assets/Scripts/Game/GameRanking.cs index cfea075..cdd092e 100644 --- a/Assets/Scripts/Game/GameRanking.cs +++ b/Assets/Scripts/Game/GameRanking.cs @@ -8,6 +8,7 @@ public class GameRanking : MonoBehaviour { [Header("UI")] + public GameObject ScoreAbove; public Text rankNumber; public Text username; public Text score; @@ -98,6 +99,12 @@ IEnumerator GetRequest(string uri) // Récupère le contenu de la page string data = webRequest.downloadHandler.text; + // Si il n'y a aucun classment + if(data == "null"){ + ScoreAbove.SetActive(false); + break; + } + // Initie l'index int index = 0; diff --git a/Assets/Scripts/GameSubTitle.cs b/Assets/Scripts/Game/GameSubTitle.cs similarity index 100% rename from Assets/Scripts/GameSubTitle.cs rename to Assets/Scripts/Game/GameSubTitle.cs diff --git a/Assets/Scripts/GameSubTitle.cs.meta b/Assets/Scripts/Game/GameSubTitle.cs.meta similarity index 100% rename from Assets/Scripts/GameSubTitle.cs.meta rename to Assets/Scripts/Game/GameSubTitle.cs.meta diff --git a/Assets/Scripts/Login.meta b/Assets/Scripts/Login.meta new file mode 100644 index 0000000..95c6bb2 --- /dev/null +++ b/Assets/Scripts/Login.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7d6e10a6482aeb643bdc7e05622e45ae +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/LoginSystem.cs b/Assets/Scripts/Login/LoginSystem.cs similarity index 100% rename from Assets/Scripts/LoginSystem.cs rename to Assets/Scripts/Login/LoginSystem.cs diff --git a/Assets/Scripts/LoginSystem.cs.meta b/Assets/Scripts/Login/LoginSystem.cs.meta similarity index 100% rename from Assets/Scripts/LoginSystem.cs.meta rename to Assets/Scripts/Login/LoginSystem.cs.meta diff --git a/Assets/Scripts/Menu/Menu.cs b/Assets/Scripts/Menu/Menu.cs index 3bc56bc..6a55be0 100644 --- a/Assets/Scripts/Menu/Menu.cs +++ b/Assets/Scripts/Menu/Menu.cs @@ -135,13 +135,12 @@ public void Download(string map) { if (!downloadIsRunning) { - mapname = map; - //TryDownload(); - StartCoroutine(BetterTryDownload()); + mapname = map;; + StartCoroutine(TryDownload()); } } - private IEnumerator BetterTryDownload() { + private IEnumerator TryDownload() { foreach (var item in menuBeatmapList.dir) { if (item == mapname) { yield return 0; @@ -171,36 +170,6 @@ private IEnumerator BetterTryDownload() { //print("Coroutine ended: " + Time.time + " seconds"); } - void TryDownload() - { - foreach (var item in menuBeatmapList.dir) - { - if (item == mapname) - { - return; - } - } - - Debug.Log("Download " + mapname); - - // Create directory beatmaps if not exist - showinfo.text = "Create beatmap's directory"; - Directory.CreateDirectory(beatmapFolder); - - // Download beatmap - showinfo.text = "Download " + mapname; - - downloadIsRunning = true; - - WebClient client = new WebClient(); - client.DownloadFileCompleted += new System.ComponentModel.AsyncCompletedEventHandler(DownloadComplet); - client.DownloadFileAsync( - // Url to download file - new Uri(URL.url + "download.php?user=" + PlayerPrefs.GetString("username") + "&password=" + PlayerPrefs.GetString("password") + "&map=" + mapname), - // Name of map download - beatmapFolder + mapname + ".zip"); - } - void DownloadComplet(object sender, System.ComponentModel.AsyncCompletedEventArgs e) { if (e.Error != null) diff --git a/Assets/Scripts/Menu/MenuLogin.cs b/Assets/Scripts/Menu/MenuLogin.cs index 7a9427d..d38e92e 100644 --- a/Assets/Scripts/Menu/MenuLogin.cs +++ b/Assets/Scripts/Menu/MenuLogin.cs @@ -37,6 +37,7 @@ public class MenuLogin : MonoBehaviour [Header("Debug")] public Text DebugMessage; + public Text Version; // Start is called before the first frame update void Start() @@ -48,12 +49,16 @@ void Start() // Clear the debug message DebugMessage.text = ""; - // Try to login the user automatically - /*if(usernameLogin.text != "" && passwordLogin.text != null) - { - GoLogin(); - } - */ + // Show the version of build + Version.text = "v" + Application.version; + + #if !UNITY_EDITOR + // Try to login the user automatically + if(usernameLogin.text != "" && passwordLogin.text != null) + { + GoLogin(); + } + #endif newPlayer.onClick.AddListener(() => changePanel(true)); oldPlayer.onClick.AddListener(() => changePanel(false)); diff --git a/Assets/Scripts/MenuNetwork.cs b/Assets/Scripts/Menu/MenuNetwork.cs similarity index 100% rename from Assets/Scripts/MenuNetwork.cs rename to Assets/Scripts/Menu/MenuNetwork.cs diff --git a/Assets/Scripts/MenuNetwork.cs.meta b/Assets/Scripts/Menu/MenuNetwork.cs.meta similarity index 100% rename from Assets/Scripts/MenuNetwork.cs.meta rename to Assets/Scripts/Menu/MenuNetwork.cs.meta diff --git a/Assets/Scripts/MenuNetworkItem.cs b/Assets/Scripts/Menu/MenuNetworkItem.cs similarity index 100% rename from Assets/Scripts/MenuNetworkItem.cs rename to Assets/Scripts/Menu/MenuNetworkItem.cs diff --git a/Assets/Scripts/MenuNetworkItem.cs.meta b/Assets/Scripts/Menu/MenuNetworkItem.cs.meta similarity index 100% rename from Assets/Scripts/MenuNetworkItem.cs.meta rename to Assets/Scripts/Menu/MenuNetworkItem.cs.meta diff --git a/Assets/Scripts/MenuPanel.cs b/Assets/Scripts/Menu/MenuPanel.cs similarity index 100% rename from Assets/Scripts/MenuPanel.cs rename to Assets/Scripts/Menu/MenuPanel.cs diff --git a/Assets/Scripts/MenuPanel.cs.meta b/Assets/Scripts/Menu/MenuPanel.cs.meta similarity index 100% rename from Assets/Scripts/MenuPanel.cs.meta rename to Assets/Scripts/Menu/MenuPanel.cs.meta diff --git a/Assets/Scripts/MenuScores.cs b/Assets/Scripts/Menu/MenuScores.cs similarity index 99% rename from Assets/Scripts/MenuScores.cs rename to Assets/Scripts/Menu/MenuScores.cs index 696e8c7..9ee9c34 100644 --- a/Assets/Scripts/MenuScores.cs +++ b/Assets/Scripts/Menu/MenuScores.cs @@ -68,7 +68,7 @@ IEnumerator GetRequest(string uri) // Créé un item puis le place dans le tableau GameObject child = GameObject.Instantiate(ItemPlayerRanking); child.transform.parent = TableContent.transform; - + // Modifie les paramètres de l'item child.transform.Find("RankingText").GetComponent().text = index.ToString(); child.transform.Find("BackgroundItem").Find("UsernameText").GetComponent().text = username; diff --git a/Assets/Scripts/MenuScores.cs.meta b/Assets/Scripts/Menu/MenuScores.cs.meta similarity index 100% rename from Assets/Scripts/MenuScores.cs.meta rename to Assets/Scripts/Menu/MenuScores.cs.meta diff --git a/Assets/Scripts/MenuUserinfo.cs b/Assets/Scripts/Menu/MenuUserinfo.cs similarity index 68% rename from Assets/Scripts/MenuUserinfo.cs rename to Assets/Scripts/Menu/MenuUserinfo.cs index 8d9f6c4..8613082 100644 --- a/Assets/Scripts/MenuUserinfo.cs +++ b/Assets/Scripts/Menu/MenuUserinfo.cs @@ -8,8 +8,11 @@ public class MenuUserinfo : MonoBehaviour { + public GameObject TableContent; + public GameObject ItemPlayerInfo; public Text Username; - public Text Result; + + //public Text Result; // Start is called before the first frame update void Start() @@ -61,26 +64,34 @@ IEnumerator GetRequest(string uri) string data = webRequest.downloadHandler.text; - //var jsonData = JSON.Parse(data); - - /*string resultdata = ""; - foreach (var item in jsonData){ - string currentdata = item[0].ToString(); - }*/ - - string resultdata = "Beatmap name\nScore - Combo - Miss\nDate of submit\n\n"; + // Initie l'index + int index = 0; + // Pour chaque element du JSON JSONNode root = JSONNode.Parse(data); foreach (JSONNode n in root){ + + // Incrémente de 1 l'index + index++; + + // Initie les variables string mapname = n["mapname"]; int score = n["score"]; int combo = n["combo"]; int miss = n["miss"]; string dateofsubbmit = n["dateofsubbmit"]; - resultdata += $"{mapname}\n{score} - {combo} - {miss}\n{dateofsubbmit}\n\n"; - } - Result.text = resultdata; + // Créé un item puis le place dans le tableau + GameObject child = GameObject.Instantiate(ItemPlayerInfo); + child.transform.parent = TableContent.transform; + + // Modifie les paramètres de l'item + child.transform.Find("MapName").GetComponent().text = mapname; + child.transform.Find("Score").GetComponent().text = score.ToString("#,#").Replace(',', ' '); + child.transform.Find("Date").GetComponent().text = dateofsubbmit; + child.transform.Find("Detail").Find("Miss").Find("Text").GetComponent().text = miss.ToString(); + child.transform.Find("Detail").Find("Combo").Find("Text").GetComponent().text = combo.ToString(); + } // [2, { ""mapname":"Thaehan - Bwa ! (Deif)","username":"EnzoDeg40","dateofsubbmit":"2020-09-22","score":"5359050","combo":"458","hit":"541","miss":"2"}] //jsonData[0] diff --git a/Assets/Scripts/MenuUserinfo.cs.meta b/Assets/Scripts/Menu/MenuUserinfo.cs.meta similarity index 100% rename from Assets/Scripts/MenuUserinfo.cs.meta rename to Assets/Scripts/Menu/MenuUserinfo.cs.meta diff --git a/Assets/Sprites/bullet.png b/Assets/Sprites/bullet.png index 1f19695f703c6a9c7aa64e66c5eb8c444d699b5c..1913e90aa2550f89edbad64741fbe00ce019bdbf 100644 GIT binary patch literal 6642 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 GefmFGo@fIA literal 6617 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�Zxf%=cfDE@WBlO2xq&Yv%q&NU*Lu%ExN%s-m?3AuRa0=|tD!5b zxSf0yMGWL#(TmB~Ohz|YvDLqaS1P!w3toRU@`OFMllO9ROIhoUOjaZ15UTSzHxtsF zS>Q5bUkR@$sg|So8Q7a7xQ{dc-Lc!iMSaHoyGr`^w$8Dw1FC&@KaR7%=YtcQGejh1SDE`Hy;!EXwdPtgFU+;E}sA z9&5fddwn2Xl_tuw-dkz9GB1=`cF|5+uLeloPTqrh&iHB!@jPt~D8i!5BVL1A z;QV&-MKtB1OTvyLo}iUJ=`S?pK|tV+NMG)_!`*#}`&Vx$PR=bz#5 zOu4?e1u;@ATV6e^&MV)O>Zn3va@4&7^CfLy-4YjALd3hCtzJKexnNuk=x%Rt=lr`? z>IyFCkuIUz=%j?Ak983JI&FRjIpa~H!J9Y~^%>0BX;`u%l=6XHS(FsWCiP)X@4={S zgKn`8JS1Y+$j0F)R~J+42M_U3ny!YW7udKf8?^(6+)4i1u%=h2jxi@e$1qxMCC}{m za$;=h7Yx}SRr=vGz*%B$cBtbj;`hMo2nOevLaEz+SJ+OCS%f+})JinhQ|_z*@(oB1 z2}Z9yP&Mcc2c!gD4|tq2Wskm~jszexq(pri=_|Vs=Vl>yR3Euu7{iLIJ;&;`XzE^O zfR}GMaLX6Wy7zoLiqem!tUvQqrQPtLA!Tt#(7zUv>PonRW~zxWC-mz)V6PfDxjyg? zGXt+-^Z~{^N&5&o%N=@+*n$kCT*7* zL-it3#{bKUrki&s9+a|dm*w+*$%~q}18LrC*@b4xJU!C(ZM8*}c0Tmin?NnV2l*G? zhzx9o2q|%_XM>*z(ueuBY0nlM?fl@cmxVikQ_cYx^D%T0B6!m(i3i<^#27azWU@G_Y)P6KGSXWt_$@|G2-s!2Afp0z933WB!WW8$a)S#IZnb426#=eI(0<%~z pA9pRm-A%8fzPE_2yg9qYN7+tJC<{7-JgoqL?OsRAdUI03zW|Ahb&>!8 diff --git a/Assets/Sprites/bullet1.png b/Assets/Sprites/bullet1.png index 73b8216875fbdddd67f2260dc6c61c99767c5194..6876d26901159ad0665180b015868daa728f909e 100644 GIT binary patch literal 6642 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�Zxf%=cfDE@WBlO2xq&Yv%q&NU*Lu%ExN%s-m?3AuRa0=|tD!5b zxSf0yMGWL#(TmB~Ohz|YvDLqaS1P!w3toRU@`OFMllO9ROIhoUOjaZ95UTSzHxtsF zS>Q5bUkR@$sg|So8Q7a7xQ{dc-Lc!iMSaHoyGr`^w$8Dw1FC&@KaR7%=YtcQYqlh1SDE`Hy~&EXwdPtgFU+;E}sA z9&5fddwn2Xl_tuw-dkz9GB1=`cF|5+uLeloPTqrh&iHB!@jPt~D8i!5BVL1A z;QV&-MKtB1OTvyLo}iUJ=`S?pK|tV+NMG)_!`*#}`&Vx$PR=bz#5 zOu4?e1u;@ATV6e^&MV)O>Zn3va@4&7^CfLy-4YjALd3hCtzJKexnNuk=x%Rt=lr`@ z>IyFCkuIUz=%j?Ak983JI&FRjIpa~H!J9Y~^%>0BX;`u%l=6XHS(FsWCiP)X@4={S zgKn`8JS1Y+$j0F)R~J+42M_U3ny!YW7udKf8?^(6+)4i1u%=h2jxi@e$1qxMCC}{m za$;=h7Yx}SRr=vGz*%B$cBtbj68FIC2nOevLaEz+SJ+OCS%f+})JinhQ|_z*@(oB1 z2}Z9yP&Mcc2c!jE4|tq2Wskm~jwB#6q(yxj87sRG=Vl>yR3Euu7{kh|J;&;`XzE^O zfR}GMaLX6Wy7zoLiqem!tUvQqrQPtLA#HI-(7zUv>PonRW~zxWC-mz)V6PfDxjyg? zGXt+-^Z~`&?&5&o%N=@+*n$kCT*7* zL-iuk#{bKUrki&s9+a|dm*w+*$%~q}18LrC*@b4xJU!C(ZM8*}c0Tmin?NnV2l*G? zhzx9o2q|%_XM>*z(TDlAY0nlM?fl@cmxVikQ_cYx^D%T0B6!m(i3i<^#27azWU@G_Y)P6KGSXWt_$@|G2-s!2Afp0z933WB!WW8$a)S#IZnb426#=eI(0<%~z pA9pRm-A%8fzPE_2yg9qYN7+tJC<{7-JgoqL?OsRAdUI03zX0u5b=&{| diff --git a/Assets/Sprites/bullet2.png b/Assets/Sprites/bullet2.png new file mode 100644 index 0000000000000000000000000000000000000000..1f19695f703c6a9c7aa64e66c5eb8c444d699b5c GIT binary patch literal 6617 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�Zxf%=cfDE@WBlO2xq&Yv%q&NU*Lu%ExN%s-m?3AuRa0=|tD!5b zxSf0yMGWL#(TmB~Ohz|YvDLqaS1P!w3toRU@`OFMllO9ROIhoUOjaZ15UTSzHxtsF zS>Q5bUkR@$sg|So8Q7a7xQ{dc-Lc!iMSaHoyGr`^w$8Dw1FC&@KaR7%=YtcQGejh1SDE`Hy;!EXwdPtgFU+;E}sA z9&5fddwn2Xl_tuw-dkz9GB1=`cF|5+uLeloPTqrh&iHB!@jPt~D8i!5BVL1A z;QV&-MKtB1OTvyLo}iUJ=`S?pK|tV+NMG)_!`*#}`&Vx$PR=bz#5 zOu4?e1u;@ATV6e^&MV)O>Zn3va@4&7^CfLy-4YjALd3hCtzJKexnNuk=x%Rt=lr`? z>IyFCkuIUz=%j?Ak983JI&FRjIpa~H!J9Y~^%>0BX;`u%l=6XHS(FsWCiP)X@4={S zgKn`8JS1Y+$j0F)R~J+42M_U3ny!YW7udKf8?^(6+)4i1u%=h2jxi@e$1qxMCC}{m za$;=h7Yx}SRr=vGz*%B$cBtbj;`hMo2nOevLaEz+SJ+OCS%f+})JinhQ|_z*@(oB1 z2}Z9yP&Mcc2c!gD4|tq2Wskm~jszexq(pri=_|Vs=Vl>yR3Euu7{iLIJ;&;`XzE^O zfR}GMaLX6Wy7zoLiqem!tUvQqrQPtLA!Tt#(7zUv>PonRW~zxWC-mz)V6PfDxjyg? zGXt+-^Z~{^N&5&o%N=@+*n$kCT*7* zL-it3#{bKUrki&s9+a|dm*w+*$%~q}18LrC*@b4xJU!C(ZM8*}c0Tmin?NnV2l*G? zhzx9o2q|%_XM>*z(ueuBY0nlM?fl@cmxVikQ_cYx^D%T0B6!m(i3i<^#27azWU@G_Y)P6KGSXWt_$@|G2-s!2Afp0z933WB!WW8$a)S#IZnb426#=eI(0<%~z pA9pRm-A%8fzPE_2yg9qYN7+tJC<{7-JgoqL?OsRAdUI03zW|Ahb&>!8 literal 0 HcmV?d00001 diff --git a/Assets/Sprites/bullet2.png.meta b/Assets/Sprites/bullet2.png.meta new file mode 100644 index 0000000..053d6af --- /dev/null +++ b/Assets/Sprites/bullet2.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 9064ef73c05201841929bf8fe5e7dde3 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/bullet3.png b/Assets/Sprites/bullet3.png new file mode 100644 index 0000000000000000000000000000000000000000..73b8216875fbdddd67f2260dc6c61c99767c5194 GIT binary patch literal 6617 zcmc&ZXIN9)vU_g`U_$Rmq<2CIO-d95q)6{AVkjaALIl*Hs9QvuG(jQM10qckDM}Y3 zMLeLwPL)}C3jW=&hOW~DkiTJxZ{qX7Wmv9+;u z1po*EA%Kew`RlDx7)1WS7*}g^pnep)j11Th?Qz%x0F7CgjQ|uf=61Gs-;4ZjZEXRU zw-7+bo2ka4i*Xa0wnQP9VC0};|-^i+7 zFQ1O08eml0c;;~pcus6Ku=8aTAa@}1{gH$BAg)s`n(bL5Xqkn|_IFCh)nIrhqsL^T z3b;Cz6s{GO3)vh~ukUW#ftDHPiK9Jyt_9;x%!>^Bb^)%Fh1Iyj%a9HE>~!X64=R=?=dnL#S|0Y z6a9fbT{t{(VHUEPsZ5=f%NI3+w4AW{ZB0Pwf%*vAF%$xS3qlbE@~(9{2{@y+Ikguv9!m4k36o*9$WPV!?^k64|Ojd*CQr z?^f&$+$y3uIv(0!movE^hhpA-^kG(~9$z@VU~&VP)~6~G=?6K4CL@$ZXcZ4~w$PKI zDvunFJA#BTg(0opJ63|z#6!ZgQyhXn0*R3_;ApHlNC*)>sx>5%EHGn{%)Iu*I$ayTbfK1Lv5@0$DJrAW2?3x2UQp&E!X~rmS}aJ560k6*}sDJ6? z+&W+IlYQ4i2Gkb3Q+2Aa`nb@VOb~{Vc2^48vqZu1W<2gOl~S z5&ntRf99+MY#2sl3HuivLTBzEr??m3^ z#)d=>X=YMw`F9alvjtG(5-D?PKZ-AU0(W(3Cc&B;+38pQ`@)esQ!J|at@v6^7!;6L znG7VwG|ym7O9{qpKKFW24ZU?dU$zBxm-O_uYDIl_u`-QQiW5(pw{U<=~$hk|&?R~DqkJ>K! z(WxPKQQ9q+l%?i*hmYQ^NPIT9!}pjdZQM$VlC6##65$i{lJ^RI>IKM4#!cfR8*ncO zR-}x{vXN92v(18jpzwy2T$8~<>#`br?g-%{*W3KX4r{KP87mGa(IlcIp9$@&M%yYF z7#?);VkRX1{6X^%iEf@3pOo7Sl6D%_0#eV$K4i2}OdsjvJNKLd(+|(uPNh$$51$b7 z7pnMDh#@%(@x42^nnWneUoWH%i{MFFM8?;$oo=kq=R-Y;!pQY^h^|2Vo2}45vnhW`%w#@xC3my z6e~W9sQbAmxtcDNt7@Rg@tCZofF%ctJD*F7wq8&qNGMM(Xr1xdmH3iIPfvmjyUuaO zYOi_{Zk{)k6feluf-5B3&Tz^{J$P%(b^F|<##9vfJFn7o=HfB_u+r4VSP)yh`0gWj zm!eaI@>2qv#Y@PrsMIp=2 zEEIgJP(_hvtdj1sJ4Gr?>-CcTG$IR!SJvS@v@QvAOd(4)!N)5DWbEEI*XE~Vl)BU`WHRL z`ATV`kdw}0_zO`QRZKaZ0~suYn~KsvTg?|VYQAzNhaB?7?k$>en8#lABTsf*j_QFQ zwZIv|(6jC0ZuJ{n;)s^RN&DjXZP^+ZsjF9{(TwEWN%gVI$mtRn=%h1`sX#M)$xq%Fsi>vzY>0KdOK; zDg(zJ(^dZ9QW=4w>FWb9)Mj5OFprVj*PI|MzqxV@+_1^)43==|R=9>!AH>f_4PY2* zK1!FPQdEZpUG3NXL`e9+hfRsXLYv~XcPMuso%$F%b6Uiw)U=Gz|MnEk{(U;do5Q9krh|ml zqG7il|NhL%V8hZFG~?@IONwe<&P;3vhD6SMVka~+?`@axptgSh^50*2m!pg^q|mfpJ5GTr zZ-<25H|}7bQjhQrTk?8Q7K%B~t*eXm@8H7s9@fEbvT~%`uVH_*Aa+ylE-3Xbs%f`4))<0ekV*XH{S= z1?rWV578;wx^*h|U&de;<;SJZ2A1GipaSpe`wS zyU~Zx3_c-x>RoB#1OCJGLcwXiNDUaj?K5XSKCzJG()j238^9_4!wGx)r};`f;Xh-B zRRS}7+&}!B{1aNQpvrEGTFeXRD#dcga+3_=jvpf||6fmRA#JN!8WBN7hwmkv0p(Y`#@$qNn26FF7ti<(IK zC-e%*@_}O(!=XJHK3+?4p&}&dzoDgOU{il#W8%x4P9ZtyxyUIjGCld9&?{G9U|_o5 zFG(nh-eaDndjpUZ_$MTdVrt>52c~cNS+S@B5r^zJXb2|baGt1%i?D^LXt)~O8x)B! zA=4k4d%$6-KU_|~8sBxI9+QKn~Gb^DpTw{+Q@NhhbqBc^$ezj76TO z37-#&^sVBLroZ|nvQfy9@);EQkxnYr;`uKwblLDi~flsbuiJSiaH(jp_cm~%dVw+iVX_;sG_^IrNf9z;rXKk2eE0%t4 zY?<}>|5D&jF>?cXmWo)LiynN;+T8!8VZCyMeX1q4nWcLzxlBa&<-nQ=36$gY@nPvz zAi3_BOQcwMik=cCtsj7XoA|=JEo_Gb3+=x3W$Ayo2a6Sy>ElyV3#{eC!`lpl0~&vM zPE!L?y1TO}vD`5*3RQED{eyWI9)sC6S_ef~{u7E&HPdJKvONF8(SOIle?mw!AnbQ> z?F`vpzF6)7pZ*OwplUdXwzu)aX}g?mLJ=1Kgi74u!!&Y&Lqpxfmx)&BsWpw`e?{#L zpp!p>emyX1U{uXapQPQWcM5oealXfvr~I6XD17DdapYbXAlM9-pG zQYq58)e)i_h#?ule<$BDO=K5);{5;G{JL!@tVW z4aR#yyqyx7r905hJce1nv%fUjSsGLq3`&|uh{8@HGm^RRzmAQkUhoet!;Ad7bxOT6 zPSO~JZdf27?U{n%hJy$xOwPWskUja{G7hn%Fl66IMb5MDh+F~<;$W4xJ#s{?A<~nf zl}c~Bq$h7YKvAV`;qW2ykIs7-?d20@`ehfH(RGUVmt)1sc0*M{{%OeRSrUWDwj|Sm zwHqQ6wuBMHbJ-4Ib!3*7vPjwXaeK0nXU@#}0bUlWN|2a#;hN!Q{#ll67y11%F9aKI zwmv~vgv#AkzzmT$qyAuR&yL?W^Vl`Rt=2CrluVPt`$6)ibTSLooPrzBaV_2&SY$cN z8hc)_gv96;!yD0qTZ;OSnk)Bu8M;B{ze*9r8Tu2i1PiEg#Ji)svl?=6NI{a-jW`m+ z_3FN+Bw@DA=xAiJ?4E;2t+VZ{5fPc;%_@wr@|&v%5l3Md|1Oh`v%>#U;^l)VBdd*% z?;-jIR}II8nPr$~c3__=hcIILboen&2C3HK-QXXJWB&d^HM*KkkCi{lTT=^wlUS{@ZC}P%UUz z%0Mc~o*HCQrog_^iCp{dJ$xwYhJZ8Ax|sq`Uun=ouOtyf)0zCXrQ-0|*yK+26(R3&iwHncroysTi`AKV*DUOooc1xHS;Vmx%jv znGBajv7@M40?b(+esiG!Wr?pPjYu5m3GNYcIaKhqqy|w>0sFY+xR285@K|Ii9>Tp; z>XY;zp5CzTZpi;ODD}pQ?qhX2ih>}0N~f&`!$MALv7&*OFG_w^ulY>23QhGMyMH}c zI%U)66Y?|I9HHDMHDyB!OZutchNzKTI%(5|3_|xI7?3YgVUqCV%w;v2tu(0h1Q4*DXrbAL|;t%~Jo|rIEx} zG@4Bduy~q%vI8ugaIA^rNP3JiYy?|x!oP1~smNA0dVk;2;*rHU<9s=f8ffd3mjl%X zjN>BAI;oxrQpkfzgy)%+8mX%h0ijlQ2;mf=Hd)3`yzsF*9CLQtWHnU!#5$YDexzVO zBG&R>fB3*pB+1EWimkM4i?%^+Bcevn(nq$58uXFF8no{`6CF_LxE<_ZKWbb7+G1539e8K$BN?l4;i+98rIUEt*px9^S4y6#*{rJ`k;P+*DNrkqTXW}|k z9}iEwqE26}2E6o1Md-Fq0_NdC@wxR7@j0xa#<-rGQkU`lh$D`c&4D`r{=Tj|8~~9{ z+G7!N|M|XWgCg6Hi83B@;QYWBCi}cICd)md!1^P!91-%JUdv~LiiO9-%9>ef3*Vt! zZ57GtB5;S(Tt�Zxf%=cfDE@WBlO2xq&Yv%q&NU*Lu%ExN%s-m?3AuRa0=|tD!5b zxSf0yMGWL#(TmB~Ohz|YvDLqaS1P!w3toRU@`OFMllO9ROIhoUOjaZ95UTSzHxtsF zS>Q5bUkR@$sg|So8Q7a7xQ{dc-Lc!iMSaHoyGr`^w$8Dw1FC&@KaR7%=YtcQYqlh1SDE`Hy~&EXwdPtgFU+;E}sA z9&5fddwn2Xl_tuw-dkz9GB1=`cF|5+uLeloPTqrh&iHB!@jPt~D8i!5BVL1A z;QV&-MKtB1OTvyLo}iUJ=`S?pK|tV+NMG)_!`*#}`&Vx$PR=bz#5 zOu4?e1u;@ATV6e^&MV)O>Zn3va@4&7^CfLy-4YjALd3hCtzJKexnNuk=x%Rt=lr`@ z>IyFCkuIUz=%j?Ak983JI&FRjIpa~H!J9Y~^%>0BX;`u%l=6XHS(FsWCiP)X@4={S zgKn`8JS1Y+$j0F)R~J+42M_U3ny!YW7udKf8?^(6+)4i1u%=h2jxi@e$1qxMCC}{m za$;=h7Yx}SRr=vGz*%B$cBtbj68FIC2nOevLaEz+SJ+OCS%f+})JinhQ|_z*@(oB1 z2}Z9yP&Mcc2c!jE4|tq2Wskm~jwB#6q(yxj87sRG=Vl>yR3Euu7{kh|J;&;`XzE^O zfR}GMaLX6Wy7zoLiqem!tUvQqrQPtLA#HI-(7zUv>PonRW~zxWC-mz)V6PfDxjyg? zGXt+-^Z~`&?&5&o%N=@+*n$kCT*7* zL-iuk#{bKUrki&s9+a|dm*w+*$%~q}18LrC*@b4xJU!C(ZM8*}c0Tmin?NnV2l*G? zhzx9o2q|%_XM>*z(TDlAY0nlM?fl@cmxVikQ_cYx^D%T0B6!m(i3i<^#27azWU@G_Y)P6KGSXWt_$@|G2-s!2Afp0z933WB!WW8$a)S#IZnb426#=eI(0<%~z pA9pRm-A%8fzPE_2yg9qYN7+tJC<{7-JgoqL?OsRAdUI03zX0u5b=&{| literal 0 HcmV?d00001 diff --git a/Assets/Sprites/bullet3.png.meta b/Assets/Sprites/bullet3.png.meta new file mode 100644 index 0000000..831f058 --- /dev/null +++ b/Assets/Sprites/bullet3.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 669a0290de29057449832d1ba7fe42b6 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index bbc9a24..ab7a47a 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -7,6 +7,7 @@ "com.unity.2d.spriteshape": "5.1.5", "com.unity.2d.tilemap": "1.0.0", "com.unity.adaptiveperformance": "2.2.3", + "com.unity.adaptiveperformance.samsung.android": "2.2.1", "com.unity.addressables": "1.18.19", "com.unity.ads": "3.7.5", "com.unity.collab-proxy": "1.13.5", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index e133b87..5151e81 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -81,6 +81,15 @@ }, "url": "https://packages.unity.com" }, + "com.unity.adaptiveperformance.samsung.android": { + "version": "2.2.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.adaptiveperformance": "2.2.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.addressables": { "version": "1.18.19", "depth": 0, diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 89317a2..ba50e3e 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -19,5 +19,6 @@ EditorBuildSettings: guid: 2cda990e2423bbf4892e6590ba056729 m_configObjects: com.unity.adaptiveperformance.loader_settings: {fileID: 11400000, guid: 41a810c9856127c4296272a8d26ec652, type: 2} + com.unity.adaptiveperformance.samsung.android.provider_settings: {fileID: 11400000, guid: 71637656f43e7ec49a73283c6a49f5a3, type: 2} com.unity.adaptiveperformance.simulator.provider_settings: {fileID: 11400000, guid: 5aa4b45ee10fffd40bbee1b3ad847480, type: 2} com.unity.addressableassets: {fileID: 11400000, guid: 3ecdfb227c0c53647a568a52fa5c3380, type: 2} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index c4b3133..b36a7c3 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 20 + serializedVersion: 22 productGUID: fccceaefbb162614d9d832b2254804af AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -18,7 +18,7 @@ PlayerSettings: cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} m_ShowUnitySplashScreen: 1 - m_ShowUnitySplashLogo: 0 + m_ShowUnitySplashLogo: 1 m_SplashScreenOverlayOpacity: 1 m_SplashScreenAnimation: 1 m_SplashScreenLogoStyle: 1 @@ -68,6 +68,12 @@ PlayerSettings: androidRenderOutsideSafeArea: 1 androidUseSwappy: 1 androidBlitType: 0 + androidResizableWindow: 0 + androidDefaultWindowWidth: 1920 + androidDefaultWindowHeight: 1080 + androidMinimumWindowWidth: 400 + androidMinimumWindowHeight: 300 + androidFullscreenMode: 1 defaultIsNativeResolution: 1 macRetinaSupport: 1 runInBackground: 0 @@ -119,45 +125,25 @@ PlayerSettings: stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 + vulkanEnablePreTransform: 0 + vulkanEnableLateAcquireNextImage: 0 + vulkanEnableCommandBufferRecycling: 1 m_SupportedAspectRatios: 4:3: 1 5:4: 1 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 1.4.1 - preloadedAssets: [] + bundleVersion: 1.6 + preloadedAssets: + - {fileID: -8391286019245023330, guid: 41a810c9856127c4296272a8d26ec652, type: 2} + - {fileID: 11400000, guid: 71637656f43e7ec49a73283c6a49f5a3, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 xboxOneDisableKinectGpuReservation: 1 xboxOneEnable7thCore: 1 vrSettings: - cardboard: - depthFormat: 0 - enableTransitionView: 0 - daydream: - depthFormat: 0 - useSustainedPerformanceMode: 0 - enableVideoLayer: 0 - useProtectedVideoMemory: 0 - minimumSupportedHeadTracking: 0 - maximumSupportedHeadTracking: 1 - hololens: - depthFormat: 1 - depthBufferSharingEnabled: 1 - lumin: - depthFormat: 0 - frameTiming: 2 - enableGLCache: 0 - glCacheMaxBlobSize: 524288 - glCacheMaxFileSize: 8388608 - oculus: - sharedDepthBuffer: 1 - dashSupport: 1 - lowOverheadMode: 0 - protectedContext: 0 - v2Signing: 1 enable360StereoCapture: 0 isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 @@ -169,7 +155,11 @@ PlayerSettings: androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: {} - buildNumber: {} + buildNumber: + Standalone: 0 + iPhone: 0 + tvOS: 0 + overrideDefaultApplicationIdentifier: 0 AndroidBundleVersionCode: 11 AndroidMinSdkVersion: 19 AndroidTargetSdkVersion: 29 @@ -223,8 +213,8 @@ PlayerSettings: iOSLaunchScreeniPadFillPct: 100 iOSLaunchScreeniPadSize: 100 iOSLaunchScreeniPadCustomXibPath: - iOSUseLaunchScreenStoryboard: 0 iOSLaunchScreenCustomStoryboardPath: + iOSLaunchScreeniPadCustomStoryboardPath: iOSDeviceRequirements: [] iOSURLSchemes: [] iOSBackgroundModes: 0 @@ -232,6 +222,7 @@ PlayerSettings: metalEditorSupport: 1 metalAPIValidation: 1 iOSRenderExtraFrameOnPause: 0 + iosCopyPluginsCodeInsteadOfSymlink: 0 appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: @@ -241,13 +232,22 @@ PlayerSettings: iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 appleEnableProMotion: 0 + shaderPrecisionModel: 0 clonedFromGUID: 10ad67313f4034357812315f3c407484 templatePackageId: com.unity.template.2d@4.0.2 templateDefaultScene: Assets/Scenes/SampleScene.unity + useCustomMainManifest: 0 + useCustomLauncherManifest: 0 + useCustomMainGradleTemplate: 0 + useCustomLauncherGradleManifest: 0 + useCustomBaseGradleTemplate: 0 + useCustomGradlePropertiesTemplate: 0 + useCustomProguardFile: 0 AndroidTargetArchitectures: 3 + AndroidTargetDevices: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} - AndroidKeystoreName: C:/Users/Enzo/OneDrive/Unity/edstudio.keystore + AndroidKeystoreName: C:/Users/enzod/OneDrive/edstudio keystore android/edstudio.keystore AndroidKeyaliasName: bulletrythm AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 0 @@ -261,6 +261,7 @@ PlayerSettings: height: 180 banner: {fileID: 0} androidGamepadSupportLevel: 0 + chromeosInputEmulation: 1 AndroidMinifyWithR8: 0 AndroidMinifyRelease: 0 AndroidMinifyDebug: 0 @@ -412,6 +413,9 @@ PlayerSettings: - m_BuildTarget: AndroidPlayer m_APIs: 150000000b000000 m_Automatic: 0 + - m_BuildTarget: iOSSupport + m_APIs: 10000000 + m_Automatic: 1 m_BuildTargetVRSettings: [] openGLRequireES31: 0 openGLRequireES31AEP: 0 @@ -423,6 +427,7 @@ PlayerSettings: tvOS: 1 m_BuildTargetGroupLightmapEncodingQuality: [] m_BuildTargetGroupLightmapSettings: [] + m_BuildTargetNormalMapEncoding: [] playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 @@ -432,6 +437,7 @@ PlayerSettings: cameraUsageDescription: locationUsageDescription: microphoneUsageDescription: + bluetoothUsageDescription: switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 @@ -457,6 +463,7 @@ PlayerSettings: switchTitleNames_12: switchTitleNames_13: switchTitleNames_14: + switchTitleNames_15: switchPublisherNames_0: switchPublisherNames_1: switchPublisherNames_2: @@ -472,6 +479,7 @@ PlayerSettings: switchPublisherNames_12: switchPublisherNames_13: switchPublisherNames_14: + switchPublisherNames_15: switchIcons_0: {fileID: 0} switchIcons_1: {fileID: 0} switchIcons_2: {fileID: 0} @@ -487,6 +495,7 @@ PlayerSettings: switchIcons_12: {fileID: 0} switchIcons_13: {fileID: 0} switchIcons_14: {fileID: 0} + switchIcons_15: {fileID: 0} switchSmallIcons_0: {fileID: 0} switchSmallIcons_1: {fileID: 0} switchSmallIcons_2: {fileID: 0} @@ -502,6 +511,7 @@ PlayerSettings: switchSmallIcons_12: {fileID: 0} switchSmallIcons_13: {fileID: 0} switchSmallIcons_14: {fileID: 0} + switchSmallIcons_15: {fileID: 0} switchManualHTML: switchAccessibleURLs: switchLegalInformation: @@ -564,6 +574,9 @@ PlayerSettings: switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 switchPlayerConnectionEnabled: 1 + switchUseNewStyleFilepaths: 0 + switchUseMicroSleepForYield: 1 + switchMicroSleepForYieldTime: 25 ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: @@ -590,6 +603,7 @@ PlayerSettings: ps4ShareFilePath: ps4ShareOverlayImagePath: ps4PrivacyGuardImagePath: + ps4ExtraSceSysFile: ps4NPtitleDatPath: ps4RemotePlayKeyAssignment: -1 ps4RemotePlayKeyMappingDir: @@ -632,6 +646,9 @@ PlayerSettings: ps4disableAutoHideSplash: 0 ps4videoRecordingFeaturesUsed: 0 ps4contentSearchFeaturesUsed: 0 + ps4CompatibilityPS5: 0 + ps4AllowPS5Detection: 0 + ps4GPU800MHz: 1 ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: [] ps4attribVROutputEnabled: 0 @@ -656,17 +673,22 @@ PlayerSettings: webGLThreadsSupport: 0 webGLDecompressionFallback: 0 scriptingDefineSymbols: {} + additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: Android: 1 il2cppCompilerConfiguration: {} managedStrippingLevel: {} incrementalIl2cppBuild: {} + suppressCommonWarnings: 1 allowUnsafeCode: 0 useDeterministicCompilation: 1 + useReferenceAssemblies: 1 + enableRoslynAnalyzers: 1 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 1 + assemblyVersionValidation: 1 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: Android: 6 @@ -716,6 +738,7 @@ PlayerSettings: XboxOneCapability: [] XboxOneGameRating: {} XboxOneIsContentPackage: 0 + XboxOneEnhancedXboxCompatibilityMode: 0 XboxOneEnableGPUVariability: 1 XboxOneSockets: {} XboxOneSplashScreen: {fileID: 0} @@ -724,10 +747,7 @@ PlayerSettings: XboxOneXTitleMemory: 8 XboxOneOverrideIdentityName: XboxOneOverrideIdentityPublisher: - vrEditorSettings: - daydream: - daydreamIconForeground: {fileID: 0} - daydreamIconBackground: {fileID: 0} + vrEditorSettings: {} cloudServicesEnabled: Analytics: 1 Build: 0 @@ -747,12 +767,12 @@ PlayerSettings: m_VersionCode: 1 m_VersionName: apiCompatibilityLevel: 6 + activeInputHandler: 0 cloudProjectId: 197a34bb-f05c-4cc8-ac64-e7d32604a15c framebufferDepthMemorylessMode: 0 + qualitySettingsNames: [] projectName: BulletRythm (2) organizationId: edstudio cloudEnabled: 0 - enableNativePlatformBackendsForNewInputSystem: 0 - disableOldInputManagerSupport: 0 legacyClampBlendShapeWeights: 0 virtualTexturingSupportEnabled: 0