Skip to content

Commit 945a64f

Browse files
aixaCodeaixaCode
authored
fix: block input during loading screen (#6085)
1 parent 9214d0d commit 945a64f

File tree

1 file changed

+23
-15
lines changed

1 file changed

+23
-15
lines changed

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

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ RectTransform:
3131
m_ConstrainProportionsScale: 0
3232
m_Children: []
3333
m_Father: {fileID: 1244904327}
34-
m_RootOrder: 2
3534
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3635
m_AnchorMin: {x: 0.5, y: 0}
3736
m_AnchorMax: {x: 0.5, y: 0}
@@ -170,7 +169,6 @@ RectTransform:
170169
- {fileID: 102198957}
171170
- {fileID: 1858120786}
172171
m_Father: {fileID: 5696763185950597558}
173-
m_RootOrder: 2
174172
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
175173
m_AnchorMin: {x: 0, y: 0}
176174
m_AnchorMax: {x: 1, y: 1}
@@ -222,7 +220,6 @@ RectTransform:
222220
m_ConstrainProportionsScale: 0
223221
m_Children: []
224222
m_Father: {fileID: 1858120786}
225-
m_RootOrder: 0
226223
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
227224
m_AnchorMin: {x: 0, y: 0}
228225
m_AnchorMax: {x: 1, y: 0}
@@ -299,7 +296,6 @@ RectTransform:
299296
m_Children:
300297
- {fileID: 1548540705}
301298
m_Father: {fileID: 1244904327}
302-
m_RootOrder: 3
303299
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
304300
m_AnchorMin: {x: 0, y: 0}
305301
m_AnchorMax: {x: 1, y: 0}
@@ -375,7 +371,6 @@ RectTransform:
375371
m_ConstrainProportionsScale: 0
376372
m_Children: []
377373
m_Father: {fileID: 1244904327}
378-
m_RootOrder: 0
379374
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
380375
m_AnchorMin: {x: 0, y: 0}
381376
m_AnchorMax: {x: 1, y: 1}
@@ -453,7 +448,6 @@ RectTransform:
453448
- {fileID: 6322710159802854320}
454449
- {fileID: 7423075662883644013}
455450
m_Father: {fileID: 5696763185950597558}
456-
m_RootOrder: 3
457451
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
458452
m_AnchorMin: {x: 0, y: 0}
459453
m_AnchorMax: {x: 1, y: 1}
@@ -533,7 +527,6 @@ RectTransform:
533527
m_ConstrainProportionsScale: 0
534528
m_Children: []
535529
m_Father: {fileID: 5696763185950597558}
536-
m_RootOrder: 1
537530
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
538531
m_AnchorMin: {x: 0, y: 0}
539532
m_AnchorMax: {x: 1, y: 1}
@@ -562,7 +555,7 @@ MonoBehaviour:
562555
m_EditorClassIdentifier:
563556
m_Material: {fileID: 0}
564557
m_Color: {r: 0, g: 0, b: 0, a: 1}
565-
m_RaycastTarget: 0
558+
m_RaycastTarget: 1
566559
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
567560
m_Maskable: 1
568561
m_OnCullStateChanged:
@@ -611,7 +604,6 @@ RectTransform:
611604
m_ConstrainProportionsScale: 0
612605
m_Children: []
613606
m_Father: {fileID: 5696763185950597558}
614-
m_RootOrder: 0
615607
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
616608
m_AnchorMin: {x: 0, y: 0}
617609
m_AnchorMax: {x: 1, y: 1}
@@ -682,7 +674,9 @@ Canvas:
682674
m_OverrideSorting: 0
683675
m_OverridePixelPerfect: 0
684676
m_SortingBucketNormalizedSize: 0
677+
m_VertexColorAlwaysGammaSpace: 0
685678
m_AdditionalShaderChannelsFlag: 0
679+
m_UpdateRectTransformForStandalone: 0
686680
m_SortingLayerID: 0
687681
m_SortingOrder: 0
688682
m_TargetDisplay: 0
@@ -722,7 +716,6 @@ RectTransform:
722716
- {fileID: 5465143494324565093}
723717
- {fileID: 136838695967996016}
724718
m_Father: {fileID: 5696763185950597558}
725-
m_RootOrder: 5
726719
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
727720
m_AnchorMin: {x: 0, y: 0}
728721
m_AnchorMax: {x: 1, y: 1}
@@ -746,7 +739,9 @@ Canvas:
746739
m_OverrideSorting: 0
747740
m_OverridePixelPerfect: 0
748741
m_SortingBucketNormalizedSize: 0
742+
m_VertexColorAlwaysGammaSpace: 0
749743
m_AdditionalShaderChannelsFlag: 25
744+
m_UpdateRectTransformForStandalone: 0
750745
m_SortingLayerID: 0
751746
m_SortingOrder: 1000
752747
m_TargetDisplay: 0
@@ -842,7 +837,6 @@ RectTransform:
842837
m_ConstrainProportionsScale: 0
843838
m_Children: []
844839
m_Father: {fileID: 5570195312150058620}
845-
m_RootOrder: 1
846840
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
847841
m_AnchorMin: {x: 0.5, y: 1}
848842
m_AnchorMax: {x: 0.5, y: 1}
@@ -918,7 +912,6 @@ RectTransform:
918912
m_ConstrainProportionsScale: 0
919913
m_Children: []
920914
m_Father: {fileID: 5570195312150058620}
921-
m_RootOrder: 2
922915
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
923916
m_AnchorMin: {x: 0.5, y: 1}
924917
m_AnchorMax: {x: 0.5, y: 1}
@@ -1055,7 +1048,6 @@ RectTransform:
10551048
m_ConstrainProportionsScale: 0
10561049
m_Children: []
10571050
m_Father: {fileID: 5570195312150058620}
1058-
m_RootOrder: 0
10591051
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
10601052
m_AnchorMin: {x: 0, y: 0}
10611053
m_AnchorMax: {x: 0, y: 0}
@@ -1145,7 +1137,6 @@ RectTransform:
11451137
m_ConstrainProportionsScale: 0
11461138
m_Children: []
11471139
m_Father: {fileID: 5696763185950597558}
1148-
m_RootOrder: 4
11491140
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
11501141
m_AnchorMin: {x: 0.5, y: 0.5}
11511142
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1231,7 +1222,6 @@ RectTransform:
12311222
- {fileID: 4296387108997757867}
12321223
- {fileID: 3246031618494657702}
12331224
m_Father: {fileID: 0}
1234-
m_RootOrder: 0
12351225
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
12361226
m_AnchorMin: {x: 0, y: 0}
12371227
m_AnchorMax: {x: 0, y: 0}
@@ -1255,7 +1245,9 @@ Canvas:
12551245
m_OverrideSorting: 0
12561246
m_OverridePixelPerfect: 0
12571247
m_SortingBucketNormalizedSize: 0
1248+
m_VertexColorAlwaysGammaSpace: 0
12581249
m_AdditionalShaderChannelsFlag: 25
1250+
m_UpdateRectTransformForStandalone: 0
12591251
m_SortingLayerID: 0
12601252
m_SortingOrder: 100
12611253
m_TargetDisplay: 0
@@ -1349,6 +1341,7 @@ PrefabInstance:
13491341
m_ObjectHideFlags: 0
13501342
serializedVersion: 2
13511343
m_Modification:
1344+
serializedVersion: 3
13521345
m_TransformParent: {fileID: 1244904327}
13531346
m_Modifications:
13541347
- target: {fileID: 1589542079631269309, guid: 2da37fa1269fc1f48a3470d0ca3e9450,
@@ -1557,6 +1550,9 @@ PrefabInstance:
15571550
value: 0
15581551
objectReference: {fileID: 0}
15591552
m_RemovedComponents: []
1553+
m_RemovedGameObjects: []
1554+
m_AddedGameObjects: []
1555+
m_AddedComponents: []
15601556
m_SourcePrefab: {fileID: 100100000, guid: 2da37fa1269fc1f48a3470d0ca3e9450, type: 3}
15611557
--- !u!224 &6281035913215727768 stripped
15621558
RectTransform:
@@ -1569,6 +1565,7 @@ PrefabInstance:
15691565
m_ObjectHideFlags: 0
15701566
serializedVersion: 2
15711567
m_Modification:
1568+
serializedVersion: 3
15721569
m_TransformParent: {fileID: 3246031618494657702}
15731570
m_Modifications:
15741571
- target: {fileID: 316622536944760797, guid: 97e9067bfed47423b9e491675f0c6d06,
@@ -1697,6 +1694,9 @@ PrefabInstance:
16971694
value: 0
16981695
objectReference: {fileID: 0}
16991696
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,6 +1739,7 @@ PrefabInstance:
17391739
m_ObjectHideFlags: 0
17401740
serializedVersion: 2
17411741
m_Modification:
1742+
serializedVersion: 3
17421743
m_TransformParent: {fileID: 3246031618494657702}
17431744
m_Modifications:
17441745
- target: {fileID: 316622536944760797, guid: 97e9067bfed47423b9e491675f0c6d06,
@@ -1892,6 +1893,9 @@ PrefabInstance:
18921893
value: -9.116089
18931894
objectReference: {fileID: 0}
18941895
m_RemovedComponents: []
1896+
m_RemovedGameObjects: []
1897+
m_AddedGameObjects: []
1898+
m_AddedComponents: []
18951899
m_SourcePrefab: {fileID: 100100000, guid: 97e9067bfed47423b9e491675f0c6d06, type: 3}
18961900
--- !u!224 &136838695967996016 stripped
18971901
RectTransform:
@@ -1922,6 +1926,7 @@ PrefabInstance:
19221926
m_ObjectHideFlags: 0
19231927
serializedVersion: 2
19241928
m_Modification:
1929+
serializedVersion: 3
19251930
m_TransformParent: {fileID: 3246031618494657702}
19261931
m_Modifications:
19271932
- target: {fileID: 608093966221723960, guid: 97e9067bfed47423b9e491675f0c6d06,
@@ -2045,6 +2050,9 @@ PrefabInstance:
20452050
value: 0
20462051
objectReference: {fileID: 0}
20472052
m_RemovedComponents: []
2053+
m_RemovedGameObjects: []
2054+
m_AddedGameObjects: []
2055+
m_AddedComponents: []
20482056
m_SourcePrefab: {fileID: 100100000, guid: 97e9067bfed47423b9e491675f0c6d06, type: 3}
20492057
--- !u!224 &3147506433864547738 stripped
20502058
RectTransform:

0 commit comments

Comments
 (0)