From 48005551dba687507d926c94a08576cf678554fd Mon Sep 17 00:00:00 2001 From: Mateo Miccino Date: Tue, 31 Jan 2023 16:44:39 -0300 Subject: [PATCH] Release 2023 01 30 (#475) * Release 2023 01 30 * missing packages * Added addressables from renderer project * Fixed test --------- Co-authored-by: Juan Molteni --- .../Assets/AddressableAssetsData.meta | 8 + .../AddressableAssetSettings.asset | 106 ++++++++ .../AddressableAssetSettings.asset.meta | 8 + .../AssetGroupTemplates.meta | 8 + .../AssetGroupTemplates/Packed Assets.asset | 76 ++++++ .../Packed Assets.asset.meta | 8 + .../AddressableAssetsData/AssetGroups.meta | 8 + .../AssetGroups/Built In Data.asset | 32 +++ .../AssetGroups/Built In Data.asset.meta | 8 + .../AssetGroups/Default Local Group.asset | 29 ++ .../Default Local Group.asset.meta | 8 + .../AssetGroups/Schemas.meta | 8 + .../Built In Data_PlayerDataGroupSchema.asset | 17 ++ ...t In Data_PlayerDataGroupSchema.asset.meta | 8 + ... Local Group_BundledAssetGroupSchema.asset | 45 ++++ ...l Group_BundledAssetGroupSchema.asset.meta | 8 + ...Local Group_ContentUpdateGroupSchema.asset | 16 ++ ... Group_ContentUpdateGroupSchema.asset.meta | 8 + .../AddressableAssetsData/DataBuilders.meta | 8 + .../DataBuilders/BuildScriptFastMode.asset | 20 ++ .../BuildScriptFastMode.asset.meta | 8 + .../DataBuilders/BuildScriptPackedMode.asset | 20 ++ .../BuildScriptPackedMode.asset.meta | 8 + .../BuildScriptPackedPlayMode.asset | 20 ++ .../BuildScriptPackedPlayMode.asset.meta | 8 + .../DataBuilders/BuildScriptVirtualMode.asset | 20 ++ .../BuildScriptVirtualMode.asset.meta | 8 + .../AddressableAssetsData/DefaultObject.asset | 15 ++ .../DefaultObject.asset.meta | 8 + .../Resources/MinimapHUDDesktop.prefab | 248 ++++++++++++++---- unity-renderer-desktop/Packages/manifest.json | 3 +- .../Packages/packages-lock.json | 18 +- .../ProjectSettings/EditorBuildSettings.asset | 4 +- 33 files changed, 776 insertions(+), 49 deletions(-) create mode 100644 unity-renderer-desktop/Assets/AddressableAssetsData.meta create mode 100644 unity-renderer-desktop/Assets/AddressableAssetsData/AddressableAssetSettings.asset create mode 100644 unity-renderer-desktop/Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta create mode 100644 unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroupTemplates.meta create mode 100644 unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset create mode 100644 unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta create mode 100644 unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups.meta create mode 100644 unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups/Built In Data.asset create mode 100644 unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta create mode 100644 unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset create mode 100644 unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset.meta create mode 100644 unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups/Schemas.meta create mode 100644 unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset create mode 100644 unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset.meta create mode 100644 unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset create mode 100644 unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset.meta create mode 100644 unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset create mode 100644 unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset.meta create mode 100644 unity-renderer-desktop/Assets/AddressableAssetsData/DataBuilders.meta create mode 100644 unity-renderer-desktop/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset create mode 100644 unity-renderer-desktop/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset.meta create mode 100644 unity-renderer-desktop/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset create mode 100644 unity-renderer-desktop/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset.meta create mode 100644 unity-renderer-desktop/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset create mode 100644 unity-renderer-desktop/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset.meta create mode 100644 unity-renderer-desktop/Assets/AddressableAssetsData/DataBuilders/BuildScriptVirtualMode.asset create mode 100644 unity-renderer-desktop/Assets/AddressableAssetsData/DataBuilders/BuildScriptVirtualMode.asset.meta create mode 100644 unity-renderer-desktop/Assets/AddressableAssetsData/DefaultObject.asset create mode 100644 unity-renderer-desktop/Assets/AddressableAssetsData/DefaultObject.asset.meta diff --git a/unity-renderer-desktop/Assets/AddressableAssetsData.meta b/unity-renderer-desktop/Assets/AddressableAssetsData.meta new file mode 100644 index 00000000..0f2363d4 --- /dev/null +++ b/unity-renderer-desktop/Assets/AddressableAssetsData.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dff856430c495fc4dbad663f76e11729 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity-renderer-desktop/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/unity-renderer-desktop/Assets/AddressableAssetsData/AddressableAssetSettings.asset new file mode 100644 index 00000000..a1cfb882 --- /dev/null +++ b/unity-renderer-desktop/Assets/AddressableAssetsData/AddressableAssetSettings.asset @@ -0,0 +1,106 @@ +%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: 468a46d0ae32c3544b7d98094e6448a9, type: 3} + m_Name: AddressableAssetSettings + m_EditorClassIdentifier: + m_DefaultGroup: f0a44aebc31f5154cbe456cd22566dad + m_CachedHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_OptimizeCatalogSize: 0 + m_BuildRemoteCatalog: 0 + m_BundleLocalCatalog: 0 + m_CatalogRequestsTimeout: 0 + m_DisableCatalogUpdateOnStart: 0 + m_IgnoreUnsupportedFilesInBuild: 0 + m_UniqueBundleIds: 0 + m_NonRecursiveBuilding: 1 + m_CCDEnabled: 0 + m_maxConcurrentWebRequests: 500 + m_ContiguousBundles: 1 + m_StripUnityVersionFromBundleBuild: 0 + m_DisableVisibleSubAssetRepresentations: 0 + m_ShaderBundleNaming: 0 + m_ShaderBundleCustomNaming: + m_MonoScriptBundleNaming: 0 + m_MonoScriptBundleCustomNaming: + m_RemoteCatalogBuildPath: + m_Id: + m_RemoteCatalogLoadPath: + m_Id: + m_ContentStateBuildPath: + m_BuildAddressablesWithPlayerBuild: 0 + m_overridePlayerVersion: + m_GroupAssets: + - {fileID: 11400000, guid: 21fbbf74d46cdd4408197ebd883a5ad4, type: 2} + - {fileID: 11400000, guid: b05eb6c57c95f5b4dba8c49e65384b23, type: 2} + - {fileID: 11400000, guid: b00cb2830851a89468c9f2178f3023e0, type: 2} + m_BuildSettings: + m_CompileScriptsInVirtualMode: 0 + m_CleanupStreamingAssetsAfterBuilds: 1 + m_LogResourceManagerExceptions: 1 + m_BundleBuildPath: Temp/com.unity.addressables/AssetBundles + m_ProfileSettings: + m_Profiles: + - m_InheritedParent: + m_Id: 8684fc3dc7fd1694089498484b908f67 + m_ProfileName: Default + m_Values: + - m_Id: fe88ca88e00473144ad6a9830dca22f9 + m_Value: '[UnityEditor.EditorUserBuildSettings.activeBuildTarget]' + - m_Id: 64f55720408bd1e45be1f1e0cf8fcb2a + m_Value: '[UnityEngine.AddressableAssets.Addressables.BuildPath]/[BuildTarget]' + - m_Id: 1b769666515106a45bdf1e8d019d2ff7 + m_Value: '{UnityEngine.AddressableAssets.Addressables.RuntimePath}/[BuildTarget]' + - m_Id: 1829d2cf200bc0040974b7640a4dd6e8 + m_Value: ServerData/[BuildTarget] + - m_Id: 39c3fb141e670e245b74fe6846d213b3 + m_Value: http://[PrivateIpAddress]:[HostingServicePort] + m_ProfileEntryNames: + - m_Id: fe88ca88e00473144ad6a9830dca22f9 + m_Name: BuildTarget + m_InlineUsage: 0 + - m_Id: 64f55720408bd1e45be1f1e0cf8fcb2a + m_Name: Local.BuildPath + m_InlineUsage: 0 + - m_Id: 1b769666515106a45bdf1e8d019d2ff7 + m_Name: Local.LoadPath + m_InlineUsage: 0 + - m_Id: 1829d2cf200bc0040974b7640a4dd6e8 + m_Name: Remote.BuildPath + m_InlineUsage: 0 + - m_Id: 39c3fb141e670e245b74fe6846d213b3 + m_Name: Remote.LoadPath + m_InlineUsage: 0 + m_ProfileVersion: 1 + m_LabelTable: + m_LabelNames: + - default + m_SchemaTemplates: [] + m_GroupTemplateObjects: + - {fileID: 11400000, guid: 89190e728e303f5499a6f16155239170, type: 2} + m_InitializationObjects: [] + m_CertificateHandlerType: + m_AssemblyName: + m_ClassName: + m_ActivePlayerDataBuilderIndex: 3 + m_DataBuilders: + - {fileID: 11400000, guid: f07984aee9513964bbb604887d38ec9d, type: 2} + - {fileID: 11400000, guid: 523b97b6a8ebca941931e29f5c418f4f, type: 2} + - {fileID: 11400000, guid: 58bdaea34b411bc40bede0454357e8bc, type: 2} + - {fileID: 11400000, guid: a3898061d4b87f24d9d2fbbe9215c0b4, type: 2} + m_ActiveProfileId: 8684fc3dc7fd1694089498484b908f67 + m_HostingServicesManager: + m_HostingServiceInfos: [] + m_Settings: {fileID: 11400000} + m_NextInstanceId: 0 + m_RegisteredServiceTypeRefs: [] diff --git a/unity-renderer-desktop/Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta b/unity-renderer-desktop/Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta new file mode 100644 index 00000000..88b8a6c4 --- /dev/null +++ b/unity-renderer-desktop/Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: eacb7126dbb812c4a927b00cff8530f4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroupTemplates.meta b/unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroupTemplates.meta new file mode 100644 index 00000000..2f1c3ee0 --- /dev/null +++ b/unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroupTemplates.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d40226505743d3a438ee24e29dad61e4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset b/unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset new file mode 100644 index 00000000..2c5bb125 --- /dev/null +++ b/unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset @@ -0,0 +1,76 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-5458047255625621019 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: e5d17a21594effb4e9591490b009e7aa, type: 3} + m_Name: BundledAssetGroupSchema + m_EditorClassIdentifier: + m_Group: {fileID: 0} + m_InternalBundleIdMode: 1 + m_Compression: 1 + m_IncludeAddressInCatalog: 1 + m_IncludeGUIDInCatalog: 1 + m_IncludeLabelsInCatalog: 1 + m_InternalIdNamingMode: 0 + m_CacheClearBehavior: 0 + m_IncludeInBuild: 1 + m_BundledAssetProviderType: + m_AssemblyName: + m_ClassName: + m_ForceUniqueProvider: 0 + m_UseAssetBundleCache: 1 + m_UseAssetBundleCrc: 1 + m_UseAssetBundleCrcForCachedBundles: 1 + m_UseUWRForLocalBundles: 0 + m_Timeout: 0 + m_ChunkedTransfer: 0 + m_RedirectLimit: -1 + m_RetryCount: 0 + m_BuildPath: + m_Id: + m_LoadPath: + m_Id: + m_BundleMode: 0 + m_AssetBundleProviderType: + m_AssemblyName: + m_ClassName: + m_BundleNaming: 0 + m_AssetLoadMode: 0 +--- !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: 1a3c5d64ac83548c09dd1678b9f6f1cd, type: 3} + m_Name: Packed Assets + m_EditorClassIdentifier: + m_SchemaObjects: + - {fileID: -5458047255625621019} + - {fileID: 5292930800938293897} + m_Description: Pack assets into asset bundles. + m_Settings: {fileID: 0} +--- !u!114 &5292930800938293897 +MonoBehaviour: + m_ObjectHideFlags: 1 + 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: 5834b5087d578d24c926ce20cd31e6d6, type: 3} + m_Name: ContentUpdateGroupSchema + m_EditorClassIdentifier: + m_Group: {fileID: 0} + m_StaticContent: 0 diff --git a/unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta b/unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta new file mode 100644 index 00000000..febf57d8 --- /dev/null +++ b/unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 89190e728e303f5499a6f16155239170 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups.meta b/unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups.meta new file mode 100644 index 00000000..d87c0932 --- /dev/null +++ b/unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5e730f5462acf164e8ba09ebdb8977ee +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups/Built In Data.asset b/unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups/Built In Data.asset new file mode 100644 index 00000000..533e2f28 --- /dev/null +++ b/unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups/Built In Data.asset @@ -0,0 +1,32 @@ +%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: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} + m_Name: Built In Data + m_EditorClassIdentifier: + m_GroupName: Built In Data + m_Data: + m_SerializedData: [] + m_GUID: f5372ed2566596e4fac3a09dbf8eadaa + m_SerializeEntries: + - m_GUID: Resources + m_Address: Resources + m_ReadOnly: 1 + m_SerializedLabels: [] + - m_GUID: EditorSceneList + m_Address: EditorSceneList + m_ReadOnly: 1 + m_SerializedLabels: [] + m_ReadOnly: 1 + m_Settings: {fileID: 11400000, guid: eacb7126dbb812c4a927b00cff8530f4, type: 2} + m_SchemaSet: + m_Schemas: + - {fileID: 11400000, guid: 2eb133d7cf0e56d4d9ac78368622ce07, type: 2} diff --git a/unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta b/unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta new file mode 100644 index 00000000..f104fbe0 --- /dev/null +++ b/unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 21fbbf74d46cdd4408197ebd883a5ad4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset b/unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset new file mode 100644 index 00000000..7aeb5280 --- /dev/null +++ b/unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset @@ -0,0 +1,29 @@ +%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: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} + m_Name: Default Local Group + m_EditorClassIdentifier: + m_GroupName: Default Local Group + m_Data: + m_SerializedData: [] + m_GUID: f0a44aebc31f5154cbe456cd22566dad + m_SerializeEntries: + - m_GUID: 436e0d4fdc1cdfa4aaef13be2e8bcef8 + m_Address: Packages/com.decentraland.unity-renderer/AddressableAssetsData/AddressableAssetSettings.asset + m_ReadOnly: 0 + m_SerializedLabels: [] + m_ReadOnly: 0 + m_Settings: {fileID: 11400000, guid: eacb7126dbb812c4a927b00cff8530f4, type: 2} + m_SchemaSet: + m_Schemas: + - {fileID: 11400000, guid: e62a470ff1dca0146a091089c2531693, type: 2} + - {fileID: 11400000, guid: 0effc628f3fe89947811214acbd4ff31, type: 2} diff --git a/unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset.meta b/unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset.meta new file mode 100644 index 00000000..7f5e4206 --- /dev/null +++ b/unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b05eb6c57c95f5b4dba8c49e65384b23 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups/Schemas.meta b/unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups/Schemas.meta new file mode 100644 index 00000000..9d757bbb --- /dev/null +++ b/unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups/Schemas.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 811c76df1bc349049926a8d6cdb57a7d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset b/unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset new file mode 100644 index 00000000..216a0bdb --- /dev/null +++ b/unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset @@ -0,0 +1,17 @@ +%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: b1487f5d688e4f94f828f879d599dbdc, type: 3} + m_Name: Built In Data_PlayerDataGroupSchema + m_EditorClassIdentifier: + m_Group: {fileID: 11400000, guid: 21fbbf74d46cdd4408197ebd883a5ad4, type: 2} + m_IncludeResourcesFolders: 1 + m_IncludeBuildSettingsScenes: 1 diff --git a/unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset.meta b/unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset.meta new file mode 100644 index 00000000..808e1e9e --- /dev/null +++ b/unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2eb133d7cf0e56d4d9ac78368622ce07 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset b/unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset new file mode 100644 index 00000000..bc31a72a --- /dev/null +++ b/unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset @@ -0,0 +1,45 @@ +%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: e5d17a21594effb4e9591490b009e7aa, type: 3} + m_Name: Default Local Group_BundledAssetGroupSchema + m_EditorClassIdentifier: + m_Group: {fileID: 11400000, guid: b05eb6c57c95f5b4dba8c49e65384b23, type: 2} + m_InternalBundleIdMode: 1 + m_Compression: 1 + m_IncludeAddressInCatalog: 1 + m_IncludeGUIDInCatalog: 1 + m_IncludeLabelsInCatalog: 1 + m_InternalIdNamingMode: 0 + m_CacheClearBehavior: 0 + m_IncludeInBuild: 1 + m_BundledAssetProviderType: + m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider + m_ForceUniqueProvider: 0 + m_UseAssetBundleCache: 1 + m_UseAssetBundleCrc: 1 + m_UseAssetBundleCrcForCachedBundles: 1 + m_UseUWRForLocalBundles: 0 + m_Timeout: 0 + m_ChunkedTransfer: 0 + m_RedirectLimit: -1 + m_RetryCount: 0 + m_BuildPath: + m_Id: 64f55720408bd1e45be1f1e0cf8fcb2a + m_LoadPath: + m_Id: 1b769666515106a45bdf1e8d019d2ff7 + m_BundleMode: 0 + m_AssetBundleProviderType: + m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider + m_BundleNaming: 0 + m_AssetLoadMode: 0 diff --git a/unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset.meta b/unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset.meta new file mode 100644 index 00000000..1b8c510d --- /dev/null +++ b/unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0effc628f3fe89947811214acbd4ff31 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset b/unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset new file mode 100644 index 00000000..11fd616c --- /dev/null +++ b/unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset @@ -0,0 +1,16 @@ +%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: 5834b5087d578d24c926ce20cd31e6d6, type: 3} + m_Name: Default Local Group_ContentUpdateGroupSchema + m_EditorClassIdentifier: + m_Group: {fileID: 11400000, guid: b05eb6c57c95f5b4dba8c49e65384b23, type: 2} + m_StaticContent: 0 diff --git a/unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset.meta b/unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset.meta new file mode 100644 index 00000000..9353a921 --- /dev/null +++ b/unity-renderer-desktop/Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e62a470ff1dca0146a091089c2531693 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity-renderer-desktop/Assets/AddressableAssetsData/DataBuilders.meta b/unity-renderer-desktop/Assets/AddressableAssetsData/DataBuilders.meta new file mode 100644 index 00000000..2784e797 --- /dev/null +++ b/unity-renderer-desktop/Assets/AddressableAssetsData/DataBuilders.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 37e6acfe193e2ff47a22c3e62aff1bdb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity-renderer-desktop/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset b/unity-renderer-desktop/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset new file mode 100644 index 00000000..50d30dc5 --- /dev/null +++ b/unity-renderer-desktop/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset @@ -0,0 +1,20 @@ +%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: 88d21199f5d473f4db36845f2318f180, type: 3} + m_Name: BuildScriptFastMode + m_EditorClassIdentifier: + instanceProviderType: + m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider + sceneProviderType: + m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.SceneProvider diff --git a/unity-renderer-desktop/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset.meta b/unity-renderer-desktop/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset.meta new file mode 100644 index 00000000..aebbee90 --- /dev/null +++ b/unity-renderer-desktop/Assets/AddressableAssetsData/DataBuilders/BuildScriptFastMode.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f07984aee9513964bbb604887d38ec9d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity-renderer-desktop/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset b/unity-renderer-desktop/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset new file mode 100644 index 00000000..ec875f94 --- /dev/null +++ b/unity-renderer-desktop/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset @@ -0,0 +1,20 @@ +%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: 3e2e0ffa088c91d41a086d0b8cb16bdc, type: 3} + m_Name: BuildScriptPackedMode + m_EditorClassIdentifier: + instanceProviderType: + m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider + sceneProviderType: + m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.SceneProvider diff --git a/unity-renderer-desktop/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset.meta b/unity-renderer-desktop/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset.meta new file mode 100644 index 00000000..e13956e7 --- /dev/null +++ b/unity-renderer-desktop/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedMode.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a3898061d4b87f24d9d2fbbe9215c0b4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity-renderer-desktop/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset b/unity-renderer-desktop/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset new file mode 100644 index 00000000..76288451 --- /dev/null +++ b/unity-renderer-desktop/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset @@ -0,0 +1,20 @@ +%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: ad8c280d42ee0ed41a27db23b43dd2bf, type: 3} + m_Name: BuildScriptPackedPlayMode + m_EditorClassIdentifier: + instanceProviderType: + m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider + sceneProviderType: + m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.SceneProvider diff --git a/unity-renderer-desktop/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset.meta b/unity-renderer-desktop/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset.meta new file mode 100644 index 00000000..c9359304 --- /dev/null +++ b/unity-renderer-desktop/Assets/AddressableAssetsData/DataBuilders/BuildScriptPackedPlayMode.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 58bdaea34b411bc40bede0454357e8bc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity-renderer-desktop/Assets/AddressableAssetsData/DataBuilders/BuildScriptVirtualMode.asset b/unity-renderer-desktop/Assets/AddressableAssetsData/DataBuilders/BuildScriptVirtualMode.asset new file mode 100644 index 00000000..dfb2d582 --- /dev/null +++ b/unity-renderer-desktop/Assets/AddressableAssetsData/DataBuilders/BuildScriptVirtualMode.asset @@ -0,0 +1,20 @@ +%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: bb0e4994b34add1409fd8ccaf4a82de5, type: 3} + m_Name: BuildScriptVirtualMode + m_EditorClassIdentifier: + instanceProviderType: + m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider + sceneProviderType: + m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.SceneProvider diff --git a/unity-renderer-desktop/Assets/AddressableAssetsData/DataBuilders/BuildScriptVirtualMode.asset.meta b/unity-renderer-desktop/Assets/AddressableAssetsData/DataBuilders/BuildScriptVirtualMode.asset.meta new file mode 100644 index 00000000..3da558a1 --- /dev/null +++ b/unity-renderer-desktop/Assets/AddressableAssetsData/DataBuilders/BuildScriptVirtualMode.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 523b97b6a8ebca941931e29f5c418f4f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity-renderer-desktop/Assets/AddressableAssetsData/DefaultObject.asset b/unity-renderer-desktop/Assets/AddressableAssetsData/DefaultObject.asset new file mode 100644 index 00000000..b3c519bf --- /dev/null +++ b/unity-renderer-desktop/Assets/AddressableAssetsData/DefaultObject.asset @@ -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: 3a189bb168d8d90478a09ea08c2f3d72, type: 3} + m_Name: DefaultObject + m_EditorClassIdentifier: + m_AddressableAssetSettingsGuid: eacb7126dbb812c4a927b00cff8530f4 diff --git a/unity-renderer-desktop/Assets/AddressableAssetsData/DefaultObject.asset.meta b/unity-renderer-desktop/Assets/AddressableAssetsData/DefaultObject.asset.meta new file mode 100644 index 00000000..b8ba2b1e --- /dev/null +++ b/unity-renderer-desktop/Assets/AddressableAssetsData/DefaultObject.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dce8e3c860d4250499555a4e2cddd883 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity-renderer-desktop/Assets/Scripts/MainScripts/DCL/Controllers/HUD/Minimap/Resources/MinimapHUDDesktop.prefab b/unity-renderer-desktop/Assets/Scripts/MainScripts/DCL/Controllers/HUD/Minimap/Resources/MinimapHUDDesktop.prefab index 11a49e00..b3fda1ce 100644 --- a/unity-renderer-desktop/Assets/Scripts/MainScripts/DCL/Controllers/HUD/Minimap/Resources/MinimapHUDDesktop.prefab +++ b/unity-renderer-desktop/Assets/Scripts/MainScripts/DCL/Controllers/HUD/Minimap/Resources/MinimapHUDDesktop.prefab @@ -28,6 +28,7 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.83333427, y: 0.83333427, z: 0.83333427} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5658907650445577744} m_Father: {fileID: 3152017465466843965} @@ -35,7 +36,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -34.77069, y: 24.666626} + m_AnchoredPosition: {x: -34.77063, y: 24.666626} m_SizeDelta: {x: 45.05005, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4069968334089262200 @@ -104,6 +105,7 @@ RectTransform: 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: - {fileID: 8895873058851204921} m_Father: {fileID: 855126726310001881} @@ -180,6 +182,7 @@ RectTransform: 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: - {fileID: 3193766002073600729} - {fileID: 4962717906899733416} @@ -240,7 +243,6 @@ GameObject: - component: {fileID: 9211774656993958778} - component: {fileID: 7765627168184248376} - component: {fileID: 4053306793857394868} - - component: {fileID: 9145835380855476319} - component: {fileID: 4829796436903443225} - component: {fileID: 406179600317839154} m_Layer: 5 @@ -260,6 +262,7 @@ RectTransform: 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: 5658907650445577744} m_RootOrder: 0 @@ -342,7 +345,7 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} @@ -351,6 +354,7 @@ MonoBehaviour: m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -368,25 +372,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!95 &9145835380855476319 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2165128297109979227} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 22100000, guid: d5f6cd638da0f1b4388c7a3679abe0b0, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 --- !u!114 &4829796436903443225 MonoBehaviour: m_ObjectHideFlags: 0 @@ -402,7 +387,7 @@ MonoBehaviour: hideOnEnable: 1 animSpeedFactor: 1 disableAfterFadeOut: 1 - visibleParam: visible + canvasGroup: {fileID: 0} --- !u!225 &406179600317839154 CanvasGroup: m_ObjectHideFlags: 0 @@ -426,7 +411,6 @@ GameObject: - component: {fileID: 3220753041847998096} - component: {fileID: 6815063791129953191} - component: {fileID: 4048329761873195195} - - component: {fileID: 8036134364244689740} - component: {fileID: 5191595910136587115} - component: {fileID: 503232177988887119} m_Layer: 5 @@ -446,6 +430,7 @@ RectTransform: 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: 5658907650445577744} m_RootOrder: 1 @@ -493,25 +478,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!95 &8036134364244689740 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3680761699765129035} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 22100000, guid: d5f6cd638da0f1b4388c7a3679abe0b0, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 --- !u!114 &5191595910136587115 MonoBehaviour: m_ObjectHideFlags: 0 @@ -527,7 +493,7 @@ MonoBehaviour: hideOnEnable: 1 animSpeedFactor: 3 disableAfterFadeOut: 0 - visibleParam: visible + canvasGroup: {fileID: 0} --- !u!225 &503232177988887119 CanvasGroup: m_ObjectHideFlags: 0 @@ -568,6 +534,7 @@ RectTransform: 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: 4962717906899733416} m_RootOrder: 0 @@ -648,7 +615,7 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} @@ -657,6 +624,7 @@ MonoBehaviour: m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -706,6 +674,7 @@ RectTransform: 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: - {fileID: 9211774656993958778} - {fileID: 3220753041847998096} @@ -745,6 +714,8 @@ MonoBehaviour: notInteractableColor: {r: 0.36862746, g: 0.36862746, b: 0.36862746, a: 1} compatibleModes: 0000000001000000 firstTimeLabelIndicator: {fileID: 0} + onImage: {fileID: 0} + offImage: {fileID: 0} --- !u!114 &3904051150748962423 MonoBehaviour: m_ObjectHideFlags: 0 @@ -863,6 +834,7 @@ RectTransform: 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: 5658907650445577744} m_RootOrder: 2 @@ -938,6 +910,7 @@ RectTransform: 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: 855126726310001881} m_RootOrder: 0 @@ -1012,11 +985,116 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1654068766305085246, guid: 4db069904ba9d4fd18704de950b93f7c, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1654068766305085246, guid: 4db069904ba9d4fd18704de950b93f7c, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1654068766305085246, guid: 4db069904ba9d4fd18704de950b93f7c, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1654068766305085246, guid: 4db069904ba9d4fd18704de950b93f7c, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1654068766305085246, guid: 4db069904ba9d4fd18704de950b93f7c, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1654068766305085246, guid: 4db069904ba9d4fd18704de950b93f7c, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1720320832292161455, guid: 4db069904ba9d4fd18704de950b93f7c, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3094980274358157737, guid: 4db069904ba9d4fd18704de950b93f7c, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3094980274358157737, guid: 4db069904ba9d4fd18704de950b93f7c, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3094980274358157737, guid: 4db069904ba9d4fd18704de950b93f7c, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3094980274358157737, guid: 4db069904ba9d4fd18704de950b93f7c, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3094980274358157737, guid: 4db069904ba9d4fd18704de950b93f7c, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3174194123047082070, guid: 4db069904ba9d4fd18704de950b93f7c, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3174194123047082070, guid: 4db069904ba9d4fd18704de950b93f7c, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3174194123047082070, guid: 4db069904ba9d4fd18704de950b93f7c, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3174194123047082070, guid: 4db069904ba9d4fd18704de950b93f7c, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4525154057530514719, guid: 4db069904ba9d4fd18704de950b93f7c, type: 3} propertyPath: m_Name value: MinimapHUDDesktop objectReference: {fileID: 0} + - target: {fileID: 4555375608536199507, guid: 4db069904ba9d4fd18704de950b93f7c, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5096443706333437024, guid: 4db069904ba9d4fd18704de950b93f7c, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5096443706333437024, guid: 4db069904ba9d4fd18704de950b93f7c, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5096443706333437024, guid: 4db069904ba9d4fd18704de950b93f7c, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5096443706333437024, guid: 4db069904ba9d4fd18704de950b93f7c, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 5875304779917548748, guid: 4db069904ba9d4fd18704de950b93f7c, type: 3} propertyPath: m_AnchorMax.y @@ -1037,6 +1115,31 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5945014886343259003, guid: 4db069904ba9d4fd18704de950b93f7c, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5945014886343259003, guid: 4db069904ba9d4fd18704de950b93f7c, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5945014886343259003, guid: 4db069904ba9d4fd18704de950b93f7c, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5945014886343259003, guid: 4db069904ba9d4fd18704de950b93f7c, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5945014886343259003, guid: 4db069904ba9d4fd18704de950b93f7c, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6238993295414465396, guid: 4db069904ba9d4fd18704de950b93f7c, type: 3} propertyPath: m_Pivot.x @@ -1142,6 +1245,61 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6957545392895023995, guid: 4db069904ba9d4fd18704de950b93f7c, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6957545392895023995, guid: 4db069904ba9d4fd18704de950b93f7c, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6957545392895023995, guid: 4db069904ba9d4fd18704de950b93f7c, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6957545392895023995, guid: 4db069904ba9d4fd18704de950b93f7c, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6957545392895023995, guid: 4db069904ba9d4fd18704de950b93f7c, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6957545392895023995, guid: 4db069904ba9d4fd18704de950b93f7c, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7684605981512774620, guid: 4db069904ba9d4fd18704de950b93f7c, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 8825137990369535304, guid: 4db069904ba9d4fd18704de950b93f7c, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8825137990369535304, guid: 4db069904ba9d4fd18704de950b93f7c, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8825137990369535304, guid: 4db069904ba9d4fd18704de950b93f7c, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8825137990369535304, guid: 4db069904ba9d4fd18704de950b93f7c, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8846952731899407684, guid: 4db069904ba9d4fd18704de950b93f7c, type: 3} propertyPath: m_AnchorMax.y diff --git a/unity-renderer-desktop/Packages/manifest.json b/unity-renderer-desktop/Packages/manifest.json index 85c30d2f..8a40e19b 100644 --- a/unity-renderer-desktop/Packages/manifest.json +++ b/unity-renderer-desktop/Packages/manifest.json @@ -7,9 +7,10 @@ "com.cysharp.unitask": "https://github.com/Cysharp/UniTask.git?path=src/UniTask/Assets/Plugins/UniTask", "com.decentraland.rpc-csharp": "https://github.com/decentraland/rpc-csharp.git?path=rpc-csharp/src", "com.decentraland.unity-shared-dependencies": "https://github.com/decentraland/unity-shared-dependencies.git", - "com.decentraland.unity-renderer": "git+https://github.com/decentraland/unity-renderer.git?path=unity-renderer/Assets#main", + "com.decentraland.unity-renderer": "git+https://github.com/decentraland/unity-renderer.git?path=unity-renderer/Assets#release/release-20230130", "com.decentraland.webgl-ime-input": "https://github.com/decentraland/webgl-ime-input.git", "com.decentraland.videoplayer": "git+https://github.com/decentraland/DCLVideoPlayerUnity.git?path=Assets#main", + "com.unity.addressables": "1.19.19", "com.unity.cinemachine": "2.8.9", "com.unity.render-pipelines.universal": "12.1.8", "com.unity.test-framework.performance": "2.8.1-preview", diff --git a/unity-renderer-desktop/Packages/packages-lock.json b/unity-renderer-desktop/Packages/packages-lock.json index 4446c0ea..a6db627b 100644 --- a/unity-renderer-desktop/Packages/packages-lock.json +++ b/unity-renderer-desktop/Packages/packages-lock.json @@ -49,7 +49,7 @@ "hash": "0edfd2eb04da488b3ea3b1bc744efb4df033b508" }, "com.decentraland.unity-renderer": { - "version": "git+https://github.com/decentraland/unity-renderer.git?path=unity-renderer/Assets#main", + "version": "git+https://github.com/decentraland/unity-renderer.git?path=unity-renderer/Assets#release/release-20230130", "depth": 0, "source": "git", "dependencies": { @@ -99,7 +99,7 @@ "com.unity.modules.vr": "1.0.0", "com.unity.modules.xr": "1.0.0" }, - "hash": "2e4047d44c14ca399cbd50a9f7af854e48ef5610" + "hash": "83f39a7db9003060871cb50cf43b81d2d1962b18" }, "com.decentraland.unity-shared-dependencies": { "version": "https://github.com/decentraland/unity-shared-dependencies.git", @@ -134,6 +134,20 @@ "source": "builtin", "dependencies": {} }, + "com.unity.addressables": { + "version": "1.19.19", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.scriptablebuildpipeline": "1.19.6", + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.unitywebrequestassetbundle": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.burst": { "version": "1.7.3", "depth": 1, diff --git a/unity-renderer-desktop/ProjectSettings/EditorBuildSettings.asset b/unity-renderer-desktop/ProjectSettings/EditorBuildSettings.asset index 59d8e0d4..d102efe3 100644 --- a/unity-renderer-desktop/ProjectSettings/EditorBuildSettings.asset +++ b/unity-renderer-desktop/ProjectSettings/EditorBuildSettings.asset @@ -11,4 +11,6 @@ EditorBuildSettings: - enabled: 1 path: Packages/com.decentraland.unity-renderer/Scenes/BuilderScene.unity guid: 08aa6ee723f77451a95ef70a7dce7e75 - m_configObjects: {} + m_configObjects: + com.unity.addressableassets: {fileID: 11400000, guid: dce8e3c860d4250499555a4e2cddd883, + type: 2}