Skip to content

Commit 7275527

Browse files
paulhazenpaulhazen
authored
Merge branch 'development' into fix/quit-at-the-right-time
2 parents 8926142 + 7b19aa8 commit 7275527

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1191
-787
lines changed

‎Assets/Prefab/achievementsUI.prefab‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1175,6 +1175,8 @@ MonoBehaviour:
11751175
m_Script: {fileID: 11500000, guid: 0cf6398f80b5d8345bb350a4ef1d026e, type: 3}
11761176
m_Name:
11771177
m_EditorClassIdentifier:
1178+
UIFirstSelected: {fileID: 4946070415795337658}
1179+
UIParent: {fileID: 0}
11781180
refreshDataButton: {fileID: 4946070415795337660}
11791181
loginIncreaseButton: {fileID: 2731332095183753156}
11801182
showDefinitionToggle: {fileID: 5759596742897632476}
@@ -1185,7 +1187,6 @@ MonoBehaviour:
11851187
itemTemplate: {fileID: 1068329455474885851}
11861188
achievementUnlockedIcon: {fileID: 988972119910036307}
11871189
achievementLockedIcon: {fileID: 8504617572463333742}
1188-
UIFirstSelected: {fileID: 4946070415795337658}
11891190
--- !u!1 &4946070414465693109
11901191
GameObject:
11911192
m_ObjectHideFlags: 0

‎Assets/Scenes/P2PNetcodeSample/P2PNetcode.unity‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,11 @@ PrefabInstance:
214214
m_Modification:
215215
m_TransformParent: {fileID: 1796544660}
216216
m_Modifications:
217+
- target: {fileID: 1520068606371974356, guid: 6a62934fd9ee35d49bf4f84f329793d1,
218+
type: 3}
219+
propertyPath: UIParent
220+
value:
221+
objectReference: {fileID: 610007859}
217222
- target: {fileID: 1520068606371974356, guid: 6a62934fd9ee35d49bf4f84f329793d1,
218223
type: 3}
219224
propertyPath: EnableP2PChat
@@ -426,6 +431,12 @@ PrefabInstance:
426431
objectReference: {fileID: 0}
427432
m_RemovedComponents: []
428433
m_SourcePrefab: {fileID: 100100000, guid: 6a62934fd9ee35d49bf4f84f329793d1, type: 3}
434+
--- !u!1 &610007859 stripped
435+
GameObject:
436+
m_CorrespondingSourceObject: {fileID: 1520068607348101689, guid: 6a62934fd9ee35d49bf4f84f329793d1,
437+
type: 3}
438+
m_PrefabInstance: {fileID: 610007858}
439+
m_PrefabAsset: {fileID: 0}
429440
--- !u!1001 &617334194
430441
PrefabInstance:
431442
m_ObjectHideFlags: 0

‎Assets/Scenes/StandardSamples/Achievements.unity‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -439,6 +439,12 @@ PrefabInstance:
439439
objectReference: {fileID: 0}
440440
m_RemovedComponents: []
441441
m_SourcePrefab: {fileID: 100100000, guid: 8b1101f5fb5af794a86a747e61bf9b31, type: 3}
442+
--- !u!1 &1969541853 stripped
443+
GameObject:
444+
m_CorrespondingSourceObject: {fileID: 4946070414399413270, guid: 5082b8137d129a34b81c8d39a6e6e80a,
445+
type: 3}
446+
m_PrefabInstance: {fileID: 2086978340}
447+
m_PrefabAsset: {fileID: 0}
442448
--- !u!1001 &2086978340
443449
PrefabInstance:
444450
m_ObjectHideFlags: 0
@@ -561,6 +567,11 @@ PrefabInstance:
561567
propertyPath: m_AnchoredPosition.y
562568
value: 0
563569
objectReference: {fileID: 0}
570+
- target: {fileID: 3912250522102205713, guid: 5082b8137d129a34b81c8d39a6e6e80a,
571+
type: 3}
572+
propertyPath: UIParent
573+
value:
574+
objectReference: {fileID: 1969541853}
564575
- target: {fileID: 4486159949228947216, guid: 5082b8137d129a34b81c8d39a6e6e80a,
565576
type: 3}
566577
propertyPath: m_AnchorMax.x

