diff --git a/Assets/Metadata/CoreLib.Commands.asset b/Assets/Metadata/CoreLib.Commands.asset index 57148519..4037acb4 100644 --- a/Assets/Metadata/CoreLib.Commands.asset +++ b/Assets/Metadata/CoreLib.Commands.asset @@ -22,6 +22,7 @@ MonoBehaviour: requiredOn: -1 files: - path: Scripts/Scripts/Util/CommandUtil.cs + - path: Scripts/Scripts/System/LoadItemDictSystem.cs - path: Scripts/Scripts/Patches/TitleScreenAnimator_Patch.cs - path: Scripts/Scripts/Patches/MenuManager_Patch.cs - path: Scripts/Scripts/Patches/ECSManager_Patch.cs diff --git a/Assets/Metadata/CoreLib.Entity.asset b/Assets/Metadata/CoreLib.Entity.asset index ac901551..4df0b6bf 100644 --- a/Assets/Metadata/CoreLib.Entity.asset +++ b/Assets/Metadata/CoreLib.Entity.asset @@ -20,7 +20,30 @@ MonoBehaviour: accessesExtraAssemblies: 1 disableHarmonyPatching: 0 requiredOn: -1 - files: [] + files: + - path: Localization/Localization.csv + - path: Scripts/Scripts/WorkbenchDefinition.cs + - path: Scripts/Scripts/PrefabCrawler.cs + - path: Scripts/Scripts/Patches/PlayerController_Patch.cs + - path: Scripts/Scripts/Patches/MemoryManager_Patch.cs + - path: Scripts/Scripts/Patches/GraphicalObjectConversion_Patch.cs + - path: Scripts/Scripts/Patches/ColorReplacer_Patch.cs + - path: Scripts/Scripts/MonoBehaviourUtils.cs + - path: Scripts/Scripts/Interfaces/IDynamicItemHandler.cs + - path: Scripts/Scripts/EntityModule.cs + - path: Scripts/Scripts/CraftingData.cs + - path: Scripts/Scripts/Components/TemplateObject.cs + - path: Scripts/Scripts/Components/SupportsPooling.cs + - path: Scripts/Scripts/Components/RuntimeMaterial.cs + - path: Scripts/Scripts/Components/PoolSettings.cs + - path: Scripts/Scripts/Components/ModWorkbenchBuilding.cs + - path: Scripts/Scripts/Components/ModCraftingAuthoring.cs + - path: Scripts/Scripts/Components/ModCDAuthoringBase.cs + - path: Scripts/Scripts/Components/EntityPrefabOverride.cs + - path: Scripts/Scripts/Atributes/PrefabModificationAttribute.cs + - path: Scripts/Scripts/Atributes/EntityModificationAttribute.cs + - path: Bundles/CoreLib.Entity_Windows.assetbundle + - path: Bundles/CoreLib.Entity_Linux.assetbundle dependencies: - modName: CoreLib required: 1 diff --git a/Assets/Metadata/CoreLib.Equipment.asset b/Assets/Metadata/CoreLib.Equipment.asset index 4e5f0a4d..ea813a2e 100644 --- a/Assets/Metadata/CoreLib.Equipment.asset +++ b/Assets/Metadata/CoreLib.Equipment.asset @@ -16,6 +16,7 @@ MonoBehaviour: guid: d7b9e43dd003478d8eefe742315dfddb name: CoreLib.Equipment skipSafetyChecks: 0 + disableScripts: 0 accessesExtraAssemblies: 1 disableHarmonyPatching: 0 requiredOn: 0 diff --git a/Assets/Resources/SpriteAssetManifest.asset b/Assets/Resources/SpriteAssetManifest.asset index 03b8fd4f..a68abb75 100644 --- a/Assets/Resources/SpriteAssetManifest.asset +++ b/Assets/Resources/SpriteAssetManifest.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: SpriteAssetManifest m_EditorClassIdentifier: spriteAssets: - - {fileID: 11400000, guid: b05d94f23f54e82429431780ad02a96e, type: 2} - - {fileID: 11400000, guid: 18ee6ee5463d288409e5abde9e80fc0e, type: 2} + - {fileID: 11400000, guid: 9e5aa8becaff59e40b5758e408e72387, type: 2} + - {fileID: 11400000, guid: d6d36324533a3a14092a17ce22ea322a, type: 2} gradientMaps: [] transformAnimations: [] diff --git a/Assets/UniversalRenderPipelineGlobalSettings.asset b/Assets/UniversalRenderPipelineGlobalSettings.asset index a996a2e6..98f0dfda 100644 --- a/Assets/UniversalRenderPipelineGlobalSettings.asset +++ b/Assets/UniversalRenderPipelineGlobalSettings.asset @@ -12,7 +12,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2ec995e51a6e251468d2a3fd8a686257, type: 3} m_Name: UniversalRenderPipelineGlobalSettings m_EditorClassIdentifier: - k_AssetVersion: 2 + k_AssetVersion: 3 + m_RenderingLayerNames: + - Light Layer default + - Light Layer 1 + - Light Layer 2 + - Light Layer 3 + - Light Layer 4 + - Light Layer 5 + - Light Layer 6 + - Light Layer 7 + m_ValidRenderingLayers: 255 lightLayerName0: Light Layer default lightLayerName1: Light Layer 1 lightLayerName2: Light Layer 2 @@ -24,4 +34,8 @@ MonoBehaviour: m_StripDebugVariants: 1 m_StripUnusedPostProcessingVariants: 0 m_StripUnusedVariants: 1 + m_StripUnusedLODCrossFadeVariants: 1 + m_StripScreenCoordOverrideVariants: 1 supportRuntimeDebugDisplay: 0 + m_ShaderVariantLogLevel: 0 + m_ExportShaderVariants: 1 diff --git a/Packages/manifest.json b/Packages/manifest.json index d49fb5d0..d9fc00e7 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,17 +1,17 @@ { "dependencies": { "com.unity.2d.sprite": "1.0.0", - "com.unity.addressables": "1.21.17", - "com.unity.ai.navigation": "1.1.4", - "com.unity.burst": "1.8.9", + "com.unity.addressables": "1.21.19", + "com.unity.ai.navigation": "1.1.5", + "com.unity.burst": "1.8.12", "com.unity.editorcoroutines": "1.0.0", - "com.unity.ide.rider": "3.0.24", - "com.unity.ide.visualstudio": "2.0.18", + "com.unity.ide.rider": "3.0.27", + "com.unity.ide.visualstudio": "2.0.22", "com.unity.ide.vscode": "1.2.5", "com.unity.netcode": "1.0.15", "com.unity.physics": "1.0.14", - "com.unity.postprocessing": "3.2.2", - "com.unity.render-pipelines.universal": "14.0.8", + "com.unity.postprocessing": "3.4.0", + "com.unity.render-pipelines.universal": "14.0.10", "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.5", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 892a6d28..329f2b5b 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -7,11 +7,11 @@ "dependencies": {} }, "com.unity.addressables": { - "version": "1.21.17", + "version": "1.21.19", "depth": 0, "source": "registry", "dependencies": { - "com.unity.scriptablebuildpipeline": "1.21.9", + "com.unity.scriptablebuildpipeline": "1.21.21", "com.unity.modules.assetbundle": "1.0.0", "com.unity.modules.imageconversion": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0", @@ -21,7 +21,7 @@ "url": "https://packages.unity.com" }, "com.unity.ai.navigation": { - "version": "1.1.4", + "version": "1.1.5", "depth": 0, "source": "registry", "dependencies": { @@ -30,11 +30,12 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.9", + "version": "1.8.12", "depth": 0, "source": "registry", "dependencies": { - "com.unity.mathematics": "1.2.1" + "com.unity.mathematics": "1.2.1", + "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, @@ -82,7 +83,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.24", + "version": "3.0.27", "depth": 0, "source": "registry", "dependencies": { @@ -91,7 +92,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.18", + "version": "2.0.22", "depth": 0, "source": "registry", "dependencies": { @@ -156,7 +157,7 @@ "url": "https://packages.unity.com" }, "com.unity.postprocessing": { - "version": "3.2.2", + "version": "3.4.0", "depth": 0, "source": "registry", "dependencies": { @@ -172,7 +173,7 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "14.0.8", + "version": "14.0.10", "depth": 1, "source": "builtin", "dependencies": { @@ -183,18 +184,27 @@ } }, "com.unity.render-pipelines.universal": { - "version": "14.0.8", + "version": "14.0.10", "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": "14.0.10", + "com.unity.shadergraph": "14.0.10", + "com.unity.render-pipelines.universal-config": "14.0.9" + } + }, + "com.unity.render-pipelines.universal-config": { + "version": "14.0.9", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.render-pipelines.core": "14.0.9" } }, "com.unity.scriptablebuildpipeline": { - "version": "1.21.9", + "version": "1.21.21", "depth": 1, "source": "registry", "dependencies": {}, @@ -218,11 +228,11 @@ "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "14.0.8", + "version": "14.0.10", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "14.0.8", + "com.unity.render-pipelines.core": "14.0.10", "com.unity.searcher": "4.9.2" } }, diff --git a/ProjectSettings/BurstAotSettings_StandaloneLinux64.json b/ProjectSettings/BurstAotSettings_StandaloneLinux64.json new file mode 100644 index 00000000..ca7cf1a1 --- /dev/null +++ b/ProjectSettings/BurstAotSettings_StandaloneLinux64.json @@ -0,0 +1,17 @@ +{ + "MonoBehaviour": { + "Version": 4, + "EnableBurstCompilation": true, + "EnableOptimisations": true, + "EnableSafetyChecks": false, + "EnableDebugInAllBuilds": false, + "DebugDataKind": 1, + "EnableArmv9SecurityFeatures": false, + "CpuMinTargetX32": 0, + "CpuMaxTargetX32": 0, + "CpuMinTargetX64": 0, + "CpuMaxTargetX64": 0, + "CpuTargetsX64": 72, + "OptimizeFor": 0 + } +} diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 55adee12..a03cd5d9 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -4,10 +4,7 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 - m_Scenes: - - enabled: 0 - path: - guid: 00000000000000000000000000000000 + m_Scenes: [] m_configObjects: - com.unity.addressableassets: {fileID: 11400000, guid: 62ffbfedd75f9de478b526bb3275f780, + com.unity.addressableassets: {fileID: 11400000, guid: 2796915a788811d42a46010e4bca64b5, type: 2} diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index b9f5d79a..54e91523 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -3,7 +3,7 @@ --- !u!30 &1 GraphicsSettings: m_ObjectHideFlags: 0 - serializedVersion: 14 + serializedVersion: 15 m_Deferred: m_Mode: 1 m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0} @@ -13,9 +13,6 @@ GraphicsSettings: m_ScreenSpaceShadows: m_Mode: 1 m_Shader: {fileID: 64, guid: 0000000000000000f000000000000000, type: 0} - m_LegacyDeferred: - m_Mode: 1 - m_Shader: {fileID: 63, guid: 0000000000000000f000000000000000, type: 0} m_DepthNormals: m_Mode: 1 m_Shader: {fileID: 62, guid: 0000000000000000f000000000000000, type: 0} @@ -41,7 +38,8 @@ GraphicsSettings: m_PreloadShadersBatchTimeLimit: -1 m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_CustomRenderPipeline: {fileID: 0} + m_CustomRenderPipeline: {fileID: 11400000, guid: b004f3effcb17704799484dedc9e52f9, + type: 2} m_TransparencySortMode: 0 m_TransparencySortAxis: {x: 0, y: 0, z: 1} m_DefaultRenderingPath: 1 @@ -50,6 +48,7 @@ GraphicsSettings: m_LightmapStripping: 0 m_FogStripping: 0 m_InstancingStripping: 0 + m_BrgStripping: 0 m_LightmapKeepPlain: 1 m_LightmapKeepDirCombined: 1 m_LightmapKeepDynamicPlain: 1 @@ -65,5 +64,8 @@ GraphicsSettings: m_DefaultRenderingLayerMask: 1 m_LogWhenShaderIsCompiled: 0 m_SRPDefaultSettings: - UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: 33f0306306c95e34c96ec23540a926e8, + UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: bc58e5daa4d693d4f96d8d679cfe07f4, type: 2} + m_LightProbeOutsideHullStrategy: 0 + m_CameraRelativeLightCulling: 0 + m_CameraRelativeShadowCulling: 0 diff --git a/ProjectSettings/NetCodeClientAndServerSettings.asset b/ProjectSettings/NetCodeClientAndServerSettings.asset index 65423b20..0be99e72 100644 --- a/ProjectSettings/NetCodeClientAndServerSettings.asset +++ b/ProjectSettings/NetCodeClientAndServerSettings.asset @@ -2,7 +2,7 @@ %TAG !u! tag:unity3d.com,2011: --- !u!114 &1 MonoBehaviour: - m_ObjectHideFlags: 53 + m_ObjectHideFlags: 61 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} diff --git a/ProjectSettings/NetCodeClientSettings.asset b/ProjectSettings/NetCodeClientSettings.asset index f2324501..7d8d26d3 100644 --- a/ProjectSettings/NetCodeClientSettings.asset +++ b/ProjectSettings/NetCodeClientSettings.asset @@ -2,7 +2,7 @@ %TAG !u! tag:unity3d.com,2011: --- !u!114 &1 MonoBehaviour: - m_ObjectHideFlags: 53 + m_ObjectHideFlags: 61 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} diff --git a/ProjectSettings/NetCodeServerSettings.asset b/ProjectSettings/NetCodeServerSettings.asset index 07cf9388..5a3a2100 100644 --- a/ProjectSettings/NetCodeServerSettings.asset +++ b/ProjectSettings/NetCodeServerSettings.asset @@ -2,7 +2,7 @@ %TAG !u! tag:unity3d.com,2011: --- !u!114 &1 MonoBehaviour: - m_ObjectHideFlags: 53 + m_ObjectHideFlags: 61 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 88bb9cf9..224decfe 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.10f1 -m_EditorVersionWithRevision: 2022.3.10f1 (ff3792e53c62) +m_EditorVersion: 2022.3.20f1 +m_EditorVersionWithRevision: 2022.3.20f1 (61c2feb0970d) diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 8ad11055..40ed0f00 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -6,7 +6,7 @@ QualitySettings: serializedVersion: 5 m_CurrentQuality: 2 m_QualitySettings: - - serializedVersion: 2 + - serializedVersion: 3 name: Performant pixelLightCount: 0 shadows: 0 @@ -19,16 +19,20 @@ QualitySettings: shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 skinWeights: 2 - textureQuality: 0 + globalTextureMipmapLimit: 0 + textureMipmapLimitSettings: [] anisotropicTextures: 0 antiAliasing: 0 softParticles: 0 softVegetation: 0 realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 0 + useLegacyDetailDistribution: 1 vSyncCount: 0 + realtimeGICPUUsage: 25 lodBias: 0.4 maximumLODLevel: 0 + enableLODCrossFade: 1 streamingMipmapsActive: 0 streamingMipmapsAddAllCameras: 1 streamingMipmapsMemoryBudget: 512 @@ -42,8 +46,17 @@ QualitySettings: resolutionScalingFixedDPIFactor: 1 customRenderPipeline: {fileID: 11400000, guid: d0e2fc18fe036412f8223b3b3d9ad574, type: 2} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 excludedTargetPlatforms: [] - - serializedVersion: 2 + - serializedVersion: 3 name: Balanced pixelLightCount: 1 shadows: 1 @@ -56,16 +69,20 @@ QualitySettings: shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 0 skinWeights: 4 - textureQuality: 0 + globalTextureMipmapLimit: 0 + textureMipmapLimitSettings: [] anisotropicTextures: 1 antiAliasing: 0 softParticles: 0 softVegetation: 0 realtimeReflectionProbes: 0 billboardsFaceCameraPosition: 0 + useLegacyDetailDistribution: 1 vSyncCount: 1 + realtimeGICPUUsage: 25 lodBias: 1 maximumLODLevel: 0 + enableLODCrossFade: 1 streamingMipmapsActive: 0 streamingMipmapsAddAllCameras: 1 streamingMipmapsMemoryBudget: 512 @@ -79,8 +96,17 @@ QualitySettings: resolutionScalingFixedDPIFactor: 1 customRenderPipeline: {fileID: 11400000, guid: e1260c1148f6143b28bae5ace5e9c5d1, type: 2} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 excludedTargetPlatforms: [] - - serializedVersion: 2 + - serializedVersion: 3 name: High Fidelity pixelLightCount: 2 shadows: 2 @@ -93,16 +119,20 @@ QualitySettings: shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 1 skinWeights: 255 - textureQuality: 0 + globalTextureMipmapLimit: 0 + textureMipmapLimitSettings: [] anisotropicTextures: 2 - antiAliasing: 4 + antiAliasing: 0 softParticles: 0 softVegetation: 1 realtimeReflectionProbes: 1 billboardsFaceCameraPosition: 1 + useLegacyDetailDistribution: 1 vSyncCount: 1 + realtimeGICPUUsage: 25 lodBias: 2 maximumLODLevel: 0 + enableLODCrossFade: 1 streamingMipmapsActive: 0 streamingMipmapsAddAllCameras: 1 streamingMipmapsMemoryBudget: 512 @@ -116,7 +146,17 @@ QualitySettings: resolutionScalingFixedDPIFactor: 1 customRenderPipeline: {fileID: 11400000, guid: 7b7fd9122c28c4d15b667c7040e3b3fd, type: 2} + terrainQualityOverrides: 0 + terrainPixelError: 1 + terrainDetailDensityScale: 1 + terrainBasemapDistance: 1000 + terrainDetailDistance: 80 + terrainTreeDistance: 5000 + terrainBillboardStart: 50 + terrainFadeLength: 5 + terrainMaxTrees: 50 excludedTargetPlatforms: [] + m_TextureMipmapLimitGroupNames: [] m_PerPlatformDefaultQuality: Android: 1 CloudRendering: 2 diff --git a/ProjectSettings/ShaderGraphSettings.asset b/ProjectSettings/ShaderGraphSettings.asset index 9b28428b..3250b068 100644 --- a/ProjectSettings/ShaderGraphSettings.asset +++ b/ProjectSettings/ShaderGraphSettings.asset @@ -12,5 +12,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: de02f9e1d18f588468e474319d09a723, type: 3} m_Name: m_EditorClassIdentifier: + shaderVariantLimit: 128 customInterpolatorErrorThreshold: 32 customInterpolatorWarningThreshold: 16 diff --git a/ProjectSettings/URPProjectSettings.asset b/ProjectSettings/URPProjectSettings.asset index c1f118ad..cd7fd8c6 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: 5 + m_LastMaterialVersion: 7