Skip to content

Commit

Permalink
[MTT-8924] - Convert Boss Room from Lobby and Relay packages to Multi…
Browse files Browse the repository at this point in the history
…player 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]>
  • Loading branch information
3 people authored Dec 3, 2024
1 parent 3dfcd47 commit 9a1ca64
Show file tree
Hide file tree
Showing 61 changed files with 1,644 additions and 1,828 deletions.
144 changes: 141 additions & 3 deletions Assets/Prefabs/UI/MainMenu UI Canvas.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -359,15 +359,17 @@ MonoBehaviour:
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_TextWrappingMode: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_ActiveFontFeatures: 00000000
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_EmojiFallbackSupport: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
Expand Down Expand Up @@ -480,6 +482,10 @@ PrefabInstance:
propertyPath: m_fontSizeMax
value: 58
objectReference: {fileID: 0}
- target: {fileID: 7721113380232533813, guid: addf3685293c35d48a673397c748f116, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 7721113380319664578, guid: addf3685293c35d48a673397c748f116, type: 3}
propertyPath: m_Name
value: IP Start Button
Expand Down Expand Up @@ -736,6 +742,18 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 6068325059450104507}
m_Modifications:
- target: {fileID: 301174889687357229, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 709593810350336946, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 785373375347833033, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 792957857740898001, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
propertyPath: m_AnchorMax.y
value: 0
Expand Down Expand Up @@ -772,6 +790,14 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1131054124500818674, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 1583053172819472216, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 2234904744820987572, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
propertyPath: m_AnchorMax.x
value: 0
Expand Down Expand Up @@ -812,6 +838,14 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3422802895906220296, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 3523563153346996873, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 3632019498769524828, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
propertyPath: m_AnchorMax.y
value: 0
Expand Down Expand Up @@ -852,6 +886,18 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4777870063691261607, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 4805371756271124143, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 5031063074198282838, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 5843186486647850782, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
propertyPath: m_AnchorMax.y
value: 0
Expand All @@ -868,6 +914,10 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6243726003260939195, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 6403041760458951094, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
propertyPath: m_AnchorMax.y
value: 0
Expand All @@ -886,7 +936,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6702871171647363808, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
propertyPath: m_Name
value: LobbyPopup
value: SessionPopup
objectReference: {fileID: 0}
- target: {fileID: 6702871171647363811, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
propertyPath: m_Pivot.x
Expand Down Expand Up @@ -992,6 +1042,10 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7486709167611836872, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 7579639325911904033, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
propertyPath: m_AnchorMax.y
value: 0
Expand All @@ -1012,6 +1066,10 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7676773602323508701, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 7878795380521772600, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
propertyPath: m_AnchorMax.y
value: 0
Expand All @@ -1028,6 +1086,10 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8349060408152716834, guid: 1bc4508935e434eb4867c367b55cca50, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
Expand Down Expand Up @@ -1058,9 +1120,13 @@ PrefabInstance:
propertyPath: m_fontSizeMax
value: 58
objectReference: {fileID: 0}
- target: {fileID: 7721113380232533813, guid: addf3685293c35d48a673397c748f116, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 7721113380319664578, guid: addf3685293c35d48a673397c748f116, type: 3}
propertyPath: m_Name
value: Lobby Start Button
value: Session Start Button
objectReference: {fileID: 0}
- target: {fileID: 7721113380319664578, guid: addf3685293c35d48a673397c748f116, type: 3}
propertyPath: m_IsActive
Expand Down Expand Up @@ -1222,6 +1288,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 6068325059450104507}
m_Modifications:
- target: {fileID: 635758218034301578, guid: 0c512555bac5ad3428012496621d5f4c, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 2425020540045722527, guid: 0c512555bac5ad3428012496621d5f4c, type: 3}
propertyPath: m_IPHostingUI
value:
Expand Down Expand Up @@ -1250,6 +1320,10 @@ PrefabInstance:
propertyPath: m_JoinTabButtonTabBlockerTinter
value:
objectReference: {fileID: 0}
- target: {fileID: 2632516940462403808, guid: 0c512555bac5ad3428012496621d5f4c, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 2837639234489633647, guid: 0c512555bac5ad3428012496621d5f4c, type: 3}
propertyPath: m_AnchorMax.y
value: 0
Expand Down Expand Up @@ -1406,6 +1480,14 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6221418847513183700, guid: 0c512555bac5ad3428012496621d5f4c, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 8477078941156091232, guid: 0c512555bac5ad3428012496621d5f4c, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 8636502446461490653, guid: 0c512555bac5ad3428012496621d5f4c, type: 3}
propertyPath: m_AnchorMax.x
value: 0
Expand Down Expand Up @@ -1436,6 +1518,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 6068325059450104507}
m_Modifications:
- target: {fileID: 142567138735162684, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 305241932145850641, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
propertyPath: m_AnchorMax.y
value: 0
Expand All @@ -1456,14 +1542,46 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 420772079678045107, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 496999993872493682, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
propertyPath: m_fontSize
value: 50
objectReference: {fileID: 0}
- target: {fileID: 496999993872493682, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 1198809863901728126, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 1724952364805774005, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
propertyPath: m_fontSize
value: 33
objectReference: {fileID: 0}
- target: {fileID: 1724952364805774005, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 1887385345636018689, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 1958720994042495195, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 2267455651107791764, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 3449200610800142136, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 4453893802180558433, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
propertyPath: m_AnchoredPosition.y
value: 58
Expand All @@ -1472,6 +1590,10 @@ PrefabInstance:
propertyPath: m_fontSize
value: 33
objectReference: {fileID: 0}
- target: {fileID: 5306707511080244411, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 5924530127146065184, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
propertyPath: m_Name
value: IPPopup
Expand Down Expand Up @@ -1560,10 +1682,18 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6456862980627209339, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 7328528642576607773, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
propertyPath: m_fontSize
value: 50
objectReference: {fileID: 0}
- target: {fileID: 7328528642576607773, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 7353534715922753761, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
propertyPath: m_AnchorMax.y
value: 0
Expand Down Expand Up @@ -1604,6 +1734,10 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8122071153592056310, guid: 4c4e3a02e746c204bb859d2a53a865e3, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
Expand Down Expand Up @@ -1634,6 +1768,10 @@ PrefabInstance:
propertyPath: m_fontSizeMax
value: 58
objectReference: {fileID: 0}
- target: {fileID: 7721113380232533813, guid: addf3685293c35d48a673397c748f116, type: 3}
propertyPath: 'm_ActiveFontFeatures.Array.data[0]'
value: 1801810542
objectReference: {fileID: 0}
- target: {fileID: 7721113380319664578, guid: addf3685293c35d48a673397c748f116, type: 3}
propertyPath: m_Name
value: Profile Button
Expand Down
Loading

0 comments on commit 9a1ca64

Please sign in to comment.