‎Assets/Scenes/StandardSamples/AuthAndFriends.unity‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1703,6 +1703,11 @@ PrefabInstance:
17031703
m_Modification:
17041704
m_TransformParent: {fileID: 733246603}
17051705
m_Modifications:
1706+
- target: {fileID: 1520068606371974356, guid: 6a62934fd9ee35d49bf4f84f329793d1,
1707+
type: 3}
1708+
propertyPath: UIParent
1709+
value:
1710+
objectReference: {fileID: 1353974310}
17061711
- target: {fileID: 1520068607348101689, guid: 6a62934fd9ee35d49bf4f84f329793d1,
17071712
type: 3}
17081713
propertyPath: m_Name
@@ -1875,6 +1880,12 @@ PrefabInstance:
18751880
objectReference: {fileID: 0}
18761881
m_RemovedComponents: []
18771882
m_SourcePrefab: {fileID: 100100000, guid: 6a62934fd9ee35d49bf4f84f329793d1, type: 3}
1883+
--- !u!1 &1353974310 stripped
1884+
GameObject:
1885+
m_CorrespondingSourceObject: {fileID: 1520068607348101689, guid: 6a62934fd9ee35d49bf4f84f329793d1,
1886+
type: 3}
1887+
m_PrefabInstance: {fileID: 1353974309}
1888+
m_PrefabAsset: {fileID: 0}
18781889
--- !u!1 &1526980365
18791890
GameObject:
18801891
m_ObjectHideFlags: 0

‎Assets/Scenes/StandardSamples/CustomInvites.unity‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1649,6 +1649,11 @@ PrefabInstance:
16491649
m_Modification:
16501650
m_TransformParent: {fileID: 562367960}
16511651
m_Modifications:
1652+
- target: {fileID: 1520068606371974356, guid: 6a62934fd9ee35d49bf4f84f329793d1,
1653+
type: 3}
1654+
propertyPath: UIParent
1655+
value:
1656+
objectReference: {fileID: 832381918}
16521657
- target: {fileID: 1520068606371974356, guid: 6a62934fd9ee35d49bf4f84f329793d1,
16531658
type: 3}
16541659
propertyPath: UIInviteMenu
@@ -1886,6 +1891,12 @@ PrefabInstance:
18861891
objectReference: {fileID: 0}
18871892
m_RemovedComponents: []
18881893
m_SourcePrefab: {fileID: 100100000, guid: 6a62934fd9ee35d49bf4f84f329793d1, type: 3}
1894+
--- !u!1 &832381918 stripped
1895+
GameObject:
1896+
m_CorrespondingSourceObject: {fileID: 1520068607348101689, guid: 6a62934fd9ee35d49bf4f84f329793d1,
1897+
type: 3}
1898+
m_PrefabInstance: {fileID: 832381917}
1899+
m_PrefabAsset: {fileID: 0}
18891900
--- !u!1001 &1256342287
18901901
PrefabInstance:
18911902
m_ObjectHideFlags: 0
@@ -2238,7 +2249,7 @@ PrefabInstance:
22382249
- target: {fileID: 2469762652482431551, guid: 21fd07f74cfeb164094b4487e87e241d,
22392250
type: 3}
22402251
propertyPath: m_AnchoredPosition.y
2241-
value: 24.436258
2252+
value: 0.00014322341
22422253
objectReference: {fileID: 0}
22432254
- target: {fileID: 2484917107755118521, guid: 21fd07f74cfeb164094b4487e87e241d,
22442255
type: 3}

