Skip to content

Commit 26c4425

Browse files
LPLafontaineBLPLafontaineB
authored
Merge branch 'develop' into fix/fixing-connection-management-test
2 parents 1810a4d + 05d4a5a commit 26c4425

File tree

8 files changed

+44
-80
lines changed

8 files changed

+44
-80
lines changed

‎Assets/GameData/NetworkPrefabs.asset

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:f1602e4cff482bcacf4eaac104fe12fe5d46e71c871a94415b96ada086f44e71
3+
size 2790

‎Assets/GameData/NetworkPrefabs.asset.meta

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

‎Assets/Prefabs/NetworkingManager.prefab

Lines changed: 5 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -51,62 +51,9 @@ MonoBehaviour:
5151
ProtocolVersion: 0
5252
NetworkTransport: {fileID: 8549047561508999566}
5353
PlayerPrefab: {fileID: 4927145850774787080, guid: 1d3f5528d25661949890bcd7f47fe81a, type: 3}
54-
NetworkPrefabs:
55-
- Override: 0
56-
Prefab: {fileID: 6009713983291384756, guid: 8237adf32a9b6de4892e6febe6b4bdef, type: 3}
57-
SourcePrefabToOverride: {fileID: 0}
58-
SourceHashToOverride: 0
59-
OverridingTargetPrefab: {fileID: 0}
60-
- Override: 0
61-
Prefab: {fileID: 3713729372785093424, guid: 6cdd52f1fa2ed34469a487ae6477eded, type: 3}
62-
SourcePrefabToOverride: {fileID: 0}
63-
SourceHashToOverride: 0
64-
OverridingTargetPrefab: {fileID: 0}
65-
- Override: 0
66-
Prefab: {fileID: 3688950541947916333, guid: 365e94337fd10fe4ebde1906df413ac7, type: 3}
67-
SourcePrefabToOverride: {fileID: 0}
68-
SourceHashToOverride: 0
69-
OverridingTargetPrefab: {fileID: 0}
70-
- Override: 0
71-
Prefab: {fileID: 2842198241268549130, guid: 30c420f004b8f6445ad2bdb2addb234a, type: 3}
72-
SourcePrefabToOverride: {fileID: 0}
73-
SourceHashToOverride: 0
74-
OverridingTargetPrefab: {fileID: 0}
75-
- Override: 0
76-
Prefab: {fileID: 2842198241268549130, guid: 7e3b8103f5622f64fa677352730f295c, type: 3}
77-
SourcePrefabToOverride: {fileID: 0}
78-
SourceHashToOverride: 0
79-
OverridingTargetPrefab: {fileID: 0}
80-
- Override: 0
81-
Prefab: {fileID: 2842198241268549130, guid: 411974b75a8b43d4e9b3c9069a5067fb, type: 3}
82-
SourcePrefabToOverride: {fileID: 0}
83-
SourceHashToOverride: 0
84-
OverridingTargetPrefab: {fileID: 0}
85-
- Override: 0
86-
Prefab: {fileID: 2842198241268549130, guid: 0251e08eeed89e844a8527b3a7874cc2, type: 3}
87-
SourcePrefabToOverride: {fileID: 0}
88-
SourceHashToOverride: 0
89-
OverridingTargetPrefab: {fileID: 0}
90-
- Override: 0
91-
Prefab: {fileID: 176558388678216176, guid: 98fafd094d0c0fa41abe5c3322251839, type: 3}
92-
SourcePrefabToOverride: {fileID: 0}
93-
SourceHashToOverride: 0
94-
OverridingTargetPrefab: {fileID: 0}
95-
- Override: 0
96-
Prefab: {fileID: 3106828016798330210, guid: 5c107a985e30aa2469a62ecf015d43a8, type: 3}
97-
SourcePrefabToOverride: {fileID: 0}
98-
SourceHashToOverride: 0
99-
OverridingTargetPrefab: {fileID: 0}
100-
- Override: 0
101-
Prefab: {fileID: 5473352307376472481, guid: 3e5c32e5766633a4eaf9e7c393418b34, type: 3}
102-
SourcePrefabToOverride: {fileID: 0}
103-
SourceHashToOverride: 0
104-
OverridingTargetPrefab: {fileID: 0}
105-
- Override: 0
106-
Prefab: {fileID: 1583543423304314434, guid: 4c1a321755b60c54099d0402be05fa2e, type: 3}
107-
SourcePrefabToOverride: {fileID: 0}
108-
SourceHashToOverride: 0
109-
OverridingTargetPrefab: {fileID: 0}
54+
Prefabs:
55+
NetworkPrefabsLists:
56+
- {fileID: 11400000, guid: 67e4325119a857f48967fab772faf1d7, type: 2}
11057
TickRate: 30
11158
ClientConnectionBufferTimeout: 5
11259
ConnectionApproval: 1
@@ -122,6 +69,7 @@ MonoBehaviour:
12269
LoadSceneTimeOut: 20
12370
SpawnTimeout: 1
12471
EnableNetworkLogs: 1
72+
OldPrefabList: []
12573
--- !u!114 &8549047561508999566
12674
MonoBehaviour:
12775
m_ObjectHideFlags: 0
@@ -144,7 +92,7 @@ MonoBehaviour:
14492
ConnectionData:
14593
Address: 127.0.0.1
14694
Port: 7777
147-
ServerListenAddress:
95+
ServerListenAddress: 127.0.0.1
14896
DebugSimulator:
14997
PacketDelayMS: 0
15098
PacketJitterMS: 0

