Skip to content

Commit ba89580

Browse files
LPLafontaineBfernando-cortezSamuelBellomo
authored
feat: other players loading progress in loading screen [MTT-2239] (#580)
* Adding way to track loading progress of other players * Removing responsibility of tracking local loading progress from ClientLoadingScreen Co-authored-by: Fernando Cortez <[email protected]> Co-authored-by: Sam Bellomo <[email protected]>
1 parent 01366bd commit ba89580

14 files changed

+3274
-386
lines changed

‎Assets/BossRoom/Prefabs/LoadingProgressTracker.prefab

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1 &3106828016798330210
4+
GameObject:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
serializedVersion: 6
10+
m_Component:
11+
- component: {fileID: 3106828016798330215}
12+
- component: {fileID: 3106828016798330208}
13+
- component: {fileID: 3106828016798330209}
14+
m_Layer: 0
15+
m_Name: LoadingProgressTracker
16+
m_TagString: Untagged
17+
m_Icon: {fileID: 0}
18+
m_NavMeshLayer: 0
19+
m_StaticEditorFlags: 0
20+
m_IsActive: 1
21+
--- !u!4 &3106828016798330215
22+
Transform:
23+
m_ObjectHideFlags: 0
24+
m_CorrespondingSourceObject: {fileID: 0}
25+
m_PrefabInstance: {fileID: 0}
26+
m_PrefabAsset: {fileID: 0}
27+
m_GameObject: {fileID: 3106828016798330210}
28+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
29+
m_LocalPosition: {x: 0, y: 0, z: 0}
30+
m_LocalScale: {x: 1, y: 1, z: 1}
31+
m_Children: []
32+
m_Father: {fileID: 0}
33+
m_RootOrder: 0
34+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
35+
--- !u!114 &3106828016798330208
36+
MonoBehaviour:
37+
m_ObjectHideFlags: 0
38+
m_CorrespondingSourceObject: {fileID: 0}
39+
m_PrefabInstance: {fileID: 0}
40+
m_PrefabAsset: {fileID: 0}
41+
m_GameObject: {fileID: 3106828016798330210}
42+
m_Enabled: 1
43+
m_EditorHideFlags: 0
44+
m_Script: {fileID: 11500000, guid: 8e20ce98a70947b68f7982c1c417f88c, type: 3}
45+
m_Name:
46+
m_EditorClassIdentifier:
47+
--- !u!114 &3106828016798330209
48+
MonoBehaviour:
49+
m_ObjectHideFlags: 0
50+
m_CorrespondingSourceObject: {fileID: 0}
51+
m_PrefabInstance: {fileID: 0}
52+
m_PrefabAsset: {fileID: 0}
53+
m_GameObject: {fileID: 3106828016798330210}
54+
m_Enabled: 1
55+
m_EditorHideFlags: 0
56+
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
57+
m_Name:
58+
m_EditorClassIdentifier:
59+
GlobalObjectIdHash: 951099334
60+
AlwaysReplicateAsRoot: 0
61+
DontDestroyWithOwner: 0
62+
AutoObjectParentSync: 1

‎Assets/BossRoom/Prefabs/LoadingProgressTracker.prefab.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/BossRoom/Prefabs/NetworkingManager.prefab

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -184,50 +184,66 @@ MonoBehaviour:
184184
NetworkConfig:
185185
ProtocolVersion: 0
186186
NetworkTransport: {fileID: 5486862276979889515}
187-
PlayerPrefab: {fileID: 4927145850774787080, guid: 1d3f5528d25661949890bcd7f47fe81a, type: 3}
187+
PlayerPrefab: {fileID: 4927145850774787080, guid: 1d3f5528d25661949890bcd7f47fe81a,
188+
type: 3}
188189
NetworkPrefabs:
189190
- Override: 0
190-
Prefab: {fileID: 6009713983291384756, guid: 8237adf32a9b6de4892e6febe6b4bdef, type: 3}
191+
Prefab: {fileID: 6009713983291384756, guid: 8237adf32a9b6de4892e6febe6b4bdef,
192+
type: 3}
191193
SourcePrefabToOverride: {fileID: 0}
192194
SourceHashToOverride: 0
193195
OverridingTargetPrefab: {fileID: 0}
194196
- Override: 0
195-
Prefab: {fileID: 3713729372785093424, guid: 6cdd52f1fa2ed34469a487ae6477eded, type: 3}
197+
Prefab: {fileID: 3713729372785093424, guid: 6cdd52f1fa2ed34469a487ae6477eded,
198+
type: 3}
196199
SourcePrefabToOverride: {fileID: 0}
197200
SourceHashToOverride: 0
198201
OverridingTargetPrefab: {fileID: 0}
199202
- Override: 0
200-
Prefab: {fileID: 3688950541947916333, guid: 365e94337fd10fe4ebde1906df413ac7, type: 3}
203+
Prefab: {fileID: 3688950541947916333, guid: 365e94337fd10fe4ebde1906df413ac7,
204+
type: 3}
201205
SourcePrefabToOverride: {fileID: 0}
202206
SourceHashToOverride: 0
203207
OverridingTargetPrefab: {fileID: 0}
204208
- Override: 0
205-
Prefab: {fileID: 2842198241268549130, guid: 30c420f004b8f6445ad2bdb2addb234a, type: 3}
209+
Prefab: {fileID: 2842198241268549130, guid: 30c420f004b8f6445ad2bdb2addb234a,
210+
type: 3}
206211
SourcePrefabToOverride: {fileID: 0}
207212
SourceHashToOverride: 0
208213
OverridingTargetPrefab: {fileID: 0}
209214
- Override: 0
210-
Prefab: {fileID: 2842198241268549130, guid: 7e3b8103f5622f64fa677352730f295c, type: 3}
215+
Prefab: {fileID: 2842198241268549130, guid: 7e3b8103f5622f64fa677352730f295c,
216+
type: 3}
211217
SourcePrefabToOverride: {fileID: 0}
212218
SourceHashToOverride: 0
213219
OverridingTargetPrefab: {fileID: 0}
214220
- Override: 0
215-
Prefab: {fileID: 2842198241268549130, guid: 411974b75a8b43d4e9b3c9069a5067fb, type: 3}
221+
Prefab: {fileID: 2842198241268549130, guid: 411974b75a8b43d4e9b3c9069a5067fb,
222+
type: 3}
216223
SourcePrefabToOverride: {fileID: 0}
217224
SourceHashToOverride: 0
218225
OverridingTargetPrefab: {fileID: 0}
219226
- Override: 0
220-
Prefab: {fileID: 2842198241268549130, guid: 0251e08eeed89e844a8527b3a7874cc2, type: 3}
227+
Prefab: {fileID: 2842198241268549130, guid: 0251e08eeed89e844a8527b3a7874cc2,
228+
type: 3}
221229
SourcePrefabToOverride: {fileID: 0}
222230
SourceHashToOverride: 0
223231
OverridingTargetPrefab: {fileID: 0}
224232
- Override: 0
225-
Prefab: {fileID: 576565557002701866, guid: 3af96a32a84bcf74d9538fa7af973c97, type: 3}
233+
Prefab: {fileID: 576565557002701866, guid: 3af96a32a84bcf74d9538fa7af973c97,
234+
type: 3}
226235
SourcePrefabToOverride: {fileID: 0}
227236
SourceHashToOverride: 0
228237
OverridingTargetPrefab: {fileID: 0}
229238
- Override: 0
230-
Prefab: {fileID: 3597354879354517420, guid: c8513d3df780cb34a9576da3772d512b, type: 3}
239+
Prefab: {fileID: 3597354879354517420, guid: c8513d3df780cb34a9576da3772d512b,
240+
type: 3}
241+
SourcePrefabToOverride: {fileID: 0}
242+
SourceHashToOverride: 0
243+
OverridingTargetPrefab: {fileID: 0}
244+
- Override: 0
245+
Prefab: {fileID: 3106828016798330210, guid: 5c107a985e30aa2469a62ecf015d43a8,
246+
type: 3}
231247
SourcePrefabToOverride: {fileID: 0}
232248
SourceHashToOverride: 0
233249
OverridingTargetPrefab: {fileID: 0}

‎Assets/BossRoom/Prefabs/SceneLoader.prefab

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ GameObject:
1111
- component: {fileID: 7533068275093218427}
1212
- component: {fileID: 2071498811241465156}
1313
- component: {fileID: 8734696198808489477}
14+
- component: {fileID: 6240023712540756099}
1415
m_Layer: 0
1516
m_Name: SceneLoader
1617
m_TagString: Untagged
@@ -44,19 +45,8 @@ MonoBehaviour:
4445
m_Script: {fileID: 11500000, guid: d202c9ed4a2c4a6fa83f21f1c21394ea, type: 3}
4546
m_Name:
4647
m_EditorClassIdentifier:
47-
m_ScenesTriggeringLoadingScreen:
48-
- MainMenu
49-
- CharSelect
50-
- PostGame
51-
- BossRoom
52-
m_ScenesEndingLoadingScreen:
53-
- MainMenu
54-
- CharSelect
55-
- PostGame
56-
- DungeonEntrance
57-
- DungeonTransition
58-
- DungeonBossRoom
5948
m_ClientLoadingScreen: {fileID: 0}
49+
m_LoadingProgressManager: {fileID: 6240023712540756099}
6050
--- !u!114 &8734696198808489477
6151
MonoBehaviour:
6252
m_ObjectHideFlags: 0
@@ -73,3 +63,16 @@ MonoBehaviour:
7363
AlwaysReplicateAsRoot: 0
7464
DontDestroyWithOwner: 0
7565
AutoObjectParentSync: 1
66+
--- !u!114 &6240023712540756099
67+
MonoBehaviour:
68+
m_ObjectHideFlags: 0
69+
m_CorrespondingSourceObject: {fileID: 0}
70+
m_PrefabInstance: {fileID: 0}
71+
m_PrefabAsset: {fileID: 0}
72+
m_GameObject: {fileID: 5970766024194302363}
73+
m_Enabled: 1
74+
m_EditorHideFlags: 0
75+
m_Script: {fileID: 11500000, guid: 831202463f434661b4f61a409b08867f, type: 3}
76+
m_Name:
77+
m_EditorClassIdentifier:
78+
m_ProgressTrackerPrefab: {fileID: 3106828016798330210, guid: 5c107a985e30aa2469a62ecf015d43a8, type: 3}

0 commit comments

Comments
 (0)