diff --git a/Explorer/Assets/Scenes/DynamicSceneLoading.unity b/Explorer/Assets/Scenes/DynamicSceneLoading.unity index dba1e6d006..4d64b518fc 100644 --- a/Explorer/Assets/Scenes/DynamicSceneLoading.unity +++ b/Explorer/Assets/Scenes/DynamicSceneLoading.unity @@ -146,13 +146,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 158563621} - serializedVersion: 2 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: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &170878723 GameObject: @@ -185,6 +185,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1648087549} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -254,13 +255,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 234607240} - serializedVersion: 2 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: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &234607243 MonoBehaviour: @@ -372,6 +373,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1648087549} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -446,6 +448,7 @@ RectTransform: m_Children: - {fileID: 619587374} m_Father: {fileID: 1382499186} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -485,6 +488,7 @@ RectTransform: m_Children: - {fileID: 1895623060} m_Father: {fileID: 1385343039} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -573,6 +577,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 527563491} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0.2} @@ -704,13 +709,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 705507993} - serializedVersion: 2 m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!114 &705507996 MonoBehaviour: @@ -775,13 +780,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 946305962} - serializedVersion: 2 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: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1277831541 GameObject: @@ -814,10 +819,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1431507216} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -1167.5, y: -27} + m_AnchoredPosition: {x: -1305.2, y: -27} m_SizeDelta: {x: 78.999, y: 30} m_Pivot: {x: 1, y: 1} --- !u!114 &1277831543 @@ -957,13 +963,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1281082859} - serializedVersion: 2 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: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1281082863 MonoBehaviour: @@ -1026,6 +1032,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1648087549} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1162,6 +1169,7 @@ RectTransform: m_Children: - {fileID: 527563491} m_Father: {fileID: 1385343039} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1289,6 +1297,7 @@ RectTransform: - {fileID: 603247677} - {fileID: 1382499186} m_Father: {fileID: 2095941040} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -1460,6 +1469,7 @@ RectTransform: - {fileID: 2095941040} - {fileID: 1277831542} m_Father: {fileID: 0} + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1499,6 +1509,7 @@ RectTransform: - {fileID: 446244953} - {fileID: 1335601610} m_Father: {fileID: 1895623060} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -1576,13 +1587,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1800558272} - serializedVersion: 2 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 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1855600545 GameObject: @@ -1615,6 +1626,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2095941040} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -1689,6 +1701,7 @@ RectTransform: m_Children: - {fileID: 1648087549} m_Father: {fileID: 603247677} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -1735,13 +1748,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1901323877} - serializedVersion: 2 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: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2042493840 GameObject: @@ -1774,10 +1787,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2095941040} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -7.5000305, y: -0.5} + m_AnchoredPosition: {x: -7.5, y: -0.5} m_SizeDelta: {x: -35, y: -13} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2042493842 @@ -1912,11 +1926,12 @@ RectTransform: - {fileID: 1855600546} - {fileID: 1385343039} m_Father: {fileID: 1431507216} + m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: -695, y: -27} - m_SizeDelta: {x: 472.5011, y: 30} + m_SizeDelta: {x: 600, y: 30} m_Pivot: {x: 1, y: 1} --- !u!114 &2095941041 MonoBehaviour: @@ -2033,13 +2048,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2104274356} - serializedVersion: 2 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: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &4363253906714060728 PrefabInstance: @@ -2071,7 +2086,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8982288525742465179, guid: 402338b75b99c91409764700d1f00a6d, type: 3} propertyPath: m_RootOrder - value: 3 + value: 7 objectReference: {fileID: 0} - target: {fileID: 8982288525742465179, guid: 402338b75b99c91409764700d1f00a6d, type: 3} propertyPath: m_LocalPosition.x @@ -2118,17 +2133,3 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 402338b75b99c91409764700d1f00a6d, type: 3} ---- !u!1660057539 &9223372036854775807 -SceneRoots: - m_ObjectHideFlags: 0 - m_Roots: - - {fileID: 234607242} - - {fileID: 158563622} - - {fileID: 705507995} - - {fileID: 4363253906714060728} - - {fileID: 1800558273} - - {fileID: 1281082862} - - {fileID: 1901323879} - - {fileID: 946305964} - - {fileID: 1431507216} - - {fileID: 2104274357} diff --git a/Explorer/Assets/Scripts/Global/Dynamic/DynamicSceneLoaderSettings.asset b/Explorer/Assets/Scripts/Global/Dynamic/DynamicSceneLoaderSettings.asset index b5135ca479..5da5d946ff 100644 --- a/Explorer/Assets/Scripts/Global/Dynamic/DynamicSceneLoaderSettings.asset +++ b/Explorer/Assets/Scripts/Global/Dynamic/DynamicSceneLoaderSettings.asset @@ -22,3 +22,4 @@ MonoBehaviour: - https://peer.decentraland.org - https://worlds-content-server.decentraland.org/world/olavra.dcl.eth - https://worlds-content-server.decentraland.org/world/yemel.dcl.eth + - https://worlds-content-server.decentraland.org/world/MetadyneLabs.dcl.eth diff --git a/Explorer/Assets/StreamingAssets/Js/Init.js b/Explorer/Assets/StreamingAssets/Js/Init.js index 8bb1d70f46..77ef65fe2e 100644 --- a/Explorer/Assets/StreamingAssets/Js/Init.js +++ b/Explorer/Assets/StreamingAssets/Js/Init.js @@ -30,6 +30,17 @@ const console = { error: function (...args) { UnityOpsApi.Error("SceneError: " + args.join(' ')) }, } +// NOTE: MetadyneLabs.dcl.eth introduced a dependency on Cannon.js, this library +// Attempts to define the "performance" object and fails. This is due to "use strict" being enabled. [https://www.w3schools.com/js/js_strict.asp] +// Note that in theory, this is invalid code - +// strict mode is enabled by default in modules (see code exported from module: https://github.com/schteppe/cannon.js/blob/569730f94a1d9da47967a24fad0323ef7d5b4119/src/world/World.js#L491C22-L491C22) +// We are unsure if this is part of a broader problem, if for some reason errors are thrown that appear +// To be related to the usage of "use strict", such as variable is not defined, we should investigate further. +// This does not occur on unity-renderer. +const performance = { + now: function() { return Date.now(); } +} + // timeout handler globalThis.setImmediate = (fn) => Promise.resolve().then(fn)