Skip to content

Commit

Permalink
style: emotes icon (#6237)
Browse files Browse the repository at this point in the history 
* Update textures

* Update PlayerPassport.prefab

* Update EmotesIcn.png

* Update EmotesWheelHUD.prefab

* Update EmoteCard.prefab

* Update EmoteSlotCard.prefab

* Update Taskbar.prefab
  • Loading branch information
@RominaMarchetti
RominaMarchetti authored Jul 25, 2024
1 parent 4fc34f2 commit 3f36ad1
Show file tree
Hide file tree
Showing 9 changed files with 58 additions and 54 deletions.
4 changes: 2 additions & 2 deletions ...cripts/DCL/Controllers/HUD/AvatarEditorHUD/Resources/EmotesCustomization/EmoteCard.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1002,8 +1002,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 2, y: -2.3}
m_SizeDelta: {x: 20, y: 20}
m_AnchoredPosition: {x: 3, y: -3}
m_SizeDelta: {x: 18, y: 18}
m_Pivot: {x: 0, y: 1}
--- !u!222 &1067968680794964267
CanvasRenderer:
Expand Down
4 changes: 2 additions & 2 deletions ...ts/DCL/Controllers/HUD/AvatarEditorHUD/Resources/EmotesCustomization/EmoteSlotCard.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -455,8 +455,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 2, y: -2}
m_SizeDelta: {x: 11, y: 11}
m_AnchoredPosition: {x: 3, y: -3}
m_SizeDelta: {x: 10, y: 10}
m_Pivot: {x: 0, y: 1}
--- !u!222 &4850818203974739451
CanvasRenderer:
Expand Down
65 changes: 35 additions & 30 deletions ...ts/Scripts/MainScripts/DCL/Controllers/HUD/EmotesWheelHUD/Resources/EmotesWheelHUD.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -723,8 +723,8 @@ RectTransform:
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: -6.0276356, y: 5.97242}
m_SizeDelta: {x: 7, y: 7}
m_AnchoredPosition: {x: -5, y: 5}
m_SizeDelta: {x: 10, y: 10}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2707474641924863602
CanvasRenderer:
Expand Down Expand Up @@ -754,7 +754,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 444dfe6ea294f4c22b1620698d4ce011, type: 3}
m_Sprite: {fileID: 21300000, guid: 05bc7d6b12857fb4b9b7634bf2a4f440, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Expand Down Expand Up @@ -1218,8 +1218,8 @@ RectTransform:
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: -6.0276356, y: 5.97242}
m_SizeDelta: {x: 7, y: 7}
m_AnchoredPosition: {x: -5, y: 5}
m_SizeDelta: {x: 10, y: 10}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5574777437422997797
CanvasRenderer:
Expand Down Expand Up @@ -1249,7 +1249,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 444dfe6ea294f4c22b1620698d4ce011, type: 3}
m_Sprite: {fileID: 21300000, guid: 05bc7d6b12857fb4b9b7634bf2a4f440, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Expand Down Expand Up @@ -1925,8 +1925,8 @@ RectTransform:
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: -6.0276356, y: 5.97242}
m_SizeDelta: {x: 7, y: 7}
m_AnchoredPosition: {x: -5, y: 5}
m_SizeDelta: {x: 10, y: 10}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7583685785367040411
CanvasRenderer:
Expand Down Expand Up @@ -1956,7 +1956,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 444dfe6ea294f4c22b1620698d4ce011, type: 3}
m_Sprite: {fileID: 21300000, guid: 05bc7d6b12857fb4b9b7634bf2a4f440, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Expand Down Expand Up @@ -2589,8 +2589,8 @@ RectTransform:
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: -6.0276356, y: 5.97242}
m_SizeDelta: {x: 7, y: 7}
m_AnchoredPosition: {x: -5, y: 5}
m_SizeDelta: {x: 10, y: 10}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &112968691304925994
CanvasRenderer:
Expand Down Expand Up @@ -2620,7 +2620,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 444dfe6ea294f4c22b1620698d4ce011, type: 3}
m_Sprite: {fileID: 21300000, guid: 05bc7d6b12857fb4b9b7634bf2a4f440, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Expand Down Expand Up @@ -3709,8 +3709,8 @@ RectTransform:
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: -6.0276356, y: 5.97242}
m_SizeDelta: {x: 7, y: 7}
m_AnchoredPosition: {x: -5, y: 5}
m_SizeDelta: {x: 10, y: 10}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &841014662171704921
CanvasRenderer:
Expand Down Expand Up @@ -3740,7 +3740,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 444dfe6ea294f4c22b1620698d4ce011, type: 3}
m_Sprite: {fileID: 21300000, guid: 05bc7d6b12857fb4b9b7634bf2a4f440, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Expand Down Expand Up @@ -4450,8 +4450,8 @@ RectTransform:
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: -6.0276356, y: 5.97242}
m_SizeDelta: {x: 7, y: 7}
m_AnchoredPosition: {x: -5, y: 5}
m_SizeDelta: {x: 10, y: 10}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5775258425258294350
CanvasRenderer:
Expand Down Expand Up @@ -4481,7 +4481,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 444dfe6ea294f4c22b1620698d4ce011, type: 3}
m_Sprite: {fileID: 21300000, guid: 05bc7d6b12857fb4b9b7634bf2a4f440, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Expand Down Expand Up @@ -5154,8 +5154,8 @@ RectTransform:
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: -6.0276356, y: 5.97242}
m_SizeDelta: {x: 7, y: 7}
m_AnchoredPosition: {x: -5, y: 5}
m_SizeDelta: {x: 10, y: 10}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6486707974257334458
CanvasRenderer:
Expand Down Expand Up @@ -5185,7 +5185,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 444dfe6ea294f4c22b1620698d4ce011, type: 3}
m_Sprite: {fileID: 21300000, guid: 05bc7d6b12857fb4b9b7634bf2a4f440, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Expand Down Expand Up @@ -5627,8 +5627,8 @@ RectTransform:
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: -6.0276356, y: 5.97242}
m_SizeDelta: {x: 7, y: 7}
m_AnchoredPosition: {x: -5, y: 5}
m_SizeDelta: {x: 10, y: 10}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5392225803950969162
CanvasRenderer:
Expand Down Expand Up @@ -5658,7 +5658,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 444dfe6ea294f4c22b1620698d4ce011, type: 3}
m_Sprite: {fileID: 21300000, guid: 05bc7d6b12857fb4b9b7634bf2a4f440, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Expand Down Expand Up @@ -6454,8 +6454,8 @@ RectTransform:
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: -6.0276356, y: 5.97242}
m_SizeDelta: {x: 7, y: 7}
m_AnchoredPosition: {x: -5, y: 5}
m_SizeDelta: {x: 10, y: 10}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4386616069319312971
CanvasRenderer:
Expand Down Expand Up @@ -6485,7 +6485,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 444dfe6ea294f4c22b1620698d4ce011, type: 3}
m_Sprite: {fileID: 21300000, guid: 05bc7d6b12857fb4b9b7634bf2a4f440, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Expand Down Expand Up @@ -7756,8 +7756,8 @@ RectTransform:
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: -6.0276356, y: 5.97242}
m_SizeDelta: {x: 7, y: 7}
m_AnchoredPosition: {x: -5, y: 5}
m_SizeDelta: {x: 10, y: 10}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1771334870392521315
CanvasRenderer:
Expand Down Expand Up @@ -7787,7 +7787,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 444dfe6ea294f4c22b1620698d4ce011, type: 3}
m_Sprite: {fileID: 21300000, guid: 05bc7d6b12857fb4b9b7634bf2a4f440, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Expand Down Expand Up @@ -10707,6 +10707,11 @@ PrefabInstance:
propertyPath: m_Name
value: Thumbnail
objectReference: {fileID: 0}
- target: {fileID: 6719010960977733696, guid: 4849d2ed3b5a18948bf3cd46256869a4,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
Expand Down
6 changes: 3 additions & 3 deletions ...r/Assets/Scripts/MainScripts/DCL/Controllers/HUD/Passport/Resources/PlayerPassport.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9183,7 +9183,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 32, y: -28}
m_SizeDelta: {x: 23.2504, y: 20.0978}
m_SizeDelta: {x: 23.2504, y: 28}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9085653859322830480
CanvasRenderer:
Expand Down Expand Up @@ -20432,7 +20432,7 @@ PrefabInstance:
- target: {fileID: 1616525665509150121, guid: 59dab406fb0f74972a9f59906589040d,
type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1659266317040970982, guid: 59dab406fb0f74972a9f59906589040d,
type: 3}
Expand Down Expand Up @@ -20542,7 +20542,7 @@ PrefabInstance:
- target: {fileID: 3255177139748142192, guid: 59dab406fb0f74972a9f59906589040d,
type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3355408138738260923, guid: 59dab406fb0f74972a9f59906589040d,
type: 3}
Expand Down
17 changes: 8 additions & 9 deletions ...nderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/TaskbarHUD/Resources/Taskbar.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1003,8 +1003,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 40, y: 40}
m_AnchoredPosition: {x: 0, y: 3}
m_SizeDelta: {x: 34, y: 34}
m_Pivot: {x: 0.5, y: 0}
--- !u!222 &8871550248471926608
CanvasRenderer:
Expand Down Expand Up @@ -1072,7 +1072,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 05bc7d6b12857fb4b9b7634bf2a4f440, type: 3}
m_Sprite: {fileID: 21300000, guid: c6cb56bd6fdab4d49879218fffcfc7f7, type: 3}
m_Type: 0
m_PreserveAspect: 1
m_FillCenter: 1
Expand Down Expand Up @@ -1247,11 +1247,10 @@ MonoBehaviour:
m_EditorClassIdentifier:
showHideAnimator: {fileID: 0}
contentModerationButton: {fileID: 6832325096302936748}
contentModerationRatingText: {fileID: 3902808279478684175}
contentModerationRatingBackground: {fileID: 0}
backgroundColorForTeen: {r: 0, g: 0, b: 0, a: 0}
backgroundColorForAdult: {r: 0, g: 0, b: 0, a: 0}
backgroundColorForRestricted: {r: 0, g: 0, b: 0, a: 0}
flagImage: {fileID: 0}
teenFlagIcon: {fileID: 0}
adultFlagIcon: {fileID: 0}
restrictedFlagIcon: {fileID: 0}
--- !u!1 &3080350646182386195
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -3743,7 +3742,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: 9.199982}
m_AnchoredPosition: {x: 0, y: 12}
m_SizeDelta: {x: 100, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4319298365752353504
Expand Down
4 changes: 2 additions & 2 deletions unity-renderer/Assets/Textures/UI/Common/EmotesIcon.png
100644 → 100755
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions unity-renderer/Assets/Textures/UI/Common/EmotesOff.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions unity-renderer/Assets/Textures/UI/Common/EmotesOn.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions unity-renderer/Assets/Textures/UI/Passport/PassportIcons/EmotesIcn.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 3f36ad1

Please sign in to comment.