Skip to content

Commit d938ebf

Browse files
fix: free screen interaction with hidden chat (#5704)
1 parent 5e54720 commit d938ebf

File tree

2 files changed

+170
-14
lines changed

2 files changed

+170
-14
lines changed

Explorer/Assets/DCL/Chat/Assets/ChatPanelView.prefab

Lines changed: 169 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -707,8 +707,8 @@ RectTransform:
707707
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
708708
m_AnchorMin: {x: 0, y: 1}
709709
m_AnchorMax: {x: 0, y: 1}
710-
m_AnchoredPosition: {x: 178, y: -202}
711-
m_SizeDelta: {x: 356, y: 404}
710+
m_AnchoredPosition: {x: 178, y: -321.5}
711+
m_SizeDelta: {x: 356, y: 643}
712712
m_Pivot: {x: 0.5, y: 0.5}
713713
--- !u!114 &3498715475671134396
714714
MonoBehaviour:
@@ -907,7 +907,7 @@ MonoBehaviour:
907907
m_PrefabInstance: {fileID: 0}
908908
m_PrefabAsset: {fileID: 0}
909909
m_GameObject: {fileID: 6054260855757390284}
910-
m_Enabled: 1
910+
m_Enabled: 0
911911
m_EditorHideFlags: 0
912912
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
913913
m_Name:
@@ -1005,8 +1005,8 @@ RectTransform:
10051005
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
10061006
m_AnchorMin: {x: 0, y: 1}
10071007
m_AnchorMax: {x: 0, y: 1}
1008-
m_AnchoredPosition: {x: 5, y: -353}
1009-
m_SizeDelta: {x: 346, y: 348}
1008+
m_AnchoredPosition: {x: 5, y: -592}
1009+
m_SizeDelta: {x: 346, y: 587}
10101010
m_Pivot: {x: 0, y: 0}
10111011
--- !u!222 &8319252122171400549
10121012
CanvasRenderer:
@@ -1151,8 +1151,8 @@ RectTransform:
11511151
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
11521152
m_AnchorMin: {x: 0, y: 1}
11531153
m_AnchorMax: {x: 0, y: 1}
1154-
m_AnchoredPosition: {x: 378, y: -202}
1155-
m_SizeDelta: {x: 44, y: 404}
1154+
m_AnchoredPosition: {x: 378, y: -321.5}
1155+
m_SizeDelta: {x: 44, y: 643}
11561156
m_Pivot: {x: 0.5, y: 0.5}
11571157
--- !u!114 &2593220804535107868
11581158
MonoBehaviour:
@@ -1506,6 +1506,26 @@ PrefabInstance:
15061506
propertyPath: m_AnchoredPosition.y
15071507
value: 0
15081508
objectReference: {fileID: 0}
1509+
- target: {fileID: 1557015218846663048, guid: f23f0006196948c42b15857775e664b5, type: 3}
1510+
propertyPath: m_AnchorMax.y
1511+
value: 0
1512+
objectReference: {fileID: 0}
1513+
- target: {fileID: 1557015218846663048, guid: f23f0006196948c42b15857775e664b5, type: 3}
1514+
propertyPath: m_AnchorMin.y
1515+
value: 0
1516+
objectReference: {fileID: 0}
1517+
- target: {fileID: 1557015218846663048, guid: f23f0006196948c42b15857775e664b5, type: 3}
1518+
propertyPath: m_SizeDelta.x
1519+
value: 0
1520+
objectReference: {fileID: 0}
1521+
- target: {fileID: 1557015218846663048, guid: f23f0006196948c42b15857775e664b5, type: 3}
1522+
propertyPath: m_SizeDelta.y
1523+
value: 0
1524+
objectReference: {fileID: 0}
1525+
- target: {fileID: 1557015218846663048, guid: f23f0006196948c42b15857775e664b5, type: 3}
1526+
propertyPath: m_AnchoredPosition.y
1527+
value: 0
1528+
objectReference: {fileID: 0}
15091529
- target: {fileID: 1699671346887296884, guid: f23f0006196948c42b15857775e664b5, type: 3}
15101530
propertyPath: m_Pivot.x
15111531
value: 0.5
@@ -1586,10 +1606,50 @@ PrefabInstance:
15861606
propertyPath: m_LocalEulerAnglesHint.z
15871607
value: 0
15881608
objectReference: {fileID: 0}
1609+
- target: {fileID: 2301134269438052834, guid: f23f0006196948c42b15857775e664b5, type: 3}
1610+
propertyPath: m_AnchorMax.y
1611+
value: 0
1612+
objectReference: {fileID: 0}
1613+
- target: {fileID: 2301134269438052834, guid: f23f0006196948c42b15857775e664b5, type: 3}
1614+
propertyPath: m_AnchorMin.y
1615+
value: 0
1616+
objectReference: {fileID: 0}
1617+
- target: {fileID: 2301134269438052834, guid: f23f0006196948c42b15857775e664b5, type: 3}
1618+
propertyPath: m_SizeDelta.x
1619+
value: 0
1620+
objectReference: {fileID: 0}
1621+
- target: {fileID: 2301134269438052834, guid: f23f0006196948c42b15857775e664b5, type: 3}
1622+
propertyPath: m_AnchoredPosition.x
1623+
value: 0
1624+
objectReference: {fileID: 0}
15891625
- target: {fileID: 2863698636028977604, guid: f23f0006196948c42b15857775e664b5, type: 3}
15901626
propertyPath: m_SizeDelta.y
15911627
value: 0
15921628
objectReference: {fileID: 0}
1629+
- target: {fileID: 2992017072356371252, guid: f23f0006196948c42b15857775e664b5, type: 3}
1630+
propertyPath: m_AnchorMax.y
1631+
value: 0
1632+
objectReference: {fileID: 0}
1633+
- target: {fileID: 2992017072356371252, guid: f23f0006196948c42b15857775e664b5, type: 3}
1634+
propertyPath: m_AnchorMin.y
1635+
value: 0
1636+
objectReference: {fileID: 0}
1637+
- target: {fileID: 2992017072356371252, guid: f23f0006196948c42b15857775e664b5, type: 3}
1638+
propertyPath: m_SizeDelta.x
1639+
value: 0
1640+
objectReference: {fileID: 0}
1641+
- target: {fileID: 2992017072356371252, guid: f23f0006196948c42b15857775e664b5, type: 3}
1642+
propertyPath: m_SizeDelta.y
1643+
value: 0
1644+
objectReference: {fileID: 0}
1645+
- target: {fileID: 2992017072356371252, guid: f23f0006196948c42b15857775e664b5, type: 3}
1646+
propertyPath: m_AnchoredPosition.x
1647+
value: 0
1648+
objectReference: {fileID: 0}
1649+
- target: {fileID: 2992017072356371252, guid: f23f0006196948c42b15857775e664b5, type: 3}
1650+
propertyPath: m_AnchoredPosition.y
1651+
value: 0
1652+
objectReference: {fileID: 0}
15931653
- target: {fileID: 3360239845487247634, guid: f23f0006196948c42b15857775e664b5, type: 3}
15941654
propertyPath: m_AnchorMax.y
15951655
value: 0
@@ -1606,6 +1666,26 @@ PrefabInstance:
16061666
propertyPath: m_AnchoredPosition.y
16071667
value: 0
16081668
objectReference: {fileID: 0}
1669+
- target: {fileID: 3504844994025811532, guid: f23f0006196948c42b15857775e664b5, type: 3}
1670+
propertyPath: m_AnchorMax.y
1671+
value: 0
1672+
objectReference: {fileID: 0}
1673+
- target: {fileID: 3504844994025811532, guid: f23f0006196948c42b15857775e664b5, type: 3}
1674+
propertyPath: m_AnchorMin.y
1675+
value: 0
1676+
objectReference: {fileID: 0}
1677+
- target: {fileID: 3504844994025811532, guid: f23f0006196948c42b15857775e664b5, type: 3}
1678+
propertyPath: m_SizeDelta.x
1679+
value: 0
1680+
objectReference: {fileID: 0}
1681+
- target: {fileID: 3504844994025811532, guid: f23f0006196948c42b15857775e664b5, type: 3}
1682+
propertyPath: m_SizeDelta.y
1683+
value: 0
1684+
objectReference: {fileID: 0}
1685+
- target: {fileID: 3504844994025811532, guid: f23f0006196948c42b15857775e664b5, type: 3}
1686+
propertyPath: m_AnchoredPosition.y
1687+
value: 0
1688+
objectReference: {fileID: 0}
16091689
- target: {fileID: 3661785393906095284, guid: f23f0006196948c42b15857775e664b5, type: 3}
16101690
propertyPath: m_AnchorMax.y
16111691
value: 1
@@ -1616,20 +1696,60 @@ PrefabInstance:
16161696
objectReference: {fileID: 0}
16171697
- target: {fileID: 3661785393906095284, guid: f23f0006196948c42b15857775e664b5, type: 3}
16181698
propertyPath: m_SizeDelta.x
1619-
value: 40.760002
1699+
value: 44.67
16201700
objectReference: {fileID: 0}
16211701
- target: {fileID: 3661785393906095284, guid: f23f0006196948c42b15857775e664b5, type: 3}
16221702
propertyPath: m_SizeDelta.y
16231703
value: 0
16241704
objectReference: {fileID: 0}
16251705
- target: {fileID: 3661785393906095284, guid: f23f0006196948c42b15857775e664b5, type: 3}
16261706
propertyPath: m_AnchoredPosition.x
1627-
value: 306.62
1707+
value: 304.665
16281708
objectReference: {fileID: 0}
16291709
- target: {fileID: 3661785393906095284, guid: f23f0006196948c42b15857775e664b5, type: 3}
16301710
propertyPath: m_AnchoredPosition.y
16311711
value: -23
16321712
objectReference: {fileID: 0}
1713+
- target: {fileID: 4288093375963304418, guid: f23f0006196948c42b15857775e664b5, type: 3}
1714+
propertyPath: m_AnchorMax.y
1715+
value: 0
1716+
objectReference: {fileID: 0}
1717+
- target: {fileID: 4288093375963304418, guid: f23f0006196948c42b15857775e664b5, type: 3}
1718+
propertyPath: m_AnchorMin.y
1719+
value: 0
1720+
objectReference: {fileID: 0}
1721+
- target: {fileID: 4288093375963304418, guid: f23f0006196948c42b15857775e664b5, type: 3}
1722+
propertyPath: m_SizeDelta.x
1723+
value: 0
1724+
objectReference: {fileID: 0}
1725+
- target: {fileID: 4288093375963304418, guid: f23f0006196948c42b15857775e664b5, type: 3}
1726+
propertyPath: m_AnchoredPosition.x
1727+
value: 0
1728+
objectReference: {fileID: 0}
1729+
- target: {fileID: 4288093375963304418, guid: f23f0006196948c42b15857775e664b5, type: 3}
1730+
propertyPath: m_AnchoredPosition.y
1731+
value: 0
1732+
objectReference: {fileID: 0}
1733+
- target: {fileID: 4291015176364605322, guid: f23f0006196948c42b15857775e664b5, type: 3}
1734+
propertyPath: m_AnchorMax.y
1735+
value: 0
1736+
objectReference: {fileID: 0}
1737+
- target: {fileID: 4291015176364605322, guid: f23f0006196948c42b15857775e664b5, type: 3}
1738+
propertyPath: m_AnchorMin.y
1739+
value: 0
1740+
objectReference: {fileID: 0}
1741+
- target: {fileID: 4291015176364605322, guid: f23f0006196948c42b15857775e664b5, type: 3}
1742+
propertyPath: m_SizeDelta.x
1743+
value: 0
1744+
objectReference: {fileID: 0}
1745+
- target: {fileID: 4291015176364605322, guid: f23f0006196948c42b15857775e664b5, type: 3}
1746+
propertyPath: m_AnchoredPosition.y
1747+
value: 0
1748+
objectReference: {fileID: 0}
1749+
- target: {fileID: 5947697035070550002, guid: f23f0006196948c42b15857775e664b5, type: 3}
1750+
propertyPath: m_SizeDelta.x
1751+
value: 0
1752+
objectReference: {fileID: 0}
16331753
- target: {fileID: 6395051202726791872, guid: f23f0006196948c42b15857775e664b5, type: 3}
16341754
propertyPath: m_AnchorMax.y
16351755
value: 0
@@ -1656,15 +1776,15 @@ PrefabInstance:
16561776
objectReference: {fileID: 0}
16571777
- target: {fileID: 6469782434302875927, guid: f23f0006196948c42b15857775e664b5, type: 3}
16581778
propertyPath: m_SizeDelta.x
1659-
value: 8.76
1779+
value: 8.67
16601780
objectReference: {fileID: 0}
16611781
- target: {fileID: 6469782434302875927, guid: f23f0006196948c42b15857775e664b5, type: 3}
16621782
propertyPath: m_AnchoredPosition.x
1663-
value: 26
1783+
value: 28
16641784
objectReference: {fileID: 0}
16651785
- target: {fileID: 6469782434302875927, guid: f23f0006196948c42b15857775e664b5, type: 3}
16661786
propertyPath: m_AnchoredPosition.y
1667-
value: -7
1787+
value: -8
16681788
objectReference: {fileID: 0}
16691789
- target: {fileID: 7302402922838617939, guid: f23f0006196948c42b15857775e664b5, type: 3}
16701790
propertyPath: m_AnchorMax.y
@@ -1678,6 +1798,18 @@ PrefabInstance:
16781798
propertyPath: m_AnchoredPosition.x
16791799
value: 0
16801800
objectReference: {fileID: 0}
1801+
- target: {fileID: 7430822195905210744, guid: f23f0006196948c42b15857775e664b5, type: 3}
1802+
propertyPath: m_AnchorMax.y
1803+
value: 0
1804+
objectReference: {fileID: 0}
1805+
- target: {fileID: 7430822195905210744, guid: f23f0006196948c42b15857775e664b5, type: 3}
1806+
propertyPath: m_AnchorMin.y
1807+
value: 0
1808+
objectReference: {fileID: 0}
1809+
- target: {fileID: 7430822195905210744, guid: f23f0006196948c42b15857775e664b5, type: 3}
1810+
propertyPath: m_AnchoredPosition.x
1811+
value: 0
1812+
objectReference: {fileID: 0}
16811813
- target: {fileID: 7637952511973492318, guid: f23f0006196948c42b15857775e664b5, type: 3}
16821814
propertyPath: m_AnchorMax.y
16831815
value: 0
@@ -1698,6 +1830,30 @@ PrefabInstance:
16981830
propertyPath: m_Name
16991831
value: '[MB] ChatTitlebarView'
17001832
objectReference: {fileID: 0}
1833+
- target: {fileID: 7980458431721666911, guid: f23f0006196948c42b15857775e664b5, type: 3}
1834+
propertyPath: m_AnchorMax.y
1835+
value: 0
1836+
objectReference: {fileID: 0}
1837+
- target: {fileID: 7980458431721666911, guid: f23f0006196948c42b15857775e664b5, type: 3}
1838+
propertyPath: m_AnchorMin.y
1839+
value: 0
1840+
objectReference: {fileID: 0}
1841+
- target: {fileID: 7980458431721666911, guid: f23f0006196948c42b15857775e664b5, type: 3}
1842+
propertyPath: m_SizeDelta.x
1843+
value: 0
1844+
objectReference: {fileID: 0}
1845+
- target: {fileID: 7980458431721666911, guid: f23f0006196948c42b15857775e664b5, type: 3}
1846+
propertyPath: m_SizeDelta.y
1847+
value: 0
1848+
objectReference: {fileID: 0}
1849+
- target: {fileID: 7980458431721666911, guid: f23f0006196948c42b15857775e664b5, type: 3}
1850+
propertyPath: m_AnchoredPosition.x
1851+
value: 0
1852+
objectReference: {fileID: 0}
1853+
- target: {fileID: 7980458431721666911, guid: f23f0006196948c42b15857775e664b5, type: 3}
1854+
propertyPath: m_AnchoredPosition.y
1855+
value: 0
1856+
objectReference: {fileID: 0}
17011857
- target: {fileID: 8637117976192628852, guid: f23f0006196948c42b15857775e664b5, type: 3}
17021858
propertyPath: m_AnchorMax.y
17031859
value: 0
@@ -1837,7 +1993,7 @@ PrefabInstance:
18371993
objectReference: {fileID: 0}
18381994
- target: {fileID: 8517794174848120442, guid: b1552137c9452f848822dd5cfec09acc, type: 3}
18391995
propertyPath: m_AnchoredPosition.y
1840-
value: -399
1996+
value: -638
18411997
objectReference: {fileID: 0}
18421998
- target: {fileID: 8517794174848120442, guid: b1552137c9452f848822dd5cfec09acc, type: 3}
18431999
propertyPath: m_LocalEulerAnglesHint.x

Explorer/Assets/DCL/Chat/Assets/VoiceChatPanelView.prefab

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ MonoBehaviour:
170170
m_PrefabInstance: {fileID: 0}
171171
m_PrefabAsset: {fileID: 0}
172172
m_GameObject: {fileID: 1190873555538097139}
173-
m_Enabled: 1
173+
m_Enabled: 0
174174
m_EditorHideFlags: 0
175175
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
176176
m_Name:

0 commit comments

Comments
 (0)