‎Assets/Scenes/StandardSamples/HighFrequencyP2P.unity‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ MonoBehaviour:
129129
type: 3}
130130
m_PrefabInstance: {fileID: 2116730116}
131131
m_PrefabAsset: {fileID: 0}
132-
m_GameObject: {fileID: 0}
132+
m_GameObject: {fileID: 2116730117}
133133
m_Enabled: 1
134134
m_EditorHideFlags: 0
135135
m_Script: {fileID: 11500000, guid: 65825c19bd722fc419825bd6ae40e842, type: 3}
@@ -226,6 +226,11 @@ PrefabInstance:
226226
m_Modification:
227227
m_TransformParent: {fileID: 1796544660}
228228
m_Modifications:
229+
- target: {fileID: 1520068606371974356, guid: 6a62934fd9ee35d49bf4f84f329793d1,
230+
type: 3}
231+
propertyPath: UIParent
232+
value:
233+
objectReference: {fileID: 610007859}
229234
- target: {fileID: 1520068606371974356, guid: 6a62934fd9ee35d49bf4f84f329793d1,
230235
type: 3}
231236
propertyPath: EnableP2PChat
@@ -453,6 +458,12 @@ PrefabInstance:
453458
objectReference: {fileID: 0}
454459
m_RemovedComponents: []
455460
m_SourcePrefab: {fileID: 100100000, guid: 6a62934fd9ee35d49bf4f84f329793d1, type: 3}
461+
--- !u!1 &610007859 stripped
462+
GameObject:
463+
m_CorrespondingSourceObject: {fileID: 1520068607348101689, guid: 6a62934fd9ee35d49bf4f84f329793d1,
464+
type: 3}
465+
m_PrefabInstance: {fileID: 610007858}
466+
m_PrefabAsset: {fileID: 0}
456467
--- !u!1001 &899407522
457468
PrefabInstance:
458469
m_ObjectHideFlags: 0
@@ -2627,6 +2638,11 @@ PrefabInstance:
26272638
propertyPath: m_AnchoredPosition.y
26282639
value: 0
26292640
objectReference: {fileID: 0}
2641+
- target: {fileID: 5923979916340501358, guid: a220aff7b274a4e4d8e544ddb95f8002,
2642+
type: 3}
2643+
propertyPath: UIParent
2644+
value:
2645+
objectReference: {fileID: 2116730117}
26302646
- target: {fileID: 6994670198616175063, guid: a220aff7b274a4e4d8e544ddb95f8002,
26312647
type: 3}
26322648
propertyPath: m_AnchorMax.y
@@ -2919,3 +2935,9 @@ PrefabInstance:
29192935
objectReference: {fileID: 0}
29202936
m_RemovedComponents: []
29212937
m_SourcePrefab: {fileID: 100100000, guid: a220aff7b274a4e4d8e544ddb95f8002, type: 3}
2938+
--- !u!1 &2116730117 stripped
2939+
GameObject:
2940+
m_CorrespondingSourceObject: {fileID: 7443171737537963610, guid: a220aff7b274a4e4d8e544ddb95f8002,
2941+
type: 3}
2942+
m_PrefabInstance: {fileID: 2116730116}
2943+
m_PrefabAsset: {fileID: 0}

