feat: exotic rarity (#6158)

decentraland · Apr 12, 2024 · de662d6 · de662d6
1 parent 85ed986
commit de662d6
Show file tree

Hide file tree

Showing 21 changed files with 351 additions and 122 deletions.
diff --git 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/.../Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Data/InfoPanelSkins/Exotic.asset b/.../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/...pts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Data/InfoPanelSkins/Exotic.asset.meta b/...pts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Data/InfoPanelSkins/Exotic.asset.meta
diff --git a/.../Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Data/ItemToggleSkinFactory.asset b/.../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/...cripts/DCL/Controllers/HUD/AvatarEditorHUD/Resources/EmotesCustomization/EmoteCard.prefab b/...cripts/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/...ts/DCL/Controllers/HUD/AvatarEditorHUD/Resources/EmotesCustomization/EmoteSlotCard.prefab b/...ts/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:
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,5 +10,6 @@ public enum NftRarity @@
             Mythic,
             Unique,
             None,
+            Exotic,
         }
     }