Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: exotic rarity #6158

Merged
merged 7 commits into from
Apr 12, 2024
Merged

feat: exotic rarity #6158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e6d05d2
added exotic rarity into wearables & emotes (wip)
lorux0 Apr 8, 2024
8c47470
added exotic wearable grid texture
lorux0 Apr 9, 2024
989708a
updated wearable info card background to legendary
lorux0 Apr 9, 2024
07df358
modifications at nft info panel at the player passport
lorux0 Apr 10, 2024
0c6f62c
added info card background texture
lorux0 Apr 10, 2024
645b764
disabled gradient color of nft info panel
lorux0 Apr 10, 2024
5e58516
changes on nft into panel layout
lorux0 Apr 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions unity-renderer/Assets/DCLServices/WearablesCatalogService/NftRarity.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@ public enum NftRarity
Mythic,
Unique,
None,
Exotic,
}
}
18 changes: 18 additions & 0 deletions .../Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Data/InfoPanelSkins/Exotic.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
8 changes: 8 additions & 0 deletions ...pts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Data/InfoPanelSkins/Exotic.asset.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions .../Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Data/ItemToggleSkinFactory.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
2 changes: 2 additions & 0 deletions ...cripts/DCL/Controllers/HUD/AvatarEditorHUD/Resources/EmotesCustomization/EmoteCard.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
21 changes: 6 additions & 15 deletions ...ts/DCL/Controllers/HUD/AvatarEditorHUD/Resources/EmotesCustomization/EmoteSlotCard.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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:
Expand Down
Loading