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: