Skip to content

Commit 9a1ca64

Browse files
FabianStollfernando-cortezfluong6
authored
[MTT-8924] - Convert Boss Room from Lobby and Relay packages to Multiplayer Services SDK (#892)
* refactorings to support Multiplayer SDK session creation & joining by session code * feat: upgrade MPS SDK to 1.0.0 * feat: first batch conversion from Lobbies API to Multiplayer Services SDK * feat: update exception handling * fix: reintroduce client and host starting logic via NetworkManager when connecting via IP * fix: don't add user to local session when leaving the session * fix: don't create a locked session * fix: create session logic * feat: rename lobby to session in char selection prefab * chore: batch renaming from lobby to session * fix: change rate limits * chore: remove obsolete comments * fix: prefab references * feat: upgrade project version to 6000.0.24f1 and auto-upgrade packages * feat: auto-upgrade project settings and package assets * feat: auto-upgrade assets * feat: upgrade project version to 6000.0.25f1 * feat: replace ParallelSync with Multiplayer Play Mode * fix: failing test * feat: update Netcode for GameObjects to version 2.0.0 * chore: update README * chore: changelog * chore: add MPPM to changelog * test: add yamato test for U6 * fix: only test Unity 6 * fix: update ubuntu version for yamato * fix: update iOS image * Added a release mode configuration for iOS jobs * Update CHANGELOG.md Co-authored-by: Fernando Cortez <[email protected]> * fix: remove unneeded asset * fix: show IET popup on startup * fix: remove warnings about deprecated methods * feat: remove deprecated vscode package * fix: add services package again after merge * chore: changelog * chore: readme changes * fix: remove lobby and relay again They were accidentally added with the merge * fix: reset connection state when joining a session failed * chore: comment fix * chore: whitespace fixes * chore: another whitespace fix * fix: revert tabs in comments that were added by auto-cleanup * review: remove redundant async * review: fix docs link * review: no need to unblock UI here * review: remove unused fields * review: remove todo * review: remove unused method * review: specify MPS SDK version and PR number * review: update README.md Co-authored-by: Fernando Cortez <[email protected]> * review: update changelog of package * fix: whitespaces * review: remove unneeded callback * review: change readme * review: remove log * review: split method for session joining * fix: newline at end of file --------- Co-authored-by: Fernando Cortez <[email protected]> Co-authored-by: Frank Luong <[email protected]>
1 parent 3dfcd47 commit 9a1ca64

File tree

61 files changed

+1644
-1828
lines changed

Some content is hidden

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

61 files changed

+1644
-1828
lines changed

‎Assets/Prefabs/UI/MainMenu UI Canvas.prefab‎

Lines changed: 141 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -359,15 +359,17 @@ MonoBehaviour:
359359
m_lineSpacingMax: 0
360360
m_paragraphSpacing: 0
361361
m_charWidthMaxAdj: 0
362-
m_enableWordWrapping: 1
362+
m_TextWrappingMode: 1
363363
m_wordWrappingRatios: 0.4
364364
m_overflowMode: 0
365365
m_linkedTextComponent: {fileID: 0}
366366
parentLinkedComponent: {fileID: 0}
367367
m_enableKerning: 1
368+
m_ActiveFontFeatures: 00000000
368369
m_enableExtraPadding: 0
369370
checkPaddingRequired: 0
370371
m_isRichText: 1
372+
m_EmojiFallbackSupport: 1
371373
m_parseCtrlCharacters: 1
372374
m_isOrthographic: 1
373375
m_isCullingEnabled: 0
@@ -480,6 +482,10 @@ PrefabInstance:
480482
propertyPath: m_fontSizeMax
481483
value: 58
482484
objectReference: {fileID: 0}
485+
- target: {fileID: 7721113380232533813, guid: addf3685293c35d48a673397c748f116, type: 3}
486+
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
487+
value: 1801810542
488+
objectReference: {fileID: 0}
483489
- target: {fileID: 7721113380319664578, guid: addf3685293c35d48a673397c748f116, type: 3}
484490
propertyPath: m_Name
485491
value: IP Start Button
@@ -736,6 +742,18 @@ PrefabInstance:
736742
serializedVersion: 3
737743
m_TransformParent: {fileID: 6068325059450104507}
738744
m_Modifications:
745+
- target: {fileID: 301174889687357229, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
746+
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
747+
value: 1801810542
748+
objectReference: {fileID: 0}
749+
- target: {fileID: 709593810350336946, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
750+
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
751+
value: 1801810542
752+
objectReference: {fileID: 0}
753+
- target: {fileID: 785373375347833033, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
754+
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
755+
value: 1801810542
756+
objectReference: {fileID: 0}
739757
- target: {fileID: 792957857740898001, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
740758
propertyPath: m_AnchorMax.y
741759
value: 0
@@ -772,6 +790,14 @@ PrefabInstance:
772790
propertyPath: m_AnchoredPosition.y
773791
value: 0
774792
objectReference: {fileID: 0}
793+
- target: {fileID: 1131054124500818674, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
794+
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
795+
value: 1801810542
796+
objectReference: {fileID: 0}
797+
- target: {fileID: 1583053172819472216, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
798+
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
799+
value: 1801810542
800+
objectReference: {fileID: 0}
775801
- target: {fileID: 2234904744820987572, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
776802
propertyPath: m_AnchorMax.x
777803
value: 0
@@ -812,6 +838,14 @@ PrefabInstance:
812838
propertyPath: m_AnchoredPosition.y
813839
value: 0
814840
objectReference: {fileID: 0}
841+
- target: {fileID: 3422802895906220296, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
842+
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
843+
value: 1801810542
844+
objectReference: {fileID: 0}
845+
- target: {fileID: 3523563153346996873, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
846+
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
847+
value: 1801810542
848+
objectReference: {fileID: 0}
815849
- target: {fileID: 3632019498769524828, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
816850
propertyPath: m_AnchorMax.y
817851
value: 0
@@ -852,6 +886,18 @@ PrefabInstance:
852886
propertyPath: m_AnchoredPosition.y
853887
value: 0
854888
objectReference: {fileID: 0}
889+
- target: {fileID: 4777870063691261607, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
890+
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
891+
value: 1801810542
892+
objectReference: {fileID: 0}
893+
- target: {fileID: 4805371756271124143, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
894+
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
895+
value: 1801810542
896+
objectReference: {fileID: 0}
897+
- target: {fileID: 5031063074198282838, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
898+
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
899+
value: 1801810542
900+
objectReference: {fileID: 0}
855901
- target: {fileID: 5843186486647850782, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
856902
propertyPath: m_AnchorMax.y
857903
value: 0
@@ -868,6 +914,10 @@ PrefabInstance:
868914
propertyPath: m_AnchoredPosition.y
869915
value: 0
870916
objectReference: {fileID: 0}
917+
- target: {fileID: 6243726003260939195, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
918+
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
919+
value: 1801810542
920+
objectReference: {fileID: 0}
871921
- target: {fileID: 6403041760458951094, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
872922
propertyPath: m_AnchorMax.y
873923
value: 0
@@ -886,7 +936,7 @@ PrefabInstance:
886936
objectReference: {fileID: 0}
887937
- target: {fileID: 6702871171647363808, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
888938
propertyPath: m_Name
889-
value: LobbyPopup
939+
value: SessionPopup
890940
objectReference: {fileID: 0}
891941
- target: {fileID: 6702871171647363811, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
892942
propertyPath: m_Pivot.x
@@ -992,6 +1042,10 @@ PrefabInstance:
9921042
propertyPath: m_AnchoredPosition.y
9931043
value: 0
9941044
objectReference: {fileID: 0}
1045+
- target: {fileID: 7486709167611836872, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
1046+
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
1047+
value: 1801810542
1048+
objectReference: {fileID: 0}
9951049
- target: {fileID: 7579639325911904033, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
9961050
propertyPath: m_AnchorMax.y
9971051
value: 0
@@ -1012,6 +1066,10 @@ PrefabInstance:
10121066
propertyPath: m_AnchoredPosition.y
10131067
value: 0
10141068
objectReference: {fileID: 0}
1069+
- target: {fileID: 7676773602323508701, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
1070+
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
1071+
value: 1801810542
1072+
objectReference: {fileID: 0}
10151073
- target: {fileID: 7878795380521772600, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
10161074
propertyPath: m_AnchorMax.y
10171075
value: 0
@@ -1028,6 +1086,10 @@ PrefabInstance:
10281086
propertyPath: m_AnchoredPosition.y
10291087
value: 0
10301088
objectReference: {fileID: 0}
1089+
- target: {fileID: 8349060408152716834, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
1090+
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
1091+
value: 1801810542
1092+
objectReference: {fileID: 0}
10311093
m_RemovedComponents: []
10321094
m_RemovedGameObjects: []
10331095
m_AddedGameObjects: []
@@ -1058,9 +1120,13 @@ PrefabInstance:
10581120
propertyPath: m_fontSizeMax
10591121
value: 58
10601122
objectReference: {fileID: 0}
1123+
- target: {fileID: 7721113380232533813, guid: addf3685293c35d48a673397c748f116, type: 3}
1124+
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
1125+
value: 1801810542
1126+
objectReference: {fileID: 0}
10611127
- target: {fileID: 7721113380319664578, guid: addf3685293c35d48a673397c748f116, type: 3}
10621128
propertyPath: m_Name
1063-
value: Lobby Start Button
1129+
value: Session Start Button
10641130
objectReference: {fileID: 0}
10651131
- target: {fileID: 7721113380319664578, guid: addf3685293c35d48a673397c748f116, type: 3}
10661132
propertyPath: m_IsActive
@@ -1222,6 +1288,10 @@ PrefabInstance:
12221288
serializedVersion: 3
12231289
m_TransformParent: {fileID: 6068325059450104507}
12241290
m_Modifications:
1291+
- target: {fileID: 635758218034301578, guid: 0c512555bac5ad3428012496621d5f4c, type: 3}
1292+
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
1293+
value: 1801810542
1294+
objectReference: {fileID: 0}
12251295
- target: {fileID: 2425020540045722527, guid: 0c512555bac5ad3428012496621d5f4c, type: 3}
12261296
propertyPath: m_IPHostingUI
12271297
value:
@@ -1250,6 +1320,10 @@ PrefabInstance:
12501320
propertyPath: m_JoinTabButtonTabBlockerTinter
12511321
value:
12521322
objectReference: {fileID: 0}
1323+
- target: {fileID: 2632516940462403808, guid: 0c512555bac5ad3428012496621d5f4c, type: 3}
1324+
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
1325+
value: 1801810542
1326+
objectReference: {fileID: 0}
12531327
- target: {fileID: 2837639234489633647, guid: 0c512555bac5ad3428012496621d5f4c, type: 3}
12541328
propertyPath: m_AnchorMax.y
12551329
value: 0
@@ -1406,6 +1480,14 @@ PrefabInstance:
14061480
propertyPath: m_AnchoredPosition.y
14071481
value: 0
14081482
objectReference: {fileID: 0}
1483+
- target: {fileID: 6221418847513183700, guid: 0c512555bac5ad3428012496621d5f4c, type: 3}
1484+
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
1485+
value: 1801810542
1486+
objectReference: {fileID: 0}
1487+
- target: {fileID: 8477078941156091232, guid: 0c512555bac5ad3428012496621d5f4c, type: 3}
1488+
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
1489+
value: 1801810542
1490+
objectReference: {fileID: 0}
14091491
- target: {fileID: 8636502446461490653, guid: 0c512555bac5ad3428012496621d5f4c, type: 3}
14101492
propertyPath: m_AnchorMax.x
14111493
value: 0
@@ -1436,6 +1518,10 @@ PrefabInstance:
14361518
serializedVersion: 3
14371519
m_TransformParent: {fileID: 6068325059450104507}
14381520
m_Modifications:
1521+
- target: {fileID: 142567138735162684, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
1522+
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
1523+
value: 1801810542
1524+
objectReference: {fileID: 0}
14391525
- target: {fileID: 305241932145850641, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
14401526
propertyPath: m_AnchorMax.y
14411527
value: 0
@@ -1456,14 +1542,46 @@ PrefabInstance:
14561542
propertyPath: m_AnchoredPosition.y
14571543
value: 0
14581544
objectReference: {fileID: 0}
1545+
- target: {fileID: 420772079678045107, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
1546+
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
1547+
value: 1801810542
1548+
objectReference: {fileID: 0}
14591549
- target: {fileID: 496999993872493682, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
14601550
propertyPath: m_fontSize
14611551
value: 50
14621552
objectReference: {fileID: 0}
1553+
- target: {fileID: 496999993872493682, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
1554+
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
1555+
value: 1801810542
1556+
objectReference: {fileID: 0}
1557+
- target: {fileID: 1198809863901728126, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
1558+
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
1559+
value: 1801810542
1560+
objectReference: {fileID: 0}
14631561
- target: {fileID: 1724952364805774005, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
14641562
propertyPath: m_fontSize
14651563
value: 33
14661564
objectReference: {fileID: 0}
1565+
- target: {fileID: 1724952364805774005, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
1566+
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
1567+
value: 1801810542
1568+
objectReference: {fileID: 0}
1569+
- target: {fileID: 1887385345636018689, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
1570+
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
1571+
value: 1801810542
1572+
objectReference: {fileID: 0}
1573+
- target: {fileID: 1958720994042495195, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
1574+
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
1575+
value: 1801810542
1576+
objectReference: {fileID: 0}
1577+
- target: {fileID: 2267455651107791764, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
1578+
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
1579+
value: 1801810542
1580+
objectReference: {fileID: 0}
1581+
- target: {fileID: 3449200610800142136, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
1582+
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
1583+
value: 1801810542
1584+
objectReference: {fileID: 0}
14671585
- target: {fileID: 4453893802180558433, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
14681586
propertyPath: m_AnchoredPosition.y
14691587
value: 58
@@ -1472,6 +1590,10 @@ PrefabInstance:
14721590
propertyPath: m_fontSize
14731591
value: 33
14741592
objectReference: {fileID: 0}
1593+
- target: {fileID: 5306707511080244411, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
1594+
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
1595+
value: 1801810542
1596+
objectReference: {fileID: 0}
14751597
- target: {fileID: 5924530127146065184, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
14761598
propertyPath: m_Name
14771599
value: IPPopup
@@ -1560,10 +1682,18 @@ PrefabInstance:
15601682
propertyPath: m_LocalEulerAnglesHint.z
15611683
value: 0
15621684
objectReference: {fileID: 0}
1685+
- target: {fileID: 6456862980627209339, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
1686+
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
1687+
value: 1801810542
1688+
objectReference: {fileID: 0}
15631689
- target: {fileID: 7328528642576607773, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
15641690
propertyPath: m_fontSize
15651691
value: 50
15661692
objectReference: {fileID: 0}
1693+
- target: {fileID: 7328528642576607773, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
1694+
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
1695+
value: 1801810542
1696+
objectReference: {fileID: 0}
15671697
- target: {fileID: 7353534715922753761, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
15681698
propertyPath: m_AnchorMax.y
15691699
value: 0
@@ -1604,6 +1734,10 @@ PrefabInstance:
16041734
propertyPath: m_AnchoredPosition.y
16051735
value: 0
16061736
objectReference: {fileID: 0}
1737+
- target: {fileID: 8122071153592056310, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
1738+
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
1739+
value: 1801810542
1740+
objectReference: {fileID: 0}
16071741
m_RemovedComponents: []
16081742
m_RemovedGameObjects: []
16091743
m_AddedGameObjects: []
@@ -1634,6 +1768,10 @@ PrefabInstance:
16341768
propertyPath: m_fontSizeMax
16351769
value: 58
16361770
objectReference: {fileID: 0}
1771+
- target: {fileID: 7721113380232533813, guid: addf3685293c35d48a673397c748f116, type: 3}
1772+
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
1773+
value: 1801810542
1774+
objectReference: {fileID: 0}
16371775
- target: {fileID: 7721113380319664578, guid: addf3685293c35d48a673397c748f116, type: 3}
16381776
propertyPath: m_Name
16391777
value: Profile Button

0 commit comments

Comments
 (0)