diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index e4bc3d10..f6c0821c 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -8,13 +8,13 @@ jobs: strategy: matrix: include: - - unity_docker_image: unityci/editor:2021.3.22f1-webgl-1 + - unity_docker_image: unityci/editor:2022.3.2f1-webgl-1 service_name: asset-bundle-converter platform_target: webgl - - unity_docker_image: unityci/editor:2021.3.22f1-windows-mono-1 + - unity_docker_image: unityci/editor:2022.3.2f1-windows-mono-1 service_name: asset-bundle-converter-windows platform_target: windows - - unity_docker_image: unityci/editor:2021.3.22f1-mac-mono-1 + - unity_docker_image: unityci/editor:2022.3.2f1-mac-mono-1 service_name: asset-bundle-converter-mac platform_target: mac diff --git a/.github/workflows/manual-build-conversion.yml b/.github/workflows/manual-build-conversion.yml index 539f7b82..6a823181 100644 --- a/.github/workflows/manual-build-conversion.yml +++ b/.github/workflows/manual-build-conversion.yml @@ -23,13 +23,13 @@ jobs: strategy: matrix: include: - - unity_docker_image: unityci/editor:2021.3.22f1-webgl-1 + - unity_docker_image: unityci/editor:2022.3.2f1-webgl-1 service_name: asset-bundle-converter platform_target: webgl - - unity_docker_image: unityci/editor:2021.3.22f1-windows-mono-1 + - unity_docker_image: unityci/editor:2022.3.2f1-windows-mono-1 service_name: asset-bundle-converter-windows platform_target: windows - - unity_docker_image: unityci/editor:2021.3.22f1-mac-mono-1 + - unity_docker_image: unityci/editor:2022.3.2f1-mac-mono-1 service_name: asset-bundle-converter-mac platform_target: mac diff --git a/Dockerfile b/Dockerfile index a65b1ece..a4760262 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,9 +46,9 @@ ENV NODE_PATH $NVM_DIR/versions/node/$NODE_VERSION/lib/node_modules ENV PATH $NVM_DIR/versions/node/$NODE_VERSION/bin:$PATH # Change this value ONLY if we have done breaking changes for every material, doing so is VERY costly -ENV AB_VERSION v11 -ENV AB_VERSION_WINDOWS v14 -ENV AB_VERSION_MAC v15 +ENV AB_VERSION v12 +ENV AB_VERSION_WINDOWS v15 +ENV AB_VERSION_MAC v16 # NODE_ENV is used to configure some runtime options, like JSON logger ENV NODE_ENV production diff --git a/asset-bundle-converter/Assets/AssetBundleConverter/AssetBundleSceneConversionWindow.cs b/asset-bundle-converter/Assets/AssetBundleConverter/AssetBundleSceneConversionWindow.cs index ae44e6d7..7f647032 100644 --- a/asset-bundle-converter/Assets/AssetBundleConverter/AssetBundleSceneConversionWindow.cs +++ b/asset-bundle-converter/Assets/AssetBundleConverter/AssetBundleSceneConversionWindow.cs @@ -40,6 +40,8 @@ public class AssetBundleSceneConversionWindow : EditorWindow private string entityId = "QmYy2TMDEfag99yZV4ZdpjievYUfdQgBVfFHKCDAge3zQi"; private string wearablesCollectionId = "urn:decentraland:off-chain:base-avatars"; private string debugEntity = "bafkreib66ufmbowp4ee2u3kdu6t52kouie7kd7tfrlv3l5kejz6yjcaq5i"; + + // The empty scenes url should be like "https://cdn.decentraland.org/@dcl/explorer/1.0.152291-20231017100112.commit-07d38e3/loader/empty-scenes/contents/" private string mappingName = "../mappings.json"; private string batchBaseUrl = ""; private string batchSceneId = ""; diff --git a/asset-bundle-converter/Assets/AssetBundleConverter/Wrappers/Implementations/Default/AssetBundleConverterMaterialGenerator.cs b/asset-bundle-converter/Assets/AssetBundleConverter/Wrappers/Implementations/Default/AssetBundleConverterMaterialGenerator.cs index 89fc3127..8f27a78a 100644 --- a/asset-bundle-converter/Assets/AssetBundleConverter/Wrappers/Implementations/Default/AssetBundleConverterMaterialGenerator.cs +++ b/asset-bundle-converter/Assets/AssetBundleConverter/Wrappers/Implementations/Default/AssetBundleConverterMaterialGenerator.cs @@ -4,6 +4,15 @@ namespace AssetBundleConverter.Wrappers.Implementations.Default { public class AssetBundleConverterMaterialGenerator : DecentralandMaterialGenerator { - public AssetBundleConverterMaterialGenerator() : base("DCL/Universal Render Pipeline/Lit") { } + public AssetBundleConverterMaterialGenerator() : base(GetShaderName()) { } + + private static string GetShaderName() + { + #if UNITY_WEBGL + return "DCL/Universal Render Pipeline/Lit"; + #else + return "DCL/Scene"; + #endif + } } -} \ No newline at end of file +} diff --git a/asset-bundle-converter/Assets/Renderer/UniversalRenderPipelineAsset.asset b/asset-bundle-converter/Assets/Renderer/UniversalRenderPipelineAsset.asset index 0d67ab45..d42cd62a 100644 --- a/asset-bundle-converter/Assets/Renderer/UniversalRenderPipelineAsset.asset +++ b/asset-bundle-converter/Assets/Renderer/UniversalRenderPipelineAsset.asset @@ -12,8 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3} m_Name: UniversalRenderPipelineAsset m_EditorClassIdentifier: - k_AssetVersion: 9 - k_AssetPreviousVersion: 9 + k_AssetVersion: 11 + k_AssetPreviousVersion: 11 m_RendererType: 1 m_RendererData: {fileID: 0} m_RendererDataList: @@ -23,13 +23,16 @@ MonoBehaviour: m_RequireOpaqueTexture: 1 m_OpaqueDownsampling: 0 m_SupportsTerrainHoles: 0 - m_StoreActionsOptimization: 0 m_SupportsHDR: 1 + m_HDRColorBufferPrecision: 0 m_MSAA: 8 m_RenderScale: 1 m_UpscalingFilter: 0 m_FsrOverrideSharpness: 0 m_FsrSharpness: 0.92 + m_EnableLODCrossFade: 1 + m_LODCrossFadeDitheringType: 1 + m_ShEvalMode: 0 m_MainLightRenderingMode: 1 m_MainLightShadowsSupported: 1 m_MainLightShadowmapResolution: 2048 @@ -50,16 +53,21 @@ MonoBehaviour: m_CascadeBorder: 0.1 m_ShadowDepthBias: 1 m_ShadowNormalBias: 1 + m_AnyShadowsSupported: 1 m_SoftShadowsSupported: 0 m_ConservativeEnclosingSphere: 0 m_NumIterationsEnclosingSphere: 64 + m_SoftShadowQuality: 2 m_AdditionalLightsCookieResolution: 2048 m_AdditionalLightsCookieFormat: 3 m_UseSRPBatcher: 1 m_SupportsDynamicBatching: 0 m_MixedLightingSupported: 1 + m_SupportsLightCookies: 1 m_SupportsLightLayers: 0 m_DebugLevel: 0 + m_StoreActionsOptimization: 0 + m_EnableRenderGraph: 0 m_UseAdaptivePerformance: 1 m_ColorGradingMode: 0 m_ColorGradingLutSize: 32 @@ -69,6 +77,33 @@ MonoBehaviour: m_LocalShadowsAtlasResolution: 256 m_MaxPixelLights: 0 m_ShadowAtlasResolution: 256 - m_ShaderVariantLogLevel: 0 m_VolumeFrameworkUpdateMode: 0 + m_Textures: + blueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3} + bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} + m_PrefilteringModeMainLightShadows: 3 + m_PrefilteringModeAdditionalLight: 3 + m_PrefilteringModeAdditionalLightShadows: 2 + m_PrefilterXRKeywords: 1 + m_PrefilteringModeForwardPlus: 0 + m_PrefilteringModeDeferredRendering: 0 + m_PrefilteringModeScreenSpaceOcclusion: 0 + m_PrefilterDebugKeywords: 1 + m_PrefilterWriteRenderingLayers: 1 + m_PrefilterHDROutput: 1 + m_PrefilterSSAODepthNormals: 1 + m_PrefilterSSAOSourceDepthLow: 1 + m_PrefilterSSAOSourceDepthMedium: 1 + m_PrefilterSSAOSourceDepthHigh: 1 + m_PrefilterSSAOInterleaved: 1 + m_PrefilterSSAOBlueNoise: 1 + m_PrefilterSSAOSampleCountLow: 1 + m_PrefilterSSAOSampleCountMedium: 1 + m_PrefilterSSAOSampleCountHigh: 1 + m_PrefilterDBufferMRT1: 1 + m_PrefilterDBufferMRT2: 1 + m_PrefilterDBufferMRT3: 1 + m_PrefilterScreenCoord: 1 + m_PrefilterNativeRenderPass: 1 + m_ShaderVariantLogLevel: 0 m_ShadowCascades: 0 diff --git a/asset-bundle-converter/Assets/Renderer/UniversalRenderPipelineAsset_Renderer.asset b/asset-bundle-converter/Assets/Renderer/UniversalRenderPipelineAsset_Renderer.asset index 5bbc64de..4becbe1d 100644 --- a/asset-bundle-converter/Assets/Renderer/UniversalRenderPipelineAsset_Renderer.asset +++ b/asset-bundle-converter/Assets/Renderer/UniversalRenderPipelineAsset_Renderer.asset @@ -14,11 +14,11 @@ MonoBehaviour: m_EditorClassIdentifier: debugShaders: debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, type: 3} + hdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3} m_RendererFeatures: [] m_RendererFeatureMap: m_UseNativeRenderPass: 0 postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} - xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} shaders: blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3} copyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} @@ -26,9 +26,11 @@ MonoBehaviour: samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3} stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} + fallbackLoadingPS: {fileID: 4800000, guid: 7f888aff2ac86494babad1c2c5daeee2, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} coreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3} coreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, type: 3} + blitHDROverlay: {fileID: 4800000, guid: a89bee29cffa951418fc1e2da94d1959, type: 3} cameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, type: 3} objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486, type: 3} m_AssetVersion: 2 @@ -50,6 +52,4 @@ MonoBehaviour: m_DepthPrimingMode: 0 m_CopyDepthMode: 0 m_AccurateGbufferNormals: 0 - m_ClusteredRendering: 0 - m_TileSize: 32 m_IntermediateTextureMode: 1 diff --git a/asset-bundle-converter/Assets/UniversalRenderPipelineGlobalSettings.asset b/asset-bundle-converter/Assets/UniversalRenderPipelineGlobalSettings.asset index a996a2e6..98f0dfda 100644 --- a/asset-bundle-converter/Assets/UniversalRenderPipelineGlobalSettings.asset +++ b/asset-bundle-converter/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/asset-bundle-converter/Assets/git-submodules/unity-shared-dependencies b/asset-bundle-converter/Assets/git-submodules/unity-shared-dependencies index b40c694f..88b0a184 160000 --- a/asset-bundle-converter/Assets/git-submodules/unity-shared-dependencies +++ b/asset-bundle-converter/Assets/git-submodules/unity-shared-dependencies @@ -1 +1 @@ -Subproject commit b40c694fbe1136431fcf0b895ba0f5f55e7bff6b +Subproject commit 88b0a184bca03248e682878add8a4824bf15c650 diff --git a/asset-bundle-converter/Packages/manifest.json b/asset-bundle-converter/Packages/manifest.json index c6b0a99f..7a5e7958 100644 --- a/asset-bundle-converter/Packages/manifest.json +++ b/asset-bundle-converter/Packages/manifest.json @@ -3,13 +3,14 @@ "com.atteneder.draco": "4.0.2", "com.atteneder.ktx": "2.2.3", "com.cysharp.unitask": "https://github.com/Cysharp/UniTask.git?path=src/UniTask/Assets/Plugins/UniTask", - "com.unity.collab-proxy": "2.0.1", + "com.unity.ai.navigation": "1.1.3", + "com.unity.collab-proxy": "2.0.4", "com.unity.ide.rider": "3.0.21", - "com.unity.ide.visualstudio": "2.0.17", + "com.unity.ide.visualstudio": "2.0.18", "com.unity.ide.vscode": "1.2.5", "com.unity.meshopt.decompress": "0.1.0-preview.5", - "com.unity.render-pipelines.universal": "12.1.10", - "com.unity.scriptablebuildpipeline": "1.20.2", + "com.unity.render-pipelines.universal": "14.0.8", + "com.unity.scriptablebuildpipeline": "1.21.5", "com.unity.test-framework": "2.0.1-pre.18", "io.sentry.unity": "https://github.com/getsentry/unity.git", "net.tnrd.nsubstitute": "https://github.com/decentraland/Unity3D-NSubstitute.git", diff --git a/asset-bundle-converter/Packages/packages-lock.json b/asset-bundle-converter/Packages/packages-lock.json index 31b8ee16..e941dd3b 100644 --- a/asset-bundle-converter/Packages/packages-lock.json +++ b/asset-bundle-converter/Packages/packages-lock.json @@ -25,8 +25,17 @@ "dependencies": {}, "hash": "305695ad5d194dda0d6b00777c2459202a1ef4ea" }, + "com.unity.ai.navigation": { + "version": "1.1.3", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.ai": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.burst": { - "version": "1.8.2", + "version": "1.8.4", "depth": 1, "source": "registry", "dependencies": { @@ -35,7 +44,7 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "2.0.1", + "version": "2.0.4", "depth": 0, "source": "registry", "dependencies": {}, @@ -58,7 +67,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.17", + "version": "2.0.18", "depth": 0, "source": "registry", "dependencies": { @@ -91,47 +100,48 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "12.1.10", + "version": "14.0.8", "depth": 1, "source": "builtin", "dependencies": { "com.unity.ugui": "1.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.render-pipelines.universal": { - "version": "12.1.10", + "version": "14.0.8", "depth": 0, "source": "builtin", "dependencies": { "com.unity.mathematics": "1.2.1", - "com.unity.burst": "1.8.2", - "com.unity.render-pipelines.core": "12.1.10", - "com.unity.shadergraph": "12.1.10" + "com.unity.burst": "1.8.4", + "com.unity.render-pipelines.core": "14.0.8", + "com.unity.shadergraph": "14.0.8" } }, "com.unity.scriptablebuildpipeline": { - "version": "1.20.2", + "version": "1.21.5", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.searcher": { - "version": "4.9.1", + "version": "4.9.2", "depth": 2, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "12.1.10", + "version": "14.0.8", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "12.1.10", - "com.unity.searcher": "4.9.1" + "com.unity.render-pipelines.core": "14.0.8", + "com.unity.searcher": "4.9.2" } }, "com.unity.test-framework": { @@ -168,6 +178,12 @@ "dependencies": {}, "hash": "cdd11bb74398afae73e71b6fe01114f597a6ce08" }, + "com.unity.modules.ai": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": {} + }, "com.unity.modules.animation": { "version": "1.0.0", "depth": 0, @@ -247,6 +263,12 @@ "com.unity.modules.imageconversion": "1.0.0" } }, + "com.unity.modules.terrain": { + "version": "1.0.0", + "depth": 2, + "source": "builtin", + "dependencies": {} + }, "com.unity.modules.ui": { "version": "1.0.0", "depth": 0, diff --git a/asset-bundle-converter/ProjectSettings/ProjectSettings.asset b/asset-bundle-converter/ProjectSettings/ProjectSettings.asset index b296ea3d..2473f577 100644 --- a/asset-bundle-converter/ProjectSettings/ProjectSettings.asset +++ b/asset-bundle-converter/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 23 + serializedVersion: 24 productGUID: cf441fa258fb0da419b72dd5903be8db AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -177,10 +177,10 @@ PlayerSettings: StripUnusedMeshComponents: 0 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 11.0 + iOSTargetOSVersionString: 12.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 11.0 + tvOSTargetOSVersionString: 12.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -450,7 +450,6 @@ PlayerSettings: switchReleaseVersion: 0 switchDisplayVersion: 1.0.0 switchStartupUserAccount: 0 - switchTouchScreenUsage: 0 switchSupportedLanguagesMask: 0 switchLogoType: 0 switchApplicationErrorCodeCategory: @@ -492,6 +491,7 @@ PlayerSettings: switchNativeFsCacheSize: 32 switchIsHoldTypeHorizontal: 0 switchSupportedNpadCount: 8 + switchEnableTouchScreen: 1 switchSocketConfigEnabled: 0 switchTcpInitialSendBufferSize: 32 switchTcpInitialReceiveBufferSize: 64 @@ -504,6 +504,7 @@ PlayerSettings: switchNetworkInterfaceManagerInitializeEnabled: 1 switchPlayerConnectionEnabled: 1 switchUseNewStyleFilepaths: 0 + switchUseLegacyFmodPriorities: 1 switchUseMicroSleepForYield: 1 switchEnableRamDiskSupport: 0 switchMicroSleepForYieldTime: 25 @@ -612,13 +613,26 @@ PlayerSettings: scriptingBackend: {} il2cppCompilerConfiguration: WebGL: 2 - managedStrippingLevel: {} + managedStrippingLevel: + EmbeddedLinux: 1 + GameCoreScarlett: 1 + GameCoreXboxOne: 1 + Lumin: 1 + Nintendo Switch: 1 + PS4: 1 + PS5: 1 + Stadia: 1 + WebGL: 1 + Windows Store Apps: 1 + XboxOne: 1 + iPhone: 1 + tvOS: 1 incrementalIl2cppBuild: {} suppressCommonWarnings: 1 allowUnsafeCode: 0 useDeterministicCompilation: 1 enableRoslynAnalyzers: 1 - selectedPlatform: 2 + selectedPlatform: 0 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 1 diff --git a/asset-bundle-converter/ProjectSettings/ProjectVersion.txt b/asset-bundle-converter/ProjectSettings/ProjectVersion.txt index f8251a7a..9bc389cc 100644 --- a/asset-bundle-converter/ProjectSettings/ProjectVersion.txt +++ b/asset-bundle-converter/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.22f1 -m_EditorVersionWithRevision: 2021.3.22f1 (b6c551784ba3) +m_EditorVersion: 2022.3.2f1 +m_EditorVersionWithRevision: 2022.3.2f1 (d74737c6db50) diff --git a/asset-bundle-converter/ProjectSettings/URPProjectSettings.asset b/asset-bundle-converter/ProjectSettings/URPProjectSettings.asset index c1f118ad..cd7fd8c6 100644 --- a/asset-bundle-converter/ProjectSettings/URPProjectSettings.asset +++ b/asset-bundle-converter/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