Skip to content

Commit 919875c

Browse files
LudmilafantaniellaLudmilafantaniella
authored
Merge pull request #6090 from decentraland/chore/sync
chore: sync main to dev
2 parents 41064ba + 33b7e01 commit 919875c

File tree

1 file changed

+15
-23
lines changed

1 file changed

+15
-23
lines changed

‎unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/LoadingScreen/Resources/_LoadingScreen.prefab‎

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ RectTransform:
3131
m_ConstrainProportionsScale: 0
3232
m_Children: []
3333
m_Father: {fileID: 1244904327}
34+
m_RootOrder: 2
3435
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3536
m_AnchorMin: {x: 0.5, y: 0}
3637
m_AnchorMax: {x: 0.5, y: 0}
@@ -169,6 +170,7 @@ RectTransform:
169170
- {fileID: 102198957}
170171
- {fileID: 1858120786}
171172
m_Father: {fileID: 5696763185950597558}
173+
m_RootOrder: 2
172174
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
173175
m_AnchorMin: {x: 0, y: 0}
174176
m_AnchorMax: {x: 1, y: 1}
@@ -220,6 +222,7 @@ RectTransform:
220222
m_ConstrainProportionsScale: 0
221223
m_Children: []
222224
m_Father: {fileID: 1858120786}
225+
m_RootOrder: 0
223226
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
224227
m_AnchorMin: {x: 0, y: 0}
225228
m_AnchorMax: {x: 1, y: 0}
@@ -296,6 +299,7 @@ RectTransform:
296299
m_Children:
297300
- {fileID: 1548540705}
298301
m_Father: {fileID: 1244904327}
302+
m_RootOrder: 3
299303
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
300304
m_AnchorMin: {x: 0, y: 0}
301305
m_AnchorMax: {x: 1, y: 0}
@@ -371,6 +375,7 @@ RectTransform:
371375
m_ConstrainProportionsScale: 0
372376
m_Children: []
373377
m_Father: {fileID: 1244904327}
378+
m_RootOrder: 0
374379
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
375380
m_AnchorMin: {x: 0, y: 0}
376381
m_AnchorMax: {x: 1, y: 1}
@@ -448,6 +453,7 @@ RectTransform:
448453
- {fileID: 6322710159802854320}
449454
- {fileID: 7423075662883644013}
450455
m_Father: {fileID: 5696763185950597558}
456+
m_RootOrder: 3
451457
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
452458
m_AnchorMin: {x: 0, y: 0}
453459
m_AnchorMax: {x: 1, y: 1}
@@ -527,6 +533,7 @@ RectTransform:
527533
m_ConstrainProportionsScale: 0
528534
m_Children: []
529535
m_Father: {fileID: 5696763185950597558}
536+
m_RootOrder: 1
530537
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
531538
m_AnchorMin: {x: 0, y: 0}
532539
m_AnchorMax: {x: 1, y: 1}
@@ -555,7 +562,7 @@ MonoBehaviour:
555562
m_EditorClassIdentifier:
556563
m_Material: {fileID: 0}
557564
m_Color: {r: 0, g: 0, b: 0, a: 1}
558-
m_RaycastTarget: 1
565+
m_RaycastTarget: 0
559566
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
560567
m_Maskable: 1
561568
m_OnCullStateChanged:
@@ -604,6 +611,7 @@ RectTransform:
604611
m_ConstrainProportionsScale: 0
605612
m_Children: []
606613
m_Father: {fileID: 5696763185950597558}
614+
m_RootOrder: 0
607615
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
608616
m_AnchorMin: {x: 0, y: 0}
609617
m_AnchorMax: {x: 1, y: 1}
@@ -674,9 +682,7 @@ Canvas:
674682
m_OverrideSorting: 0
675683
m_OverridePixelPerfect: 0
676684
m_SortingBucketNormalizedSize: 0
677-
m_VertexColorAlwaysGammaSpace: 0
678685
m_AdditionalShaderChannelsFlag: 0
679-
m_UpdateRectTransformForStandalone: 0
680686
m_SortingLayerID: 0
681687
m_SortingOrder: 0
682688
m_TargetDisplay: 0
@@ -716,6 +722,7 @@ RectTransform:
716722
- {fileID: 5465143494324565093}
717723
- {fileID: 136838695967996016}
718724
m_Father: {fileID: 5696763185950597558}
725+
m_RootOrder: 5
719726
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
720727
m_AnchorMin: {x: 0, y: 0}
721728
m_AnchorMax: {x: 1, y: 1}
@@ -739,9 +746,7 @@ Canvas:
739746
m_OverrideSorting: 0
740747
m_OverridePixelPerfect: 0
741748
m_SortingBucketNormalizedSize: 0
742-
m_VertexColorAlwaysGammaSpace: 0
743749
m_AdditionalShaderChannelsFlag: 25
744-
m_UpdateRectTransformForStandalone: 0
745750
m_SortingLayerID: 0
746751
m_SortingOrder: 1000
747752
m_TargetDisplay: 0
@@ -837,6 +842,7 @@ RectTransform:
837842
m_ConstrainProportionsScale: 0
838843
m_Children: []
839844
m_Father: {fileID: 5570195312150058620}
845+
m_RootOrder: 1
840846
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
841847
m_AnchorMin: {x: 0.5, y: 1}
842848
m_AnchorMax: {x: 0.5, y: 1}
@@ -912,6 +918,7 @@ RectTransform:
912918
m_ConstrainProportionsScale: 0
913919
m_Children: []
914920
m_Father: {fileID: 5570195312150058620}
921+
m_RootOrder: 2
915922
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
916923
m_AnchorMin: {x: 0.5, y: 1}
917924
m_AnchorMax: {x: 0.5, y: 1}
@@ -1048,6 +1055,7 @@ RectTransform:
10481055
m_ConstrainProportionsScale: 0
10491056
m_Children: []
10501057
m_Father: {fileID: 5570195312150058620}
1058+
m_RootOrder: 0
10511059
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
10521060
m_AnchorMin: {x: 0, y: 0}
10531061
m_AnchorMax: {x: 0, y: 0}
@@ -1137,6 +1145,7 @@ RectTransform:
11371145
m_ConstrainProportionsScale: 0
11381146
m_Children: []
11391147
m_Father: {fileID: 5696763185950597558}
1148+
m_RootOrder: 4
11401149
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
11411150
m_AnchorMin: {x: 0.5, y: 0.5}
11421151
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1222,6 +1231,7 @@ RectTransform:
12221231
- {fileID: 4296387108997757867}
12231232
- {fileID: 3246031618494657702}
12241233
m_Father: {fileID: 0}
1234+
m_RootOrder: 0
12251235
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
12261236
m_AnchorMin: {x: 0, y: 0}
12271237
m_AnchorMax: {x: 0, y: 0}
@@ -1245,9 +1255,7 @@ Canvas:
12451255
m_OverrideSorting: 0
12461256
m_OverridePixelPerfect: 0
12471257
m_SortingBucketNormalizedSize: 0
1248-
m_VertexColorAlwaysGammaSpace: 0
12491258
m_AdditionalShaderChannelsFlag: 25
1250-
m_UpdateRectTransformForStandalone: 0
12511259
m_SortingLayerID: 0
12521260
m_SortingOrder: 100
12531261
m_TargetDisplay: 0
@@ -1341,7 +1349,6 @@ PrefabInstance:
13411349
m_ObjectHideFlags: 0
13421350
serializedVersion: 2
13431351
m_Modification:
1344-
serializedVersion: 3
13451352
m_TransformParent: {fileID: 1244904327}
13461353
m_Modifications:
13471354
- target: {fileID: 1589542079631269309, guid: 2da37fa1269fc1f48a3470d0ca3e9450,
@@ -1550,9 +1557,6 @@ PrefabInstance:
15501557
value: 0
15511558
objectReference: {fileID: 0}
15521559
m_RemovedComponents: []
1553-
m_RemovedGameObjects: []
1554-
m_AddedGameObjects: []
1555-
m_AddedComponents: []
15561560
m_SourcePrefab: {fileID: 100100000, guid: 2da37fa1269fc1f48a3470d0ca3e9450, type: 3}
15571561
--- !u!224 &6281035913215727768 stripped
15581562
RectTransform:
@@ -1565,7 +1569,6 @@ PrefabInstance:
15651569
m_ObjectHideFlags: 0
15661570
serializedVersion: 2
15671571
m_Modification:
1568-
serializedVersion: 3
15691572
m_TransformParent: {fileID: 3246031618494657702}
15701573
m_Modifications:
15711574
- target: {fileID: 316622536944760797, guid: 97e9067bfed47423b9e491675f0c6d06,
@@ -1694,9 +1697,6 @@ PrefabInstance:
16941697
value: 0
16951698
objectReference: {fileID: 0}
16961699
m_RemovedComponents: []
1697-
m_RemovedGameObjects: []
1698-
m_AddedGameObjects: []
1699-
m_AddedComponents: []
17001700
m_SourcePrefab: {fileID: 100100000, guid: 97e9067bfed47423b9e491675f0c6d06, type: 3}
17011701
--- !u!1 &728389790094115166 stripped
17021702
GameObject:
@@ -1739,7 +1739,6 @@ PrefabInstance:
17391739
m_ObjectHideFlags: 0
17401740
serializedVersion: 2
17411741
m_Modification:
1742-
serializedVersion: 3
17431742
m_TransformParent: {fileID: 3246031618494657702}
17441743
m_Modifications:
17451744
- target: {fileID: 316622536944760797, guid: 97e9067bfed47423b9e491675f0c6d06,
@@ -1893,9 +1892,6 @@ PrefabInstance:
18931892
value: -9.116089
18941893
objectReference: {fileID: 0}
18951894
m_RemovedComponents: []
1896-
m_RemovedGameObjects: []
1897-
m_AddedGameObjects: []
1898-
m_AddedComponents: []
18991895
m_SourcePrefab: {fileID: 100100000, guid: 97e9067bfed47423b9e491675f0c6d06, type: 3}
19001896
--- !u!224 &136838695967996016 stripped
19011897
RectTransform:
@@ -1926,7 +1922,6 @@ PrefabInstance:
19261922
m_ObjectHideFlags: 0
19271923
serializedVersion: 2
19281924
m_Modification:
1929-
serializedVersion: 3
19301925
m_TransformParent: {fileID: 3246031618494657702}
19311926
m_Modifications:
19321927
- target: {fileID: 608093966221723960, guid: 97e9067bfed47423b9e491675f0c6d06,
@@ -2050,9 +2045,6 @@ PrefabInstance:
20502045
value: 0
20512046
objectReference: {fileID: 0}
20522047
m_RemovedComponents: []
2053-
m_RemovedGameObjects: []
2054-
m_AddedGameObjects: []
2055-
m_AddedComponents: []
20562048
m_SourcePrefab: {fileID: 100100000, guid: 97e9067bfed47423b9e491675f0c6d06, type: 3}
20572049
--- !u!224 &3147506433864547738 stripped
20582050
RectTransform:

0 commit comments

Comments
 (0)