Skip to content

Commit f8a9985

Browse files
author
FirstGearGames
committed
4.6.21R
- Fixed MovePosition/Rotation being unintentionally cleared with velocities (#1009, #1010). - Fixed NetworkCollider disposing of rather than pooling some collections, resulting in garbage collection. - Fixed NetworkTrafficStatistics initializing when disabled; this did not result in tracking but did have a neglible runtime performance impact. - Fixed NetworkTransform.GetChanged including non-synchronized properties (#1016). - Fixed missing error log when exceeding NetworkBehaviour limit pet NetworkObject. - Fixed prefab searching being done recursively despite being set not to (#1005 #1015). - Fixed ObserversRpc.BufferLast not handling ExcludeOwner (#985). - Fixed smoothers AttachOnStop not working (#1018). - Improved NetworkTrafficStatics uses TryGetBidirectionalNetworkTraffic rather than assume value is not null. This is to resolve a Unity bug where fields lose value during debug inspection (#1000). - Improved added additional ProfileMarkers to PredictionManager. - Improved NetworkTransform performance marginally (#989). - Improved added ProfileMarkers to ClientManager, ClientObjects/.RpcLinks, NetworkTransform (#989). - Improved Writer.WriteGuidAllocated obsoleted. Allocations have been removed; use WriteGuid instead (@belplaton). - Improved added INetworkConnectionBroadcast interface to allow broadcast mocking (#1007). - Added ManagedObjects.OnSpawnedAdd/Remove/Clear events (#989). - Added Beta Threaded TickSmoothers (contribution by https://github.com/belplaton) - Added Beta Threaded Collider Rollback (contribution by https://github.com/belplaton). - Added ability for NetworkTrafficStatistics to run in headless builds (#1004).
1 parent db0bc2b commit f8a9985

File tree

105 files changed

+7089
-2055
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

+7089
-2055
lines changed

‎Assets/FishNet/CodeGenerating/Unity.FishNet.CodeGen.asmdef‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@
44
"references": [
55
"FishNet.Runtime",
66
"FishNet.Codegen.Cecil",
7-
"GameKit.Dependencies",
8-
"Unity.Burst",
9-
"Unity.Mathematics",
10-
"Unity.Collections"
7+
"GameKit.Dependencies"
118
],
129
"includePlatforms": [
1310
"Editor"

‎Assets/FishNet/Demos/Benchmarks/NetworkTransform/Prefabs/NetworkTransform Benchmark 2D.prefab‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,11 @@ MonoBehaviour:
151151
_initializeOrder: 0
152152
_preventDespawnOnDisconnect: 0
153153
_defaultDespawnType: 0
154-
_initializedTimestamp: -8584382207264223314
154+
_initializedTimestamp: -8584312066425166658
155155
NetworkObserver: {fileID: 0}
156156
_enablePrediction: 0
157157
_predictionType: 0
158+
_localReconcileCorrectionType: 2
158159
_graphicalObject: {fileID: 0}
159160
_detachGraphicalObject: 0
160161
_enableStateForwarding: 1
@@ -166,7 +167,7 @@ MonoBehaviour:
166167
_spectatorInterpolation: 2
167168
_enableTeleport: 0
168169
_teleportThreshold: 1
169-
<PrefabId>k__BackingField: 2
170+
<PrefabId>k__BackingField: 1
170171
<SpawnableCollectionId>k__BackingField: 0
171172
<AssetPathHash>k__BackingField: 4778360394554103146
172173
SceneId: 0

‎Assets/FishNet/Demos/Benchmarks/NetworkTransform/Prefabs/NetworkTransform Benchmark 3D Normal.prefab‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,11 @@ MonoBehaviour:
6666
_initializeOrder: 0
6767
_preventDespawnOnDisconnect: 0
6868
_defaultDespawnType: 0
69-
_initializedTimestamp: -8584382207264223314
69+
_initializedTimestamp: -8584312066425166658
7070
NetworkObserver: {fileID: 0}
7171
_enablePrediction: 0
7272
_predictionType: 0
73+
_localReconcileCorrectionType: 2
7374
_graphicalObject: {fileID: 0}
7475
_detachGraphicalObject: 0
7576
_enableStateForwarding: 1
@@ -81,7 +82,7 @@ MonoBehaviour:
8182
_spectatorInterpolation: 2
8283
_enableTeleport: 0
8384
_teleportThreshold: 1
84-
<PrefabId>k__BackingField: 1
85+
<PrefabId>k__BackingField: 0
8586
<SpawnableCollectionId>k__BackingField: 0
8687
<AssetPathHash>k__BackingField: 2903053101402871766
8788
SceneId: 0

‎Assets/FishNet/Demos/Benchmarks/NetworkTransform/Prefabs/NetworkTransform Benchmark 3D Rigidbodies.prefab‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,10 +236,11 @@ MonoBehaviour:
236236
_initializeOrder: 0
237237
_preventDespawnOnDisconnect: 0
238238
_defaultDespawnType: 0
239-
_initializedTimestamp: -8584382207264223314
239+
_initializedTimestamp: -8584312066425166658
240240
NetworkObserver: {fileID: 0}
241241
_enablePrediction: 0
242242
_predictionType: 0
243+
_localReconcileCorrectionType: 2
243244
_graphicalObject: {fileID: 0}
244245
_detachGraphicalObject: 0
245246
_enableStateForwarding: 1
@@ -251,7 +252,7 @@ MonoBehaviour:
251252
_spectatorInterpolation: 2
252253
_enableTeleport: 0
253254
_teleportThreshold: 1
254-
<PrefabId>k__BackingField: 5
255+
<PrefabId>k__BackingField: 6
255256
<SpawnableCollectionId>k__BackingField: 0
256257
<AssetPathHash>k__BackingField: 8265366384202762268
257258
SceneId: 0

‎Assets/FishNet/Demos/Benchmarks/NetworkTransform/Prefabs/NetworkTransform Benchmark Cubes.prefab‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,11 @@ MonoBehaviour:
6666
_initializeOrder: 0
6767
_preventDespawnOnDisconnect: 0
6868
_defaultDespawnType: 0
69-
_initializedTimestamp: -8584382207264223314
69+
_initializedTimestamp: -8584312066425166658
7070
NetworkObserver: {fileID: 0}
7171
_enablePrediction: 0
7272
_predictionType: 0
73+
_localReconcileCorrectionType: 2
7374
_graphicalObject: {fileID: 0}
7475
_detachGraphicalObject: 0
7576
_enableStateForwarding: 1
@@ -81,7 +82,7 @@ MonoBehaviour:
8182
_spectatorInterpolation: 2
8283
_enableTeleport: 0
8384
_teleportThreshold: 1
84-
<PrefabId>k__BackingField: 12
85+
<PrefabId>k__BackingField: 14
8586
<SpawnableCollectionId>k__BackingField: 0
8687
<AssetPathHash>k__BackingField: 17307177893486029436
8788
SceneId: 0

‎Assets/FishNet/Demos/Benchmarks/NetworkTransform/Prefabs/NetworkTransform Benchmark Rigidbodies.prefab‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,11 @@ MonoBehaviour:
6767
_initializeOrder: 0
6868
_preventDespawnOnDisconnect: 0
6969
_defaultDespawnType: 0
70-
_initializedTimestamp: -8584382207264223314
70+
_initializedTimestamp: -8584312066425166658
7171
NetworkObserver: {fileID: 0}
7272
_enablePrediction: 0
7373
_predictionType: 0
74+
_localReconcileCorrectionType: 2
7475
_graphicalObject: {fileID: 0}
7576
_detachGraphicalObject: 0
7677
_enableStateForwarding: 1
@@ -82,7 +83,7 @@ MonoBehaviour:
8283
_spectatorInterpolation: 2
8384
_enableTeleport: 0
8485
_teleportThreshold: 1
85-
<PrefabId>k__BackingField: 8
86+
<PrefabId>k__BackingField: 11
8687
<SpawnableCollectionId>k__BackingField: 0
8788
<AssetPathHash>k__BackingField: 13441272123366128544
8889
SceneId: 0

‎Assets/FishNet/Demos/ColliderRollback/Prefabs/Player.prefab‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,11 @@ MonoBehaviour:
6868
_initializeOrder: 0
6969
_preventDespawnOnDisconnect: 0
7070
_defaultDespawnType: 0
71-
_initializedTimestamp: -8584382207264223314
71+
_initializedTimestamp: -8584312066425166658
7272
NetworkObserver: {fileID: 0}
7373
_enablePrediction: 0
7474
_predictionType: 0
75+
_localReconcileCorrectionType: 2
7576
_graphicalObject: {fileID: 0}
7677
_detachGraphicalObject: 0
7778
_enableStateForwarding: 1
@@ -83,7 +84,7 @@ MonoBehaviour:
8384
_spectatorInterpolation: 1
8485
_enableTeleport: 0
8586
_teleportThreshold: 1
86-
<PrefabId>k__BackingField: 4
87+
<PrefabId>k__BackingField: 5
8788
<SpawnableCollectionId>k__BackingField: 0
8889
<AssetPathHash>k__BackingField: 7357667251099481026
8990
SceneId: 0

‎Assets/FishNet/Demos/HashGrid/Prefabs/HashGrid_Moving.prefab‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,11 @@ MonoBehaviour:
150150
_initializeOrder: 0
151151
_preventDespawnOnDisconnect: 0
152152
_defaultDespawnType: 0
153-
_initializedTimestamp: -8584382207264223314
153+
_initializedTimestamp: -8584312066425166658
154154
NetworkObserver: {fileID: 0}
155155
_enablePrediction: 0
156156
_predictionType: 0
157+
_localReconcileCorrectionType: 2
157158
_graphicalObject: {fileID: 0}
158159
_detachGraphicalObject: 0
159160
_enableStateForwarding: 1
@@ -165,7 +166,7 @@ MonoBehaviour:
165166
_spectatorInterpolation: 2
166167
_enableTeleport: 0
167168
_teleportThreshold: 1
168-
<PrefabId>k__BackingField: 10
169+
<PrefabId>k__BackingField: 12
169170
<SpawnableCollectionId>k__BackingField: 0
170171
<AssetPathHash>k__BackingField: 15851448279207409322
171172
SceneId: 0

‎Assets/FishNet/Demos/HashGrid/Prefabs/HashGrid_Static.prefab‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,11 @@ MonoBehaviour:
148148
_initializeOrder: 0
149149
_preventDespawnOnDisconnect: 0
150150
_defaultDespawnType: 0
151-
_initializedTimestamp: -8584382207264223314
151+
_initializedTimestamp: -8584312066425166658
152152
NetworkObserver: {fileID: 0}
153153
_enablePrediction: 0
154154
_predictionType: 0
155+
_localReconcileCorrectionType: 2
155156
_graphicalObject: {fileID: 0}
156157
_detachGraphicalObject: 0
157158
_enableStateForwarding: 1

‎Assets/FishNet/Demos/Prediction/CharacterController/CharacterController Prediction Demo.unity‎

Lines changed: 6 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ GameObject:
140140
m_Icon: {fileID: 0}
141141
m_NavMeshLayer: 0
142142
m_StaticEditorFlags: 0
143-
m_IsActive: 1
143+
m_IsActive: 0
144144
--- !u!4 &33715565
145145
Transform:
146146
m_ObjectHideFlags: 0
@@ -171,7 +171,7 @@ MonoBehaviour:
171171
m_Name:
172172
m_EditorClassIdentifier:
173173
<IsNested>k__BackingField: 0
174-
WasActiveDuringEdit: 1
174+
WasActiveDuringEdit: 0
175175
WasActiveDuringEdit_Set1: 1
176176
<ComponentIndex>k__BackingField: 0
177177
<PredictedSpawn>k__BackingField: {fileID: 0}
@@ -258,7 +258,7 @@ GameObject:
258258
m_Icon: {fileID: 0}
259259
m_NavMeshLayer: 0
260260
m_StaticEditorFlags: 0
261-
m_IsActive: 1
261+
m_IsActive: 0
262262
--- !u!4 &128315957
263263
Transform:
264264
m_ObjectHideFlags: 0
@@ -342,24 +342,9 @@ MonoBehaviour:
342342
_timingType: 0
343343
_allowTickDropping: 0
344344
_maximumFrameTicks: 2
345-
_tickRate: 30
345+
_tickRate: 60
346346
_pingInterval: 1
347347
_physicsMode: 1
348-
--- !u!114 &192429406
349-
MonoBehaviour:
350-
m_ObjectHideFlags: 0
351-
m_CorrespondingSourceObject: {fileID: 0}
352-
m_PrefabInstance: {fileID: 0}
353-
m_PrefabAsset: {fileID: 0}
354-
m_GameObject: {fileID: 7443408886491487334}
355-
m_Enabled: 1
356-
m_EditorHideFlags: 0
357-
m_Script: {fileID: 11500000, guid: f9b6b565cd9533c4ebc18003f0fc18a2, type: 3}
358-
m_Name:
359-
m_EditorClassIdentifier:
360-
_color: {r: 1, g: 1, b: 1, a: 1}
361-
_placement: 1
362-
_hideTickRate: 1
363348
--- !u!114 &192429409
364349
MonoBehaviour:
365350
m_ObjectHideFlags: 0
@@ -489,6 +474,7 @@ MonoBehaviour:
489474
InterpolationValue: 2
490475
SmoothedProperties: 4294967295
491476
SnapNonSmoothedProperties: 0
477+
_favorPredictionNetworkTransform: 1
492478
_spectatorMovementSettings:
493479
EnableTeleport: 0
494480
TeleportThreshold: 0
@@ -1013,6 +999,7 @@ MonoBehaviour:
1013999
InterpolationValue: 2
10141000
SmoothedProperties: 4294967295
10151001
SnapNonSmoothedProperties: 0
1002+
_favorPredictionNetworkTransform: 1
10161003
_spectatorMovementSettings:
10171004
EnableTeleport: 0
10181005
TeleportThreshold: 0
@@ -1718,10 +1705,7 @@ GameObject:
17181705
- component: {fileID: 7443408886491487335}
17191706
- component: {fileID: 192429409}
17201707
- component: {fileID: 192429404}
1721-
- component: {fileID: 192429406}
17221708
- component: {fileID: 7443408886491487336}
1723-
- component: {fileID: 7443408886491487337}
1724-
- component: {fileID: 7443408886491487338}
17251709
- component: {fileID: 7443408886491487339}
17261710
m_Layer: 0
17271711
m_Name: NetworkManager
@@ -1764,42 +1748,6 @@ MonoBehaviour:
17641748
_playerPrefab: {fileID: 201277550, guid: 5b712878ecece354ba4ffb026c0a221c, type: 3}
17651749
_addToDefaultScene: 1
17661750
Spawns: []
1767-
--- !u!114 &7443408886491487337
1768-
MonoBehaviour:
1769-
m_ObjectHideFlags: 0
1770-
m_CorrespondingSourceObject: {fileID: 0}
1771-
m_PrefabInstance: {fileID: 0}
1772-
m_PrefabAsset: {fileID: 0}
1773-
m_GameObject: {fileID: 7443408886491487334}
1774-
m_Enabled: 1
1775-
m_EditorHideFlags: 0
1776-
m_Script: {fileID: 11500000, guid: 8bc8f0363ddc75946a958043c5e49a83, type: 3}
1777-
m_Name:
1778-
m_EditorClassIdentifier:
1779-
_runInRelease: 0
1780-
_secondsAveraged: 1
1781-
_updateInterval: 1
1782-
_color: {r: 0, g: 0, b: 0, a: 1}
1783-
_placement: 2
1784-
_showOutgoing: 1
1785-
_showIncoming: 1
1786-
--- !u!114 &7443408886491487338
1787-
MonoBehaviour:
1788-
m_ObjectHideFlags: 0
1789-
m_CorrespondingSourceObject: {fileID: 0}
1790-
m_PrefabInstance: {fileID: 0}
1791-
m_PrefabAsset: {fileID: 0}
1792-
m_GameObject: {fileID: 7443408886491487334}
1793-
m_Enabled: 1
1794-
m_EditorHideFlags: 0
1795-
m_Script: {fileID: 11500000, guid: 756c28cd3141c4140ae776188ee26729, type: 3}
1796-
m_Name:
1797-
m_EditorClassIdentifier:
1798-
_runInRelease: 0
1799-
_networkTraffic:
1800-
_enableMode: 0
1801-
_updateClient: 0
1802-
_updateServer: 0
18031751
--- !u!114 &7443408886491487339
18041752
MonoBehaviour:
18051753
m_ObjectHideFlags: 0

0 commit comments

Comments
 (0)