‎Assets/Scripts/Infrastructure/NetworkObjectPool.cs

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,13 @@ public void OnValidate()
8686
/// <returns></returns>
8787
public NetworkObject GetNetworkObject(GameObject prefab, Vector3 position, Quaternion rotation)
8888
{
89-
return GetNetworkObjectInternal(prefab, position, rotation);
89+
var networkObject = m_PooledObjects[prefab].Get();
90+
91+
var noTransform = networkObject.transform;
92+
noTransform.position = position;
93+
noTransform.rotation = rotation;
94+
95+
return networkObject;
9096
}
9197

9298
/// <summary>
@@ -141,24 +147,6 @@ void ActionOnDestroy(NetworkObject networkObject)
141147
// Register Netcode Spawn handlers
142148
NetworkManager.Singleton.PrefabHandler.AddHandler(prefab, new PooledPrefabInstanceHandler(prefab, this));
143149
}
144-
145-
/// <summary>
146-
/// This matches the signature of <see cref="NetworkSpawnManager.SpawnHandlerDelegate"/>
147-
/// </summary>
148-
/// <param name="prefab"></param>
149-
/// <param name="position"></param>
150-
/// <param name="rotation"></param>
151-
/// <returns></returns>
152-
NetworkObject GetNetworkObjectInternal(GameObject prefab, Vector3 position, Quaternion rotation)
153-
{
154-
var networkObject = m_PooledObjects[prefab].Get();
155-
156-
var noTransform = networkObject.transform;
157-
noTransform.position = position;
158-
noTransform.rotation = rotation;
159-
160-
return networkObject;
161-
}
162150
}
163151

164152
[Serializable]

‎CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ Additional documentation and release notes are available at [Multiplayer Documen
1515
* Replaced our polling for lobby updates with a subscription to the new Websocket based LobbyEvents (#805). This saves up a significant amount of bandwidth usage to and from the service, since updates are infrequent in this game. Now clients and hosts only use up bandwidth on the Lobby service when it is needed. With polling, we used to send a GET request per client once every 2s. The responses were between ~550 bytes and 900 bytes, so if we suppose an average of 725 bytes and 100 000 concurrent users (CCU), this amounted to around 725B * 30 calls per minute * 100 000 CCU = 2.175 GB per minute. Scaling this to a month would get us 93.96 TB per month. In our case, since the only changes to the lobbies happen when a user connects or disconnects, most of that data was not necessary and can be saved to reduce bandwidth usage. Since the cost of using the Lobby service depends on bandwidth usage, this would also save money on an actual game.
1616
* Simplified reconnection flow by offloading responsibility to ConnectionMethod (#804). Now the ClientReconnectingState uses the ConnectionMethod it is configured with to handle setting up reconnection (i.e. reconnecting to the Lobby before trying to reconnect to the Relay server if it is using Relay and Lobby). It can now also fail early and stop retrying if the lobby doesn't exist anymore.
1717
* Replaced our custom pool implementation using queues with ObjectPool (#824)
18+
* Upgraded Boss Room to NGO 1.3.1 (#828) NetworkPrefabs inside NetworkManager's NetworkPrefabs list have been converted to NetworkPrefabsList ScriptableObject.
19+
* Upgraded Boss Room to NGO 1.4.0 (#829)
1820

1921
### Cleanup
2022
* Clarified a TODO comment inside ClientCharacter, detailing how anticipation should only be executed on owning client players (#786)

‎Packages/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"com.unity.learn.iet-framework": "2.2.2",
1111
"com.unity.memoryprofiler": "0.5.0-preview.1",
1212
"com.unity.multiplayer.tools": "1.1.0",
13-
"com.unity.netcode.gameobjects": "1.2.0",
13+
"com.unity.netcode.gameobjects": "1.4.0",
1414
"com.unity.performance.profile-analyzer": "1.1.1",
1515
"com.unity.postprocessing": "3.2.2",
1616
"com.unity.render-pipelines.universal": "12.1.8",

‎Packages/packages-lock.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,12 +142,12 @@
142142
"url": "https://packages.unity.com"
143143
},
144144
"com.unity.netcode.gameobjects": {
145-
"version": "1.2.0",
145+
"version": "1.4.0",
146146
"depth": 0,
147147
"source": "registry",
148148
"dependencies": {
149149
"com.unity.nuget.mono-cecil": "1.10.1",
150-
"com.unity.transport": "1.3.0"
150+
"com.unity.transport": "1.3.3"
151151
},
152152
"url": "https://packages.unity.com"
153153
},
@@ -373,7 +373,7 @@
373373
"url": "https://packages.unity.com"
374374
},
375375
"com.unity.transport": {
376-
"version": "1.3.0",
376+
"version": "1.3.3",
377377
"depth": 1,
378378
"source": "registry",
379379
"dependencies": {

‎ProjectSettings/NetcodeForGameObjects.settings

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &1
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 61
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 0}
13+
m_Name:
14+
m_EditorClassIdentifier: Unity.Netcode.Editor:Unity.Netcode.Editor.Configuration:NetcodeForGameObjectsProjectSettings
15+
GenerateDefaultNetworkPrefabs: 0

0 commit comments

Comments
 (0)