Skip to content

Commit 049d0e3

Browse files
anicalbanoanicalbano
authored
Merge pull request #6154 from decentraland/style/blocking-copies
style: update blocking accounts copies
2 parents 8245e52 + cb2037e commit 049d0e3

File tree

3 files changed

+156
-48
lines changed

3 files changed

+156
-48
lines changed

‎unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/ConfirmationPopup/Resources/GenericConfirmationPopup.prefab‎

Lines changed: 144 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,11 @@ RectTransform:
3131
m_ConstrainProportionsScale: 0
3232
m_Children: []
3333
m_Father: {fileID: 748608453488172493}
34-
m_RootOrder: 3
3534
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
36-
m_AnchorMin: {x: 0.5, y: 0.5}
37-
m_AnchorMax: {x: 0.5, y: 0.5}
38-
m_AnchoredPosition: {x: 0, y: 87.000015}
39-
m_SizeDelta: {x: 306, y: 44}
35+
m_AnchorMin: {x: 0, y: 0}
36+
m_AnchorMax: {x: 0, y: 0}
37+
m_AnchoredPosition: {x: 0, y: 0}
38+
m_SizeDelta: {x: 306, y: 0}
4039
m_Pivot: {x: 0.5, y: 0.5}
4140
--- !u!222 &1703960191160554575
4241
CanvasRenderer:
@@ -136,6 +135,64 @@ MonoBehaviour:
136135
m_hasFontAssetChanged: 0
137136
m_baseMaterial: {fileID: 0}
138137
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
138+
--- !u!1 &4765217074038235746
139+
GameObject:
140+
m_ObjectHideFlags: 0
141+
m_CorrespondingSourceObject: {fileID: 0}
142+
m_PrefabInstance: {fileID: 0}
143+
m_PrefabAsset: {fileID: 0}
144+
serializedVersion: 6
145+
m_Component:
146+
- component: {fileID: 2385456774495241379}
147+
- component: {fileID: 5405317425283375627}
148+
m_Layer: 5
149+
m_Name: Buttons
150+
m_TagString: Untagged
151+
m_Icon: {fileID: 0}
152+
m_NavMeshLayer: 0
153+
m_StaticEditorFlags: 0
154+
m_IsActive: 1
155+
--- !u!224 &2385456774495241379
156+
RectTransform:
157+
m_ObjectHideFlags: 0
158+
m_CorrespondingSourceObject: {fileID: 0}
159+
m_PrefabInstance: {fileID: 0}
160+
m_PrefabAsset: {fileID: 0}
161+
m_GameObject: {fileID: 4765217074038235746}
162+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
163+
m_LocalPosition: {x: 0, y: 0, z: 0}
164+
m_LocalScale: {x: 1, y: 1, z: 1}
165+
m_ConstrainProportionsScale: 0
166+
m_Children:
167+
- {fileID: 1767993552507509700}
168+
- {fileID: 2707158814742602100}
169+
m_Father: {fileID: 748608453488172493}
170+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
171+
m_AnchorMin: {x: 0, y: 0}
172+
m_AnchorMax: {x: 0, y: 0}
173+
m_AnchoredPosition: {x: 0, y: 0}
174+
m_SizeDelta: {x: 306, y: 0}
175+
m_Pivot: {x: 0.5, y: 0.5}
176+
--- !u!114 &5405317425283375627
177+
MonoBehaviour:
178+
m_ObjectHideFlags: 0
179+
m_CorrespondingSourceObject: {fileID: 0}
180+
m_PrefabInstance: {fileID: 0}
181+
m_PrefabAsset: {fileID: 0}
182+
m_GameObject: {fileID: 4765217074038235746}
183+
m_Enabled: 1
184+
m_EditorHideFlags: 0
185+
m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
186+
m_Name:
187+
m_EditorClassIdentifier:
188+
m_IgnoreLayout: 0
189+
m_MinWidth: -1
190+
m_MinHeight: 52
191+
m_PreferredWidth: -1
192+
m_PreferredHeight: -1
193+
m_FlexibleWidth: -1
194+
m_FlexibleHeight: 52
195+
m_LayoutPriority: 1
139196
--- !u!1 &5670732266688795212
140197
GameObject:
141198
m_ObjectHideFlags: 0
@@ -169,7 +226,6 @@ RectTransform:
169226
m_ConstrainProportionsScale: 0
170227
m_Children: []
171228
m_Father: {fileID: 334105295397510177}
172-
m_RootOrder: 0
173229
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
174230
m_AnchorMin: {x: 0, y: 0}
175231
m_AnchorMax: {x: 1, y: 1}
@@ -286,6 +342,8 @@ GameObject:
286342
- component: {fileID: 424981647407856322}
287343
- component: {fileID: 390931854261043918}
288344
- component: {fileID: 8722178245602580679}
345+
- component: {fileID: 5805276553323350248}
346+
- component: {fileID: 1350796038641582709}
289347
m_Layer: 5
290348
m_Name: Modal
291349
m_TagString: Untagged
@@ -305,17 +363,15 @@ RectTransform:
305363
m_LocalScale: {x: 1, y: 1, z: 1}
306364
m_ConstrainProportionsScale: 0
307365
m_Children:
308-
- {fileID: 1767993552507509700}
309-
- {fileID: 2707158814742602100}
310-
- {fileID: 7750366355427468054}
311366
- {fileID: 5320795065761248863}
367+
- {fileID: 7750366355427468054}
368+
- {fileID: 2385456774495241379}
312369
m_Father: {fileID: 334105295397510177}
313-
m_RootOrder: 1
314370
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
315371
m_AnchorMin: {x: 0.5, y: 0.5}
316372
m_AnchorMax: {x: 0.5, y: 0.5}
317373
m_AnchoredPosition: {x: 0, y: 0}
318-
m_SizeDelta: {x: 430, y: 350}
374+
m_SizeDelta: {x: 430, y: 0}
319375
m_Pivot: {x: 0.5, y: 0.5}
320376
--- !u!222 &424981647407856322
321377
CanvasRenderer:
@@ -368,6 +424,46 @@ MonoBehaviour:
368424
m_Name:
369425
m_EditorClassIdentifier:
370426
m_ShowMaskGraphic: 1
427+
--- !u!114 &5805276553323350248
428+
MonoBehaviour:
429+
m_ObjectHideFlags: 0
430+
m_CorrespondingSourceObject: {fileID: 0}
431+
m_PrefabInstance: {fileID: 0}
432+
m_PrefabAsset: {fileID: 0}
433+
m_GameObject: {fileID: 6150239558006173254}
434+
m_Enabled: 1
435+
m_EditorHideFlags: 0
436+
m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
437+
m_Name:
438+
m_EditorClassIdentifier:
439+
m_Padding:
440+
m_Left: 0
441+
m_Right: 0
442+
m_Top: 60
443+
m_Bottom: 60
444+
m_ChildAlignment: 4
445+
m_Spacing: 30
446+
m_ChildForceExpandWidth: 1
447+
m_ChildForceExpandHeight: 1
448+
m_ChildControlWidth: 0
449+
m_ChildControlHeight: 1
450+
m_ChildScaleWidth: 0
451+
m_ChildScaleHeight: 0
452+
m_ReverseArrangement: 0
453+
--- !u!114 &1350796038641582709
454+
MonoBehaviour:
455+
m_ObjectHideFlags: 0
456+
m_CorrespondingSourceObject: {fileID: 0}
457+
m_PrefabInstance: {fileID: 0}
458+
m_PrefabAsset: {fileID: 0}
459+
m_GameObject: {fileID: 6150239558006173254}
460+
m_Enabled: 1
461+
m_EditorHideFlags: 0
462+
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
463+
m_Name:
464+
m_EditorClassIdentifier:
465+
m_HorizontalFit: 0
466+
m_VerticalFit: 2
371467
--- !u!1 &7886239998420550621
372468
GameObject:
373469
m_ObjectHideFlags: 0
@@ -405,7 +501,6 @@ RectTransform:
405501
- {fileID: 5404782228060347586}
406502
- {fileID: 748608453488172493}
407503
m_Father: {fileID: 0}
408-
m_RootOrder: 0
409504
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
410505
m_AnchorMin: {x: 0, y: 0}
411506
m_AnchorMax: {x: 0, y: 0}
@@ -429,7 +524,9 @@ Canvas:
429524
m_OverrideSorting: 0
430525
m_OverridePixelPerfect: 0
431526
m_SortingBucketNormalizedSize: 0
527+
m_VertexColorAlwaysGammaSpace: 0
432528
m_AdditionalShaderChannelsFlag: 25
529+
m_UpdateRectTransformForStandalone: 0
433530
m_SortingLayerID: 0
434531
m_SortingOrder: 100
435532
m_TargetDisplay: 0
@@ -551,12 +648,11 @@ RectTransform:
551648
m_ConstrainProportionsScale: 0
552649
m_Children: []
553650
m_Father: {fileID: 748608453488172493}
554-
m_RootOrder: 2
555651
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
556-
m_AnchorMin: {x: 0.5, y: 0.5}
557-
m_AnchorMax: {x: 0.5, y: 0.5}
558-
m_AnchoredPosition: {x: 0, y: -5.4999986}
559-
m_SizeDelta: {x: 306, y: 81}
652+
m_AnchorMin: {x: 0, y: 0}
653+
m_AnchorMax: {x: 0, y: 0}
654+
m_AnchoredPosition: {x: 0, y: 0}
655+
m_SizeDelta: {x: 306, y: 0}
560656
m_Pivot: {x: 0.5, y: 0.5}
561657
--- !u!222 &1262808249577876865
562658
CanvasRenderer:
@@ -586,7 +682,9 @@ MonoBehaviour:
586682
m_OnCullStateChanged:
587683
m_PersistentCalls:
588684
m_Calls: []
589-
m_text: Description
685+
m_text: Blocking someone means that you will no longer see their avatar in-world.
686+
Both of you will also not see each other's messages in private and public chats
687+
and will not be able to send each other messages or friend requests.
590688
m_isRightToLeft: 0
591689
m_fontAsset: {fileID: 11400000, guid: 6708c7eadd49b49f4ac3469e5104e7c9, type: 2}
592690
m_sharedMaterial: {fileID: 2100000, guid: dd1effe058ec94479a0dd10765262662, type: 2}
@@ -661,7 +759,8 @@ PrefabInstance:
661759
m_ObjectHideFlags: 0
662760
serializedVersion: 2
663761
m_Modification:
664-
m_TransformParent: {fileID: 748608453488172493}
762+
serializedVersion: 3
763+
m_TransformParent: {fileID: 2385456774495241379}
665764
m_Modifications:
666765
- target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6,
667766
type: 3}
@@ -681,22 +780,22 @@ PrefabInstance:
681780
- target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6,
682781
type: 3}
683782
propertyPath: m_AnchorMax.x
684-
value: 0.5
783+
value: 1
685784
objectReference: {fileID: 0}
686785
- target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6,
687786
type: 3}
688787
propertyPath: m_AnchorMax.y
689-
value: 0.5
788+
value: 0
690789
objectReference: {fileID: 0}
691790
- target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6,
692791
type: 3}
693792
propertyPath: m_AnchorMin.x
694-
value: 0.5
793+
value: 1
695794
objectReference: {fileID: 0}
696795
- target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6,
697796
type: 3}
698797
propertyPath: m_AnchorMin.y
699-
value: 0.5
798+
value: 0
700799
objectReference: {fileID: 0}
701800
- target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6,
702801
type: 3}
@@ -731,27 +830,27 @@ PrefabInstance:
731830
- target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6,
732831
type: 3}
733832
propertyPath: m_LocalRotation.x
734-
value: 0
833+
value: -0
735834
objectReference: {fileID: 0}
736835
- target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6,
737836
type: 3}
738837
propertyPath: m_LocalRotation.y
739-
value: 0
838+
value: -0
740839
objectReference: {fileID: 0}
741840
- target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6,
742841
type: 3}
743842
propertyPath: m_LocalRotation.z
744-
value: 0
843+
value: -0
745844
objectReference: {fileID: 0}
746845
- target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6,
747846
type: 3}
748847
propertyPath: m_AnchoredPosition.x
749-
value: 153
848+
value: 0.000045776367
750849
objectReference: {fileID: 0}
751850
- target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6,
752851
type: 3}
753852
propertyPath: m_AnchoredPosition.y
754-
value: -113
853+
value: 0
755854
objectReference: {fileID: 0}
756855
- target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6,
757856
type: 3}
@@ -890,6 +989,9 @@ PrefabInstance:
890989
value: 0
891990
objectReference: {fileID: 0}
892991
m_RemovedComponents: []
992+
m_RemovedGameObjects: []
993+
m_AddedGameObjects: []
994+
m_AddedComponents: []
893995
m_SourcePrefab: {fileID: 100100000, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3}
894996
--- !u!114 &886928643233455748 stripped
895997
MonoBehaviour:
@@ -926,7 +1028,8 @@ PrefabInstance:
9261028
m_ObjectHideFlags: 0
9271029
serializedVersion: 2
9281030
m_Modification:
929-
m_TransformParent: {fileID: 748608453488172493}
1031+
serializedVersion: 3
1032+
m_TransformParent: {fileID: 2385456774495241379}
9301033
m_Modifications:
9311034
- target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6,
9321035
type: 3}
@@ -946,22 +1049,22 @@ PrefabInstance:
9461049
- target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6,
9471050
type: 3}
9481051
propertyPath: m_AnchorMax.x
949-
value: 0.5
1052+
value: 0
9501053
objectReference: {fileID: 0}
9511054
- target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6,
9521055
type: 3}
9531056
propertyPath: m_AnchorMax.y
954-
value: 0.5
1057+
value: 0
9551058
objectReference: {fileID: 0}
9561059
- target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6,
9571060
type: 3}
9581061
propertyPath: m_AnchorMin.x
959-
value: 0.5
1062+
value: 0
9601063
objectReference: {fileID: 0}
9611064
- target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6,
9621065
type: 3}
9631066
propertyPath: m_AnchorMin.y
964-
value: 0.5
1067+
value: 0
9651068
objectReference: {fileID: 0}
9661069
- target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6,
9671070
type: 3}
@@ -996,27 +1099,27 @@ PrefabInstance:
9961099
- target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6,
9971100
type: 3}
9981101
propertyPath: m_LocalRotation.x
999-
value: 0
1102+
value: -0
10001103
objectReference: {fileID: 0}
10011104
- target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6,
10021105
type: 3}
10031106
propertyPath: m_LocalRotation.y
1004-
value: 0
1107+
value: -0
10051108
objectReference: {fileID: 0}
10061109
- target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6,
10071110
type: 3}
10081111
propertyPath: m_LocalRotation.z
1009-
value: 0
1112+
value: -0
10101113
objectReference: {fileID: 0}
10111114
- target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6,
10121115
type: 3}
10131116
propertyPath: m_AnchoredPosition.x
1014-
value: -153
1117+
value: 0
10151118
objectReference: {fileID: 0}
10161119
- target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6,
10171120
type: 3}
10181121
propertyPath: m_AnchoredPosition.y
1019-
value: -113
1122+
value: 0
10201123
objectReference: {fileID: 0}
10211124
- target: {fileID: 54622623229548845, guid: fb037d81b9c10ad439a13e356a17bab6,
10221125
type: 3}
@@ -1170,6 +1273,9 @@ PrefabInstance:
11701273
value: 0
11711274
objectReference: {fileID: 0}
11721275
m_RemovedComponents: []
1276+
m_RemovedGameObjects: []
1277+
m_AddedGameObjects: []
1278+
m_AddedComponents: []
11731279
m_SourcePrefab: {fileID: 100100000, guid: fb037d81b9c10ad439a13e356a17bab6, type: 3}
11741280
--- !u!114 &1969861380810069237 stripped
11751281
MonoBehaviour:

0 commit comments

Comments
 (0)