Skip to content

Commit 04c35fc

Browse files
authored
Merge pull request #6112 from decentraland/release/release-20240304
Release: 20240304
2 parents 52cf906 + d4c3f53 commit 04c35fc

File tree

6 files changed

+86
-11
lines changed

6 files changed

+86
-11
lines changed

unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/ExploreV2/Resources/MainMenu/ExploreV2Menu.prefab

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13392,7 +13392,7 @@ PrefabInstance:
1339213392
- target: {fileID: 1768900959223747055, guid: 01095a78852393446834e68bf8628274,
1339313393
type: 3}
1339413394
propertyPath: m_Value
13395-
value: 1
13395+
value: 0
1339613396
objectReference: {fileID: 0}
1339713397
- target: {fileID: 1769823040169016768, guid: 01095a78852393446834e68bf8628274,
1339813398
type: 3}
@@ -14019,6 +14019,31 @@ PrefabInstance:
1401914019
propertyPath: m_AnchoredPosition.y
1402014020
value: 0
1402114021
objectReference: {fileID: 0}
14022+
- target: {fileID: 2149698934118888499, guid: 01095a78852393446834e68bf8628274,
14023+
type: 3}
14024+
propertyPath: m_AnchorMax.y
14025+
value: 1
14026+
objectReference: {fileID: 0}
14027+
- target: {fileID: 2149698934118888499, guid: 01095a78852393446834e68bf8628274,
14028+
type: 3}
14029+
propertyPath: m_AnchorMin.y
14030+
value: 1
14031+
objectReference: {fileID: 0}
14032+
- target: {fileID: 2149698934118888499, guid: 01095a78852393446834e68bf8628274,
14033+
type: 3}
14034+
propertyPath: m_SizeDelta.x
14035+
value: 921.053
14036+
objectReference: {fileID: 0}
14037+
- target: {fileID: 2149698934118888499, guid: 01095a78852393446834e68bf8628274,
14038+
type: 3}
14039+
propertyPath: m_AnchoredPosition.x
14040+
value: -460.7
14041+
objectReference: {fileID: 0}
14042+
- target: {fileID: 2149698934118888499, guid: 01095a78852393446834e68bf8628274,
14043+
type: 3}
14044+
propertyPath: m_AnchoredPosition.y
14045+
value: -72.442024
14046+
objectReference: {fileID: 0}
1402214047
- target: {fileID: 2150171300012380080, guid: 01095a78852393446834e68bf8628274,
1402314048
type: 3}
1402414049
propertyPath: m_AnchorMax.y

unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/ExploreV2/Resources/Sections/PlacesAndEventsSection/PlacesAndEventsSection.prefab

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8312,6 +8312,31 @@ PrefabInstance:
83128312
propertyPath: m_SizeDelta.y
83138313
value: 0
83148314
objectReference: {fileID: 0}
8315+
- target: {fileID: 4343850142067033455, guid: e7f5a2ca6d845b245990c567955385a0,
8316+
type: 3}
8317+
propertyPath: m_AnchorMax.y
8318+
value: 0
8319+
objectReference: {fileID: 0}
8320+
- target: {fileID: 4343850142067033455, guid: e7f5a2ca6d845b245990c567955385a0,
8321+
type: 3}
8322+
propertyPath: m_AnchorMin.y
8323+
value: 0
8324+
objectReference: {fileID: 0}
8325+
- target: {fileID: 4343850142067033455, guid: e7f5a2ca6d845b245990c567955385a0,
8326+
type: 3}
8327+
propertyPath: m_SizeDelta.x
8328+
value: 1868
8329+
objectReference: {fileID: 0}
8330+
- target: {fileID: 4343850142067033455, guid: e7f5a2ca6d845b245990c567955385a0,
8331+
type: 3}
8332+
propertyPath: m_AnchoredPosition.x
8333+
value: 26
8334+
objectReference: {fileID: 0}
8335+
- target: {fileID: 4343850142067033455, guid: e7f5a2ca6d845b245990c567955385a0,
8336+
type: 3}
8337+
propertyPath: m_AnchoredPosition.y
8338+
value: 0
8339+
objectReference: {fileID: 0}
83158340
- target: {fileID: 4514692257233509624, guid: e7f5a2ca6d845b245990c567955385a0,
83168341
type: 3}
83178342
propertyPath: m_AnchorMax.y
@@ -10273,6 +10298,31 @@ PrefabInstance:
1027310298
propertyPath: m_AnchoredPosition.y
1027410299
value: 0
1027510300
objectReference: {fileID: 0}
10301+
- target: {fileID: 6503063510664517196, guid: 30885b1234eac474f9ebe15b4d4ad9d6,
10302+
type: 3}
10303+
propertyPath: m_AnchorMax.y
10304+
value: 0
10305+
objectReference: {fileID: 0}
10306+
- target: {fileID: 6503063510664517196, guid: 30885b1234eac474f9ebe15b4d4ad9d6,
10307+
type: 3}
10308+
propertyPath: m_AnchorMin.y
10309+
value: 0
10310+
objectReference: {fileID: 0}
10311+
- target: {fileID: 6503063510664517196, guid: 30885b1234eac474f9ebe15b4d4ad9d6,
10312+
type: 3}
10313+
propertyPath: m_SizeDelta.x
10314+
value: 0
10315+
objectReference: {fileID: 0}
10316+
- target: {fileID: 6503063510664517196, guid: 30885b1234eac474f9ebe15b4d4ad9d6,
10317+
type: 3}
10318+
propertyPath: m_AnchoredPosition.x
10319+
value: 0
10320+
objectReference: {fileID: 0}
10321+
- target: {fileID: 6503063510664517196, guid: 30885b1234eac474f9ebe15b4d4ad9d6,
10322+
type: 3}
10323+
propertyPath: m_AnchoredPosition.y
10324+
value: 0
10325+
objectReference: {fileID: 0}
1027610326
- target: {fileID: 6769270611316808978, guid: 30885b1234eac474f9ebe15b4d4ad9d6,
1027710327
type: 3}
1027810328
propertyPath: m_AnchorMax.y

unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/ExploreV2/Resources/Sections/PlacesAndEventsSection/WorldsSubSection/WorldsSubSection.prefab

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1517,7 +1517,7 @@ RectTransform:
15171517
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
15181518
m_AnchorMin: {x: 0, y: 0.5}
15191519
m_AnchorMax: {x: 0, y: 0.5}
1520-
m_AnchoredPosition: {x: 800, y: -21}
1520+
m_AnchoredPosition: {x: 817, y: -21}
15211521
m_SizeDelta: {x: 160, y: 46}
15221522
m_Pivot: {x: 0.5, y: 0.5}
15231523
--- !u!222 &4060694181056187896
@@ -1934,8 +1934,8 @@ RectTransform:
19341934
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
19351935
m_AnchorMin: {x: 1, y: 1}
19361936
m_AnchorMax: {x: 1, y: 1}
1937-
m_AnchoredPosition: {x: -933, y: -73}
1938-
m_SizeDelta: {x: 1866, y: 182}
1937+
m_AnchoredPosition: {x: -460.7, y: -72.442024}
1938+
m_SizeDelta: {x: 921.053, y: 180.9191}
19391939
m_Pivot: {x: 0.5, y: 0.5}
19401940
--- !u!222 &1849199017070512815
19411941
CanvasRenderer:
@@ -1961,12 +1961,12 @@ MonoBehaviour:
19611961
m_Color: {r: 1, g: 1, b: 1, a: 1}
19621962
m_RaycastTarget: 0
19631963
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
1964-
m_Maskable: 1
1964+
m_Maskable: 0
19651965
m_OnCullStateChanged:
19661966
m_PersistentCalls:
19671967
m_Calls: []
19681968
m_Sprite: {fileID: 21300000, guid: c9ce4a22ac8da475e9a7e6229efb4c98, type: 3}
1969-
m_Type: 1
1969+
m_Type: 0
19701970
m_PreserveAspect: 0
19711971
m_FillCenter: 1
19721972
m_FillMethod: 4

unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/MyAccountHUD/Prefabs/ProfileLanguageList.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ MonoBehaviour:
7979
- "Tibetan\r"
8080
- "Tonga\r"
8181
- "Turkish\r"
82-
- "Ukranian\r"
82+
- "Ukrainian\r"
8383
- "Urdu\r"
8484
- "Uzbek\r"
8585
- "Vietnamese\r"
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading

0 commit comments

Comments
 (0)