lionfish/Gnome-s-Bounty
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

upgrade unity version

Browse Source
This commit is contained in:
Vova
2024-01-02 22:52:03 +02:00
parent c64bcbeeab
commit 4f3b2d5190
11 changed files with 189 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/DefaultVolumeProfile.asset
+15
View File
@@ -0,0 +1,15 @@
%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: d7fd9488000d3734a9e00ee676215985, type: 3}
m_Name: DefaultVolumeProfile
m_EditorClassIdentifier:
components: []
Assets/DefaultVolumeProfile.asset.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 04e4051854890434e87e8f9749050a25
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
Assets/Materials/BrixParticles.mat
+2 -1
View File
@@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
version: 9
--- !u!21 &2100000
Material:
serializedVersion: 8
@@ -110,3 +110,4 @@ Material:
- _RendererColor: {r: 1, g: 1, b: 1, a: 1}
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
m_BuildTextureStacks: []
m_AllowLocking: 1
Assets/Shaders/WaterMaterial.mat
+4 -2
View File
@@ -18,7 +18,8 @@ Material:
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
@@ -63,6 +64,7 @@ Material:
- _WaterOffset: {r: 0, g: 0.2, b: 0, a: 0}
- _WaterTiling: {r: 1, g: -1, b: 0, a: 0}
m_BuildTextureStacks: []
m_AllowLocking: 1
--- !u!114 &8379333480552503494
MonoBehaviour:
m_ObjectHideFlags: 11
@@ -75,4 +77,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7
version: 9
Assets/URP/URP Lights.asset
+25 -2
View File
@@ -12,8 +12,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3}
m_Name: URP Lights
m_EditorClassIdentifier:
k_AssetVersion: 11
k_AssetPreviousVersion: 11
k_AssetVersion: 12
k_AssetPreviousVersion: 12
m_RendererType: 1
m_RendererData: {fileID: 0}
m_RendererDataList:
@@ -33,6 +33,10 @@ MonoBehaviour:
m_EnableLODCrossFade: 1
m_LODCrossFadeDitheringType: 1
m_ShEvalMode: 0
m_LightProbeSystem: 0
m_ProbeVolumeMemoryBudget: 1024
m_SupportProbeVolumeStreaming: 0
m_ProbeVolumeSHBands: 1
m_MainLightRenderingMode: 1
m_MainLightShadowsSupported: 1
m_MainLightShadowmapResolution: 2048
@@ -72,15 +76,30 @@ MonoBehaviour:
m_ColorGradingMode: 0
m_ColorGradingLutSize: 32
m_UseFastSRGBLinearConversion: 0
m_SupportDataDrivenLensFlare: 1
m_SupportScreenSpaceLensFlare: 1
m_ShadowType: 1
m_LocalShadowsSupported: 0
m_LocalShadowsAtlasResolution: 256
m_MaxPixelLights: 0
m_ShadowAtlasResolution: 256
m_VolumeFrameworkUpdateMode: 0
m_VolumeProfile: {fileID: 0}
m_Textures:
blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3}
bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3}
apvScenesData:
m_ObsoleteSerializedBakingSets: []
sceneToBakingSet:
m_Keys: []
m_Values: []
bakingSets: []
sceneBounds:
m_Keys: []
m_Values: []
hasProbeVolumes:
m_Keys: []
m_Values:
m_PrefilteringModeMainLightShadows: 4
m_PrefilteringModeAdditionalLight: 4
m_PrefilteringModeAdditionalLightShadows: 0
@@ -103,6 +122,10 @@ MonoBehaviour:
m_PrefilterDBufferMRT1: 1
m_PrefilterDBufferMRT2: 1
m_PrefilterDBufferMRT3: 1
m_PrefilterSoftShadowsQualityLow: 0
m_PrefilterSoftShadowsQualityMedium: 0
m_PrefilterSoftShadowsQualityHigh: 0
m_PrefilterSoftShadows: 0
m_PrefilterScreenCoord: 1
m_PrefilterNativeRenderPass: 1
m_ShaderVariantLogLevel: 0
Assets/URP/URP Lights_Renderer.asset
+11 -5
View File
@@ -15,6 +15,14 @@ MonoBehaviour:
debugShaders:
debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, type: 3}
hdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3}
probeVolumeSamplingDebugComputeShader: {fileID: 7200000, guid: 53626a513ea68ce47b59dc1299fe3959, type: 3}
probeVolumeResources:
probeVolumeDebugShader: {fileID: 4800000, guid: e5c6678ed2aaa91408dd3df699057aae, type: 3}
probeVolumeFragmentationDebugShader: {fileID: 4800000, guid: 03cfc4915c15d504a9ed85ecc404e607, type: 3}
probeVolumeOffsetDebugShader: {fileID: 4800000, guid: 53a11f4ebaebf4049b3638ef78dc9664, type: 3}
probeVolumeSamplingDebugShader: {fileID: 4800000, guid: 8f96cd657dc40064aa21efcc7e50a2e7, type: 3}
probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 57d7c4c16e2765b47a4d2069b311bffe, type: 3}
probeSamplingDebugTexture: {fileID: 2800000, guid: 24ec0e140fb444a44ab96ee80844e18e, type: 3}
m_RendererFeatures: []
m_RendererFeatureMap:
m_UseNativeRenderPass: 0
@@ -41,17 +49,15 @@ MonoBehaviour:
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_LightShader: {fileID: 4800000, guid: 3f6c848ca3d7bca4bbe846546ac701a1, type: 3}
m_CoreBlitShader: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3}
m_BlitHDROverlay: {fileID: 4800000, guid: a89bee29cffa951418fc1e2da94d1959, type: 3}
m_CoreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, type: 3}
m_BlitHDROverlay: {fileID: 4800000, guid: a89bee29cffa951418fc1e2da94d1959, 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_GeometryShadowShader: {fileID: 4800000, guid: 19349a0f9a7ed4c48a27445bcf92e5e1, 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}
Assets/URP/UniversalRenderPipelineGlobalSettings.asset
+32 -4
View File
@@ -12,7 +12,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2ec995e51a6e251468d2a3fd8a686257, type: 3}
m_Name: UniversalRenderPipelineGlobalSettings
m_EditorClassIdentifier:
k_AssetVersion: 3
m_Settings:
m_SettingsList: []
m_RuntimeSettings: []
m_AssetVersion: 5
m_DefaultVolumeProfile: {fileID: 11400000, guid: 04e4051854890434e87e8f9749050a25, type: 2}
m_RenderingLayerNames:
- Default
m_ValidRenderingLayers: 1
@@ -24,11 +28,35 @@ MonoBehaviour:
lightLayerName5:
lightLayerName6:
lightLayerName7:
apvScenesData:
m_ObsoleteSerializedBakingSets: []
sceneToBakingSet:
m_Keys: []
m_Values: []
bakingSets: []
sceneBounds:
m_Keys: []
m_Values: []
hasProbeVolumes:
m_Keys: []
m_Values:
m_ShaderStrippingSetting:
m_Version: 0
m_ExportShaderVariants: 1
m_ShaderVariantLogLevel: 0
m_StripRuntimeDebugShaders: 1
m_URPShaderStrippingSetting:
m_Version: 0
m_StripUnusedPostProcessingVariants: 0
m_StripUnusedVariants: 1
m_StripScreenCoordOverrideVariants: 1
m_ShaderVariantLogLevel: 0
m_ExportShaderVariants: 1
m_StripDebugVariants: 1
m_StripUnusedPostProcessingVariants: 0
m_StripUnusedVariants: 1
m_StripUnusedLODCrossFadeVariants: 1
m_StripScreenCoordOverrideVariants: 1
supportRuntimeDebugDisplay: 0
m_ShaderVariantLogLevel: 0
m_ExportShaderVariants: 1
references:
version: 2
RefIds: []
Packages/manifest.json
+14 -15
View File
@@ -1,26 +1,25 @@
{
"dependencies": {
"com.unity.2d.animation": "9.0.3",
"com.unity.2d.animation": "10.0.3",
"com.unity.2d.pixel-perfect": "5.0.3",
"com.unity.2d.psdimporter": "8.0.2",
"com.unity.2d.psdimporter": "9.0.1",
"com.unity.2d.sprite": "1.0.0",
"com.unity.2d.spriteshape": "9.0.2",
"com.unity.2d.spriteshape": "10.0.2",
"com.unity.2d.tilemap": "1.0.0",
"com.unity.2d.tilemap.extras": "3.1.1",
"com.unity.2d.tilemap.extras": "4.0.2",
"com.unity.ads": "4.4.2",
"com.unity.ai.navigation": "1.1.4",
"com.unity.ai.navigation": "2.0.0",
"com.unity.analytics": "3.8.1",
"com.unity.collab-proxy": "2.0.5",
"com.unity.ide.rider": "3.0.24",
"com.unity.ide.visualstudio": "2.0.18",
"com.unity.ide.vscode": "1.2.5",
"com.unity.purchasing": "4.9.3",
"com.unity.render-pipelines.universal": "14.0.8",
"com.unity.test-framework": "1.1.33",
"com.unity.textmeshpro": "3.0.6",
"com.unity.timeline": "1.7.5",
"com.unity.ugui": "1.0.0",
"com.unity.collab-proxy": "2.2.0",
"com.unity.ide.rider": "3.0.26",
"com.unity.ide.visualstudio": "2.0.22",
"com.unity.purchasing": "4.10.0",
"com.unity.render-pipelines.universal": "16.0.4",
"com.unity.test-framework": "1.3.9",
"com.unity.timeline": "1.8.6",
"com.unity.ugui": "2.0.0",
"com.unity.xr.legacyinputhelpers": "2.1.10",
"com.unity.modules.accessibility": "1.0.0",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
"com.unity.modules.animation": "1.0.0",
Packages/packages-lock.json
+70 -55
View File
@@ -1,20 +1,20 @@
{
"dependencies": {
"com.unity.2d.animation": {
"version": "9.0.3",
"version": "10.0.3",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.2d.common": "8.0.1",
"com.unity.2d.common": "9.0.2",
"com.unity.2d.sprite": "1.0.0",
"com.unity.collections": "1.1.0",
"com.unity.collections": "1.2.4",
"com.unity.modules.animation": "1.0.0",
"com.unity.modules.uielements": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.2d.common": {
"version": "8.0.1",
"version": "9.0.2",
"depth": 1,
"source": "registry",
"dependencies": {
@@ -22,7 +22,7 @@
"com.unity.mathematics": "1.1.0",
"com.unity.modules.uielements": "1.0.0",
"com.unity.modules.animation": "1.0.0",
"com.unity.burst": "1.7.3"
"com.unity.burst": "1.8.4"
},
"url": "https://packages.unity.com"
},
@@ -34,12 +34,11 @@
"url": "https://packages.unity.com"
},
"com.unity.2d.psdimporter": {
"version": "8.0.2",
"version": "9.0.1",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.2d.animation": "9.0.1",
"com.unity.2d.common": "8.0.1",
"com.unity.2d.common": "9.0.2",
"com.unity.2d.sprite": "1.0.0"
},
"url": "https://packages.unity.com"
@@ -51,12 +50,12 @@
"dependencies": {}
},
"com.unity.2d.spriteshape": {
"version": "9.0.2",
"version": "10.0.2",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.mathematics": "1.1.0",
"com.unity.2d.common": "8.0.1",
"com.unity.2d.common": "9.0.2",
"com.unity.modules.physics2d": "1.0.0"
},
"url": "https://packages.unity.com"
@@ -71,7 +70,7 @@
}
},
"com.unity.2d.tilemap.extras": {
"version": "3.1.1",
"version": "4.0.2",
"depth": 0,
"source": "registry",
"dependencies": {
@@ -92,7 +91,7 @@
"url": "https://packages.unity.com"
},
"com.unity.ai.navigation": {
"version": "1.1.4",
"version": "2.0.0",
"depth": 0,
"source": "registry",
"dependencies": {
@@ -111,7 +110,7 @@
"url": "https://packages.unity.com"
},
"com.unity.burst": {
"version": "1.8.7",
"version": "1.8.11",
"depth": 1,
"source": "registry",
"dependencies": {
@@ -120,31 +119,32 @@
"url": "https://packages.unity.com"
},
"com.unity.collab-proxy": {
"version": "2.0.5",
"version": "2.2.0",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.collections": {
"version": "1.2.4",
"depth": 1,
"version": "1.4.0",
"depth": 3,
"source": "registry",
"dependencies": {
"com.unity.burst": "1.6.6",
"com.unity.nuget.mono-cecil": "1.11.4",
"com.unity.test-framework": "1.1.31"
},
"url": "https://packages.unity.com"
},
"com.unity.ext.nunit": {
"version": "1.0.6",
"version": "2.0.5",
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.ide.rider": {
"version": "3.0.24",
"version": "3.0.26",
"depth": 0,
"source": "registry",
"dependencies": {
@@ -153,7 +153,7 @@
"url": "https://packages.unity.com"
},
"com.unity.ide.visualstudio": {
"version": "2.0.18",
"version": "2.0.22",
"depth": 0,
"source": "registry",
"dependencies": {
@@ -161,16 +161,16 @@
},
"url": "https://packages.unity.com"
},
"com.unity.ide.vscode": {
"version": "1.2.5",
"depth": 0,
"com.unity.mathematics": {
"version": "1.2.6",
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.mathematics": {
"version": "1.2.6",
"depth": 1,
"com.unity.nuget.mono-cecil": {
"version": "1.11.4",
"depth": 4,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
@@ -183,39 +183,50 @@
"url": "https://packages.unity.com"
},
"com.unity.purchasing": {
"version": "4.9.3",
"version": "4.10.0",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.ugui": "1.0.0",
"com.unity.modules.unityanalytics": "1.0.0",
"com.unity.modules.unitywebrequest": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
"com.unity.services.core": "1.8.1"
"com.unity.services.core": "1.8.2"
},
"url": "https://packages.unity.com"
},
"com.unity.render-pipelines.core": {
"version": "14.0.8",
"version": "16.0.4",
"depth": 1,
"source": "builtin",
"dependencies": {
"com.unity.ugui": "1.0.0",
"com.unity.mathematics": "1.2.4",
"com.unity.ugui": "2.0.0",
"com.unity.modules.physics": "1.0.0",
"com.unity.modules.terrain": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0"
"com.unity.modules.jsonserialize": "1.0.0",
"com.unity.rendering.light-transport": "1.0.0"
}
},
"com.unity.render-pipelines.universal": {
"version": "14.0.8",
"version": "16.0.4",
"depth": 0,
"source": "builtin",
"dependencies": {
"com.unity.mathematics": "1.2.1",
"com.unity.burst": "1.8.4",
"com.unity.render-pipelines.core": "14.0.8",
"com.unity.shadergraph": "14.0.8"
"com.unity.burst": "1.8.9",
"com.unity.render-pipelines.core": "16.0.4",
"com.unity.shadergraph": "16.0.4"
}
},
"com.unity.rendering.light-transport": {
"version": "1.0.0",
"depth": 2,
"source": "builtin",
"dependencies": {
"com.unity.collections": "1.4.0",
"com.unity.mathematics": "1.2.4",
"com.unity.render-pipelines.core": "16.0.1"
}
},
"com.unity.searcher": {
@@ -226,18 +237,18 @@
"url": "https://packages.unity.com"
},
"com.unity.services.analytics": {
"version": "5.0.0",
"version": "4.4.0",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.ugui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0",
"com.unity.services.core": "1.10.1"
"com.unity.services.core": "1.8.1",
"com.unity.nuget.newtonsoft-json": "3.0.2"
},
"url": "https://packages.unity.com"
},
"com.unity.services.core": {
"version": "1.10.1",
"version": "1.12.0",
"depth": 1,
"source": "registry",
"dependencies": {
@@ -248,36 +259,27 @@
"url": "https://packages.unity.com"
},
"com.unity.shadergraph": {
"version": "14.0.8",
"version": "16.0.4",
"depth": 1,
"source": "builtin",
"dependencies": {
"com.unity.render-pipelines.core": "14.0.8",
"com.unity.render-pipelines.core": "16.0.4",
"com.unity.searcher": "4.9.2"
}
},
"com.unity.test-framework": {
"version": "1.1.33",
"version": "1.3.9",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.ext.nunit": "1.0.6",
"com.unity.ext.nunit": "2.0.3",
"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.6",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.ugui": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.timeline": {
"version": "1.7.5",
"version": "1.8.6",
"depth": 0,
"source": "registry",
"dependencies": {
@@ -289,7 +291,7 @@
"url": "https://packages.unity.com"
},
"com.unity.ugui": {
"version": "1.0.0",
"version": "2.0.0",
"depth": 0,
"source": "builtin",
"dependencies": {
@@ -307,6 +309,12 @@
},
"url": "https://packages.unity.com"
},
"com.unity.modules.accessibility": {
"version": "1.0.0",
"depth": 0,
"source": "builtin",
"dependencies": {}
},
"com.unity.modules.ai": {
"version": "1.0.0",
"depth": 0,
@@ -354,6 +362,12 @@
"com.unity.modules.animation": "1.0.0"
}
},
"com.unity.modules.hierarchycore": {
"version": "1.0.0",
"depth": 1,
"source": "builtin",
"dependencies": {}
},
"com.unity.modules.imageconversion": {
"version": "1.0.0",
"depth": 0,
@@ -442,7 +456,8 @@
"dependencies": {
"com.unity.modules.ui": "1.0.0",
"com.unity.modules.imgui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0"
"com.unity.modules.jsonserialize": "1.0.0",
"com.unity.modules.hierarchycore": "1.0.0"
}
},
"com.unity.modules.umbra": {
ProjectSettings/MultiplayerManager.asset
+7
View File
@@ -0,0 +1,7 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!655991488 &1
MultiplayerManager:
m_ObjectHideFlags: 0
m_EnableMultiplayerRoles: 0
m_ActiveMultiplayerRole: 0
ProjectSettings/URPProjectSettings.asset
+1 -1
View File
@@ -12,4 +12,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3}
m_Name:
m_EditorClassIdentifier:
m_LastMaterialVersion: 7
m_LastMaterialVersion: 9