Skip to content

Commit 97da641

Browse files
popuzpopuz
authored
Merge pull request #5650 from decentraland/chore/sync
chore: sync main to dev
2 parents 5475612 + e060db1 commit 97da641

File tree

4 files changed

+59
-10
lines changed

4 files changed

+59
-10
lines changed

‎unity-renderer/Assets/DCLServices/CameraReelService/ScreenshotMetadata.cs‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ public class ScreenshotMetadata
1717
public Scene scene;
1818
public VisiblePerson[] visiblePeople;
1919

20+
private static bool isWorld => DataStore.i.common.isWorld.Get();
21+
private static string realmName => DataStore.i.realm.realmName.Get();
22+
2023
public static ScreenshotMetadata Create(DataStore_Player player, IAvatarsLODController avatarsLODController, Camera screenshotCamera)
2124
{
2225
Player ownPlayer = player.ownPlayer.Get();
@@ -27,10 +30,10 @@ public static ScreenshotMetadata Create(DataStore_Player player, IAvatarsLODCont
2730
userName = UserProfileController.userProfilesCatalog.Get(ownPlayer.id).userName,
2831
userAddress = ownPlayer.id,
2932
dateTime = DateTimeOffset.UtcNow.ToUnixTimeSeconds().ToString(),
30-
realm = DataStore.i.realm.realmName.Get(),
33+
realm = realmName,
3134
scene = new Scene
3235
{
33-
name = MinimapMetadata.GetMetadata().GetSceneInfo(playerPosition.x, playerPosition.y).name,
36+
name = isWorld? $"World {realmName}" : MinimapMetadata.GetMetadata().GetSceneInfo(playerPosition.x, playerPosition.y).name,
3437
location = new Location(playerPosition),
3538
},
3639
visiblePeople = GetVisiblePeoplesMetadata(
@@ -45,11 +48,9 @@ private static VisiblePerson[] GetVisiblePeoplesMetadata(List<Player> visiblePla
4548
var visiblePeople = new VisiblePerson[visiblePlayers.Count];
4649
UserProfileDictionary userProfilesCatalog = UserProfileController.userProfilesCatalog;
4750

48-
UserProfile profile;
49-
5051
for (var i = 0; i < visiblePlayers.Count; i++)
5152
{
52-
profile = userProfilesCatalog.Get(visiblePlayers[i].id);
53+
UserProfile profile = userProfilesCatalog.Get(visiblePlayers[i].id);
5354

5455
visiblePeople[i] = new VisiblePerson
5556
{

‎unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/BackpackEditorHUDController.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ public class BackpackEditorHUDController
3131
{
3232
{"urn:decentraland:off-chain:base-avatars:BaseFemale", new Dictionary<string, string>
3333
{
34-
{WearableLiterals.Categories.UPPER_BODY, "urn:decentraland:off-chain:base-avatars:f_blue_jacket"},
35-
{WearableLiterals.Categories.LOWER_BODY, "urn:decentraland:off-chain:base-avatars:f_capris"},
34+
{WearableLiterals.Categories.UPPER_BODY, "urn:decentraland:off-chain:base-avatars:white_top"},
35+
{WearableLiterals.Categories.LOWER_BODY, "urn:decentraland:off-chain:base-avatars:f_jeans"},
3636
{WearableLiterals.Categories.FEET, "urn:decentraland:off-chain:base-avatars:ruby_blue_loafer"},
3737
{WearableLiterals.Categories.HAIR, "urn:decentraland:off-chain:base-avatars:pony_tail"},
3838
{WearableLiterals.Categories.MOUTH, "urn:decentraland:off-chain:base-avatars:f_mouth_05"},
@@ -42,8 +42,8 @@ public class BackpackEditorHUDController
4242
{"urn:decentraland:off-chain:base-avatars:BaseMale", new Dictionary<string, string>
4343
{
4444
{WearableLiterals.Categories.UPPER_BODY, "urn:decentraland:off-chain:base-avatars:m_sweater_02"},
45-
{WearableLiterals.Categories.LOWER_BODY, "urn:decentraland:off-chain:base-avatars:comfortablepants"},
46-
{WearableLiterals.Categories.FEET, "urn:decentraland:off-chain:base-avatars:Espadrilles"},
45+
{WearableLiterals.Categories.LOWER_BODY, "urn:decentraland:off-chain:base-avatars:soccer_pants"},
46+
{WearableLiterals.Categories.FEET, "urn:decentraland:off-chain:base-avatars:sport_colored_shoes"},
4747
{WearableLiterals.Categories.HAIR, "urn:decentraland:off-chain:base-avatars:cool_hair"},
4848
{WearableLiterals.Categories.FACIAL_HAIR, "urn:decentraland:off-chain:base-avatars:beard"},
4949
{WearableLiterals.Categories.EYEBROWS, "urn:decentraland:off-chain:base-avatars:eyebrows_00"},

‎unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/Tests/BackpackEditorHUDControllerShould.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ public void FallbackIncompatibleWearablesWhenChangingBodyShape()
414414
dataStore.HUDs.avatarEditorVisible.Set(false, true);
415415

416416
Assert.IsTrue(userProfile.avatar.wearables.Contains("urn:decentraland:off-chain:base-avatars:m_sweater_02"));
417-
Assert.IsTrue(userProfile.avatar.wearables.Contains("urn:decentraland:off-chain:base-avatars:comfortablepants"));
417+
Assert.IsTrue(userProfile.avatar.wearables.Contains("urn:decentraland:off-chain:base-avatars:soccer_pants"));
418418
Assert.IsTrue(userProfile.avatar.wearables.Contains("urn:decentraland:off-chain:base-avatars:sneakers"));
419419
Assert.IsFalse(userProfile.avatar.wearables.Contains("urn:decentraland:off-chain:base-avatars:f_sweater"));
420420
Assert.IsFalse(userProfile.avatar.wearables.Contains("urn:decentraland:off-chain:base-avatars:f_jeans"));

‎unity-renderer/Assets/Scripts/MainScripts/DCL/Models/AvatarAssets/Tests/Helpers/TestCatalogArrayLocalAssets.asset‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1824,3 +1824,51 @@ MonoBehaviour:
18241824
description: Steampunk top hat. Gives a bonus in the WonderMine game. Created
18251825
by Maricela.
18261826
issuedId: 0
1827+
- data:
1828+
representations:
1829+
- bodyShapes:
1830+
- urn:decentraland:off-chain:base-avatars:BaseMale
1831+
mainFile: steampunk_hat_male.glb
1832+
contents:
1833+
- key: SteampunkHatFlat1.png
1834+
hash:
1835+
url:
1836+
- key: SteampunkHatLight.png
1837+
hash:
1838+
url:
1839+
- key: pasted__ReflectionMap.png
1840+
hash:
1841+
url:
1842+
- key: steampunk_hat_female.glb
1843+
hash:
1844+
url:
1845+
- key: steampunk_hat_male.glb
1846+
hash:
1847+
url:
1848+
overrideHides: []
1849+
overrideReplaces: []
1850+
category: lower_body
1851+
tags: []
1852+
replaces: []
1853+
hides: []
1854+
removesDefaultHiding: []
1855+
loop: 0
1856+
emoteDataV0:
1857+
loop: 0
1858+
id: urn:decentraland:off-chain:base-avatars:soccer_pants
1859+
entityId:
1860+
baseUrl:
1861+
baseUrlBundles:
1862+
i18n:
1863+
- code: en
1864+
text: Steampunk Top Hat
1865+
- code: es
1866+
text: Sombrero de Steampunk
1867+
- code: fr
1868+
text: Chapeau haut-de-forme Steampunk
1869+
thumbnail: https://peer.decentraland.org/content/contents/QmUP7THwKQshPSUAEtczkUwKSEppz4Jgn8tvgbKGN26PCC
1870+
thumbnailSprite: {fileID: 0}
1871+
rarity: legendary
1872+
description: Steampunk top hat. Gives a bonus in the WonderMine game. Created
1873+
by Maricela.
1874+
issuedId: 0

0 commit comments

Comments
 (0)