Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ public static async UniTaskVoid FetchWearableByPointerAndExecuteAsync(string poi
{
if (wearableStorage.TryGetElement(pointer, out var wearable))
{
await UniTask.WaitWhile(() => wearable.IsLoading, cancellationToken: ct);

onWearableFetched(wearable);
return;
}
Expand Down
74 changes: 73 additions & 1 deletion Explorer/Assets/DCL/Backpack/Assets/Backpack.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ MonoBehaviour:
m_VerticalAlignment: 256
m_textAlignment: 65535
m_characterSpacing: 0
m_characterHorizontalScale: 1
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
Expand Down Expand Up @@ -419,6 +420,7 @@ MonoBehaviour:
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_characterHorizontalScale: 1
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
Expand Down Expand Up @@ -575,6 +577,7 @@ MonoBehaviour:
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_characterHorizontalScale: 1
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
Expand Down Expand Up @@ -912,6 +915,7 @@ MonoBehaviour:
<SelectedText>k__BackingField: {fileID: 7352243595257465483}
tabAnimator: {fileID: 2336429962957216277}
<TabClickAudio>k__BackingField: {fileID: 11400000, guid: 0df7b16e196525d40a3a98032e38abea, type: 2}
<HoverAudio>k__BackingField: {fileID: 0}
--- !u!114 &5528145173281264370
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -2122,6 +2126,7 @@ MonoBehaviour:
m_VerticalAlignment: 256
m_textAlignment: 65535
m_characterSpacing: 0
m_characterHorizontalScale: 1
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
Expand Down Expand Up @@ -2348,6 +2353,7 @@ MonoBehaviour:
m_VerticalAlignment: 256
m_textAlignment: 65535
m_characterSpacing: 0
m_characterHorizontalScale: 1
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
Expand Down Expand Up @@ -2914,6 +2920,7 @@ MonoBehaviour:
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_characterHorizontalScale: 1
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
Expand Down Expand Up @@ -3345,6 +3352,7 @@ MonoBehaviour:
m_VerticalAlignment: 256
m_textAlignment: 65535
m_characterSpacing: 0
m_characterHorizontalScale: 1
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
Expand Down Expand Up @@ -3635,6 +3643,7 @@ MonoBehaviour:
m_VerticalAlignment: 256
m_textAlignment: 65535
m_characterSpacing: 0
m_characterHorizontalScale: 1
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
Expand Down Expand Up @@ -3946,6 +3955,8 @@ MonoBehaviour:
<NoCategoryResults>k__BackingField: {fileID: 4883820917948329291}
<NoCategoryResultsMarketplaceTextLink>k__BackingField: {fileID: 1010713006274671892}
<BreadCrumbView>k__BackingField: {fileID: 6956049020834478445}
<LoadingCanvasGroup>k__BackingField: {fileID: 0}
<LoadingSpinner>k__BackingField: {fileID: 0}
--- !u!1 &3165730750654084244
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -4222,6 +4233,7 @@ MonoBehaviour:
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_characterHorizontalScale: 1
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
Expand Down Expand Up @@ -4521,6 +4533,7 @@ MonoBehaviour:
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_characterHorizontalScale: 1
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
Expand Down Expand Up @@ -4711,6 +4724,7 @@ MonoBehaviour:
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_characterHorizontalScale: 1
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
Expand Down Expand Up @@ -5000,6 +5014,7 @@ MonoBehaviour:
m_VerticalAlignment: 256
m_textAlignment: 65535
m_characterSpacing: 0
m_characterHorizontalScale: 1
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
Expand Down Expand Up @@ -5521,6 +5536,7 @@ MonoBehaviour:
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_characterHorizontalScale: 1
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
Expand Down Expand Up @@ -6161,6 +6177,7 @@ MonoBehaviour:
m_VerticalAlignment: 256
m_textAlignment: 65535
m_characterSpacing: 0
m_characterHorizontalScale: 1
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
Expand Down Expand Up @@ -6372,6 +6389,7 @@ MonoBehaviour:
m_VerticalAlignment: 256
m_textAlignment: 65535
m_characterSpacing: 0
m_characterHorizontalScale: 1
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
Expand Down Expand Up @@ -6508,6 +6526,7 @@ MonoBehaviour:
m_VerticalAlignment: 256
m_textAlignment: 65535
m_characterSpacing: 0
m_characterHorizontalScale: 1
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
Expand Down Expand Up @@ -6644,6 +6663,7 @@ MonoBehaviour:
m_VerticalAlignment: 256
m_textAlignment: 65535
m_characterSpacing: 0
m_characterHorizontalScale: 1
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
Expand Down Expand Up @@ -6873,6 +6893,7 @@ MonoBehaviour:
m_VerticalAlignment: 256
m_textAlignment: 65535
m_characterSpacing: 0
m_characterHorizontalScale: 1
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
Expand Down Expand Up @@ -7175,6 +7196,7 @@ MonoBehaviour:
m_VerticalAlignment: 256
m_textAlignment: 65535
m_characterSpacing: 0
m_characterHorizontalScale: 1
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
Expand Down Expand Up @@ -7401,6 +7423,7 @@ MonoBehaviour:
m_VerticalAlignment: 256
m_textAlignment: 65535
m_characterSpacing: 0
m_characterHorizontalScale: 1
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
Expand Down Expand Up @@ -7713,6 +7736,7 @@ MonoBehaviour:
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_characterHorizontalScale: 1
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
Expand Down Expand Up @@ -8136,6 +8160,7 @@ MonoBehaviour:
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_characterHorizontalScale: 1
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
Expand Down Expand Up @@ -8322,6 +8347,7 @@ MonoBehaviour:
<SelectedText>k__BackingField: {fileID: 3305546034217115494}
tabAnimator: {fileID: 4662076339570818765}
<TabClickAudio>k__BackingField: {fileID: 11400000, guid: 0df7b16e196525d40a3a98032e38abea, type: 2}
<HoverAudio>k__BackingField: {fileID: 0}
--- !u!114 &4751659431733366447
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -8509,6 +8535,8 @@ MonoBehaviour:
<NoCategoryResults>k__BackingField: {fileID: 4373380581338508548}
<NoCategoryResultsMarketplaceTextLink>k__BackingField: {fileID: 9100726896621302767}
<BreadCrumbView>k__BackingField: {fileID: 0}
<LoadingCanvasGroup>k__BackingField: {fileID: 0}
<LoadingSpinner>k__BackingField: {fileID: 0}
--- !u!1 &7825276156756374324
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -14444,6 +14472,34 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 154018262731813276}
m_Modifications:
- target: {fileID: 109823476035200777, guid: f14ef4b9a685146a3b0fef13c9925ec6, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 109823476035200777, guid: f14ef4b9a685146a3b0fef13c9925ec6, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 109823476035200777, guid: f14ef4b9a685146a3b0fef13c9925ec6, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 439502464634303402, guid: f14ef4b9a685146a3b0fef13c9925ec6, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 439502464634303402, guid: f14ef4b9a685146a3b0fef13c9925ec6, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 439502464634303402, guid: f14ef4b9a685146a3b0fef13c9925ec6, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 439502464634303402, guid: f14ef4b9a685146a3b0fef13c9925ec6, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1462312519642397879, guid: f14ef4b9a685146a3b0fef13c9925ec6, type: 3}
propertyPath: m_AnchorMax.y
value: 0
Expand Down Expand Up @@ -14496,6 +14552,22 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3617014636506109816, guid: f14ef4b9a685146a3b0fef13c9925ec6, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3617014636506109816, guid: f14ef4b9a685146a3b0fef13c9925ec6, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3617014636506109816, guid: f14ef4b9a685146a3b0fef13c9925ec6, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3617014636506109816, guid: f14ef4b9a685146a3b0fef13c9925ec6, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3796563865791146493, guid: f14ef4b9a685146a3b0fef13c9925ec6, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
Expand Down Expand Up @@ -15749,7 +15821,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7294333419115145998, guid: e64a5b3ebe4b2447e965bb76004651a4, type: 3}
propertyPath: m_SizeDelta.x
value: 117.7
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7294333419115145998, guid: e64a5b3ebe4b2447e965bb76004651a4, type: 3}
propertyPath: m_SizeDelta.y
Expand Down
Loading