diff --git a/Explorer/Assets/DCL/AvatarRendering/Emotes/Systems/FinalizeEmoteLoadingSystem.cs b/Explorer/Assets/DCL/AvatarRendering/Emotes/Systems/FinalizeEmoteLoadingSystem.cs index e9099903c47..56e8cc33f4e 100644 --- a/Explorer/Assets/DCL/AvatarRendering/Emotes/Systems/FinalizeEmoteLoadingSystem.cs +++ b/Explorer/Assets/DCL/AvatarRendering/Emotes/Systems/FinalizeEmoteLoadingSystem.cs @@ -87,7 +87,10 @@ private void FinalizeAssetBundleLoading( AssignEmoteResult(emote, bodyShape, regularAssetResult); } else + { ReportHub.LogWarning(GetReportData(), $"The emote {emote.DTO.id} failed to load from the AB"); + AssignFailedEmoteResult(emote, bodyShape); + } emote.UpdateLoadingStatus(false); World.Destroy(entity); @@ -109,7 +112,10 @@ private void FinalizeGltfLoading( if (gltfAssetResult.Succeeded && gltfAssetResult.TryToConvertToRegularAsset(out AttachmentRegularAsset regularAssetResult)) AssignEmoteResult(emote, bodyShape, regularAssetResult); else + { ReportHub.LogWarning(GetReportData(), $"The emote {emote.DTO.id} failed to load from the GLTF"); + AssignFailedEmoteResult(emote, bodyShape); + } emote.UpdateLoadingStatus(false); World.Destroy(entity); @@ -129,6 +135,21 @@ private void AssignEmoteResult(IEmote emote, BodyShape bodyShape, AttachmentRegu emote.AssetResults[bodyShape] = asset; } + private void AssignFailedEmoteResult(IEmote emote, BodyShape bodyShape) + { + var failedResult = new StreamableLoadingResult( + GetReportData(), + new Exception($"Emote {emote.DTO.id} failed to load")); + + if (emote.IsUnisex() && emote.HasSameClipForAllGenders()) + { + emote.AssetResults[BodyShape.MALE] = failedResult; + emote.AssetResults[BodyShape.FEMALE] = failedResult; + } + else + emote.AssetResults[bodyShape] = failedResult; + } + private bool IsCancellationRequested( Entity entity, ref AssetPromise promise, diff --git a/Explorer/Assets/DCL/Infrastructure/ECS/StreamableLoading/AssetBundles/LoadAssetBundleManifestSystem.cs b/Explorer/Assets/DCL/Infrastructure/ECS/StreamableLoading/AssetBundles/LoadAssetBundleManifestSystem.cs index 23f50c7629a..4c3715f9082 100644 --- a/Explorer/Assets/DCL/Infrastructure/ECS/StreamableLoading/AssetBundles/LoadAssetBundleManifestSystem.cs +++ b/Explorer/Assets/DCL/Infrastructure/ECS/StreamableLoading/AssetBundles/LoadAssetBundleManifestSystem.cs @@ -4,8 +4,8 @@ using Cysharp.Threading.Tasks; using DCL.Diagnostics; using DCL.Ipfs; -using DCL.Optimization.Pools; using DCL.Platforms; +using DCL.Optimization.Pools; using DCL.Utility; using UnityEngine; using DCL.WebRequests; @@ -50,6 +50,8 @@ await LoadAssetBundleManifestAsync( } + // This fallback manifest fetch is only used by worlds, which don't query the asset-bundle-registry yet. + // Once multi-scene-worlds is merged, worlds will use the registry like catalyst scenes and this path won't be needed. private async UniTask LoadAssetBundleManifestAsync(string hash, ReportData reportCategory, CancellationToken ct) { using var scope = URL_BUILDER_POOL.Get(out var urlBuilder); @@ -57,7 +59,7 @@ private async UniTask LoadAssetBundleManifestAsync(str urlBuilder.AppendDomain(assetBundleURL) .AppendSubDirectory(URLSubdirectory.FromString("manifest")) - .AppendPath(URLPath.FromString($"{hash}{PlatformUtils.GetCurrentPlatform()}.json")); + .AppendPath(URLPath.FromString($"{hash}.json")); URLAddress url = urlBuilder.Build(); SceneAbDto sceneAbDto = await webRequestController.GetAsync(new CommonArguments(url, RetryPolicy.WithRetries(1)), ct, reportCategory) diff --git a/Explorer/Assets/DCL/Infrastructure/ECS/StreamableLoading/AssetBundles/PrepareAssetBundleLoadingParametersSystemBase.cs b/Explorer/Assets/DCL/Infrastructure/ECS/StreamableLoading/AssetBundles/PrepareAssetBundleLoadingParametersSystemBase.cs index 46d12274854..b4e46391f58 100644 --- a/Explorer/Assets/DCL/Infrastructure/ECS/StreamableLoading/AssetBundles/PrepareAssetBundleLoadingParametersSystemBase.cs +++ b/Explorer/Assets/DCL/Infrastructure/ECS/StreamableLoading/AssetBundles/PrepareAssetBundleLoadingParametersSystemBase.cs @@ -16,10 +16,12 @@ public abstract class PrepareAssetBundleLoadingParametersSystemBase : BaseUnityL { private static readonly string[] COMMON_SHADERS = { + //TODO: Probably scene_ignore and lit_igore are not needed #if UNITY_WEBGL "dcl/scene_ignore", "dcl/universal render pipeline/lit_ignore", - "dcl/toon_ignore" + "dcl/scene_ignore_webgl", + "dcl/universal render pipeline/lit_ignore_webgl", #else "dcl/scene_ignore_windows", "dcl/scene_ignore_mac", diff --git a/Explorer/Assets/Rendering/ShaderVariants.shadervariants b/Explorer/Assets/Rendering/ShaderVariants.shadervariants index b851e6432bc..702b40754e3 100644 --- a/Explorer/Assets/Rendering/ShaderVariants.shadervariants +++ b/Explorer/Assets/Rendering/ShaderVariants.shadervariants @@ -595,7 +595,9 @@ ShaderVariantCollection: - first: {fileID: 4800000, guid: fe393ace9b354375a9cb14cdbbc28be4, type: 3} second: variants: - - keywords: + - keywords: + passType: 0 + - keywords: OUTLINE_ON passType: 0 - keywords: UNDERLAY_ON passType: 0 @@ -657,10 +659,15 @@ ShaderVariantCollection: passType: 0 - keywords: _TERRAIN_BLEND_HEIGHT passType: 0 + - first: {fileID: 4800000, guid: 84ce70d26f48d412ab142adda1b14f22, type: 3} + second: + variants: + - keywords: SOFTMASK_SIMPLE UNDERLAY_ON + passType: 0 - first: {fileID: 4800000, guid: 28d453dc10844f4418372200603a88e5, type: 3} second: variants: - - keywords: + - keywords: passType: 0 - - keywords: + - keywords: passType: 13 diff --git a/Explorer/Assets/StreamingAssets/AssetBundles/Wearables/bafkreicjhpml7xdib2knhbl2qn7sgqq7cudwys75xwgejdd47cxp3dkbc4_webgl b/Explorer/Assets/StreamingAssets/AssetBundles/Wearables/bafkreicjhpml7xdib2knhbl2qn7sgqq7cudwys75xwgejdd47cxp3dkbc4_webgl index de37c03f7c5..5fe559ee049 100644 --- a/Explorer/Assets/StreamingAssets/AssetBundles/Wearables/bafkreicjhpml7xdib2knhbl2qn7sgqq7cudwys75xwgejdd47cxp3dkbc4_webgl +++ b/Explorer/Assets/StreamingAssets/AssetBundles/Wearables/bafkreicjhpml7xdib2knhbl2qn7sgqq7cudwys75xwgejdd47cxp3dkbc4_webgl @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:98cdcd5d1cbd6e0e296dc01ab7f0b9c6eed7404fc2619e2e1d10db6560ea5160 -size 1118120 +oid sha256:7bd42bd22893fb0e73571ab90731c91a5c69ae47ba2adab1b9fc99dcfdae843b +size 117073 diff --git a/Explorer/Assets/StreamingAssets/AssetBundles/Wearables/bafkreicxwj4mhufwziveusb733zs3ly2vz7evnpsbybto3izqtfrbr7umq_webgl b/Explorer/Assets/StreamingAssets/AssetBundles/Wearables/bafkreicxwj4mhufwziveusb733zs3ly2vz7evnpsbybto3izqtfrbr7umq_webgl index ff3cedbdcaa..712137352cb 100644 --- a/Explorer/Assets/StreamingAssets/AssetBundles/Wearables/bafkreicxwj4mhufwziveusb733zs3ly2vz7evnpsbybto3izqtfrbr7umq_webgl +++ b/Explorer/Assets/StreamingAssets/AssetBundles/Wearables/bafkreicxwj4mhufwziveusb733zs3ly2vz7evnpsbybto3izqtfrbr7umq_webgl @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be4b2fb7ab1c37dab11a6a12c07e780f74353feb9fe662cd54fc4d3c89fe489c -size 1119546 +oid sha256:eb7faf510bc8b57f93c66790e9fbefeb8ea2c6d7cbf9b72ad8e24e83357a9f10 +size 108743 diff --git a/Explorer/Assets/StreamingAssets/AssetBundles/dcl/scene_ignore_webgl b/Explorer/Assets/StreamingAssets/AssetBundles/dcl/scene_ignore_webgl index e3555418ccd..7d06cc5a04e 100644 --- a/Explorer/Assets/StreamingAssets/AssetBundles/dcl/scene_ignore_webgl +++ b/Explorer/Assets/StreamingAssets/AssetBundles/dcl/scene_ignore_webgl @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2cdc0e6ed4aa2c2c2419b8b2029f943433e135e9f90068b9e35e472803c6b696 -size 2847662 +oid sha256:efea708b1e19152d7693983550309bbaad490bc51696df7021151191ebef48ad +size 3164054