Skip to content

Commit 0d874b5

Browse files
netcode-ci-servicenetcode-ci-service
authored
Merge develop into feature/replace-guid-with-auth-playerid
2 parents 020cce1 + be3c9c6 commit 0d874b5

File tree

5 files changed

+1117
-292
lines changed

5 files changed

+1117
-292
lines changed

‎Assets/BossRoom/Prefabs/UI/IPPopup.prefab

Lines changed: 213 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -189,15 +189,16 @@ RectTransform:
189189
m_LocalPosition: {x: 0, y: 0, z: 0}
190190
m_LocalScale: {x: 1, y: 1, z: 1}
191191
m_Children:
192+
- {fileID: 7207922465784669414}
192193
- {fileID: 3922962363196413880}
193194
m_Father: {fileID: 7211620873335412190}
194195
m_RootOrder: 0
195196
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
196-
m_AnchorMin: {x: 0, y: 1}
197-
m_AnchorMax: {x: 0, y: 1}
198-
m_AnchoredPosition: {x: 80, y: -24.663475}
199-
m_SizeDelta: {x: 160, y: 49.32695}
200-
m_Pivot: {x: 0.5, y: 0.5}
197+
m_AnchorMin: {x: 0.5, y: 1}
198+
m_AnchorMax: {x: 0.5, y: 1}
199+
m_AnchoredPosition: {x: -15, y: -32.3}
200+
m_SizeDelta: {x: 191.5, y: 64.8}
201+
m_Pivot: {x: 1, y: 1}
201202
--- !u!222 &2162395241664750301
202203
CanvasRenderer:
203204
m_ObjectHideFlags: 0
@@ -249,8 +250,8 @@ MonoBehaviour:
249250
m_Name:
250251
m_EditorClassIdentifier:
251252
m_TintColors:
253+
- {r: 0.681, g: 0.6342607, b: 0.584298, a: 1}
252254
- {r: 1, g: 1, b: 1, a: 1}
253-
- {r: 0.5471698, g: 0.5471698, b: 0.5471698, a: 1}
254255
--- !u!114 &1146989341565134001
255256
MonoBehaviour:
256257
m_ObjectHideFlags: 0
@@ -342,7 +343,7 @@ RectTransform:
342343
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
343344
m_AnchorMin: {x: 0.5, y: 0.5}
344345
m_AnchorMax: {x: 0.5, y: 0.5}
345-
m_AnchoredPosition: {x: 0, y: 168}
346+
m_AnchoredPosition: {x: 0, y: 125}
346347
m_SizeDelta: {x: 351.2328, y: 74.9954}
347348
m_Pivot: {x: 0.5, y: 0.5}
348349
--- !u!222 &1772128666558346541
@@ -442,6 +443,97 @@ MonoBehaviour:
442443
m_hasFontAssetChanged: 0
443444
m_baseMaterial: {fileID: 0}
444445
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
446+
--- !u!1 &1744874828343043826
447+
GameObject:
448+
m_ObjectHideFlags: 0
449+
m_CorrespondingSourceObject: {fileID: 0}
450+
m_PrefabInstance: {fileID: 0}
451+
m_PrefabAsset: {fileID: 0}
452+
serializedVersion: 6
453+
m_Component:
454+
- component: {fileID: 7207922465784669414}
455+
- component: {fileID: 4423380880871866321}
456+
- component: {fileID: 5168908336122243771}
457+
- component: {fileID: 5103307801264146900}
458+
m_Layer: 5
459+
m_Name: JoinToggleBorder
460+
m_TagString: Untagged
461+
m_Icon: {fileID: 0}
462+
m_NavMeshLayer: 0
463+
m_StaticEditorFlags: 0
464+
m_IsActive: 1
465+
--- !u!224 &7207922465784669414
466+
RectTransform:
467+
m_ObjectHideFlags: 0
468+
m_CorrespondingSourceObject: {fileID: 0}
469+
m_PrefabInstance: {fileID: 0}
470+
m_PrefabAsset: {fileID: 0}
471+
m_GameObject: {fileID: 1744874828343043826}
472+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
473+
m_LocalPosition: {x: 0, y: 0, z: 0}
474+
m_LocalScale: {x: 1, y: 1, z: 1}
475+
m_Children: []
476+
m_Father: {fileID: 5360785957834520664}
477+
m_RootOrder: 0
478+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
479+
m_AnchorMin: {x: 0.5, y: 0.5}
480+
m_AnchorMax: {x: 0.5, y: 0.5}
481+
m_AnchoredPosition: {x: 0, y: 0}
482+
m_SizeDelta: {x: 220.375, y: 92.58}
483+
m_Pivot: {x: 0.5, y: 0.5}
484+
--- !u!222 &4423380880871866321
485+
CanvasRenderer:
486+
m_ObjectHideFlags: 0
487+
m_CorrespondingSourceObject: {fileID: 0}
488+
m_PrefabInstance: {fileID: 0}
489+
m_PrefabAsset: {fileID: 0}
490+
m_GameObject: {fileID: 1744874828343043826}
491+
m_CullTransparentMesh: 1
492+
--- !u!114 &5168908336122243771
493+
MonoBehaviour:
494+
m_ObjectHideFlags: 0
495+
m_CorrespondingSourceObject: {fileID: 0}
496+
m_PrefabInstance: {fileID: 0}
497+
m_PrefabAsset: {fileID: 0}
498+
m_GameObject: {fileID: 1744874828343043826}
499+
m_Enabled: 1
500+
m_EditorHideFlags: 0
501+
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
502+
m_Name:
503+
m_EditorClassIdentifier:
504+
m_Material: {fileID: 0}
505+
m_Color: {r: 1, g: 1, b: 1, a: 1}
506+
m_RaycastTarget: 1
507+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
508+
m_Maskable: 1
509+
m_OnCullStateChanged:
510+
m_PersistentCalls:
511+
m_Calls: []
512+
m_Sprite: {fileID: 21300000, guid: 298518cc35452404bbec1592572f23eb, type: 3}
513+
m_Type: 1
514+
m_PreserveAspect: 0
515+
m_FillCenter: 0
516+
m_FillMethod: 4
517+
m_FillAmount: 1
518+
m_FillClockwise: 1
519+
m_FillOrigin: 0
520+
m_UseSpriteMesh: 0
521+
m_PixelsPerUnitMultiplier: 1
522+
--- !u!114 &5103307801264146900
523+
MonoBehaviour:
524+
m_ObjectHideFlags: 0
525+
m_CorrespondingSourceObject: {fileID: 0}
526+
m_PrefabInstance: {fileID: 0}
527+
m_PrefabAsset: {fileID: 0}
528+
m_GameObject: {fileID: 1744874828343043826}
529+
m_Enabled: 1
530+
m_EditorHideFlags: 0
531+
m_Script: {fileID: 11500000, guid: 86fd4fbcc3fc84b228fc9c4cb612c32a, type: 3}
532+
m_Name:
533+
m_EditorClassIdentifier:
534+
m_TintColors:
535+
- {r: 0.54901963, g: 0.54901963, b: 0.54901963, a: 0}
536+
- {r: 1, g: 1, b: 1, a: 1}
445537
--- !u!1 &2091371516226210259
446538
GameObject:
447539
m_ObjectHideFlags: 0
@@ -477,7 +569,7 @@ RectTransform:
477569
m_AnchorMin: {x: 0, y: 0}
478570
m_AnchorMax: {x: 0, y: 0}
479571
m_AnchoredPosition: {x: 0, y: 0}
480-
m_SizeDelta: {x: 0, y: 74.9954}
572+
m_SizeDelta: {x: 0, y: 60}
481573
m_Pivot: {x: 0.5, y: 1}
482574
--- !u!222 &3266033845783689121
483575
CanvasRenderer:
@@ -534,7 +626,7 @@ MonoBehaviour:
534626
m_faceColor:
535627
serializedVersion: 2
536628
rgba: 4294967295
537-
m_fontSize: 31.95
629+
m_fontSize: 50
538630
m_fontSizeBase: 36
539631
m_fontWeight: 400
540632
m_enableAutoSizing: 1
@@ -793,7 +885,7 @@ RectTransform:
793885
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
794886
m_AnchorMin: {x: 0.5, y: 0.5}
795887
m_AnchorMax: {x: 0.5, y: 0.5}
796-
m_AnchoredPosition: {x: 0, y: 168}
888+
m_AnchoredPosition: {x: 0, y: 125.000015}
797889
m_SizeDelta: {x: 351.2328, y: 74.9954}
798890
m_Pivot: {x: 0.5, y: 0.5}
799891
--- !u!222 &3744961511776045358
@@ -923,7 +1015,7 @@ RectTransform:
9231015
m_LocalScale: {x: 1, y: 1, z: 1}
9241016
m_Children: []
9251017
m_Father: {fileID: 925362719653560221}
926-
m_RootOrder: 0
1018+
m_RootOrder: 1
9271019
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
9281020
m_AnchorMin: {x: 0, y: 0}
9291021
m_AnchorMax: {x: 1, y: 1}
@@ -985,8 +1077,8 @@ MonoBehaviour:
9851077
m_faceColor:
9861078
serializedVersion: 2
9871079
rgba: 4294967295
988-
m_fontSize: 20
989-
m_fontSizeBase: 20
1080+
m_fontSize: 24
1081+
m_fontSizeBase: 24
9901082
m_fontWeight: 400
9911083
m_enableAutoSizing: 0
9921084
m_fontSizeMin: 18
@@ -1057,7 +1149,7 @@ RectTransform:
10571149
m_LocalScale: {x: 1, y: 1, z: 1}
10581150
m_Children: []
10591151
m_Father: {fileID: 5360785957834520664}
1060-
m_RootOrder: 0
1152+
m_RootOrder: 1
10611153
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
10621154
m_AnchorMin: {x: 0, y: 0}
10631155
m_AnchorMax: {x: 1, y: 1}
@@ -1119,8 +1211,8 @@ MonoBehaviour:
11191211
m_faceColor:
11201212
serializedVersion: 2
11211213
rgba: 4294967295
1122-
m_fontSize: 20
1123-
m_fontSizeBase: 20
1214+
m_fontSize: 24
1215+
m_fontSizeBase: 24
11241216
m_fontWeight: 400
11251217
m_enableAutoSizing: 0
11261218
m_fontSizeMin: 18
@@ -1240,6 +1332,97 @@ MonoBehaviour:
12401332
m_VerticalOverflow: 0
12411333
m_LineSpacing: 1
12421334
m_Text:
1335+
--- !u!1 &4269576300304280103
1336+
GameObject:
1337+
m_ObjectHideFlags: 0
1338+
m_CorrespondingSourceObject: {fileID: 0}
1339+
m_PrefabInstance: {fileID: 0}
1340+
m_PrefabAsset: {fileID: 0}
1341+
serializedVersion: 6
1342+
m_Component:
1343+
- component: {fileID: 8334914665808330226}
1344+
- component: {fileID: 5721188117814502558}
1345+
- component: {fileID: 4613260058036252427}
1346+
- component: {fileID: 4992990316083676702}
1347+
m_Layer: 5
1348+
m_Name: CreateToggleBorder
1349+
m_TagString: Untagged
1350+
m_Icon: {fileID: 0}
1351+
m_NavMeshLayer: 0
1352+
m_StaticEditorFlags: 0
1353+
m_IsActive: 1
1354+
--- !u!224 &8334914665808330226
1355+
RectTransform:
1356+
m_ObjectHideFlags: 0
1357+
m_CorrespondingSourceObject: {fileID: 0}
1358+
m_PrefabInstance: {fileID: 0}
1359+
m_PrefabAsset: {fileID: 0}
1360+
m_GameObject: {fileID: 4269576300304280103}
1361+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
1362+
m_LocalPosition: {x: 0, y: 0, z: 0}
1363+
m_LocalScale: {x: 1, y: 1, z: 1}
1364+
m_Children: []
1365+
m_Father: {fileID: 925362719653560221}
1366+
m_RootOrder: 0
1367+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1368+
m_AnchorMin: {x: 0.5, y: 0.5}
1369+
m_AnchorMax: {x: 0.5, y: 0.5}
1370+
m_AnchoredPosition: {x: 0, y: 0}
1371+
m_SizeDelta: {x: 220.375, y: 92.58}
1372+
m_Pivot: {x: 0.5, y: 0.5}
1373+
--- !u!222 &5721188117814502558
1374+
CanvasRenderer:
1375+
m_ObjectHideFlags: 0
1376+
m_CorrespondingSourceObject: {fileID: 0}
1377+
m_PrefabInstance: {fileID: 0}
1378+
m_PrefabAsset: {fileID: 0}
1379+
m_GameObject: {fileID: 4269576300304280103}
1380+
m_CullTransparentMesh: 1
1381+
--- !u!114 &4613260058036252427
1382+
MonoBehaviour:
1383+
m_ObjectHideFlags: 0
1384+
m_CorrespondingSourceObject: {fileID: 0}
1385+
m_PrefabInstance: {fileID: 0}
1386+
m_PrefabAsset: {fileID: 0}
1387+
m_GameObject: {fileID: 4269576300304280103}
1388+
m_Enabled: 1
1389+
m_EditorHideFlags: 0
1390+
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
1391+
m_Name:
1392+
m_EditorClassIdentifier:
1393+
m_Material: {fileID: 0}
1394+
m_Color: {r: 1, g: 1, b: 1, a: 1}
1395+
m_RaycastTarget: 1
1396+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
1397+
m_Maskable: 1
1398+
m_OnCullStateChanged:
1399+
m_PersistentCalls:
1400+
m_Calls: []
1401+
m_Sprite: {fileID: 21300000, guid: 298518cc35452404bbec1592572f23eb, type: 3}
1402+
m_Type: 1
1403+
m_PreserveAspect: 0
1404+
m_FillCenter: 0
1405+
m_FillMethod: 4
1406+
m_FillAmount: 1
1407+
m_FillClockwise: 1
1408+
m_FillOrigin: 0
1409+
m_UseSpriteMesh: 0
1410+
m_PixelsPerUnitMultiplier: 1
1411+
--- !u!114 &4992990316083676702
1412+
MonoBehaviour:
1413+
m_ObjectHideFlags: 0
1414+
m_CorrespondingSourceObject: {fileID: 0}
1415+
m_PrefabInstance: {fileID: 0}
1416+
m_PrefabAsset: {fileID: 0}
1417+
m_GameObject: {fileID: 4269576300304280103}
1418+
m_Enabled: 1
1419+
m_EditorHideFlags: 0
1420+
m_Script: {fileID: 11500000, guid: 86fd4fbcc3fc84b228fc9c4cb612c32a, type: 3}
1421+
m_Name:
1422+
m_EditorClassIdentifier:
1423+
m_TintColors:
1424+
- {r: 0.54901963, g: 0.54901963, b: 0.54901963, a: 0}
1425+
- {r: 1, g: 1, b: 1, a: 1}
12431426
--- !u!1 &4363443222934554037
12441427
GameObject:
12451428
m_ObjectHideFlags: 0
@@ -1427,15 +1610,16 @@ RectTransform:
14271610
m_LocalPosition: {x: 0, y: 0, z: 0}
14281611
m_LocalScale: {x: 1, y: 1, z: 1}
14291612
m_Children:
1613+
- {fileID: 8334914665808330226}
14301614
- {fileID: 3364346682957362099}
14311615
m_Father: {fileID: 7211620873335412190}
14321616
m_RootOrder: 1
14331617
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1434-
m_AnchorMin: {x: 0, y: 1}
1435-
m_AnchorMax: {x: 0, y: 1}
1436-
m_AnchoredPosition: {x: 245, y: -24.663475}
1437-
m_SizeDelta: {x: 160, y: 49.32695}
1438-
m_Pivot: {x: 0.5, y: 0.5}
1618+
m_AnchorMin: {x: 0.5, y: 1}
1619+
m_AnchorMax: {x: 0.5, y: 1}
1620+
m_AnchoredPosition: {x: 15, y: -32.3}
1621+
m_SizeDelta: {x: 191.5, y: 64.8}
1622+
m_Pivot: {x: 0, y: 1}
14391623
--- !u!222 &4676932742985563135
14401624
CanvasRenderer:
14411625
m_ObjectHideFlags: 0
@@ -1487,8 +1671,8 @@ MonoBehaviour:
14871671
m_Name:
14881672
m_EditorClassIdentifier:
14891673
m_TintColors:
1674+
- {r: 0.681, g: 0.6342607, b: 0.584298, a: 1}
14901675
- {r: 1, g: 1, b: 1, a: 1}
1491-
- {r: 0.5471698, g: 0.5471698, b: 0.5471698, a: 1}
14921676
--- !u!114 &1998613087429313438
14931677
MonoBehaviour:
14941678
m_ObjectHideFlags: 0
@@ -1660,7 +1844,7 @@ RectTransform:
16601844
m_AnchorMin: {x: 0, y: 0}
16611845
m_AnchorMax: {x: 0, y: 0}
16621846
m_AnchoredPosition: {x: 0, y: 0}
1663-
m_SizeDelta: {x: 0, y: 74.995}
1847+
m_SizeDelta: {x: 0, y: 60}
16641848
m_Pivot: {x: 0.5, y: 1}
16651849
--- !u!222 &8005476179083983394
16661850
CanvasRenderer:
@@ -1717,7 +1901,7 @@ MonoBehaviour:
17171901
m_faceColor:
17181902
serializedVersion: 2
17191903
rgba: 4294967295
1720-
m_fontSize: 31.95
1904+
m_fontSize: 50
17211905
m_fontSizeBase: 36
17221906
m_fontWeight: 400
17231907
m_enableAutoSizing: 1
@@ -2376,7 +2560,7 @@ RectTransform:
23762560
m_AnchorMin: {x: 0, y: 0}
23772561
m_AnchorMax: {x: 0, y: 0}
23782562
m_AnchoredPosition: {x: 0, y: 0}
2379-
m_SizeDelta: {x: 0, y: 80}
2563+
m_SizeDelta: {x: 0, y: 60}
23802564
m_Pivot: {x: 0.5, y: 1}
23812565
--- !u!222 &6634905022760130131
23822566
CanvasRenderer:
@@ -2568,7 +2752,7 @@ RectTransform:
25682752
m_PrefabInstance: {fileID: 0}
25692753
m_PrefabAsset: {fileID: 0}
25702754
m_GameObject: {fileID: 5924530127146065184}
2571-
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
2755+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
25722756
m_LocalPosition: {x: 0, y: 0, z: 0}
25732757
m_LocalScale: {x: 1, y: 1, z: 1}
25742758
m_Children:
@@ -2652,7 +2836,9 @@ MonoBehaviour:
26522836
m_IPJoiningUI: {fileID: 4035387343632270047}
26532837
m_IPHostingUI: {fileID: 6512829474060433337}
26542838
m_JoinTabButtonTinter: {fileID: 5820100690359471312}
2839+
m_JoinTabButtonBorderTinter: {fileID: 5103307801264146900}
26552840
m_HostTabButtonTinter: {fileID: 7888223589903858095}
2841+
m_HostTabButtonBorderTinter: {fileID: 4992990316083676702}
26562842
m_SignInSpinner: {fileID: 8543714399569277319}
26572843
--- !u!1 &6720699109820320406
26582844
GameObject:
@@ -3348,7 +3534,7 @@ RectTransform:
33483534
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
33493535
m_AnchorMin: {x: 0.5, y: 0.5}
33503536
m_AnchorMax: {x: 0.5, y: 0.5}
3351-
m_AnchoredPosition: {x: 0, y: 72.25492}
3537+
m_AnchoredPosition: {x: 0, y: 58}
33523538
m_SizeDelta: {x: 100, y: 100}
33533539
m_Pivot: {x: 0.5, y: 0.5}
33543540
--- !u!222 &5540966166362907071

0 commit comments

Comments
 (0)