‎Assets/Scenes/StandardSamples/Leaderboards.unity‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -525,6 +525,11 @@ PrefabInstance:
525525
propertyPath: m_LocalEulerAnglesHint.z
526526
value: 0
527527
objectReference: {fileID: 0}
528+
- target: {fileID: 6709832751038871670, guid: 78d9f93b0616de4428f4a1b5114d3377,
529+
type: 3}
530+
propertyPath: UIParent
531+
value:
532+
objectReference: {fileID: 900602816}
528533
- target: {fileID: 6709832751248227870, guid: 78d9f93b0616de4428f4a1b5114d3377,
529534
type: 3}
530535
propertyPath: m_Value
@@ -662,6 +667,12 @@ PrefabInstance:
662667
objectReference: {fileID: 0}
663668
m_RemovedComponents: []
664669
m_SourcePrefab: {fileID: 100100000, guid: 78d9f93b0616de4428f4a1b5114d3377, type: 3}
670+
--- !u!1 &900602816 stripped
671+
GameObject:
672+
m_CorrespondingSourceObject: {fileID: 6709832751038871656, guid: 78d9f93b0616de4428f4a1b5114d3377,
673+
type: 3}
674+
m_PrefabInstance: {fileID: 900602815}
675+
m_PrefabAsset: {fileID: 0}
665676
--- !u!114 &988828927 stripped
666677
MonoBehaviour:
667678
m_CorrespondingSourceObject: {fileID: 2138711975279902407, guid: 11e4648022445f041b4c867ff8f3fd94,

‎Assets/Scenes/StandardSamples/Lobbies.unity‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1754,6 +1754,10 @@ PrefabInstance:
17541754
m_Modification:
17551755
m_TransformParent: {fileID: 562367960}
17561756
m_Modifications:
1757+
- target: {fileID: 126780952, guid: aeac9914cf69f3e45971f52404af81a8, type: 3}
1758+
propertyPath: UIParent
1759+
value:
1760+
objectReference: {fileID: 805891813}
17571761
- target: {fileID: 126780952, guid: aeac9914cf69f3e45971f52404af81a8, type: 3}
17581762
propertyPath: LobbySearchUI
17591763
value:
@@ -3295,13 +3299,24 @@ PrefabInstance:
32953299
objectReference: {fileID: 0}
32963300
m_RemovedComponents: []
32973301
m_SourcePrefab: {fileID: 100100000, guid: aeac9914cf69f3e45971f52404af81a8, type: 3}
3302+
--- !u!1 &805891813 stripped
3303+
GameObject:
3304+
m_CorrespondingSourceObject: {fileID: 525090540118629950, guid: aeac9914cf69f3e45971f52404af81a8,
3305+
type: 3}
3306+
m_PrefabInstance: {fileID: 805891812}
3307+
m_PrefabAsset: {fileID: 0}
32983308
--- !u!1001 &832381917
32993309
PrefabInstance:
33003310
m_ObjectHideFlags: 0
33013311
serializedVersion: 2
33023312
m_Modification:
33033313
m_TransformParent: {fileID: 562367960}
33043314
m_Modifications:
3315+
- target: {fileID: 1520068606371974356, guid: 6a62934fd9ee35d49bf4f84f329793d1,
3316+
type: 3}
3317+
propertyPath: UIParent
3318+
value:
3319+
objectReference: {fileID: 832381918}
33053320
- target: {fileID: 1520068606371974356, guid: 6a62934fd9ee35d49bf4f84f329793d1,
33063321
type: 3}
33073322
propertyPath: UIInviteMenu
@@ -3539,6 +3554,12 @@ PrefabInstance:
35393554
objectReference: {fileID: 0}
35403555
m_RemovedComponents: []
35413556
m_SourcePrefab: {fileID: 100100000, guid: 6a62934fd9ee35d49bf4f84f329793d1, type: 3}
3557+
--- !u!1 &832381918 stripped
3558+
GameObject:
3559+
m_CorrespondingSourceObject: {fileID: 1520068607348101689, guid: 6a62934fd9ee35d49bf4f84f329793d1,
3560+
type: 3}
3561+
m_PrefabInstance: {fileID: 832381917}
3562+
m_PrefabAsset: {fileID: 0}
35423563
--- !u!1001 &967009383
35433564
PrefabInstance:
35443565
m_ObjectHideFlags: 0
@@ -3714,7 +3735,7 @@ MonoBehaviour:
37143735
type: 3}
37153736
m_PrefabInstance: {fileID: 805891812}
37163737
m_PrefabAsset: {fileID: 0}
3717-
m_GameObject: {fileID: 0}
3738+
m_GameObject: {fileID: 805891813}
37183739
m_Enabled: 1
37193740
m_EditorHideFlags: 0
37203741
m_Script: {fileID: 11500000, guid: a19ae3a69c6c6ae4b80c8df30dd710a8, type: 3}

