diff --git a/Assets/2D Renderer.asset b/Assets/2D Renderer.asset index 59c81af..7a31383 100644 --- a/Assets/2D Renderer.asset +++ b/Assets/2D Renderer.asset @@ -12,50 +12,49 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 11145981673336645838492a2d98e247, type: 3} m_Name: 2D Renderer m_EditorClassIdentifier: + debugShaders: + debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, type: 3} m_RendererFeatures: [] m_RendererFeatureMap: + m_UseNativeRenderPass: 0 m_TransparencySortMode: 0 m_TransparencySortAxis: {x: 0, y: 1, z: 0} m_HDREmulationScale: 1 + m_LightRenderTextureScale: 0.5 m_LightBlendStyles: - name: Blend Style 0 maskTextureChannel: 0 - renderTextureScale: 0.5 blendMode: 1 - customBlendFactors: - multiplicative: 0 - additive: 0 - name: Blend Style 1 maskTextureChannel: 0 - renderTextureScale: 0.5 blendMode: 1 - customBlendFactors: - multiplicative: 0 - additive: 0 - name: Blend Style 2 maskTextureChannel: 0 - renderTextureScale: 0.5 blendMode: 1 - customBlendFactors: - multiplicative: 0 - additive: 0 - name: Blend Style 3 maskTextureChannel: 0 - renderTextureScale: 0.5 blendMode: 1 - customBlendFactors: - multiplicative: 0 - additive: 0 m_UseDepthStencilBuffer: 1 + m_UseCameraSortingLayersTexture: 0 + m_CameraSortingLayersTextureBound: 0 + m_CameraSortingLayerDownsamplingMethod: 0 + m_MaxLightRenderTextureCount: 16 + m_MaxShadowRenderTextureCount: 1 m_ShapeLightShader: {fileID: 4800000, guid: d79e1c784eaf80c4585c0be7391f757a, type: 3} m_ShapeLightVolumeShader: {fileID: 4800000, guid: 7e60080c8cd24a2468cb08b4bfee5606, type: 3} m_PointLightShader: {fileID: 4800000, guid: e35a31e1679aeff489e202f5cc4853d5, type: 3} m_PointLightVolumeShader: {fileID: 4800000, guid: c7d04ca57e5449d49ad9cee1c604bc26, type: 3} m_BlitShader: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3} - m_ShadowGroupShader: {fileID: 4800000, guid: d33b6d70b14697547ad0dc2d4debb009, type: 3} - m_RemoveSelfShadowShader: {fileID: 4800000, guid: 02e071f10b6a15d4d87dac88ce529302, type: 3} + m_SamplingShader: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3} + m_ProjectedShadowShader: {fileID: 4800000, guid: ce09d4a80b88c5a4eb9768fab4f1ee00, type: 3} + m_SpriteShadowShader: {fileID: 4800000, guid: 44fc62292b65ab04eabcf310e799ccf6, type: 3} + m_SpriteUnshadowShader: {fileID: 4800000, guid: de02b375720b5c445afe83cd483bedf3, type: 3} + m_GeometryUnshadowShader: {fileID: 4800000, guid: 77774d9009bb81447b048c907d4c6273, type: 3} + m_FallbackErrorShader: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} m_PostProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} + m_FallOffLookup: {fileID: 2800000, guid: 5688ab254e4c0634f8d6c8e0792331ca, type: 3} m_DefaultMaterialType: 0 m_DefaultCustomMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} + m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2} diff --git a/Assets/Pipeline.asset b/Assets/Pipeline.asset index 89d832e..fea624b 100644 --- a/Assets/Pipeline.asset +++ b/Assets/Pipeline.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} m_Name: Pipeline m_EditorClassIdentifier: - k_AssetVersion: 6 - k_AssetPreviousVersion: 5 + k_AssetVersion: 9 + k_AssetPreviousVersion: 9 m_RendererType: 1 m_RendererData: {fileID: 0} m_RendererDataList: @@ -23,6 +23,7 @@ MonoBehaviour: m_RequireOpaqueTexture: 0 m_OpaqueDownsampling: 1 m_SupportsTerrainHoles: 1 + m_StoreActionsOptimization: 0 m_SupportsHDR: 1 m_MSAA: 1 m_RenderScale: 1 @@ -33,25 +34,36 @@ MonoBehaviour: m_AdditionalLightsPerObjectLimit: 4 m_AdditionalLightShadowsSupported: 0 m_AdditionalLightsShadowmapResolution: 512 + m_AdditionalLightsShadowResolutionTierLow: 128 + m_AdditionalLightsShadowResolutionTierMedium: 256 + m_AdditionalLightsShadowResolutionTierHigh: 512 + m_ReflectionProbeBlending: 0 + m_ReflectionProbeBoxProjection: 0 m_ShadowDistance: 50 m_ShadowCascadeCount: 1 m_Cascade2Split: 0.25 m_Cascade3Split: {x: 0.1, y: 0.3} m_Cascade4Split: {x: 0.067, y: 0.2, z: 0.467} + m_CascadeBorder: 0.1 m_ShadowDepthBias: 1 m_ShadowNormalBias: 1 m_SoftShadowsSupported: 0 + m_AdditionalLightsCookieResolution: 2048 + m_AdditionalLightsCookieFormat: 3 m_UseSRPBatcher: 1 m_SupportsDynamicBatching: 0 m_MixedLightingSupported: 1 + m_SupportsLightLayers: 0 m_DebugLevel: 0 m_UseAdaptivePerformance: 1 m_ColorGradingMode: 0 m_ColorGradingLutSize: 32 + m_UseFastSRGBLinearConversion: 0 m_ShadowType: 1 m_LocalShadowsSupported: 0 m_LocalShadowsAtlasResolution: 256 m_MaxPixelLights: 0 m_ShadowAtlasResolution: 256 m_ShaderVariantLogLevel: 0 + m_VolumeFrameworkUpdateMode: 0 m_ShadowCascades: 0 diff --git a/Assets/Resources/0x72_16x16DungeonTileset.v3.png.meta b/Assets/Resources/0x72_16x16DungeonTileset.v3.png.meta index c45c6f8..fa7afc6 100644 --- a/Assets/Resources/0x72_16x16DungeonTileset.v3.png.meta +++ b/Assets/Resources/0x72_16x16DungeonTileset.v3.png.meta @@ -663,6 +663,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -671,9 +672,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -5212,6 +5213,220 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: + 0x72_16x16DungeonTileset.v3_156: -5567758406834983150 + 0x72_16x16DungeonTileset.v3_82: 6305298469108813336 + 0x72_16x16DungeonTileset.v3_116: 1346232702952405745 + 0x72_16x16DungeonTileset.v3_0: -3162336433277574538 + 0x72_16x16DungeonTileset.v3_146: -6912989216504611558 + 0x72_16x16DungeonTileset.v3_9: 5149325482246518006 + 0x72_16x16DungeonTileset.v3_16: 8593676909740621209 + 0x72_16x16DungeonTileset.v3_98: 7960948628148099999 + 0x72_16x16DungeonTileset.v3_185: 6924398512416452354 + 0x72_16x16DungeonTileset.v3_172: 6129839306740047808 + 0x72_16x16DungeonTileset.v3_195: -9016666298984485207 + 0x72_16x16DungeonTileset.v3_179: -8071940941329118406 + 0x72_16x16DungeonTileset.v3_13: -5368232363043395154 + 0x72_16x16DungeonTileset.v3_67: 2249295615752987948 + 0x72_16x16DungeonTileset.v3_122: 4924389529976102558 + 0x72_16x16DungeonTileset.v3_211: -1183507306935235550 + 0x72_16x16DungeonTileset.v3_153: 7789275100458135224 + 0x72_16x16DungeonTileset.v3_168: -2636794160484798947 + 0x72_16x16DungeonTileset.v3_203: -735872510300864838 + 0x72_16x16DungeonTileset.v3_204: -2407748409114466240 + 0x72_16x16DungeonTileset.v3_38: 6462502313477909265 + 0x72_16x16DungeonTileset.v3_40: 6244750119335714321 + 0x72_16x16DungeonTileset.v3_6: 7468142756326344501 + 0x72_16x16DungeonTileset.v3_109: -8694497875866311806 + 0x72_16x16DungeonTileset.v3_53: 5045492362019341348 + 0x72_16x16DungeonTileset.v3_97: 2614291918604005581 + 0x72_16x16DungeonTileset.v3_167: 6526300288058057569 + 0x72_16x16DungeonTileset.v3_199: 5861438142609983624 + 0x72_16x16DungeonTileset.v3_106: -7924006991697283335 + 0x72_16x16DungeonTileset.v3_65: -8861447968859962895 + 0x72_16x16DungeonTileset.v3_161: -8090597367913111583 + 0x72_16x16DungeonTileset.v3_160: -3728786153617426376 + 0x72_16x16DungeonTileset.v3_191: 6782942333209420783 + 0x72_16x16DungeonTileset.v3_210: -5578025347174870961 + 0x72_16x16DungeonTileset.v3_125: -38534284127222430 + 0x72_16x16DungeonTileset.v3_128: 725680683011079703 + 0x72_16x16DungeonTileset.v3_66: -1476292174764911350 + 0x72_16x16DungeonTileset.v3_7: 4594980772889565524 + 0x72_16x16DungeonTileset.v3_59: 1947495308698272604 + 0x72_16x16DungeonTileset.v3_205: 1137966435743314614 + 0x72_16x16DungeonTileset.v3_25: 8345168225771048080 + 0x72_16x16DungeonTileset.v3_183: 6404839066222127722 + 0x72_16x16DungeonTileset.v3_206: -8051342807086654012 + 0x72_16x16DungeonTileset.v3_14: 6040075341374030921 + 0x72_16x16DungeonTileset.v3_169: -6351006594402904403 + 0x72_16x16DungeonTileset.v3_68: 6479953473352232447 + 0x72_16x16DungeonTileset.v3_110: 8960884071101629521 + 0x72_16x16DungeonTileset.v3_166: 9205419524054275605 + 0x72_16x16DungeonTileset.v3_91: 7578640847488914981 + 0x72_16x16DungeonTileset.v3_52: -765472724379399833 + 0x72_16x16DungeonTileset.v3_170: -4071290243097235897 + 0x72_16x16DungeonTileset.v3_151: 6163903827199789156 + 0x72_16x16DungeonTileset.v3_163: 7598965038668382504 + 0x72_16x16DungeonTileset.v3_93: -741813354742823586 + 0x72_16x16DungeonTileset.v3_133: -8285591661963061990 + 0x72_16x16DungeonTileset.v3_115: 2854812282687784031 + 0x72_16x16DungeonTileset.v3_176: 7942444730896289666 + 0x72_16x16DungeonTileset.v3_171: 7733424789536156442 + 0x72_16x16DungeonTileset.v3_202: -6159142065549414456 + 0x72_16x16DungeonTileset.v3_143: 350873842511486542 + 0x72_16x16DungeonTileset.v3_209: -6385318662205566561 + 0x72_16x16DungeonTileset.v3_208: -2118983126780759573 + 0x72_16x16DungeonTileset.v3_150: 3580662934835163990 + 0x72_16x16DungeonTileset.v3_136: -3159262947322286267 + 0x72_16x16DungeonTileset.v3_148: -8963131046287561 + 0x72_16x16DungeonTileset.v3_212: -6746078821804374989 + 0x72_16x16DungeonTileset.v3_76: -3256036934176339282 + 0x72_16x16DungeonTileset.v3_105: -3790701722364660736 + 0x72_16x16DungeonTileset.v3_118: -1423439315454067356 + 0x72_16x16DungeonTileset.v3_135: 5852916177457737551 + 0x72_16x16DungeonTileset.v3_60: -6100761092657564857 + 0x72_16x16DungeonTileset.v3_85: 6600879706882517348 + 0x72_16x16DungeonTileset.v3_49: 3148209327967640025 + 0x72_16x16DungeonTileset.v3_194: 5386644665981829098 + 0x72_16x16DungeonTileset.v3_99: 8226930381946262324 + 0x72_16x16DungeonTileset.v3_162: -7371827728505247818 + 0x72_16x16DungeonTileset.v3_47: -5389712892761651410 + 0x72_16x16DungeonTileset.v3_15: -4523314999963357628 + 0x72_16x16DungeonTileset.v3_90: 2996869989695747535 + 0x72_16x16DungeonTileset.v3_192: 6124067144575620986 + 0x72_16x16DungeonTileset.v3_23: -4581976485331411833 + 0x72_16x16DungeonTileset.v3_33: 9099467641400569595 + 0x72_16x16DungeonTileset.v3_44: 3700968835124016039 + 0x72_16x16DungeonTileset.v3_104: -6930082695720533355 + 0x72_16x16DungeonTileset.v3_124: 5779975816578485673 + 0x72_16x16DungeonTileset.v3_57: 6219034902205340979 + 0x72_16x16DungeonTileset.v3_113: -2986538020750620901 + 0x72_16x16DungeonTileset.v3_175: -5076258358169861855 + 0x72_16x16DungeonTileset.v3_159: 4507382611506702788 + 0x72_16x16DungeonTileset.v3_29: -104671715908841499 + 0x72_16x16DungeonTileset.v3_127: -1444147126536496807 + 0x72_16x16DungeonTileset.v3_121: -8183931221469745942 + 0x72_16x16DungeonTileset.v3_39: 3345490154002896500 + 0x72_16x16DungeonTileset.v3_46: 3215239234823057375 + 0x72_16x16DungeonTileset.v3_102: 4846992401047075813 + 0x72_16x16DungeonTileset.v3_182: 5172793471820520380 + 0x72_16x16DungeonTileset.v3_50: -1342949125767712106 + 0x72_16x16DungeonTileset.v3_84: -6705787013494642778 + 0x72_16x16DungeonTileset.v3_58: 6383864722584147952 + 0x72_16x16DungeonTileset.v3_101: -2864796895288624582 + 0x72_16x16DungeonTileset.v3_73: -5755639884918193291 + 0x72_16x16DungeonTileset.v3_100: 2520500487223618771 + 0x72_16x16DungeonTileset.v3_12: -839162874926276321 + 0x72_16x16DungeonTileset.v3_11: 655693207265345546 + 0x72_16x16DungeonTileset.v3_107: -5058428496639829361 + 0x72_16x16DungeonTileset.v3_108: -5799917902953713197 + 0x72_16x16DungeonTileset.v3_198: -122557860836790010 + 0x72_16x16DungeonTileset.v3_132: -7452010853083753893 + 0x72_16x16DungeonTileset.v3_180: -52265698051740518 + 0x72_16x16DungeonTileset.v3_35: -3894014306481760128 + 0x72_16x16DungeonTileset.v3_88: -6196757561926267164 + 0x72_16x16DungeonTileset.v3_56: -3049249119278454291 + 0x72_16x16DungeonTileset.v3_71: -5708966184345670077 + 0x72_16x16DungeonTileset.v3_120: -1231727880242624410 + 0x72_16x16DungeonTileset.v3_45: 4071601397740623314 + 0x72_16x16DungeonTileset.v3_137: -8195810526609476249 + 0x72_16x16DungeonTileset.v3_4: -1204035540374746876 + 0x72_16x16DungeonTileset.v3_77: -8228898641401966834 + 0x72_16x16DungeonTileset.v3_165: -5292152013390152882 + 0x72_16x16DungeonTileset.v3_80: -4139150726321879055 + 0x72_16x16DungeonTileset.v3_196: 5995536514147789107 + 0x72_16x16DungeonTileset.v3_81: -2629534850163864447 + 0x72_16x16DungeonTileset.v3_117: 8650576575316933415 + 0x72_16x16DungeonTileset.v3_2: -6517870645779676952 + 0x72_16x16DungeonTileset.v3_54: 8118230176904439918 + 0x72_16x16DungeonTileset.v3_141: -6103805907874012953 + 0x72_16x16DungeonTileset.v3_144: 6364165189810515469 + 0x72_16x16DungeonTileset.v3_36: 7606965338683444480 + 0x72_16x16DungeonTileset.v3_197: 2886368308633181185 + 0x72_16x16DungeonTileset.v3_19: 5658655404295041207 + 0x72_16x16DungeonTileset.v3_48: 8078386394235787704 + 0x72_16x16DungeonTileset.v3_140: -6042624477420165989 + 0x72_16x16DungeonTileset.v3_20: -2725497752490242459 + 0x72_16x16DungeonTileset.v3_78: 7993127967662485011 + 0x72_16x16DungeonTileset.v3_201: 1728940871029218839 + 0x72_16x16DungeonTileset.v3_27: -8269208270107834473 + 0x72_16x16DungeonTileset.v3_79: -8753792392719202518 + 0x72_16x16DungeonTileset.v3_142: 861244033574732058 + 0x72_16x16DungeonTileset.v3_21: 645881298548483791 + 0x72_16x16DungeonTileset.v3_92: 6242478971150903889 + 0x72_16x16DungeonTileset.v3_64: 6014343832959240974 + 0x72_16x16DungeonTileset.v3_95: -3806122815245162230 + 0x72_16x16DungeonTileset.v3_22: 1301650304470687213 + 0x72_16x16DungeonTileset.v3_145: -1267744803273106024 + 0x72_16x16DungeonTileset.v3_74: 5850662542587172093 + 0x72_16x16DungeonTileset.v3_173: 2153310621393832847 + 0x72_16x16DungeonTileset.v3_30: 676800919513697180 + 0x72_16x16DungeonTileset.v3_5: -3590015874963573982 + 0x72_16x16DungeonTileset.v3_8: 3129380643430753336 + 0x72_16x16DungeonTileset.v3_18: 7821099029440544869 + 0x72_16x16DungeonTileset.v3_119: -5760882354284450262 + 0x72_16x16DungeonTileset.v3_87: 2678434388586883683 + 0x72_16x16DungeonTileset.v3_155: -998543563715485206 + 0x72_16x16DungeonTileset.v3_139: 6500186627345249534 + 0x72_16x16DungeonTileset.v3_130: -2807502091344344031 + 0x72_16x16DungeonTileset.v3_147: 871242416342610549 + 0x72_16x16DungeonTileset.v3_154: 551435349554954914 + 0x72_16x16DungeonTileset.v3_72: -7303865650846125229 + 0x72_16x16DungeonTileset.v3_178: -412998863625974521 + 0x72_16x16DungeonTileset.v3_193: 4484334458352761427 + 0x72_16x16DungeonTileset.v3_103: 3677550443799652110 + 0x72_16x16DungeonTileset.v3_69: 2496226198668827246 + 0x72_16x16DungeonTileset.v3_89: 1558763015397749208 + 0x72_16x16DungeonTileset.v3_51: 3179512005791028916 + 0x72_16x16DungeonTileset.v3_114: 7044432568074412412 + 0x72_16x16DungeonTileset.v3_34: 5532645384195803447 + 0x72_16x16DungeonTileset.v3_75: 8346423673761907239 + 0x72_16x16DungeonTileset.v3_164: 3618723423059518998 + 0x72_16x16DungeonTileset.v3_24: -6545214729401163126 + 0x72_16x16DungeonTileset.v3_43: 1950899979466198798 + 0x72_16x16DungeonTileset.v3_63: -2133815306027078932 + 0x72_16x16DungeonTileset.v3_32: -1727390343878222711 + 0x72_16x16DungeonTileset.v3_96: 8191336086187591249 + 0x72_16x16DungeonTileset.v3_188: 5586916522849671510 + 0x72_16x16DungeonTileset.v3_28: 6836306363962678893 + 0x72_16x16DungeonTileset.v3_134: -1785887817003375385 + 0x72_16x16DungeonTileset.v3_3: -2920302936249799813 + 0x72_16x16DungeonTileset.v3_123: 6048040609753716056 + 0x72_16x16DungeonTileset.v3_26: -5122064783300658169 + 0x72_16x16DungeonTileset.v3_42: -1397208447133298675 + 0x72_16x16DungeonTileset.v3_1: -2175339132055221483 + 0x72_16x16DungeonTileset.v3_157: -5956484677703793389 + 0x72_16x16DungeonTileset.v3_189: -8566918265334741760 + 0x72_16x16DungeonTileset.v3_184: -8787762957889981176 + 0x72_16x16DungeonTileset.v3_186: 4742469659771633959 + 0x72_16x16DungeonTileset.v3_181: -4569738599195710831 + 0x72_16x16DungeonTileset.v3_10: -6145294304213714370 + 0x72_16x16DungeonTileset.v3_126: 7115644846543310588 + 0x72_16x16DungeonTileset.v3_138: 2316604135777578032 + 0x72_16x16DungeonTileset.v3_177: 7144837643944393251 + 0x72_16x16DungeonTileset.v3_70: 3570911124380740839 + 0x72_16x16DungeonTileset.v3_61: -8024810617642666805 + 0x72_16x16DungeonTileset.v3_112: -5826859880489264537 + 0x72_16x16DungeonTileset.v3_174: -2209690846305479543 + 0x72_16x16DungeonTileset.v3_190: 4883082504864858299 + 0x72_16x16DungeonTileset.v3_31: 4862176946640531199 + 0x72_16x16DungeonTileset.v3_94: -2020503937363500717 + 0x72_16x16DungeonTileset.v3_149: -261681445734004113 + 0x72_16x16DungeonTileset.v3_207: 9140261455448228553 + 0x72_16x16DungeonTileset.v3_131: 1851565907909916624 + 0x72_16x16DungeonTileset.v3_62: 288968796434439809 + 0x72_16x16DungeonTileset.v3_129: -467079546595609076 + 0x72_16x16DungeonTileset.v3_17: -647412959036772658 + 0x72_16x16DungeonTileset.v3_41: -3473808729661105000 + 0x72_16x16DungeonTileset.v3_187: -2608026772822045537 + 0x72_16x16DungeonTileset.v3_83: -287245784768575164 + 0x72_16x16DungeonTileset.v3_55: -5665605885561116903 + 0x72_16x16DungeonTileset.v3_158: 4657368432069442023 + 0x72_16x16DungeonTileset.v3_152: -3173535843763633950 + 0x72_16x16DungeonTileset.v3_37: -3692308260629087269 + 0x72_16x16DungeonTileset.v3_86: 4930903980901948091 + 0x72_16x16DungeonTileset.v3_111: 2595428750976852064 + 0x72_16x16DungeonTileset.v3_200: 4870310554356128525 spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Scenes/Menu.unity b/Assets/Scenes/Menu.unity index ddef0e0..3903b4f 100644 --- a/Assets/Scenes/Menu.unity +++ b/Assets/Scenes/Menu.unity @@ -185,6 +185,7 @@ Transform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 @@ -217,6 +218,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 507597220} m_Father: {fileID: 1592012731} @@ -293,6 +295,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 238165770} m_RootOrder: 0 @@ -375,6 +378,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1015267004} m_RootOrder: 0 @@ -453,6 +457,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 10, y: 10, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1477765771} m_RootOrder: 0 @@ -468,6 +473,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -536,6 +542,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1592012731} m_RootOrder: 6 @@ -665,6 +672,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -691,6 +699,7 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 1 m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 m_RenderPostProcessing: 0 m_Antialiasing: 0 m_AntialiasingQuality: 2 @@ -827,7 +836,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &839796365 RectTransform: m_ObjectHideFlags: 0 @@ -838,6 +847,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 2106916402} m_Father: {fileID: 1592012731} @@ -971,6 +981,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 530308025} m_Father: {fileID: 1592012731} @@ -978,7 +989,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.3951795} m_AnchorMax: {x: 1, y: 0.5383847} - m_AnchoredPosition: {x: 0, y: -16} + m_AnchoredPosition: {x: 0, y: -39.6} m_SizeDelta: {x: -532, y: -26} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1015267005 @@ -1103,6 +1114,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 2007510964} m_Father: {fileID: 1592012731} @@ -1179,6 +1191,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1229,6 +1242,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 458.1181, y: 191.91925, z: 0} m_LocalScale: {x: 2.04, y: 2.03, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 576941918} m_Father: {fileID: 0} @@ -1262,6 +1276,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1592012731} m_RootOrder: 7 @@ -1337,6 +1352,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1592012731} m_RootOrder: 1 @@ -1474,6 +1490,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1813727989} - {fileID: 1585388757} @@ -1519,6 +1536,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 1971071423} m_Father: {fileID: 1592012731} @@ -1595,6 +1613,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1813727989} m_RootOrder: 0 @@ -1674,6 +1693,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1032681152} m_RootOrder: 0 @@ -1760,6 +1780,7 @@ RectTransform: 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 839796365} m_RootOrder: 0 diff --git a/Assets/Scripts/PlayerBehavior.cs b/Assets/Scripts/PlayerBehavior.cs index 7f99893..298eb08 100644 --- a/Assets/Scripts/PlayerBehavior.cs +++ b/Assets/Scripts/PlayerBehavior.cs @@ -1,6 +1,6 @@ using System.Collections; using UnityEngine; -using UnityEngine.Experimental.Rendering.Universal; + using UnityEngine.UI; public class PlayerBehavior : MonoBehaviour @@ -13,7 +13,7 @@ public class PlayerBehavior : MonoBehaviour bool _firstLightActivation; Camera _camera; - Light2D _light2D; + UnityEngine.Rendering.Universal.Light2D _light2D; Sprite _chosenSprite; AudioSource _fireSpell; @@ -49,7 +49,7 @@ void Start() _chosenSprite = _generator.GetSprite(); _firstLightActivation = true; - _light2D = _camera.GetComponent(); + _light2D = _camera.GetComponent(); _fireSpell = GetComponent(); var spriteRenders = GetComponentsInChildren(); spriteRenders[spriteRenders.Length - 1].sprite = _chosenSprite; diff --git a/Assets/Tiles/New Sprite Atlas.spriteatlas b/Assets/Tiles/New Sprite Atlas.spriteatlas index a21e0d5..29d25f2 100644 --- a/Assets/Tiles/New Sprite Atlas.spriteatlas +++ b/Assets/Tiles/New Sprite Atlas.spriteatlas @@ -28,10 +28,10 @@ SpriteAtlas: allowAlphaSplitting: 0 enableRotation: 1 enableTightPacking: 1 + enableAlphaDilation: 0 secondaryTextureSettings: {} variantMultiplier: 1 packables: [] - totalSpriteSurfaceArea: 0 bindAsDefault: 1 isAtlasV2: 0 cachedData: {fileID: 0} diff --git a/Assets/UniversalRenderPipelineGlobalSettings.asset b/Assets/UniversalRenderPipelineGlobalSettings.asset new file mode 100644 index 0000000..e845351 --- /dev/null +++ b/Assets/UniversalRenderPipelineGlobalSettings.asset @@ -0,0 +1,25 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: 2ec995e51a6e251468d2a3fd8a686257, type: 3} + m_Name: UniversalRenderPipelineGlobalSettings + m_EditorClassIdentifier: + k_AssetVersion: 1 + k_AssetPreviousVersion: 1 + lightLayerName0: Light Layer default + lightLayerName1: Light Layer 1 + lightLayerName2: Light Layer 2 + lightLayerName3: Light Layer 3 + lightLayerName4: Light Layer 4 + lightLayerName5: Light Layer 5 + lightLayerName6: Light Layer 6 + lightLayerName7: Light Layer 7 + supportRuntimeDebugDisplay: 0 diff --git a/Assets/UniversalRenderPipelineGlobalSettings.asset.meta b/Assets/UniversalRenderPipelineGlobalSettings.asset.meta new file mode 100644 index 0000000..da25572 --- /dev/null +++ b/Assets/UniversalRenderPipelineGlobalSettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8eef741b02caa9242a387491d4f51815 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index 8c5a8db..73b67a7 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,19 +1,19 @@ { "dependencies": { - "com.unity.2d.animation": "5.0.3", - "com.unity.2d.pixel-perfect": "4.0.1", - "com.unity.2d.psdimporter": "4.0.2", + "com.unity.2d.animation": "7.0.0-pre.2", + "com.unity.2d.pixel-perfect": "5.0.0", + "com.unity.2d.psdimporter": "6.0.0-pre.3", "com.unity.2d.sprite": "1.0.0", - "com.unity.2d.spriteshape": "5.1.0", + "com.unity.2d.spriteshape": "7.0.0-pre.3", "com.unity.2d.tilemap": "1.0.0", - "com.unity.collab-proxy": "1.3.9", - "com.unity.ide.rider": "2.0.7", - "com.unity.ide.visualstudio": "2.0.5", + "com.unity.collab-proxy": "1.5.7", + "com.unity.ide.rider": "3.0.7", + "com.unity.ide.visualstudio": "2.0.9", "com.unity.ide.vscode": "1.2.3", - "com.unity.render-pipelines.universal": "10.2.2", - "com.unity.test-framework": "1.1.19", - "com.unity.textmeshpro": "3.0.1", - "com.unity.timeline": "1.4.4", + "com.unity.render-pipelines.universal": "12.0.0", + "com.unity.test-framework": "1.1.26", + "com.unity.textmeshpro": "3.0.6", + "com.unity.timeline": "1.6.1", "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 63b50a4..862ca21 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,12 +1,11 @@ { "dependencies": { "com.unity.2d.animation": { - "version": "5.0.3", + "version": "7.0.0-pre.2", "depth": 0, "source": "registry", "dependencies": { - "com.unity.2d.common": "4.0.3", - "com.unity.mathematics": "1.1.0", + "com.unity.2d.common": "6.0.0-pre.3", "com.unity.2d.sprite": "1.0.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.uielements": "1.0.0" @@ -14,36 +13,38 @@ "url": "https://packages.unity.com" }, "com.unity.2d.common": { - "version": "4.0.3", + "version": "6.0.0-pre.3", "depth": 1, "source": "registry", "dependencies": { "com.unity.2d.sprite": "1.0.0", - "com.unity.modules.uielements": "1.0.0" + "com.unity.mathematics": "1.1.0", + "com.unity.modules.uielements": "1.0.0", + "com.unity.burst": "1.5.1" }, "url": "https://packages.unity.com" }, "com.unity.2d.path": { - "version": "4.0.1", + "version": "5.0.0", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.2d.pixel-perfect": { - "version": "4.0.1", + "version": "5.0.0", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.2d.psdimporter": { - "version": "4.0.2", + "version": "6.0.0-pre.3", "depth": 0, "source": "registry", "dependencies": { - "com.unity.2d.common": "4.0.2", - "com.unity.2d.animation": "5.0.2", + "com.unity.2d.animation": "7.0.0-pre.2", + "com.unity.2d.common": "6.0.0-pre.3", "com.unity.2d.sprite": "1.0.0" }, "url": "https://packages.unity.com" @@ -55,13 +56,13 @@ "dependencies": {} }, "com.unity.2d.spriteshape": { - "version": "5.1.0", + "version": "7.0.0-pre.3", "depth": 0, "source": "registry", "dependencies": { "com.unity.mathematics": "1.1.0", - "com.unity.2d.common": "4.0.3", - "com.unity.2d.path": "4.0.1", + "com.unity.2d.common": "6.0.0-pre.3", + "com.unity.2d.path": "5.0.0", "com.unity.modules.physics2d": "1.0.0" }, "url": "https://packages.unity.com" @@ -72,34 +73,47 @@ "source": "builtin", "dependencies": {} }, + "com.unity.burst": { + "version": "1.6.0-pre.2", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.mathematics": "1.2.1" + }, + "url": "https://packages.unity.com" + }, "com.unity.collab-proxy": { - "version": "1.3.9", + "version": "1.5.7", "depth": 0, "source": "registry", - "dependencies": {}, + "dependencies": { + "com.unity.nuget.newtonsoft-json": "2.0.0" + }, "url": "https://packages.unity.com" }, "com.unity.ext.nunit": { - "version": "1.0.5", + "version": "1.0.6", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "2.0.7", + "version": "3.0.7", "depth": 0, "source": "registry", "dependencies": { - "com.unity.test-framework": "1.1.1" + "com.unity.ext.nunit": "1.0.6" }, "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.5", + "version": "2.0.9", "depth": 0, "source": "registry", - "dependencies": {}, + "dependencies": { + "com.unity.test-framework": "1.1.9" + }, "url": "https://packages.unity.com" }, "com.unity.ide.vscode": { @@ -110,62 +124,68 @@ "url": "https://packages.unity.com" }, "com.unity.mathematics": { - "version": "1.1.0", + "version": "1.2.1", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, - "com.unity.render-pipelines.core": { - "version": "10.2.2", + "com.unity.nuget.newtonsoft-json": { + "version": "2.0.0", "depth": 1, "source": "registry", - "dependencies": { - "com.unity.ugui": "1.0.0" - }, + "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.render-pipelines.core": { + "version": "12.0.0", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.ugui": "1.0.0", + "com.unity.modules.physics": "1.0.0" + } + }, "com.unity.render-pipelines.universal": { - "version": "10.2.2", + "version": "12.0.0", "depth": 0, - "source": "registry", + "source": "builtin", "dependencies": { - "com.unity.mathematics": "1.1.0", - "com.unity.render-pipelines.core": "10.2.2", - "com.unity.shadergraph": "10.2.2" - }, - "url": "https://packages.unity.com" + "com.unity.mathematics": "1.2.1", + "com.unity.burst": "1.5.0", + "com.unity.render-pipelines.core": "12.0.0", + "com.unity.shadergraph": "12.0.0" + } }, "com.unity.searcher": { - "version": "4.3.1", + "version": "4.3.2", "depth": 2, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "10.2.2", + "version": "12.0.0", "depth": 1, - "source": "registry", + "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "10.2.2", + "com.unity.render-pipelines.core": "12.0.0", "com.unity.searcher": "4.3.1" - }, - "url": "https://packages.unity.com" + } }, "com.unity.test-framework": { - "version": "1.1.19", + "version": "1.1.26", "depth": 0, "source": "registry", "dependencies": { - "com.unity.ext.nunit": "1.0.5", + "com.unity.ext.nunit": "1.0.6", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.textmeshpro": { - "version": "3.0.1", + "version": "3.0.6", "depth": 0, "source": "registry", "dependencies": { @@ -174,7 +194,7 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.4.4", + "version": "1.6.1", "depth": 0, "source": "registry", "dependencies": { diff --git a/ProjectSettings/BurstAotSettings_WebGL.json b/ProjectSettings/BurstAotSettings_WebGL.json new file mode 100644 index 0000000..751473f --- /dev/null +++ b/ProjectSettings/BurstAotSettings_WebGL.json @@ -0,0 +1,13 @@ +{ + "MonoBehaviour": { + "Version": 3, + "EnableBurstCompilation": true, + "EnableOptimisations": true, + "EnableSafetyChecks": false, + "EnableDebugInAllBuilds": false, + "CpuMinTargetX32": 0, + "CpuMaxTargetX32": 0, + "CpuMinTargetX64": 0, + "CpuMaxTargetX64": 0 + } +} diff --git a/ProjectSettings/CommonBurstAotSettings.json b/ProjectSettings/CommonBurstAotSettings.json new file mode 100644 index 0000000..3dffdba --- /dev/null +++ b/ProjectSettings/CommonBurstAotSettings.json @@ -0,0 +1,6 @@ +{ + "MonoBehaviour": { + "Version": 3, + "DisabledWarnings": "" + } +} diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index fe06e99..49ccf53 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -3,7 +3,7 @@ --- !u!30 &1 GraphicsSettings: m_ObjectHideFlags: 0 - serializedVersion: 13 + serializedVersion: 14 m_Deferred: m_Mode: 1 m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} @@ -38,6 +38,7 @@ GraphicsSettings: - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10783, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] + m_PreloadShadersBatchTimeLimit: -1 m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_CustomRenderPipeline: {fileID: 11400000, guid: 863e2b308ced15148afc49088cb53965, type: 2} m_TransparencySortMode: 0 @@ -59,6 +60,8 @@ GraphicsSettings: m_FogKeepExp2: 1 m_AlbedoSwatchInfos: [] m_LightsUseLinearIntensity: 0 - m_LightsUseColorTemperature: 0 + m_LightsUseColorTemperature: 1 m_DefaultRenderingLayerMask: 1 m_LogWhenShaderIsCompiled: 0 + m_SRPDefaultSettings: + UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: 8eef741b02caa9242a387491d4f51815, type: 2} diff --git a/ProjectSettings/MemorySettings.asset b/ProjectSettings/MemorySettings.asset new file mode 100644 index 0000000..5b5face --- /dev/null +++ b/ProjectSettings/MemorySettings.asset @@ -0,0 +1,35 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!387306366 &1 +MemorySettings: + m_ObjectHideFlags: 0 + m_EditorMemorySettings: + m_MainAllocatorBlockSize: -1 + m_ThreadAllocatorBlockSize: -1 + m_MainGfxBlockSize: -1 + m_ThreadGfxBlockSize: -1 + m_CacheBlockSize: -1 + m_TypetreeBlockSize: -1 + m_ProfilerBlockSize: -1 + m_ProfilerEditorBlockSize: -1 + m_BucketAllocatorGranularity: -1 + m_BucketAllocatorBucketsCount: -1 + m_BucketAllocatorBlockSize: -1 + m_BucketAllocatorBlockCount: -1 + m_ProfilerBucketAllocatorGranularity: -1 + m_ProfilerBucketAllocatorBucketsCount: -1 + m_ProfilerBucketAllocatorBlockSize: -1 + m_ProfilerBucketAllocatorBlockCount: -1 + m_TempAllocatorSizeMain: -1 + m_JobTempAllocatorBlockSize: -1 + m_BackgroundJobTempAllocatorBlockSize: -1 + m_JobTempAllocatorReducedBlockSize: -1 + m_TempAllocatorSizeGIBakingWorker: -1 + m_TempAllocatorSizeNavMeshWorker: -1 + m_TempAllocatorSizeAudioWorker: -1 + m_TempAllocatorSizeCloudWorker: -1 + m_TempAllocatorSizeGfx: -1 + m_TempAllocatorSizeJobWorker: -1 + m_TempAllocatorSizeBackgroundWorker: -1 + m_TempAllocatorSizePreloadManager: -1 + m_PlatformMemorySettings: {} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 4ed3ed9..d298bb2 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 22 + serializedVersion: 23 productGUID: f23c843397b908947935d2b5567b81fd AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -42,8 +42,8 @@ PlayerSettings: m_SplashScreenLogos: [] m_VirtualRealitySplashScreen: {fileID: 0} m_HolographicTrackingLossScreen: {fileID: 0} - defaultScreenWidth: 1920 - defaultScreenHeight: 1080 + defaultScreenWidth: 960 + defaultScreenHeight: 600 defaultScreenWidthWeb: 960 defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 @@ -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 @@ -80,9 +86,9 @@ PlayerSettings: submitAnalytics: 1 usePlayerLog: 1 bakeCollisionMeshes: 0 - forceSingleInstance: 0 + forceSingleInstance: 1 useFlipModelSwapchain: 1 - resizableWindow: 0 + resizableWindow: 1 useMacAppStoreValidation: 0 macAppStoreCategory: public.app-category.games gpuSkinning: 0 @@ -93,7 +99,7 @@ PlayerSettings: xboxEnableFitness: 0 visibleInBackground: 1 allowFullscreenSwitch: 1 - fullscreenMode: 1 + fullscreenMode: 3 xboxSpeechDB: 0 xboxEnableHeadOrientation: 0 xboxEnableGuest: 0 @@ -121,6 +127,7 @@ PlayerSettings: vulkanEnableSetSRGBWrite: 0 vulkanEnablePreTransform: 0 vulkanEnableLateAcquireNextImage: 0 + vulkanEnableCommandBufferRecycling: 1 m_SupportedAspectRatios: 4:3: 1 5:4: 1 @@ -145,14 +152,15 @@ PlayerSettings: resolutionScalingMode: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 - applicationIdentifier: {} + applicationIdentifier: + Standalone: com.DefaultCompany.LostOrFound buildNumber: Standalone: 0 iPhone: 0 tvOS: 0 overrideDefaultApplicationIdentifier: 0 AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 19 + AndroidMinSdkVersion: 22 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 aotOptions: @@ -208,6 +216,7 @@ PlayerSettings: iOSLaunchScreeniPadCustomStoryboardPath: iOSDeviceRequirements: [] iOSURLSchemes: [] + macOSURLSchemes: [] iOSBackgroundModes: 0 iOSMetalForceHardShadows: 0 metalEditorSupport: 1 @@ -235,6 +244,7 @@ PlayerSettings: useCustomGradlePropertiesTemplate: 0 useCustomProguardFile: 0 AndroidTargetArchitectures: 1 + AndroidTargetDevices: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} AndroidKeystoreName: @@ -251,6 +261,7 @@ PlayerSettings: height: 180 banner: {fileID: 0} androidGamepadSupportLevel: 0 + chromeosInputEmulation: 1 AndroidMinifyWithR8: 0 AndroidMinifyRelease: 0 AndroidMinifyDebug: 0 @@ -290,7 +301,7 @@ PlayerSettings: m_BuildTargetGraphicsAPIs: - m_BuildTarget: AndroidPlayer m_APIs: 150000000b000000 - m_Automatic: 0 + m_Automatic: 1 - m_BuildTarget: iOSSupport m_APIs: 10000000 m_Automatic: 1 @@ -306,6 +317,7 @@ PlayerSettings: m_BuildTargetGroupLightmapEncodingQuality: [] m_BuildTargetGroupLightmapSettings: [] m_BuildTargetNormalMapEncoding: [] + m_BuildTargetDefaultTextureCompressionFormat: [] playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 @@ -315,6 +327,7 @@ PlayerSettings: cameraUsageDescription: locationUsageDescription: microphoneUsageDescription: + bluetoothUsageDescription: switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 @@ -323,6 +336,7 @@ PlayerSettings: switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 switchUseGOLDLinker: 0 + switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: switchTitleNames_0: @@ -340,6 +354,7 @@ PlayerSettings: switchTitleNames_12: switchTitleNames_13: switchTitleNames_14: + switchTitleNames_15: switchPublisherNames_0: switchPublisherNames_1: switchPublisherNames_2: @@ -355,6 +370,7 @@ PlayerSettings: switchPublisherNames_12: switchPublisherNames_13: switchPublisherNames_14: + switchPublisherNames_15: switchIcons_0: {fileID: 0} switchIcons_1: {fileID: 0} switchIcons_2: {fileID: 0} @@ -370,6 +386,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} @@ -385,6 +402,7 @@ PlayerSettings: switchSmallIcons_12: {fileID: 0} switchSmallIcons_13: {fileID: 0} switchSmallIcons_14: {fileID: 0} + switchSmallIcons_15: {fileID: 0} switchManualHTML: switchAccessibleURLs: switchLegalInformation: @@ -448,6 +466,8 @@ PlayerSettings: switchNetworkInterfaceManagerInitializeEnabled: 1 switchPlayerConnectionEnabled: 1 switchUseNewStyleFilepaths: 0 + switchUseMicroSleepForYield: 1 + switchMicroSleepForYieldTime: 25 ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: @@ -537,7 +557,7 @@ PlayerSettings: webGLTemplate: APPLICATION:Default webGLAnalyzeBuildSize: 0 webGLUseEmbeddedResources: 0 - webGLCompressionFormat: 0 + webGLCompressionFormat: 2 webGLWasmArithmeticExceptions: 0 webGLLinkerTarget: 1 webGLThreadsSupport: 0 @@ -552,11 +572,11 @@ PlayerSettings: suppressCommonWarnings: 1 allowUnsafeCode: 0 useDeterministicCompilation: 1 - useReferenceAssemblies: 1 enableRoslynAnalyzers: 1 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 1 + assemblyVersionValidation: 1 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: {} m_RenderingPath: 1 @@ -605,6 +625,7 @@ PlayerSettings: XboxOneCapability: [] XboxOneGameRating: {} XboxOneIsContentPackage: 0 + XboxOneEnhancedXboxCompatibilityMode: 0 XboxOneEnableGPUVariability: 1 XboxOneSockets: {} XboxOneSplashScreen: {fileID: 0} @@ -635,4 +656,7 @@ PlayerSettings: organizationId: cloudEnabled: 0 legacyClampBlendShapeWeights: 0 + playerDataPath: + forceSRGBBlit: 1 virtualTexturingSupportEnabled: 0 + uploadClearedTextureDataAfterCreationFromScript: 1 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 0560e11..c88913f 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.2.0f1 -m_EditorVersionWithRevision: 2020.2.0f1 (3721df5a8b28) +m_EditorVersion: 2021.2.0b4 +m_EditorVersionWithRevision: 2021.2.0b4 (af9ec38f7da3) diff --git a/ProjectSettings/ShaderGraphSettings.asset b/ProjectSettings/ShaderGraphSettings.asset new file mode 100644 index 0000000..9b28428 --- /dev/null +++ b/ProjectSettings/ShaderGraphSettings.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 61 + 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: de02f9e1d18f588468e474319d09a723, type: 3} + m_Name: + m_EditorClassIdentifier: + customInterpolatorErrorThreshold: 32 + customInterpolatorWarningThreshold: 16 diff --git a/ProjectSettings/URPProjectSettings.asset b/ProjectSettings/URPProjectSettings.asset index 3077404..c1f118a 100644 --- a/ProjectSettings/URPProjectSettings.asset +++ b/ProjectSettings/URPProjectSettings.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3} m_Name: m_EditorClassIdentifier: - m_LastMaterialVersion: 4 + m_LastMaterialVersion: 5 diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset index fa0b146..6125b30 100644 --- a/ProjectSettings/UnityConnectSettings.asset +++ b/ProjectSettings/UnityConnectSettings.asset @@ -9,6 +9,7 @@ UnityConnectSettings: m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events m_EventUrl: https://cdp.cloud.unity3d.com/v1/events m_ConfigUrl: https://config.uca.cloud.unity3d.com + m_DashboardUrl: https://dashboard.unity3d.com m_TestInitMode: 0 CrashReportingSettings: m_EventUrl: https://perf-events.cloud.unity3d.com diff --git a/ProjectSettings/boot.config b/ProjectSettings/boot.config new file mode 100644 index 0000000..e69de29