Skip to content

Commit f4fa6b1

Browse files
committed
Merge branch 'develop' into sam/feat/dedicated-server-support
* develop: refactor: replacing GameNetPortal with state machine [MTT-1742] [MTT-3501] [MTT-3502] (#666) chore: update NGO, tools, authentication and relay packages (#690) feat: replacing discope with vcontainer [MTT-3675] (PR recreated) (#679) updated changelogs with fixes made to the release changelog (#688) # Conflicts: # Assets/Scenes/CharSelect.unity # Assets/Scenes/PostGame.unity # Assets/Scenes/Startup.unity # Assets/Scripts/ApplicationLifecycle/ApplicationController.cs # Assets/Scripts/Gameplay/ConnectionManagement/ClientGameNetPortal.cs # Assets/Scripts/Gameplay/ConnectionManagement/GameNetPortal.cs # Assets/Scripts/Gameplay/ConnectionManagement/ServerGameNetPortal.cs # Assets/Scripts/Gameplay/DebugCheats/Unity.BossRoom.DebugCheats.asmdef # Assets/Scripts/Gameplay/GameState/ClientBossRoomState.cs # Assets/Scripts/Gameplay/GameState/ClientCharSelectState.cs # Assets/Scripts/Gameplay/GameState/ClientPostGameState.cs # Assets/Scripts/Gameplay/GameState/GameStateBehaviour.cs # Assets/Scripts/Gameplay/GameState/ServerBossRoomState.cs # Assets/Scripts/Gameplay/GameState/ServerCharSelectState.cs # Assets/Scripts/Gameplay/GameState/ServerPostGameState.cs # Assets/Scripts/Gameplay/GameplayObjects/ClientDoorVisualization.cs # Assets/Scripts/Gameplay/UI/IPUIMediator.cs # Assets/Scripts/Gameplay/UI/PostGameUI.cs # Assets/Scripts/Infrastructure/DIScope.cs # Assets/Tests/Runtime/Unity.BossRoom.Tests.Runtime.asmdef
2 parents 095adfd + fd60daa commit f4fa6b1

File tree

105 files changed

+1494
-749
lines changed

Some content is hidden

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

105 files changed

+1494
-749
lines changed

Assets/Prefabs/GameNetPortal.prefab

Lines changed: 4 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ GameObject:
99
serializedVersion: 6
1010
m_Component:
1111
- component: {fileID: 5062837533140207352}
12-
- component: {fileID: 5062837533140207350}
13-
- component: {fileID: 5062837533140207353}
14-
- component: {fileID: 5062837533140207351}
12+
- component: {fileID: 1984353324962460586}
1513
m_Layer: 0
1614
m_Name: GameNetPortal
1715
m_TagString: GameNetPortal
@@ -29,11 +27,12 @@ Transform:
2927
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3028
m_LocalPosition: {x: 0, y: 0, z: 0}
3129
m_LocalScale: {x: 1, y: 1, z: 1}
30+
m_ConstrainProportionsScale: 0
3231
m_Children: []
3332
m_Father: {fileID: 0}
3433
m_RootOrder: 0
3534
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
36-
--- !u!114 &5062837533140207350
35+
--- !u!114 &1984353324962460586
3736
MonoBehaviour:
3837
m_ObjectHideFlags: 0
3938
m_CorrespondingSourceObject: {fileID: 0}
@@ -42,34 +41,9 @@ MonoBehaviour:
4241
m_GameObject: {fileID: 5062837533140207349}
4342
m_Enabled: 1
4443
m_EditorHideFlags: 0
45-
m_Script: {fileID: 11500000, guid: 7ba4a1d598313d94a81a08ceae147b57, type: 3}
44+
m_Script: {fileID: 11500000, guid: bf51ea31bbc84cc3aa883cc5f1caae06, type: 3}
4645
m_Name:
4746
m_EditorClassIdentifier:
4847
m_NetworkManager: {fileID: 0}
4948
m_AvatarRegistry: {fileID: 11400000, guid: 48d17d764bff6c643a3dc035fb71c979, type: 2}
50-
PlayerName:
51-
--- !u!114 &5062837533140207353
52-
MonoBehaviour:
53-
m_ObjectHideFlags: 0
54-
m_CorrespondingSourceObject: {fileID: 0}
55-
m_PrefabInstance: {fileID: 0}
56-
m_PrefabAsset: {fileID: 0}
57-
m_GameObject: {fileID: 5062837533140207349}
58-
m_Enabled: 1
59-
m_EditorHideFlags: 0
60-
m_Script: {fileID: 11500000, guid: 5bd31edc1b1fd1342b3bf8193a5a03b2, type: 3}
61-
m_Name:
62-
m_EditorClassIdentifier:
63-
--- !u!114 &5062837533140207351
64-
MonoBehaviour:
65-
m_ObjectHideFlags: 0
66-
m_CorrespondingSourceObject: {fileID: 0}
67-
m_PrefabInstance: {fileID: 0}
68-
m_PrefabAsset: {fileID: 0}
69-
m_GameObject: {fileID: 5062837533140207349}
70-
m_Enabled: 1
71-
m_EditorHideFlags: 0
72-
m_Script: {fileID: 11500000, guid: 54b0859a1da930541adf0b2d1bb8d977, type: 3}
73-
m_Name:
74-
m_EditorClassIdentifier:
7549
m_GameState: {fileID: 7151198093957655792, guid: 3af96a32a84bcf74d9538fa7af973c97, type: 3}

Assets/Prefabs/State/BossRoomState.prefab

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ Transform:
2929
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3030
m_LocalPosition: {x: 0, y: 0, z: 0}
3131
m_LocalScale: {x: 1, y: 1, z: 1}
32+
m_ConstrainProportionsScale: 0
3233
m_Children:
3334
- {fileID: 6319832178442273571}
3435
- {fileID: 374135395555381814}
@@ -53,7 +54,10 @@ MonoBehaviour:
5354
m_Script: {fileID: 11500000, guid: 5e631ac38df479741af592cf6a1fb553, type: 3}
5455
m_Name:
5556
m_EditorClassIdentifier:
56-
m_GameObjectsThatWillBeInjectedAutomatically: []
57+
parentReference:
58+
TypeName: Unity.Multiplayer.Samples.BossRoom.Shared.ApplicationController
59+
autoRun: 1
60+
autoInjectGameObjects: []
5761
--- !u!114 &3608714310874968837
5862
MonoBehaviour:
5963
m_ObjectHideFlags: 0
@@ -82,7 +86,10 @@ MonoBehaviour:
8286
m_Script: {fileID: 11500000, guid: 927521835ae055247b17e4abe805b4ab, type: 3}
8387
m_Name:
8488
m_EditorClassIdentifier:
85-
m_GameObjectsThatWillBeInjectedAutomatically: []
89+
parentReference:
90+
TypeName: Unity.Multiplayer.Samples.BossRoom.Shared.ApplicationController
91+
autoRun: 1
92+
autoInjectGameObjects: []
8693
m_NetworkGameStateTransform: {fileID: 11400000, guid: 07bddcdf06738e74cb79d30065ff96af, type: 2}
8794
m_PlayerPrefab: {fileID: 6009713983291384767, guid: 8237adf32a9b6de4892e6febe6b4bdef, type: 3}
8895
m_PlayerSpawnPoints:
@@ -120,6 +127,7 @@ Transform:
120127
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
121128
m_LocalPosition: {x: -1, y: 0, z: 2}
122129
m_LocalScale: {x: 1, y: 1, z: 1}
130+
m_ConstrainProportionsScale: 0
123131
m_Children: []
124132
m_Father: {fileID: 5655447013084909147}
125133
m_RootOrder: 4
@@ -150,6 +158,7 @@ Transform:
150158
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
151159
m_LocalPosition: {x: 8, y: 0, z: 2}
152160
m_LocalScale: {x: 1, y: 1, z: 1}
161+
m_ConstrainProportionsScale: 0
153162
m_Children: []
154163
m_Father: {fileID: 5655447013084909147}
155164
m_RootOrder: 7
@@ -180,6 +189,7 @@ Transform:
180189
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
181190
m_LocalPosition: {x: 4, y: 0, z: 4}
182191
m_LocalScale: {x: 1, y: 1, z: 1}
192+
m_ConstrainProportionsScale: 0
183193
m_Children: []
184194
m_Father: {fileID: 5655447013084909147}
185195
m_RootOrder: 2
@@ -210,6 +220,7 @@ Transform:
210220
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
211221
m_LocalPosition: {x: 7, y: 0, z: 4}
212222
m_LocalScale: {x: 1, y: 1, z: 1}
223+
m_ConstrainProportionsScale: 0
213224
m_Children: []
214225
m_Father: {fileID: 5655447013084909147}
215226
m_RootOrder: 3
@@ -240,6 +251,7 @@ Transform:
240251
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
241252
m_LocalPosition: {x: -2, y: 0, z: 4}
242253
m_LocalScale: {x: 1, y: 1, z: 1}
254+
m_ConstrainProportionsScale: 0
243255
m_Children: []
244256
m_Father: {fileID: 5655447013084909147}
245257
m_RootOrder: 0
@@ -270,6 +282,7 @@ Transform:
270282
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
271283
m_LocalPosition: {x: 5, y: 0, z: 2}
272284
m_LocalScale: {x: 1, y: 1, z: 1}
285+
m_ConstrainProportionsScale: 0
273286
m_Children: []
274287
m_Father: {fileID: 5655447013084909147}
275288
m_RootOrder: 6
@@ -300,6 +313,7 @@ Transform:
300313
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
301314
m_LocalPosition: {x: 1, y: 0, z: 4}
302315
m_LocalScale: {x: 1, y: 1, z: 1}
316+
m_ConstrainProportionsScale: 0
303317
m_Children: []
304318
m_Father: {fileID: 5655447013084909147}
305319
m_RootOrder: 1
@@ -330,6 +344,7 @@ Transform:
330344
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
331345
m_LocalPosition: {x: 2, y: 0, z: 2}
332346
m_LocalScale: {x: 1, y: 1, z: 1}
347+
m_ConstrainProportionsScale: 0
333348
m_Children: []
334349
m_Father: {fileID: 5655447013084909147}
335350
m_RootOrder: 5

Assets/Prefabs/State/CharSelectState.prefab

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ Transform:
3030
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3131
m_LocalPosition: {x: 0, y: 0, z: 0}
3232
m_LocalScale: {x: 1, y: 1, z: 1}
33+
m_ConstrainProportionsScale: 0
3334
m_Children: []
3435
m_Father: {fileID: 0}
3536
m_RootOrder: 0
@@ -62,6 +63,10 @@ MonoBehaviour:
6263
m_Script: {fileID: 11500000, guid: b4ae93287066a264d92939aa957cf227, type: 3}
6364
m_Name:
6465
m_EditorClassIdentifier:
66+
parentReference:
67+
TypeName: Unity.Multiplayer.Samples.BossRoom.Shared.ApplicationController
68+
autoRun: 1
69+
autoInjectGameObjects: []
6570
--- !u!114 &3565665953789623674
6671
MonoBehaviour:
6772
m_ObjectHideFlags: 0
@@ -74,6 +79,10 @@ MonoBehaviour:
7479
m_Script: {fileID: 11500000, guid: eca1f4b442326cc4d9be3975746b8cdb, type: 3}
7580
m_Name:
7681
m_EditorClassIdentifier:
82+
parentReference:
83+
TypeName: Unity.Multiplayer.Samples.BossRoom.Shared.ApplicationController
84+
autoRun: 1
85+
autoInjectGameObjects: []
7786
m_AnimationTriggerOnCharSelect: BeginRevive
7887
m_AnimationTriggerOnCharChosen: BeginRevive
7988
m_PlayerSeats:
@@ -103,6 +112,7 @@ MonoBehaviour:
103112
- Indicator: {fileID: 21300000, guid: 5e0531f7cad04b346bf05685f3b9a846, type: 3}
104113
Color: {r: 0.19215687, g: 0.03137255, b: 0.9882353, a: 1}
105114
m_NumPlayersText: {fileID: 0}
115+
m_ReadyButtonText: {fileID: 0}
106116
m_UIElementsForNoSeatChosen:
107117
- {fileID: 0}
108118
- {fileID: 0}
@@ -114,8 +124,6 @@ MonoBehaviour:
114124
m_UIElementsForFatalError:
115125
- {fileID: 0}
116126
m_ClassInfoBox: {fileID: 0}
117-
m_FatalLobbyErrorText: {fileID: 0}
118-
m_FatalErrorLobbyFullMsg: 'Error: lobby is full! You cannot play.'
119127
m_CharacterGraphicsParent: {fileID: 0}
120128
--- !u!114 &3565665953789623673
121129
MonoBehaviour:

Assets/Prefabs/State/MainMenuState.prefab

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,17 @@ MonoBehaviour:
6969
m_Script: {fileID: 11500000, guid: ab10fd7c6aa7d36438f5ac1c0ebfadbb, type: 3}
7070
m_Name:
7171
m_EditorClassIdentifier:
72-
m_GameObjectsThatWillBeInjectedAutomatically: []
72+
parentReference:
73+
TypeName: Unity.Multiplayer.Samples.BossRoom.Shared.ApplicationController
74+
autoRun: 1
75+
autoInjectGameObjects: []
7376
m_NameGenerationData: {fileID: 11400000, guid: cc0e4025ad893614a8db0d9c10bf7c4f, type: 2}
7477
m_LobbyUIMediator: {fileID: 0}
7578
m_IPUIMediator: {fileID: 0}
7679
m_LobbyButton: {fileID: 0}
7780
m_SignInSpinner: {fileID: 0}
81+
m_UIProfileSelector: {fileID: 0}
82+
m_UGSSetupTooltipDetector: {fileID: 0}
7883
--- !u!223 &2665876610389888237
7984
Canvas:
8085
m_ObjectHideFlags: 0

Assets/Prefabs/State/PostGameState.prefab

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ Transform:
2929
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3030
m_LocalPosition: {x: 0, y: 0, z: 0}
3131
m_LocalScale: {x: 1, y: 1, z: 1}
32+
m_ConstrainProportionsScale: 0
3233
m_Children: []
3334
m_Father: {fileID: 0}
3435
m_RootOrder: 0
@@ -45,6 +46,10 @@ MonoBehaviour:
4546
m_Script: {fileID: 11500000, guid: a2a5cf2c4e970b64a9073f4f760322b5, type: 3}
4647
m_Name:
4748
m_EditorClassIdentifier:
49+
parentReference:
50+
TypeName: Unity.Multiplayer.Samples.BossRoom.Shared.ApplicationController
51+
autoRun: 1
52+
autoInjectGameObjects: []
4853
--- !u!114 &-1007214952234040975
4954
MonoBehaviour:
5055
m_ObjectHideFlags: 0
@@ -73,3 +78,7 @@ MonoBehaviour:
7378
m_Script: {fileID: 11500000, guid: 1cb58d1788f410740b05cace1af646d7, type: 3}
7479
m_Name:
7580
m_EditorClassIdentifier:
81+
parentReference:
82+
TypeName: Unity.Multiplayer.Samples.BossRoom.Shared.ApplicationController
83+
autoRun: 1
84+
autoInjectGameObjects: []

Assets/Scenes/BossRoom.unity

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:3de6367e1590522862f4e215fee25c7625e74596ab09067345a67c895080139c
3-
size 508257
2+
oid sha256:e3f00d58c6349986e4c2ca3da5c3d980eeda05bd854d63e23d1f3ab33f034b71
3+
size 509756

Assets/Scenes/CharSelect.unity

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:a68d92ca34cf5341b5f3ed20391bbe49a54112d97ca8ac96cc1e65565ec7253a
3-
size 12256
2+
oid sha256:fe57cffed60d9bfe7f42257a90c3d6a2240755dcaa4e10ae0c745f6fb4aecd66
3+
size 45820

Assets/Scenes/MainMenu.unity

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:79d3b1f7bd554253e1b21ba934a02c91665c3bbdbd920871291f0ceada2803b6
3-
size 64423
2+
oid sha256:f63ef21240536cea8fc653871261d274a3fe381f0bbe9a297bfb8b547fd82ae9
3+
size 67930

Assets/Scenes/PostGame.unity

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:5fdc96daf5fb5841360c941b7bed3400d84550aabf2f0fb9d7fe8f435aaac855
3-
size 71656
2+
oid sha256:ddaaa366f8d07e0e8347f5cecd0d7bd6b71715365ad0458a45667ce3463f3672
3+
size 67888

Assets/Scenes/Startup.unity

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:be38935f67141c5edece1a17feaa0cc296cb390f6946eb421dc92dc2769b3acd
3-
size 29736
2+
oid sha256:48a24b280794a53ab92b88c560dba8dddc996e910e534a952e60fa0bad85a1cc
3+
size 45753

0 commit comments

Comments
 (0)