‎Assets/Scenes/StandardSamples/Peer2Peer.unity‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,11 @@ PrefabInstance:
214214
m_Modification:
215215
m_TransformParent: {fileID: 1796544660}
216216
m_Modifications:
217+
- target: {fileID: 1520068606371974356, guid: 6a62934fd9ee35d49bf4f84f329793d1,
218+
type: 3}
219+
propertyPath: UIParent
220+
value:
221+
objectReference: {fileID: 610007859}
217222
- target: {fileID: 1520068606371974356, guid: 6a62934fd9ee35d49bf4f84f329793d1,
218223
type: 3}
219224
propertyPath: EnableP2PChat
@@ -426,6 +431,12 @@ PrefabInstance:
426431
objectReference: {fileID: 0}
427432
m_RemovedComponents: []
428433
m_SourcePrefab: {fileID: 100100000, guid: 6a62934fd9ee35d49bf4f84f329793d1, type: 3}
434+
--- !u!1 &610007859 stripped
435+
GameObject:
436+
m_CorrespondingSourceObject: {fileID: 1520068607348101689, guid: 6a62934fd9ee35d49bf4f84f329793d1,
437+
type: 3}
438+
m_PrefabInstance: {fileID: 610007858}
439+
m_PrefabAsset: {fileID: 0}
429440
--- !u!1001 &899407522
430441
PrefabInstance:
431442
m_ObjectHideFlags: 0
@@ -2357,6 +2368,11 @@ PrefabInstance:
23572368
propertyPath: m_AnchoredPosition.y
23582369
value: 0
23592370
objectReference: {fileID: 0}
2371+
- target: {fileID: 7443171737537963588, guid: 0bcbfe182df3f0643b09c4fa32578ba4,
2372+
type: 3}
2373+
propertyPath: UIParent
2374+
value:
2375+
objectReference: {fileID: 1396200476}
23602376
- target: {fileID: 7443171737537963610, guid: 0bcbfe182df3f0643b09c4fa32578ba4,
23612377
type: 3}
23622378
propertyPath: m_Name
@@ -2475,12 +2491,18 @@ MonoBehaviour:
24752491
type: 3}
24762492
m_PrefabInstance: {fileID: 1396200474}
24772493
m_PrefabAsset: {fileID: 0}
2478-
m_GameObject: {fileID: 0}
2494+
m_GameObject: {fileID: 1396200476}
24792495
m_Enabled: 1
24802496
m_EditorHideFlags: 0
24812497
m_Script: {fileID: 11500000, guid: 5c55cb3e7656c234595e8d4e18d76192, type: 3}
24822498
m_Name:
24832499
m_EditorClassIdentifier:
2500+
--- !u!1 &1396200476 stripped
2501+
GameObject:
2502+
m_CorrespondingSourceObject: {fileID: 7443171737537963610, guid: 0bcbfe182df3f0643b09c4fa32578ba4,
2503+
type: 3}
2504+
m_PrefabInstance: {fileID: 1396200474}
2505+
m_PrefabAsset: {fileID: 0}
24842506
--- !u!1001 &1473491335
24852507
PrefabInstance:
24862508
m_ObjectHideFlags: 0

‎Assets/Scenes/StandardSamples/PlayerDataStorage.unity‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ PrefabInstance:
213213
- target: {fileID: 1793095483685924632, guid: 3cd277febd6f1ad429f7c082973fd32b,
214214
type: 3}
215215
propertyPath: m_AnchoredPosition.y
216-
value: 0.0001157071
216+
value: 0.00014659938
217217
objectReference: {fileID: 0}
218218
- target: {fileID: 1793095484208831003, guid: 3cd277febd6f1ad429f7c082973fd32b,
219219
type: 3}
@@ -405,6 +405,11 @@ PrefabInstance:
405405
propertyPath: m_LocalEulerAnglesHint.z
406406
value: 0
407407
objectReference: {fileID: 0}
408+
- target: {fileID: 1793095484641389004, guid: 3cd277febd6f1ad429f7c082973fd32b,
409+
type: 3}
410+
propertyPath: UIParent
411+
value:
412+
objectReference: {fileID: 29359719}
408413
- target: {fileID: 1793095484641389005, guid: 3cd277febd6f1ad429f7c082973fd32b,
409414
type: 3}
410415
propertyPath: m_Name
@@ -1107,6 +1112,12 @@ PrefabInstance:
11071112
objectReference: {fileID: 0}
11081113
m_RemovedComponents: []
11091114
m_SourcePrefab: {fileID: 100100000, guid: 3cd277febd6f1ad429f7c082973fd32b, type: 3}
1115+
--- !u!1 &29359719 stripped
1116+
GameObject:
1117+
m_CorrespondingSourceObject: {fileID: 1793095484641389005, guid: 3cd277febd6f1ad429f7c082973fd32b,
1118+
type: 3}
1119+
m_PrefabInstance: {fileID: 29359718}
1120+
m_PrefabAsset: {fileID: 0}
11101121
--- !u!1 &282840810
11111122
GameObject:
11121123
m_ObjectHideFlags: 0

0 commit comments

Comments
 (0)