From eaa4725cdcc3fb640f304d25c822ed6590afc792 Mon Sep 17 00:00:00 2001 From: Romina Marchetti Date: Wed, 3 Apr 2024 11:09:23 -0300 Subject: [PATCH 1/8] Update copies --- .../MyAccountHUD/Prefabs/BlockedList.prefab | 18 ++++++++++-------- .../DCL/DataStore/DataStore_Notifications.cs | 4 ++-- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/Prefabs/BlockedList.prefab b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/Prefabs/BlockedList.prefab index f69899c99a..ed0563d149 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/Prefabs/BlockedList.prefab +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/Prefabs/BlockedList.prefab @@ -141,9 +141,10 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: When you block someone, both you and that person won't be able to see each - other's avatars, messages in public or private channels, or send friend requests - to each other. + m_text: "If you block someone in Decentraland, you will no longer see their avatar + in-world, and you will not be able to send friend requests or messages to each + other. You will also not see each other\u2019s messages in public or private + chats." m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 6708c7eadd49b49f4ac3469e5104e7c9, type: 2} m_sharedMaterial: {fileID: 2100000, guid: dd1effe058ec94479a0dd10765262662, type: 2} @@ -531,7 +532,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 128, y: -200} - m_SizeDelta: {x: 713, y: 56.98} + m_SizeDelta: {x: 713, y: 76.3574} m_Pivot: {x: 0, y: 1} --- !u!222 &3345930943405460214 CanvasRenderer: @@ -561,9 +562,10 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: You can block anyone from the menu option that appears when you click the - three dots icon within their profile card or private conversation, or when you - hover over the person's name in the channel members, chat or friends list. + m_text: "To block someone, open their profile card by clicking on their avatar + and click on the three dots in the upper right corner above their avatar image, + then select the option \u2018Block\u2019. You can also block someone within a + chat by clicking on the three dots to the right of their name and selecting \u2018Block\u2019." m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 6708c7eadd49b49f4ac3469e5104e7c9, type: 2} m_sharedMaterial: {fileID: 2100000, guid: dd1effe058ec94479a0dd10765262662, type: 2} @@ -911,7 +913,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 511, y: -8} + m_AnchoredPosition: {x: 511, y: -7.9999695} m_SizeDelta: {x: 8, y: -94} m_Pivot: {x: 1, y: 1} --- !u!222 &1993293957083626822 diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/DataStore/DataStore_Notifications.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/DataStore/DataStore_Notifications.cs index 46cd5660dd..7b1d09afff 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/DataStore/DataStore_Notifications.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/DataStore/DataStore_Notifications.cs @@ -34,7 +34,7 @@ public static GenericConfirmationNotificationData CreateUnFriendData(string user public static GenericConfirmationNotificationData CreateBlockUserData(string userName, Action confirmationAction) => new ( $"Are you sure you want to block {userName}?", - "Blocking someone means that you and that person can no longer see each other's avatars, messages, and send friend requests.", + "Blocking someone means that you will no longer see their avatar in-world. Both of you will also not see each other's messages in private and public chats and will not be able to send each other messages or friend requests.", "CANCEL", "BLOCK", null, @@ -43,7 +43,7 @@ public static GenericConfirmationNotificationData CreateBlockUserData(string use public static GenericConfirmationNotificationData CreateUnBlockUserData(string userName, Action confirmationAction) => new ( $"Are you sure you want to unblock {userName}?", - "Once you unblock someone, you and that person would be able to see each other's avatars, messages, and send friend requests.", + "Once you unblock someone, you will see their avatar in-world and you will both be able to see each other's messages and send each other friend requests.", "CANCEL", "UNBLOCK", null, From cb2037e98698e681dcf48cc9046c8ae0a458680c Mon Sep 17 00:00:00 2001 From: Romina Marchetti Date: Wed, 3 Apr 2024 12:51:15 -0300 Subject: [PATCH 2/8] Make generic pop up vertically flexible --- .../Resources/GenericConfirmationPopup.prefab | 182 ++++++++++++++---- 1 file changed, 144 insertions(+), 38 deletions(-) diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/ConfirmationPopup/Resources/GenericConfirmationPopup.prefab b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/ConfirmationPopup/Resources/GenericConfirmationPopup.prefab index 5465bba262..895974ad2b 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/ConfirmationPopup/Resources/GenericConfirmationPopup.prefab +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/ConfirmationPopup/Resources/GenericConfirmationPopup.prefab @@ -31,12 +31,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 748608453488172493} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 87.000015} - m_SizeDelta: {x: 306, y: 44} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 306, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1703960191160554575 CanvasRenderer: @@ -136,6 +135,64 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &4765217074038235746 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2385456774495241379} + - component: {fileID: 5405317425283375627} + m_Layer: 5 + m_Name: Buttons + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2385456774495241379 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4765217074038235746} + 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: 1767993552507509700} + - {fileID: 2707158814742602100} + m_Father: {fileID: 748608453488172493} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 306, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &5405317425283375627 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4765217074038235746} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: 52 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: 52 + m_LayoutPriority: 1 --- !u!1 &5670732266688795212 GameObject: m_ObjectHideFlags: 0 @@ -169,7 +226,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 334105295397510177} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -286,6 +342,8 @@ GameObject: - component: {fileID: 424981647407856322} - component: {fileID: 390931854261043918} - component: {fileID: 8722178245602580679} + - component: {fileID: 5805276553323350248} + - component: {fileID: 1350796038641582709} m_Layer: 5 m_Name: Modal m_TagString: Untagged @@ -305,17 +363,15 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1767993552507509700} - - {fileID: 2707158814742602100} - - {fileID: 7750366355427468054} - {fileID: 5320795065761248863} + - {fileID: 7750366355427468054} + - {fileID: 2385456774495241379} m_Father: {fileID: 334105295397510177} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 430, y: 350} + m_SizeDelta: {x: 430, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &424981647407856322 CanvasRenderer: @@ -368,6 +424,46 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ShowMaskGraphic: 1 +--- !u!114 &5805276553323350248 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6150239558006173254} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 60 + m_Bottom: 60 + m_ChildAlignment: 4 + m_Spacing: 30 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &1350796038641582709 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6150239558006173254} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 --- !u!1 &7886239998420550621 GameObject: m_ObjectHideFlags: 0 @@ -405,7 +501,6 @@ RectTransform: - {fileID: 5404782228060347586} - {fileID: 748608453488172493} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -429,7 +524,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 100 m_TargetDisplay: 0 @@ -551,12 +648,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 748608453488172493} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -5.4999986} - m_SizeDelta: {x: 306, y: 81} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 306, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1262808249577876865 CanvasRenderer: @@ -586,7 +682,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Description + m_text: Blocking someone means that you will no longer see their avatar in-world. + Both of you will also not see each other's messages in private and public chats + and will not be able to send each other messages or friend requests. m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 6708c7eadd49b49f4ac3469e5104e7c9, type: 2} m_sharedMaterial: {fileID: 2100000, guid: dd1effe058ec94479a0dd10765262662, type: 2} @@ -661,7 +759,8 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 748608453488172493} + serializedVersion: 3 + m_TransformParent: {fileID: 2385456774495241379} m_Modifications: - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} @@ -681,22 +780,22 @@ PrefabInstance: - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} propertyPath: m_AnchorMax.x - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} propertyPath: m_AnchorMax.y - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} propertyPath: m_AnchorMin.x - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} propertyPath: m_AnchorMin.y - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} @@ -731,27 +830,27 @@ PrefabInstance: - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} propertyPath: m_AnchoredPosition.x - value: 153 + value: 0.000045776367 objectReference: {fileID: 0} - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} propertyPath: m_AnchoredPosition.y - value: -113 + value: 0 objectReference: {fileID: 0} - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} @@ -890,6 +989,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} --- !u!114 &886928643233455748 stripped MonoBehaviour: @@ -926,7 +1028,8 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 748608453488172493} + serializedVersion: 3 + m_TransformParent: {fileID: 2385456774495241379} m_Modifications: - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} @@ -946,22 +1049,22 @@ PrefabInstance: - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} propertyPath: m_AnchorMax.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} propertyPath: m_AnchorMax.y - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} propertyPath: m_AnchorMin.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} propertyPath: m_AnchorMin.y - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} @@ -996,27 +1099,27 @@ PrefabInstance: - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} propertyPath: m_AnchoredPosition.x - value: -153 + value: 0 objectReference: {fileID: 0} - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} propertyPath: m_AnchoredPosition.y - value: -113 + value: 0 objectReference: {fileID: 0} - target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} @@ -1170,6 +1273,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3} --- !u!114 &1969861380810069237 stripped MonoBehaviour: From 9aa4fec757d1ca88122b1139147ef8dba20226ee Mon Sep 17 00:00:00 2001 From: Lean Mendoza Date: Tue, 9 Apr 2024 15:54:45 -0300 Subject: [PATCH 3/8] fix: unify to entity.id the scene_id by comms, remove unused kernel code (#6156) --- .../shared/apis/host/CommunicationsController.ts | 6 +++--- .../packages/shared/comms/sceneSubscriptions.ts | 15 --------------- .../emptyParcelController.ts | 1 + browser-interface/packages/shared/types.ts | 2 +- .../shared/wearablesPortableExperience/sagas.ts | 3 +++ browser-interface/packages/unity-interface/dcl.ts | 1 + .../unity-interface/portableExperiencesUtils.ts | 4 ++++ .../test/unit/RestrictedActions.test.tsx | 1 + .../test/unit/portableExperiences.test.tsx | 1 + 9 files changed, 15 insertions(+), 19 deletions(-) diff --git a/browser-interface/packages/shared/apis/host/CommunicationsController.ts b/browser-interface/packages/shared/apis/host/CommunicationsController.ts index e3bb7ca6cc..1abe8e8689 100644 --- a/browser-interface/packages/shared/apis/host/CommunicationsController.ts +++ b/browser-interface/packages/shared/apis/host/CommunicationsController.ts @@ -48,7 +48,7 @@ export function registerCommunicationsControllerServiceServerImplementation(port * The `receiveCommsMessage` relays messages in direction: scene -> comms */ const commsController: ICommunicationsController = { - cid: ctx.sceneData.id, + cid: ctx.sceneData.entity.id || ctx.sceneData.id, receiveCommsMessage(preData: Uint8Array, sender: PeerInformation) { const [msgType, data] = decodeMessage(preData) if (msgType === MsgType.String) { @@ -85,13 +85,13 @@ export function registerCommunicationsControllerServiceServerImplementation(port return { async send(req, ctx) { const message = textEncoder.encode(req.message) - sendParcelSceneCommsMessage(ctx.sceneData.id, encodeMessage(message, MsgType.String)) + sendParcelSceneCommsMessage(commsController.cid, encodeMessage(message, MsgType.String)) return {} }, async sendBinary(req, ctx) { // Send messages for (const data of req.data) { - sendParcelSceneCommsMessage(ctx.sceneData.id, encodeMessage(data, MsgType.Uint8Array)) + sendParcelSceneCommsMessage(commsController.cid, encodeMessage(data, MsgType.Uint8Array)) } // Process received messages diff --git a/browser-interface/packages/shared/comms/sceneSubscriptions.ts b/browser-interface/packages/shared/comms/sceneSubscriptions.ts index db1b5bda37..36bf2e1e5e 100644 --- a/browser-interface/packages/shared/comms/sceneSubscriptions.ts +++ b/browser-interface/packages/shared/comms/sceneSubscriptions.ts @@ -14,18 +14,3 @@ export function subscribeParcelSceneToCommsMessages(controller: ICommunicationsC export function unsubscribeParcelSceneToCommsMessages(controller: ICommunicationsController) { scenesSubscribedToCommsEvents.delete(controller) } - -/** - * Retrieve the scene IDs that are subscribed to receive scene messages from comms - * - * @returns a list of CIDs, identifying the Scenes by their hash - */ -export function getParcelSceneSubscriptions(): string[] { - const ids: string[] = [] - - scenesSubscribedToCommsEvents.forEach(($) => { - ids.push($.cid) - }) - - return ids -} diff --git a/browser-interface/packages/shared/scene-loader/genesis-city-loader-impl/emptyParcelController.ts b/browser-interface/packages/shared/scene-loader/genesis-city-loader-impl/emptyParcelController.ts index 7d3d29992e..4e0d7759db 100644 --- a/browser-interface/packages/shared/scene-loader/genesis-city-loader-impl/emptyParcelController.ts +++ b/browser-interface/packages/shared/scene-loader/genesis-city-loader-impl/emptyParcelController.ts @@ -36,6 +36,7 @@ export class EmptyParcelController { id: entityId, baseUrl: this.baseUrl + 'contents/', entity: { + id: entityId, content: emptyScenes[sceneName]!, pointers: [coordinates], timestamp: Date.now(), diff --git a/browser-interface/packages/shared/types.ts b/browser-interface/packages/shared/types.ts index 4200f6a887..eac741375f 100644 --- a/browser-interface/packages/shared/types.ts +++ b/browser-interface/packages/shared/types.ts @@ -181,7 +181,7 @@ export type SceneSourcePlacement = { export const VOICE_CHAT_FEATURE_TOGGLE: SceneFeatureToggle = { name: 'voiceChat', default: 'enabled' } export type LoadableScene = { - readonly entity: Readonly> + readonly entity: Readonly readonly baseUrl: string readonly id: string /** Id of the parent scene that spawned this scene experience */ diff --git a/browser-interface/packages/shared/wearablesPortableExperience/sagas.ts b/browser-interface/packages/shared/wearablesPortableExperience/sagas.ts index a95a32ac71..01ad12c779 100644 --- a/browser-interface/packages/shared/wearablesPortableExperience/sagas.ts +++ b/browser-interface/packages/shared/wearablesPortableExperience/sagas.ts @@ -154,6 +154,9 @@ export async function wearableToSceneEntity(wearable: WearableV2, defaultBaseUrl baseUrl, parentCid: 'avatar', entity: { + // TODO: the wearable.id is an urn because the wearable was fetched + // from `lambdas/wearables` instead of `content/entities/active` + id: wearable.id, content, metadata, pointers: [wearable.id], diff --git a/browser-interface/packages/unity-interface/dcl.ts b/browser-interface/packages/unity-interface/dcl.ts index c2fa964bc4..7d68e9fca0 100644 --- a/browser-interface/packages/unity-interface/dcl.ts +++ b/browser-interface/packages/unity-interface/dcl.ts @@ -110,6 +110,7 @@ async function startGlobalScene(cid: string, title: string, fileContentUrl: stri id: cid, baseUrl, entity: { + id: cid, content: [...extraContent, { file: 'scene.js', hash: fileContentUrl }], pointers: [cid], timestamp: 0, diff --git a/browser-interface/packages/unity-interface/portableExperiencesUtils.ts b/browser-interface/packages/unity-interface/portableExperiencesUtils.ts index bb97b2e01f..0a320b9f3b 100644 --- a/browser-interface/packages/unity-interface/portableExperiencesUtils.ts +++ b/browser-interface/packages/unity-interface/portableExperiencesUtils.ts @@ -85,6 +85,10 @@ export async function getPortableExperienceFromUrn(sceneUrn: string): Promise { sceneNumber: 3, baseUrl: '', entity: { + id: 'test', version: 'v3', content: [], pointers: [], diff --git a/browser-interface/test/unit/portableExperiences.test.tsx b/browser-interface/test/unit/portableExperiences.test.tsx index ead8a4b7b3..d0f67631a8 100644 --- a/browser-interface/test/unit/portableExperiences.test.tsx +++ b/browser-interface/test/unit/portableExperiences.test.tsx @@ -22,6 +22,7 @@ describe('Portable experiences sagas test', () => { id: urn, baseUrl: '', entity: { + id: urn, content: [], metadata: { menuBarIcon: 'icon' From 312aa4644bec4b7cce1970d8b6594d2306a9e6d2 Mon Sep 17 00:00:00 2001 From: Nicolas Echezarreta Date: Tue, 9 Apr 2024 11:47:23 -0300 Subject: [PATCH 4/8] update livekit-client@2.0.10 --- browser-interface/package-lock.json | 151 +++++------------- browser-interface/package.json | 2 +- .../shared/comms/adapters/LivekitAdapter.ts | 23 +-- .../adapters/voice/liveKitVoiceHandler.ts | 6 +- .../packages/shared/comms/sagas.ts | 2 +- 5 files changed, 61 insertions(+), 123 deletions(-) diff --git a/browser-interface/package-lock.json b/browser-interface/package-lock.json index 1ae7f39ae8..426ec28d89 100644 --- a/browser-interface/package-lock.json +++ b/browser-interface/package-lock.json @@ -37,7 +37,7 @@ "fp-future": "^1.0.1", "gifuct-js": "^2.1.2", "hls.js": "^1.3.4", - "livekit-client": "^1.8.0", + "livekit-client": "^2.0.10", "mitt": "^3.0.0", "mz-observable": "^1.0.1", "redux": "^4.2.1", @@ -443,6 +443,11 @@ "node": ">=6.9.0" } }, + "node_modules/@bufbuild/protobuf": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@bufbuild/protobuf/-/protobuf-1.8.0.tgz", + "integrity": "sha512-qR9FwI8QKIveDnUYutvfzbC21UZJJryYrLuZGjeZ/VGz+vXelUkK+xgkOHsvPEdYEdxtgUUq4313N8QtOehJ1Q==" + }, "node_modules/@cspotcode/source-map-support": { "version": "0.8.1", "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", @@ -896,6 +901,14 @@ "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==" }, + "node_modules/@livekit/protocol": { + "version": "1.10.4", + "resolved": "https://registry.npmjs.org/@livekit/protocol/-/protocol-1.10.4.tgz", + "integrity": "sha512-7Occ6l5VqjsKsUjpLeVJXJkip4ce22iG9QR/haOkrDXYwGSY+TwCA4ubbJ81aQBt2z0kHVZuaQWdzJSDLI+Kag==", + "dependencies": { + "@bufbuild/protobuf": "^1.7.2" + } + }, "node_modules/@matrix-org/matrix-sdk-crypto-js": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/@matrix-org/matrix-sdk-crypto-js/-/matrix-sdk-crypto-js-0.1.4.tgz", @@ -1941,11 +1954,6 @@ "node": ">=12.0" } }, - "node_modules/async-await-queue": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/async-await-queue/-/async-await-queue-1.2.1.tgz", - "integrity": "sha512-v2j+/EMzAnuJZ8I4570KJMFhi6G9g3WZyFh6cPnmQSJh3nLao77XpRt01kyFegQazPSKvue1yaIYDp/NfV/b0g==" - }, "node_modules/asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", @@ -5976,49 +5984,20 @@ "dev": true }, "node_modules/livekit-client": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/livekit-client/-/livekit-client-1.9.3.tgz", - "integrity": "sha512-GBZBRYYHI8POOCCQCSPjRwqVJX/jRmdZi1sE8ZZV0EFHB1OhgiWa/Uhng+t8E8HIolb9lf8Ela9WhzzsI8a8yA==", + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/livekit-client/-/livekit-client-2.0.10.tgz", + "integrity": "sha512-V+EyTEd3kM1Vl9/TsE3nc7PEnJI2t21ZV0/nkqhGThszym1SJzmc61hKjmCJBnR199pskUxSjrwzMl9HrPQ85A==", "dependencies": { - "async-await-queue": "^1.2.1", + "@livekit/protocol": "1.10.4", "events": "^3.3.0", "loglevel": "^1.8.0", - "protobufjs": "^7.0.0", "sdp-transform": "^2.14.1", "ts-debounce": "^4.0.0", + "tslib": "2.6.2", "typed-emitter": "^2.1.0", - "ua-parser-js": "^1.0.2", "webrtc-adapter": "^8.1.1" } }, - "node_modules/livekit-client/node_modules/long": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz", - "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==" - }, - "node_modules/livekit-client/node_modules/protobufjs": { - "version": "7.2.5", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.5.tgz", - "integrity": "sha512-gGXRSXvxQ7UiPgfw8gevrfRWcTlSbOFg+p/N+JVJEK5VhueL2miT6qTymqAmjr1Q5WbOCyJbyrk6JfWKwlFn6A==", - "hasInstallScript": true, - "dependencies": { - "@protobufjs/aspromise": "^1.1.2", - "@protobufjs/base64": "^1.1.2", - "@protobufjs/codegen": "^2.0.4", - "@protobufjs/eventemitter": "^1.1.0", - "@protobufjs/fetch": "^1.1.0", - "@protobufjs/float": "^1.0.2", - "@protobufjs/inquire": "^1.1.0", - "@protobufjs/path": "^1.1.2", - "@protobufjs/pool": "^1.1.0", - "@protobufjs/utf8": "^1.1.0", - "@types/node": ">=13.7.0", - "long": "^5.0.0" - }, - "engines": { - "node": ">=12.0.0" - } - }, "node_modules/locate-path": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", @@ -9449,10 +9428,9 @@ } }, "node_modules/tslib": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", - "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==", - "devOptional": true + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "node_modules/tsutils": { "version": "3.21.0", @@ -9584,24 +9562,6 @@ "typescript-compare": "^0.0.2" } }, - "node_modules/ua-parser-js": { - "version": "1.0.35", - "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.35.tgz", - "integrity": "sha512-fKnGuqmTBnIE+/KXSzCn4db8RTigUzw1AN0DmdU6hJovUTbYJKyqj+8Mt1c4VfRDnOVJnENmfYkIPZ946UrSAA==", - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/ua-parser-js" - }, - { - "type": "paypal", - "url": "https://paypal.me/faisalman" - } - ], - "engines": { - "node": "*" - } - }, "node_modules/uint8arrays": { "version": "2.1.10", "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-2.1.10.tgz", @@ -10373,6 +10333,11 @@ "to-fast-properties": "^2.0.0" } }, + "@bufbuild/protobuf": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/@bufbuild/protobuf/-/protobuf-1.8.0.tgz", + "integrity": "sha512-qR9FwI8QKIveDnUYutvfzbC21UZJJryYrLuZGjeZ/VGz+vXelUkK+xgkOHsvPEdYEdxtgUUq4313N8QtOehJ1Q==" + }, "@cspotcode/source-map-support": { "version": "0.8.1", "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", @@ -10770,6 +10735,14 @@ } } }, + "@livekit/protocol": { + "version": "1.10.4", + "resolved": "https://registry.npmjs.org/@livekit/protocol/-/protocol-1.10.4.tgz", + "integrity": "sha512-7Occ6l5VqjsKsUjpLeVJXJkip4ce22iG9QR/haOkrDXYwGSY+TwCA4ubbJ81aQBt2z0kHVZuaQWdzJSDLI+Kag==", + "requires": { + "@bufbuild/protobuf": "^1.7.2" + } + }, "@matrix-org/matrix-sdk-crypto-js": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/@matrix-org/matrix-sdk-crypto-js/-/matrix-sdk-crypto-js-0.1.4.tgz", @@ -11579,11 +11552,6 @@ "integrity": "sha512-Kd0o8r6CDazJGCRzs8Ivpn0xj19oNKrULhoJFzhGjRsLpekF2zyZs9Ukz+JvZhWD6smszfepakTFhAaYpsI12g==", "dev": true }, - "async-await-queue": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/async-await-queue/-/async-await-queue-1.2.1.tgz", - "integrity": "sha512-v2j+/EMzAnuJZ8I4570KJMFhi6G9g3WZyFh6cPnmQSJh3nLao77XpRt01kyFegQazPSKvue1yaIYDp/NfV/b0g==" - }, "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", @@ -14641,45 +14609,18 @@ "dev": true }, "livekit-client": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/livekit-client/-/livekit-client-1.9.3.tgz", - "integrity": "sha512-GBZBRYYHI8POOCCQCSPjRwqVJX/jRmdZi1sE8ZZV0EFHB1OhgiWa/Uhng+t8E8HIolb9lf8Ela9WhzzsI8a8yA==", + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/livekit-client/-/livekit-client-2.0.10.tgz", + "integrity": "sha512-V+EyTEd3kM1Vl9/TsE3nc7PEnJI2t21ZV0/nkqhGThszym1SJzmc61hKjmCJBnR199pskUxSjrwzMl9HrPQ85A==", "requires": { - "async-await-queue": "^1.2.1", + "@livekit/protocol": "1.10.4", "events": "^3.3.0", "loglevel": "^1.8.0", - "protobufjs": "^7.0.0", "sdp-transform": "^2.14.1", "ts-debounce": "^4.0.0", + "tslib": "2.6.2", "typed-emitter": "^2.1.0", - "ua-parser-js": "^1.0.2", "webrtc-adapter": "^8.1.1" - }, - "dependencies": { - "long": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz", - "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==" - }, - "protobufjs": { - "version": "7.2.5", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.5.tgz", - "integrity": "sha512-gGXRSXvxQ7UiPgfw8gevrfRWcTlSbOFg+p/N+JVJEK5VhueL2miT6qTymqAmjr1Q5WbOCyJbyrk6JfWKwlFn6A==", - "requires": { - "@protobufjs/aspromise": "^1.1.2", - "@protobufjs/base64": "^1.1.2", - "@protobufjs/codegen": "^2.0.4", - "@protobufjs/eventemitter": "^1.1.0", - "@protobufjs/fetch": "^1.1.0", - "@protobufjs/float": "^1.0.2", - "@protobufjs/inquire": "^1.1.0", - "@protobufjs/path": "^1.1.2", - "@protobufjs/pool": "^1.1.0", - "@protobufjs/utf8": "^1.1.0", - "@types/node": ">=13.7.0", - "long": "^5.0.0" - } - } } }, "locate-path": { @@ -17241,10 +17182,9 @@ } }, "tslib": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", - "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==", - "devOptional": true + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "tsutils": { "version": "3.21.0", @@ -17344,11 +17284,6 @@ "typescript-compare": "^0.0.2" } }, - "ua-parser-js": { - "version": "1.0.35", - "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.35.tgz", - "integrity": "sha512-fKnGuqmTBnIE+/KXSzCn4db8RTigUzw1AN0DmdU6hJovUTbYJKyqj+8Mt1c4VfRDnOVJnENmfYkIPZ946UrSAA==" - }, "uint8arrays": { "version": "2.1.10", "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-2.1.10.tgz", diff --git a/browser-interface/package.json b/browser-interface/package.json index 0cb54b5953..db6d67d068 100644 --- a/browser-interface/package.json +++ b/browser-interface/package.json @@ -83,7 +83,7 @@ "fp-future": "^1.0.1", "gifuct-js": "^2.1.2", "hls.js": "^1.3.4", - "livekit-client": "^1.8.0", + "livekit-client": "^2.0.10", "mitt": "^3.0.0", "mz-observable": "^1.0.1", "redux": "^4.2.1", diff --git a/browser-interface/packages/shared/comms/adapters/LivekitAdapter.ts b/browser-interface/packages/shared/comms/adapters/LivekitAdapter.ts index d113c6cab0..efbde7d9f0 100644 --- a/browser-interface/packages/shared/comms/adapters/LivekitAdapter.ts +++ b/browser-interface/packages/shared/comms/adapters/LivekitAdapter.ts @@ -30,12 +30,15 @@ export class LivekitAdapter implements MinimumCommunicationsAdapter { public readonly events = mitt() private disposed = false - private readonly room: Room private voiceHandler: VoiceHandler - constructor(private config: LivekitConfig) { - this.room = new Room() + static async init(config: LivekitConfig) { + const room = new Room() + const sid = await room.getSid() + return new LivekitAdapter(config, room, sid) + } + private constructor(private config: LivekitConfig, private readonly room: Room, private sid: string) { this.voiceHandler = createLiveKitVoiceHandler(this.room, this.config.globalAudioStream) this.room @@ -58,13 +61,13 @@ export class LivekitAdapter implements MinimumCommunicationsAdapter { this.config.logger.log(this.room.name, 'disconnected from room', reason, { liveKitParticipantSid: this.room.localParticipant.sid, - liveKitRoomSid: this.room.sid + liveKitRoomSid: this.sid }) trackEvent('disconnection_cause', { context: 'livekit-adapter', message: `Got RoomEvent.Disconnected. Reason: ${reason}`, liveKitParticipantSid: this.room.localParticipant.sid, - liveKitRoomSid: this.room.sid + liveKitRoomSid: this.sid }) const kicked = reason === DisconnectReason.DUPLICATE_IDENTITY this.do_disconnect(kicked).catch((err) => { @@ -108,14 +111,14 @@ export class LivekitAdapter implements MinimumCommunicationsAdapter { } try { - await this.room.localParticipant.publishData(data, reliable ? DataPacket_Kind.RELIABLE : DataPacket_Kind.LOSSY) + await this.room.localParticipant.publishData(data, { reliable }) } catch (err: any) { // NOTE: for tracking purposes only, this is not a "code" error, this is a failed connection or a problem with the livekit instance trackEvent('error', { context: 'livekit-adapter', message: `Error trying to send data. Reason: ${err.message}`, stack: err.stack, - saga_stack: `room session id: ${this.room.sid}, participant id: ${this.room.localParticipant.sid}, state: ${state}` + saga_stack: `room session id: ${this.sid}, participant id: ${this.room.localParticipant.sid}, state: ${state}` }) await this.disconnect() } @@ -144,12 +147,12 @@ export class LivekitAdapter implements MinimumCommunicationsAdapter { getActiveVideoStreams(): Map { const result = new Map() - const participants = this.room.participants + const participants = this.room.remoteParticipants for (const [sid, participant] of participants) { - if (participant.videoTracks.size > 0) { + if (participant.videoTrackPublications.size > 0) { const participantTracks = new Map() - for (const [videoSid, track] of participant.videoTracks) { + for (const [videoSid, track] of participant.videoTrackPublications) { if (track.videoTrack?.mediaStream) { participantTracks.set(videoSid, track.videoTrack) } diff --git a/browser-interface/packages/shared/comms/adapters/voice/liveKitVoiceHandler.ts b/browser-interface/packages/shared/comms/adapters/voice/liveKitVoiceHandler.ts index eb2111b613..c255747f80 100644 --- a/browser-interface/packages/shared/comms/adapters/voice/liveKitVoiceHandler.ts +++ b/browser-interface/packages/shared/comms/adapters/voice/liveKitVoiceHandler.ts @@ -54,7 +54,7 @@ export function createLiveKitVoiceHandler(room: Room, globalAudioStream: GlobalA participantsInfo.set(participant.identity, $) participant.on(ParticipantEvent.IsSpeakingChanged, (talking: boolean) => { - const audioPublication = participant.getTrack(Track.Source.Microphone) + const audioPublication = participant.getTrackPublication(Track.Source.Microphone) if (audioPublication && audioPublication.track) { const audioTrack = audioPublication.track as RemoteAudioTrack onUserTalkingCallback(participant.identity, audioTrack.isMuted ? false : talking) @@ -200,7 +200,7 @@ export function createLiveKitVoiceHandler(room: Room, globalAudioStream: GlobalA ) } - for (const [_, participant] of room.participants) { + for (const [_, participant] of room.remoteParticipants) { const address = participant.identity const peer = getPeer(address) const participantInfo = participantsInfo.get(address) @@ -209,7 +209,7 @@ export function createLiveKitVoiceHandler(room: Room, globalAudioStream: GlobalA const profile = getCurrentUserProfile(state) if (profile) { const muted = !shouldPlayVoice(state, profile, address) - const audioPublication = participant.getTrack(Track.Source.Microphone) + const audioPublication = participant.getTrackPublication(Track.Source.Microphone) if (audioPublication && audioPublication.track) { const audioTrack = audioPublication.track as RemoteAudioTrack audioTrack.setMuted(muted) diff --git a/browser-interface/packages/shared/comms/sagas.ts b/browser-interface/packages/shared/comms/sagas.ts index 420984a86a..d4fdc0d1dd 100644 --- a/browser-interface/packages/shared/comms/sagas.ts +++ b/browser-interface/packages/shared/comms/sagas.ts @@ -289,7 +289,7 @@ async function connectAdapter(connStr: string, identity: ExplorerIdentity): Prom throw new Error('No access token') } - const livekitAdapter = new LivekitAdapter({ + const livekitAdapter = await LivekitAdapter.init({ logger: commsLogger, url: theUrl.origin + theUrl.pathname, token, From de662d634ad81bd505bbc5c47b63c3a96c1c0f3b Mon Sep 17 00:00:00 2001 From: Nicolas Lorusso <56365551+lorux0@users.noreply.github.com> Date: Fri, 12 Apr 2024 10:20:50 -0300 Subject: [PATCH 5/8] feat: exotic rarity (#6158) --- .../WearablesCatalogService/NftRarity.cs | 1 + .../Data/InfoPanelSkins/Exotic.asset | 18 +++ .../Data/InfoPanelSkins/Exotic.asset.meta | 8 ++ .../Data/ItemToggleSkinFactory.asset | 2 + .../EmotesCustomization/EmoteCard.prefab | 2 + .../EmotesCustomization/EmoteSlotCard.prefab | 21 +-- .../Resources/InfoPanel.prefab | 130 +++++------------- .../Scripts/AvatarEditorHUDAudioHandler.cs | 3 +- .../AvatarEditorHUD/Scripts/NFTItemInfo.cs | 7 +- .../Tests/AvatarEditorHUDViewShould.cs | 1 + .../AvatarSlot/NftRarityBackground.asset | 2 + .../NftWearableRarityBackground.asset | 2 + .../Resources/EmotesWheelHUD.prefab | 2 + .../HUD/Passport/NFTIcons/NFTTypesIcons.asset | 2 + .../PlayerInfoCardHUDControllerShould.cs | 9 +- .../DCL/Models/AvatarAssets/WearableItem.cs | 2 + .../Models/AvatarAssets/WearableLiterals.cs | 1 + .../BackpackTextures/ExoticThumbnail.png | 3 + .../BackpackTextures/ExoticThumbnail.png.meta | 127 +++++++++++++++++ .../BackpackTextures/InfoCardExotic.png | 3 + .../BackpackTextures/InfoCardExotic.png.meta | 127 +++++++++++++++++ 21 files changed, 351 insertions(+), 122 deletions(-) create mode 100644 unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Data/InfoPanelSkins/Exotic.asset create mode 100644 unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Data/InfoPanelSkins/Exotic.asset.meta create mode 100644 unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/ExoticThumbnail.png create mode 100644 unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/ExoticThumbnail.png.meta create mode 100644 unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/InfoCardExotic.png create mode 100644 unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/InfoCardExotic.png.meta diff --git a/unity-renderer/Assets/DCLServices/WearablesCatalogService/NftRarity.cs b/unity-renderer/Assets/DCLServices/WearablesCatalogService/NftRarity.cs index d341f6598e..3b6514691c 100644 --- a/unity-renderer/Assets/DCLServices/WearablesCatalogService/NftRarity.cs +++ b/unity-renderer/Assets/DCLServices/WearablesCatalogService/NftRarity.cs @@ -10,5 +10,6 @@ public enum NftRarity Mythic, Unique, None, + Exotic, } } diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Data/InfoPanelSkins/Exotic.asset b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Data/InfoPanelSkins/Exotic.asset new file mode 100644 index 0000000000..cab87399ab --- /dev/null +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Data/InfoPanelSkins/Exotic.asset @@ -0,0 +1,18 @@ +%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: 4dc671f1b2624312a9138e7217d2c725, type: 3} + m_Name: Exotic + m_EditorClassIdentifier: + backgroundColor: {r: 0.7921569, g: 1, b: 0.4509804, a: 1} + rarityNameColor: {r: 0.4745098, g: 0.6, b: 0.27058825, a: 1} + gradientColor: {r: 0, g: 0, b: 0, a: 0} + isBase: 0 diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Data/InfoPanelSkins/Exotic.asset.meta b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Data/InfoPanelSkins/Exotic.asset.meta new file mode 100644 index 0000000000..5d6d52290f --- /dev/null +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Data/InfoPanelSkins/Exotic.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 328446dcef0234af8a585064b39239a8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Data/ItemToggleSkinFactory.asset b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Data/ItemToggleSkinFactory.asset index 7db89fb11b..e709cfe3e8 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Data/ItemToggleSkinFactory.asset +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Data/ItemToggleSkinFactory.asset @@ -29,3 +29,5 @@ MonoBehaviour: skin: {fileID: 11400000, guid: 2ed4fac2cecbeb8468529aeb6448dcf3, type: 2} - rarity: base skin: {fileID: 11400000, guid: 3986c9106c9d88b4898dc92ef16dc48c, type: 2} + - rarity: exotic + skin: {fileID: 11400000, guid: 328446dcef0234af8a585064b39239a8, type: 2} diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Resources/EmotesCustomization/EmoteCard.prefab b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Resources/EmotesCustomization/EmoteCard.prefab index 7916c5f497..d58e0a3cba 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Resources/EmotesCustomization/EmoteCard.prefab +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Resources/EmotesCustomization/EmoteCard.prefab @@ -1245,6 +1245,8 @@ MonoBehaviour: markColor: {r: 0.4509804, g: 0.827451, b: 0.827451, a: 1} - rarity: uncommon markColor: {r: 1, g: 0.5137255, b: 0.38431373, a: 1} + - rarity: exotic + markColor: {r: 0.7921569, g: 1, b: 0.4509804, a: 1} model: id: TestId name: Emote name diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Resources/EmotesCustomization/EmoteSlotCard.prefab b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Resources/EmotesCustomization/EmoteSlotCard.prefab index 62b1e2c870..ab2f9e9611 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Resources/EmotesCustomization/EmoteSlotCard.prefab +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Resources/EmotesCustomization/EmoteSlotCard.prefab @@ -32,7 +32,6 @@ RectTransform: m_Children: - {fileID: 6632935345652180066} m_Father: {fileID: 6307937999073975908} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -108,7 +107,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8644696348179406289} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -244,7 +242,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8644696348179406289} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} @@ -380,7 +377,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6307937999073975908} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -456,7 +452,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5630504725028102285} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -533,7 +528,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6307937999073975908} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -630,7 +624,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5989498347712335370} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -706,7 +699,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2264468713520702337} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -786,7 +778,6 @@ RectTransform: - {fileID: 5630504725028102285} - {fileID: 4282460491909798165} m_Father: {fileID: 8644696348179406289} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -837,7 +828,6 @@ RectTransform: - {fileID: 2264468713520702337} - {fileID: 5972197344983308672} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -956,6 +946,8 @@ MonoBehaviour: markColor: {r: 0.4509804, g: 0.827451, b: 0.827451, a: 1} - rarity: uncommon markColor: {r: 1, g: 0.5137255, b: 0.38431373, a: 1} + - rarity: exotic + markColor: {r: 0.7921569, g: 1, b: 0.4509804, a: 1} model: emoteId: emoteName: Name @@ -999,7 +991,6 @@ RectTransform: - {fileID: 9167734917805677236} - {fileID: 6307937999073975908} m_Father: {fileID: 2264468713520702337} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1049,7 +1040,6 @@ RectTransform: - {fileID: 6113472091391423418} - {fileID: 8644696348179406289} m_Father: {fileID: 5989498347712335370} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1166,7 +1156,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2264468713520702337} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1243,7 +1232,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6307937999073975908} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1340,7 +1328,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8644696348179406289} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -1390,6 +1377,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6307937999073975908} m_Modifications: - target: {fileID: 4936655407855709455, guid: 4849d2ed3b5a18948bf3cd46256869a4, @@ -1530,6 +1518,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4849d2ed3b5a18948bf3cd46256869a4, type: 3} --- !u!224 &5090644010913815139 stripped RectTransform: diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Resources/InfoPanel.prefab b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Resources/InfoPanel.prefab index 386ad917ff..1e6f9f7b48 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Resources/InfoPanel.prefab +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Resources/InfoPanel.prefab @@ -31,7 +31,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3261743854788886140} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -109,7 +108,6 @@ RectTransform: - {fileID: 633677018793588932} - {fileID: 2032492818114121995} m_Father: {fileID: 1487313827608049107} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -185,7 +183,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 619811805175740151} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -259,7 +256,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 626039790801476180} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -297,7 +293,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6926629516638315714} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -373,7 +368,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3015978757741787219} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -449,7 +443,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4788174521128430335} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -572,7 +565,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &428239692464419380 RectTransform: m_ObjectHideFlags: 0 @@ -587,12 +580,11 @@ RectTransform: m_Children: - {fileID: 5858938990411152446} m_Father: {fileID: 8697685121013238991} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 134, y: -126} + m_SizeDelta: {x: 216, y: 152} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5628476619319597156 MonoBehaviour: @@ -687,11 +679,10 @@ RectTransform: m_Children: - {fileID: 1165322724003139559} m_Father: {fileID: 8697685121013238991} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 134, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5521845276682724747 @@ -786,7 +777,6 @@ RectTransform: m_Children: - {fileID: 7234413485157498893} m_Father: {fileID: 189741099783477407} - m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -865,11 +855,10 @@ RectTransform: - {fileID: 5449526497214711783} - {fileID: 189741099783477407} m_Father: {fileID: 8697685121013238991} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 134, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4073283865850580740 @@ -963,7 +952,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4788174521128430335} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -1039,7 +1027,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4900271697994871178} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1116,7 +1103,6 @@ RectTransform: m_Children: - {fileID: 3268546053690637373} m_Father: {fileID: 189741099783477407} - m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1214,11 +1200,10 @@ RectTransform: - {fileID: 2026036083187984911} - {fileID: 3015978757741787219} m_Father: {fileID: 3465827815602990005} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 14, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!222 &3897295257232798543 @@ -1319,7 +1304,6 @@ RectTransform: m_Children: - {fileID: 6853543058523703745} m_Father: {fileID: 189741099783477407} - m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1395,7 +1379,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 247630622158982991} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1472,7 +1455,6 @@ RectTransform: - {fileID: 4788174521128430335} - {fileID: 1312714700507039857} m_Father: {fileID: 8697685121013238991} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1511,7 +1493,6 @@ RectTransform: m_Children: - {fileID: 131270979524291396} m_Father: {fileID: 189741099783477407} - m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1588,7 +1569,6 @@ RectTransform: m_Children: - {fileID: 602223552229310829} m_Father: {fileID: 189741099783477407} - m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1665,7 +1645,6 @@ RectTransform: m_Children: - {fileID: 357092421529855955} m_Father: {fileID: 189741099783477407} - m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1742,7 +1721,6 @@ RectTransform: m_Children: - {fileID: 2252084841793811057} m_Father: {fileID: 189741099783477407} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1819,7 +1797,6 @@ RectTransform: m_Children: - {fileID: 2597808390139161741} m_Father: {fileID: 1487313827608049107} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -1956,7 +1933,6 @@ RectTransform: m_Children: - {fileID: 1122231239512417556} m_Father: {fileID: 189741099783477407} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -2047,7 +2023,6 @@ RectTransform: - {fileID: 3926077425006055319} - {fileID: 3261743854788886140} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -2071,7 +2046,9 @@ Canvas: m_OverrideSorting: 1 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 10 m_TargetDisplay: 0 @@ -2096,7 +2073,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.7830189, g: 0.7830189, b: 0.7830189, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -2187,8 +2164,8 @@ MonoBehaviour: m_Padding: m_Left: 24 m_Right: 24 - m_Top: 0 - m_Bottom: 40 + m_Top: 40 + m_Bottom: 45 m_ChildAlignment: 0 m_Spacing: 0 m_ChildForceExpandWidth: 1 @@ -2261,7 +2238,6 @@ RectTransform: - {fileID: 3765021508290200117} - {fileID: 6082319683778232619} m_Father: {fileID: 8697685121013238991} - m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -2326,7 +2302,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8697685121013238991} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -2422,7 +2397,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6131368630834936712} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2498,7 +2472,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6459774206431276903} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2575,7 +2548,6 @@ RectTransform: m_Children: - {fileID: 6194136944366205527} m_Father: {fileID: 189741099783477407} - m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -2651,7 +2623,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2923399201167003120} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2729,7 +2700,6 @@ RectTransform: - {fileID: 1468733285106176966} - {fileID: 8908691582983929822} m_Father: {fileID: 1487313827608049107} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2805,7 +2775,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4961680663327370611} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2882,7 +2851,6 @@ RectTransform: m_Children: - {fileID: 7054455189507106018} m_Father: {fileID: 189741099783477407} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2956,7 +2924,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 189741099783477407} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2994,7 +2961,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3261743854788886140} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -3132,7 +3098,6 @@ RectTransform: m_Children: - {fileID: 5278580251751750381} m_Father: {fileID: 189741099783477407} - m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -3208,7 +3173,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4761011641851499366} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -3277,7 +3241,7 @@ MonoBehaviour: m_fontSizeMin: 11 m_fontSizeMax: 16 m_fontStyle: 16 - m_HorizontalAlignment: 2 + m_HorizontalAlignment: 1 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -3344,7 +3308,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 775103623155688665} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -3481,7 +3444,6 @@ RectTransform: m_Children: - {fileID: 2501956090427330305} m_Father: {fileID: 189741099783477407} - m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -3558,7 +3520,6 @@ RectTransform: m_Children: - {fileID: 6554273072198455753} m_Father: {fileID: 189741099783477407} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -3638,7 +3599,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8697685121013238991} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -3810,12 +3770,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8697685121013238991} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -61.551605} - m_SizeDelta: {x: -20.000046, y: -153.10321} + m_AnchoredPosition: {x: 0, y: 3.5000014} + m_SizeDelta: {x: -16, y: -23.000004} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2801573427488340118 CanvasRenderer: @@ -3838,7 +3797,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9528302, g: 0.9528302, b: 0.9528302, a: 1} + m_Color: {r: 0.9882353, g: 0.9882353, b: 0.9882353, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -3907,7 +3866,6 @@ RectTransform: m_Children: - {fileID: 6963758765322407508} m_Father: {fileID: 189741099783477407} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -3984,7 +3942,6 @@ RectTransform: m_Children: - {fileID: 2989559680933346776} m_Father: {fileID: 189741099783477407} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -4061,7 +4018,6 @@ RectTransform: m_Children: - {fileID: 6682459054387353326} m_Father: {fileID: 189741099783477407} - m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -4138,7 +4094,6 @@ RectTransform: m_Children: - {fileID: 959042900432249351} m_Father: {fileID: 189741099783477407} - m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -4214,7 +4169,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5592233992570311858} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -4290,7 +4244,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7640137861430484778} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -4366,7 +4319,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4528479326552066965} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -4442,7 +4394,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4761011641851499366} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -4486,8 +4437,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} + rgba: 4283056195 + m_fontColor: {r: 0.2627451, g: 0.2509804, b: 0.2901961, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -4511,7 +4462,7 @@ MonoBehaviour: m_fontSizeMin: 11 m_fontSizeMax: 16 m_fontStyle: 0 - m_HorizontalAlignment: 2 + m_HorizontalAlignment: 1 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -4579,7 +4530,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 775103623155688665} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -4675,7 +4625,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8041280325394139589} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -4753,11 +4702,10 @@ RectTransform: m_Children: - {fileID: 775103623155688665} m_Father: {fileID: 8697685121013238991} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 134, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5004092260815141877 @@ -4851,7 +4799,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1312714700507039857} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -4986,7 +4933,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 189741099783477407} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -5026,11 +4972,10 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3465827815602990005} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 0.5999985, y: -5.3} + m_AnchoredPosition: {x: 0.6000061, y: -5.3} m_SizeDelta: {x: 0, y: 30} m_Pivot: {x: 0, y: 0.5} --- !u!222 &4014279169370274442 @@ -5199,11 +5144,10 @@ RectTransform: - {fileID: 7239528584353179843} - {fileID: 3635308477886120212} m_Father: {fileID: 8697685121013238991} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 134, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &913744341089880270 @@ -5221,10 +5165,10 @@ MonoBehaviour: m_Padding: m_Left: 0 m_Right: 0 - m_Top: 10 + m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 4 - m_Spacing: 0 + m_ChildAlignment: 3 + m_Spacing: 2 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 @@ -5247,7 +5191,7 @@ MonoBehaviour: m_IgnoreLayout: 0 m_MinWidth: -1 m_MinHeight: -1 - m_PreferredWidth: 200 + m_PreferredWidth: 220 m_PreferredHeight: -1 m_FlexibleWidth: -1 m_FlexibleHeight: -1 @@ -5298,7 +5242,6 @@ RectTransform: m_Children: - {fileID: 2905960628267195786} m_Father: {fileID: 189741099783477407} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -5374,7 +5317,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5196067485268574777} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -5450,7 +5392,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2026036083187984911} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -5526,7 +5467,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1312714700507039857} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -5604,11 +5544,10 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3926077425006055319} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 110, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &471053097770013555 @@ -5775,7 +5714,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 566603317409466727} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -5851,7 +5789,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6510683240129573557} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -5927,7 +5864,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6364857131986025415} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -6011,11 +5947,10 @@ RectTransform: - {fileID: 3010189839504068651} - {fileID: 7406054040917614175} m_Father: {fileID: 2817435974220827537} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 42, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1163086306238076957 @@ -6222,11 +6157,10 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 428239692464419380} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 108.00002, y: -75.999985} m_SizeDelta: {x: 132, y: 132} m_Pivot: {x: 0.5000002, y: 0.5000001} --- !u!222 &5978519757245594909 diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Scripts/AvatarEditorHUDAudioHandler.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Scripts/AvatarEditorHUDAudioHandler.cs index 7d328b3543..5dcc43f0f4 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Scripts/AvatarEditorHUDAudioHandler.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Scripts/AvatarEditorHUDAudioHandler.cs @@ -185,7 +185,8 @@ void PlayVoiceReaction(string bodyShape) if (lastSelectedWearable.rarity == Rarity.EPIC || lastSelectedWearable.rarity == Rarity.LEGENDARY || lastSelectedWearable.rarity == Rarity.MYTHIC - || lastSelectedWearable.rarity == Rarity.UNIQUE) + || lastSelectedWearable.rarity == Rarity.UNIQUE + || lastSelectedWearable.rarity == Rarity.EXOTIC) { eventReaction.RandomizeIndex(14, 28); chanceToPlay = 1f; diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Scripts/NFTItemInfo.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Scripts/NFTItemInfo.cs index efd53d935d..1589355b2f 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Scripts/NFTItemInfo.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Scripts/NFTItemInfo.cs @@ -96,10 +96,9 @@ public void SetSkin(string rarityName, NFTItemToggleSkin skin) this.rarityName.text = rarityName; this.rarityName.color = skin.rarityNameColor; backgroundImage.color = skin.backgroundColor; - gradientImage.color = skin.gradientColor; - + // gradientImage.color = skin.gradientColor; } - + public void SetModel(Model newModel) { if (newModel == null) @@ -176,7 +175,7 @@ private void GetThumbnail() thumbnail.sprite = currentModel.thumbnailSprite; return; } - + ThumbnailsManager.GetThumbnail(currentModel.thumbnail, UpdateItemThumbnail); } diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Tests/AvatarEditorHUDViewShould.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Tests/AvatarEditorHUDViewShould.cs index a6e0768c5b..0c6b57392e 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Tests/AvatarEditorHUDViewShould.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Tests/AvatarEditorHUDViewShould.cs @@ -162,6 +162,7 @@ public void Add_Exclusives_ToCollectibles(string wearableId) [TestCase(WearableLiterals.ItemRarity.LEGENDARY)] [TestCase(WearableLiterals.ItemRarity.MYTHIC)] [TestCase(WearableLiterals.ItemRarity.UNIQUE)] + [TestCase(WearableLiterals.ItemRarity.EXOTIC)] public void CreateNFTsButtonsByRarityCorrectly(string rarity) { WearableItem dummyItem = CreateDummyNFT(rarity); diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/AvatarSlot/NftRarityBackground.asset b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/AvatarSlot/NftRarityBackground.asset index f12dc407e6..d1fd16ddfa 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/AvatarSlot/NftRarityBackground.asset +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/AvatarSlot/NftRarityBackground.asset @@ -29,3 +29,5 @@ MonoBehaviour: value: {fileID: 21300000, guid: 94d7328f5583d47d6b961ae666f6db88, type: 3} - key: default value: {fileID: 21300000, guid: 43c5d03f6ddc94dd59cebf176b48c9d8, type: 3} + - key: exotic + value: {fileID: 21300000, guid: 47322084c05e74035ae381083f82a781, type: 3} diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/AvatarSlot/NftWearableRarityBackground.asset b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/AvatarSlot/NftWearableRarityBackground.asset index b43d04aa38..0433cee1fe 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/AvatarSlot/NftWearableRarityBackground.asset +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/AvatarSlot/NftWearableRarityBackground.asset @@ -31,3 +31,5 @@ MonoBehaviour: value: {fileID: 21300000, guid: a239a282af9bf48f7a26a34d76d77155, type: 3} - key: default value: {fileID: 21300000, guid: a239a282af9bf48f7a26a34d76d77155, type: 3} + - key: exotic + value: {fileID: 21300000, guid: 08eaea8a23fb84cb78a52c7aa089cdea, type: 3} diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmotesWheelHUD/Resources/EmotesWheelHUD.prefab b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmotesWheelHUD/Resources/EmotesWheelHUD.prefab index e412b23e59..dd2d06283b 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmotesWheelHUD/Resources/EmotesWheelHUD.prefab +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmotesWheelHUD/Resources/EmotesWheelHUD.prefab @@ -3042,6 +3042,8 @@ MonoBehaviour: markColor: {r: 0.4509804, g: 0.827451, b: 0.827451, a: 1} - rarity: uncommon markColor: {r: 1, g: 0.5137255, b: 0.38431373, a: 1} + - rarity: exotic + markColor: {r: 0.7921569, g: 1, b: 0.4509804, a: 1} customizeTitle: {fileID: 0} --- !u!222 &5211374839953244563 CanvasRenderer: diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/Passport/NFTIcons/NFTTypesIcons.asset b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/Passport/NFTIcons/NFTTypesIcons.asset index 0688a9ef85..37d2b44d48 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/Passport/NFTIcons/NFTTypesIcons.asset +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/Passport/NFTIcons/NFTTypesIcons.asset @@ -82,4 +82,6 @@ MonoBehaviour: value: {r: 0.08395632, g: 0.07876467, b: 0.09433961, a: 1} - key: name value: {r: 1, g: 0.4949912, b: 0.23113209, a: 1} + - key: exotic + value: {r: 0.7921569, g: 1, b: 0.4509804, a: 1} defaultColor: {r: 0.627451, g: 0.60784316, b: 0.65882355, a: 1} diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/PlayerInfoCardHUD/Tests/PlayerInfoCardHUDControllerShould.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/PlayerInfoCardHUD/Tests/PlayerInfoCardHUDControllerShould.cs index 72258b1ac1..507fb74aed 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/PlayerInfoCardHUD/Tests/PlayerInfoCardHUDControllerShould.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/PlayerInfoCardHUD/Tests/PlayerInfoCardHUDControllerShould.cs @@ -230,13 +230,13 @@ public void SendAnalyticsWhenOpened() private void PrepareUsers() { - var wearables = new[] - { + string[] wearables = { WearableLiterals.ItemRarity.EPIC, WearableLiterals.ItemRarity.LEGENDARY, WearableLiterals.ItemRarity.MYTHIC, WearableLiterals.ItemRarity.RARE, - WearableLiterals.ItemRarity.UNIQUE + WearableLiterals.ItemRarity.UNIQUE, + WearableLiterals.ItemRarity.EXOTIC, }; userProfiles = IDS.ToDictionary(x => x, x => GetUserProfile(x, wearables)); @@ -295,7 +295,8 @@ private void GivenWearableCatalog() new WearableItem { id = "legendary", rarity = WearableLiterals.ItemRarity.LEGENDARY }, new WearableItem { id = "mythic", rarity = WearableLiterals.ItemRarity.MYTHIC }, new WearableItem { id = "rare", rarity = WearableLiterals.ItemRarity.RARE }, - new WearableItem { id = "unique", rarity = WearableLiterals.ItemRarity.UNIQUE } + new WearableItem { id = "unique", rarity = WearableLiterals.ItemRarity.UNIQUE }, + new WearableItem { id = "exotic", rarity = WearableLiterals.ItemRarity.EXOTIC }, }; wearablesCatalogService = Substitute.For(); diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Models/AvatarAssets/WearableItem.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Models/AvatarAssets/WearableItem.cs index 123efb0597..6239de9e4b 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Models/AvatarAssets/WearableItem.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Models/AvatarAssets/WearableItem.cs @@ -323,6 +323,8 @@ public int GetIssuedCountFromRarity(string rarity) return 100; case ItemRarity.MYTHIC: return 10; + case ItemRarity.EXOTIC: + return 50; case ItemRarity.UNIQUE: return 1; } diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Models/AvatarAssets/WearableLiterals.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Models/AvatarAssets/WearableLiterals.cs index a1cf1ef594..351473c49a 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Models/AvatarAssets/WearableLiterals.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Models/AvatarAssets/WearableLiterals.cs @@ -54,6 +54,7 @@ public static class ItemRarity public const string LEGENDARY = "legendary"; public const string MYTHIC = "mythic"; public const string UNIQUE = "unique"; + public const string EXOTIC = "exotic"; } public static class DefaultWearables diff --git a/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/ExoticThumbnail.png b/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/ExoticThumbnail.png new file mode 100644 index 0000000000..28344624af --- /dev/null +++ b/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/ExoticThumbnail.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:618e3f09fcbf4831d233eeb5f03815585d2909bf52f87c2f846b4ebccb5dda5b +size 159383 diff --git a/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/ExoticThumbnail.png.meta b/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/ExoticThumbnail.png.meta new file mode 100644 index 0000000000..2dba99b521 --- /dev/null +++ b/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/ExoticThumbnail.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 08eaea8a23fb84cb78a52c7aa089cdea +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/InfoCardExotic.png b/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/InfoCardExotic.png new file mode 100644 index 0000000000..6686a0e1ac --- /dev/null +++ b/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/InfoCardExotic.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:26f849ebd7fafcb854c394a39157ad30c06765462c16b6c048318407aee8305d +size 39186 diff --git a/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/InfoCardExotic.png.meta b/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/InfoCardExotic.png.meta new file mode 100644 index 0000000000..ffe46ba779 --- /dev/null +++ b/unity-renderer/Assets/Textures/UI/BackpackV2/BackpackTextures/InfoCardExotic.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 47322084c05e74035ae381083f82a781 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: From 46c29a8c5e51b9225203c611c27ede0e52567ead Mon Sep 17 00:00:00 2001 From: Nicolas Lorusso <56365551+lorux0@users.noreply.github.com> Date: Fri, 12 Apr 2024 14:47:40 -0300 Subject: [PATCH 6/8] fix: changed epic, rare & unique title colors (#6162) --- .../HUD/AvatarEditorHUD/Data/InfoPanelSkins/Epic.asset | 3 ++- .../HUD/AvatarEditorHUD/Data/InfoPanelSkins/Rare.asset | 3 ++- .../HUD/AvatarEditorHUD/Data/InfoPanelSkins/Unique.asset | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Data/InfoPanelSkins/Epic.asset b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Data/InfoPanelSkins/Epic.asset index 6ea56a9298..33518fc5c0 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Data/InfoPanelSkins/Epic.asset +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Data/InfoPanelSkins/Epic.asset @@ -13,5 +13,6 @@ MonoBehaviour: m_Name: Epic m_EditorClassIdentifier: backgroundColor: {r: 0.2627451, g: 0.56078434, b: 1, a: 1} - rarityNameColor: {r: 0.6039216, g: 0.87058824, b: 0.99607843, a: 1} + rarityNameColor: {r: 0.20392157, g: 0.46666667, b: 0.99607843, a: 1} gradientColor: {r: 0, g: 0, b: 0, a: 0} + isBase: 0 diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Data/InfoPanelSkins/Rare.asset b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Data/InfoPanelSkins/Rare.asset index 9f562c1d2f..626d76aa3e 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Data/InfoPanelSkins/Rare.asset +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Data/InfoPanelSkins/Rare.asset @@ -13,5 +13,6 @@ MonoBehaviour: m_Name: Rare m_EditorClassIdentifier: backgroundColor: {r: 0.20392157, g: 0.80784315, b: 0.4627451, a: 1} - rarityNameColor: {r: 0.6745098, g: 1, b: 0.7294118, a: 1} + rarityNameColor: {r: 0.19215687, g: 0.78431374, b: 0.3882353, a: 1} gradientColor: {r: 0, g: 0, b: 0, a: 0} + isBase: 0 diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Data/InfoPanelSkins/Unique.asset b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Data/InfoPanelSkins/Unique.asset index 34283fa6c8..c5febd571d 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Data/InfoPanelSkins/Unique.asset +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Data/InfoPanelSkins/Unique.asset @@ -13,5 +13,6 @@ MonoBehaviour: m_Name: Unique m_EditorClassIdentifier: backgroundColor: {r: 0.99607843, g: 0.63529414, b: 0.09019608, a: 1} - rarityNameColor: {r: 0.96862745, g: 1, b: 0, a: 1} + rarityNameColor: {r: 0.9843137, g: 0.5686275, b: 0.08235294, a: 1} gradientColor: {r: 1, g: 0.84705883, b: 0.61960787, a: 1} + isBase: 0 From e76c9d0edb58246b1a4bf5650b90d5f2c2769e39 Mon Sep 17 00:00:00 2001 From: Nicolas Lorusso <56365551+lorux0@users.noreply.github.com> Date: Sat, 13 Apr 2024 12:43:09 -0300 Subject: [PATCH 7/8] style: modified uncommon text color (#6164) --- .../HUD/AvatarEditorHUD/Data/InfoPanelSkins/Uncommon.asset | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Data/InfoPanelSkins/Uncommon.asset b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Data/InfoPanelSkins/Uncommon.asset index c1e8788ec1..fd042a85d8 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Data/InfoPanelSkins/Uncommon.asset +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Data/InfoPanelSkins/Uncommon.asset @@ -13,5 +13,6 @@ MonoBehaviour: m_Name: Uncommon m_EditorClassIdentifier: backgroundColor: {r: 1, g: 0.5137255, b: 0.38431373, a: 1} - rarityNameColor: {r: 1, g: 0.8666667, b: 0.74509805, a: 1} + rarityNameColor: {r: 1, g: 0.5137255, b: 0.38431373, a: 1} gradientColor: {r: 0, g: 0, b: 0, a: 0} + isBase: 0 From 1ca1c5612de8651f6d7084b4f764d517f6f8dad1 Mon Sep 17 00:00:00 2001 From: Aga Date: Mon, 15 Apr 2024 07:04:13 -0700 Subject: [PATCH 8/8] chore: updating testing urls for sdk 7 (#6167) Update main.yml Signed-off-by: Aga --- .github/workflows/main.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b69fd2e454..864b92310d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -25,9 +25,12 @@ jobs: - [Open custom protocol](https://renderer-artifacts.decentraland.org/desktop/index.html?dcl://DESKTOP-BRANCH=${{ github.head_ref }}) - [Open custom protocol with Developer Mode](https://renderer-artifacts.decentraland.org/desktop/index.html?dcl://DESKTOP-BRANCH=${{ github.head_ref }}&DESKTOP-DEVELOPER-MODE) - ### SDK 6/7: + ### SDK 7 - [Open SDK7 scenes playground](https://playground.decentraland.org/?explorer-branch=${{ github.head_ref }}) - - [Open SDK7 scenes in preview](https://sdk-test-scenes.decentraland.zone/?position=73,-8&realm=LocalPreview&explorer-branch=${{ github.head_ref }}) + - [Open SDK7 goerli plaza scenes](https://decentraland.org/play/?realm=sdk-team-cdn.decentraland.org/ipfs/goerli-plaza-main-latest&position=72%2C-10&explorer-branch=${{ github.head_ref }}) + - [Open SDK7 test scenes](https://decentraland.org/play/?realm=sdk-team-cdn.decentraland.org/ipfs/sdk7-test-scenes-main-latest&position=72%2C-10&explorer-branch=${{ github.head_ref }}) + + ### SDK 6 - [Open SDK6 scenes in preview](https://sdk-test-scenes.decentraland.zone/?position=-1,27&realm=LocalPreview&explorer-branch=${{ github.head_ref }}) ### More