Skip to content

Commit 5b991d2

Browse files
author
FirstGearGames
committed
4.6.13
- Fixed scenes unloading on host when other clients were still loading the scene. - Fixed NetworkTransform incorrectly marking very small movements as sent #930. - Fixed NetworkTrafficStatistics NullReferenceException affecting users perhaps with invalid Library caches #963. - Fixed predicted spawning Ids being added twice for clientHost #933. - Fixed IsKinematic not being applied from RigidbodyState/2D #960 - Fixed codegen failing prediction method generation related to assembly definitions #962. - Fixed space introduced within links in commented code #964. - Added PredictionManager.ReduceReconcilesWithFramerate. - Added PredictoinManager.MinimumClientReconcileFramerate. - Added detection for duplicate DefaultPrefabObject collections. - Added implicit operator for NetworkBahviour to NetworkObjet #967.
1 parent 393a1e4 commit 5b991d2

File tree

42 files changed

+1019
-386
lines changed

Some content is hidden

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

42 files changed

+1019
-386
lines changed

‎Assets/FishNet/CodeGenerating/Helpers/GeneralHelper.cs‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -692,7 +692,7 @@ public bool HasNonSerializableAttribute(FieldDefinition fieldDef)
692692
// Fall through, no matches.
693693
return false;
694694
}
695-
695+
696696
/// <summary>
697697
/// Returns if fieldDef has a NonSerialized attribute.
698698
/// </summary>
@@ -1258,29 +1258,33 @@ void CreateClassOrStructComparer()
12581258
foreach (FieldDefinition fieldDef in dataTr.FindAllSerializableFields(Session, null, WriterProcessor.EXCLUDED_ASSEMBLY_PREFIXES))
12591259
{
12601260
FieldReference fr = ImportReference(fieldDef);
1261-
TypeReference fieldTypeRef = ImportReference( fieldDef.FieldType );
1261+
TypeReference fieldTypeRef = ImportReference(fieldDef.FieldType);
12621262
MethodDefinition recursiveMd = CreateEqualityComparer(fieldTypeRef);
1263+
12631264
if (recursiveMd == null)
12641265
break;
1266+
12651267
processor.Append(GetLoadParameterInstruction(comparerMd, v0Pd));
12661268
processor.Emit(OpCodes.Ldfld, fr);
12671269
processor.Append(GetLoadParameterInstruction(comparerMd, v1Pd));
12681270
processor.Emit(OpCodes.Ldfld, fr);
1269-
FinishTypeReferenceCompare( fieldTypeRef );
1271+
FinishTypeReferenceCompare(fieldTypeRef);
12701272
}
12711273

12721274
// Properties.
12731275
foreach (PropertyDefinition propertyDef in dataTr.FindAllSerializableProperties(Session, null, WriterProcessor.EXCLUDED_ASSEMBLY_PREFIXES))
12741276
{
12751277
MethodReference getMr = Module.ImportReference(propertyDef.GetMethod);
1276-
MethodDefinition recursiveMd = CreateEqualityComparer( ImportReference( getMr.ReturnType ) );
1278+
MethodDefinition recursiveMd = CreateEqualityComparer(ImportReference(getMr.ReturnType));
1279+
12771280
if (recursiveMd == null)
12781281
break;
1282+
12791283
processor.Append(GetLoadParameterInstruction(comparerMd, v0Pd));
12801284
processor.Emit(OpCodes.Call, getMr);
12811285
processor.Append(GetLoadParameterInstruction(comparerMd, v1Pd));
12821286
processor.Emit(OpCodes.Call, getMr);
1283-
FinishTypeReferenceCompare( ImportReference( propertyDef.PropertyType ) );
1287+
FinishTypeReferenceCompare(ImportReference(propertyDef.PropertyType));
12841288
}
12851289

12861290
// Return true;

‎Assets/FishNet/CodeGenerating/Processing/Prediction/PredictionProcessor.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -713,7 +713,7 @@ bool CreateReplicate()
713713
{
714714
ILProcessor processor = replicateMd.Body.GetILProcessor();
715715
ParameterDefinition replicateDataPd = replicateMd.Parameters[0];
716-
replicateDataPd.ParameterType = Module.ImportReference( replicateDataPd.ParameterType );
716+
replicateDataPd.ParameterType = Module.ImportReference(replicateDataPd.ParameterType);
717717
MethodDefinition comparerMd = gh.CreateEqualityComparer(replicateDataPd.ParameterType);
718718
gh.CreateIsDefaultComparer(replicateDataPd.ParameterType, comparerMd);
719719

@@ -1008,7 +1008,7 @@ private bool CreateReplicateReader(TypeDefinition typeDef, uint hash, MethodDefi
10081008
private void ServerCreateReconcile(MethodDefinition reconcileMd, CreatedPredictionFields predictionFields, ref uint rpcCount)
10091009
{
10101010
ParameterDefinition reconcileDataPd = reconcileMd.Parameters[0];
1011-
reconcileDataPd.ParameterType = Module.ImportReference( reconcileDataPd.ParameterType );
1011+
reconcileDataPd.ParameterType = Module.ImportReference(reconcileDataPd.ParameterType);
10121012
ParameterDefinition channelPd = reconcileMd.Parameters[1];
10131013
ILProcessor processor = reconcileMd.Body.GetILProcessor();
10141014

‎Assets/FishNet/CodeGenerating/Processing/Rpc/RpcProcessor.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -854,6 +854,8 @@ private MethodDefinition CreateRpcLogicMethod(List<AttributeData> datas, Created
854854
TypeDefinition typeDef = cr.TypeDef;
855855
MethodDefinition originalMd = cr.OriginalMethodDef;
856856

857+
858+
857859
//Methodname for logic methods do not use prefixes because there can be only one.
858860
string methodName = $"{LOGIC_PREFIX}{GetMethodNameAsParameters(originalMd)}";
859861

@@ -966,6 +968,8 @@ private void RedirectOriginalToWriter(List<CreatedRpc> createdRpcs)
966968
* entry. */
967969
MethodDefinition originalMd = createdRpcs[0].OriginalMethodDef;
968970

971+
972+
969973
ILProcessor processor = originalMd.Body.GetILProcessor();
970974
originalMd.Body.Instructions.Clear();
971975

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ MonoBehaviour:
167167
_teleportThreshold: 1
168168
<PrefabId>k__BackingField: 12
169169
<SpawnableCollectionId>k__BackingField: 0
170-
<AssetPathHash>k__BackingField: 5448584063611559504
170+
<AssetPathHash>k__BackingField: 4778360394554103146
171171
<SceneId>k__BackingField: 0
172172
SerializedTransformProperties:
173173
Position: {x: 0, y: 0, z: 0}
@@ -195,6 +195,8 @@ MonoBehaviour:
195195
_axes: 2
196196
_chancePerAxes: 0.5
197197
_rotationChance: 1
198+
_delayBetweenMovements: 1.5
199+
_yOffsetPerInstance: 0
198200
_randomMovement: 1
199201
_goalDatas: []
200202
_moveInUpdate: 0
@@ -230,6 +232,7 @@ MonoBehaviour:
230232
_sendToOwner: 1
231233
_interval: 1
232234
_synchronizePosition: 1
235+
_positionSensitivity: 0.001
233236
_positionSnapping:
234237
X: 0
235238
Y: 0
@@ -240,6 +243,7 @@ MonoBehaviour:
240243
Y: 1
241244
Z: 1
242245
_synchronizeScale: 0
246+
_scaleSensitivity: 0.001
243247
_scaleSnapping:
244248
X: 0
245249
Y: 0

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ MonoBehaviour:
8282
_teleportThreshold: 1
8383
<PrefabId>k__BackingField: 31
8484
<SpawnableCollectionId>k__BackingField: 0
85-
<AssetPathHash>k__BackingField: 12758516177287752350
85+
<AssetPathHash>k__BackingField: 2903053101402871766
8686
<SceneId>k__BackingField: 0
8787
SerializedTransformProperties:
8888
Position: {x: 0, y: 0, z: 0}
@@ -110,6 +110,8 @@ MonoBehaviour:
110110
_axes: 3
111111
_chancePerAxes: 0.8
112112
_rotationChance: 0.33
113+
_delayBetweenMovements: 1.5
114+
_yOffsetPerInstance: 0
113115
_randomMovement: 1
114116
_goalDatas: []
115117
_moveInUpdate: 0
@@ -145,6 +147,7 @@ MonoBehaviour:
145147
_sendToOwner: 1
146148
_interval: 1
147149
_synchronizePosition: 1
150+
_positionSensitivity: 0.001
148151
_positionSnapping:
149152
X: 0
150153
Y: 0
@@ -155,6 +158,7 @@ MonoBehaviour:
155158
Y: 0
156159
Z: 0
157160
_synchronizeScale: 0
161+
_scaleSensitivity: 0.001
158162
_scaleSnapping:
159163
X: 0
160164
Y: 0

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ MonoBehaviour:
252252
_teleportThreshold: 1
253253
<PrefabId>k__BackingField: 17
254254
<SpawnableCollectionId>k__BackingField: 0
255-
<AssetPathHash>k__BackingField: 6471616483407953140
255+
<AssetPathHash>k__BackingField: 8265366384202762268
256256
<SceneId>k__BackingField: 0
257257
SerializedTransformProperties:
258258
Position: {x: 0, y: 0, z: 0}
@@ -309,6 +309,7 @@ MonoBehaviour:
309309
_sendToOwner: 1
310310
_interval: 1
311311
_synchronizePosition: 1
312+
_positionSensitivity: 0.001
312313
_positionSnapping:
313314
X: 0
314315
Y: 0
@@ -319,6 +320,7 @@ MonoBehaviour:
319320
Y: 0
320321
Z: 0
321322
_synchronizeScale: 0
323+
_scaleSensitivity: 0.001
322324
_scaleSnapping:
323325
X: 0
324326
Y: 0

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ MonoBehaviour:
8282
_teleportThreshold: 1
8383
<PrefabId>k__BackingField: 36
8484
<SpawnableCollectionId>k__BackingField: 0
85-
<AssetPathHash>k__BackingField: 15845183709739124870
85+
<AssetPathHash>k__BackingField: 17307177893486029436
8686
<SceneId>k__BackingField: 0
8787
SerializedTransformProperties:
8888
Position: {x: 0, y: 0, z: 0}
@@ -110,6 +110,8 @@ MonoBehaviour:
110110
_axes: 3
111111
_chancePerAxes: 0.8
112112
_rotationChance: 0.33
113+
_delayBetweenMovements: 1.5
114+
_yOffsetPerInstance: 0
113115
_randomMovement: 1
114116
_goalDatas: []
115117
_moveInUpdate: 0
@@ -145,6 +147,7 @@ MonoBehaviour:
145147
_sendToOwner: 1
146148
_interval: 1
147149
_synchronizePosition: 1
150+
_positionSensitivity: 0.001
148151
_positionSnapping:
149152
X: 0
150153
Y: 0
@@ -155,6 +158,7 @@ MonoBehaviour:
155158
Y: 0
156159
Z: 0
157160
_synchronizeScale: 0
161+
_scaleSensitivity: 0.001
158162
_scaleSnapping:
159163
X: 0
160164
Y: 0

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ MonoBehaviour:
8383
_teleportThreshold: 1
8484
<PrefabId>k__BackingField: 35
8585
<SpawnableCollectionId>k__BackingField: 0
86-
<AssetPathHash>k__BackingField: 15013615375196309252
86+
<AssetPathHash>k__BackingField: 13441272123366128544
8787
<SceneId>k__BackingField: 0
8888
SerializedTransformProperties:
8989
Position: {x: 0, y: 0, z: 0}
@@ -140,6 +140,7 @@ MonoBehaviour:
140140
_sendToOwner: 1
141141
_interval: 1
142142
_synchronizePosition: 1
143+
_positionSensitivity: 0.001
143144
_positionSnapping:
144145
X: 0
145146
Y: 0
@@ -150,6 +151,7 @@ MonoBehaviour:
150151
Y: 0
151152
Z: 0
152153
_synchronizeScale: 0
154+
_scaleSensitivity: 0.001
153155
_scaleSnapping:
154156
X: 0
155157
Y: 0

‎Assets/FishNet/Demos/Benchmarks/NetworkTransform/Scenes/NetworkTransform Benchmark.unity‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1275,6 +1275,7 @@ MonoBehaviour:
12751275
m_EditorClassIdentifier:
12761276
_runInRelease: 0
12771277
_networkTraffic:
1278+
_enableMode: 0
12781279
_updateClient: 1
12791280
_updateServer: 1
12801281
--- !u!114 &7443408886575219566
@@ -1315,6 +1316,6 @@ MonoBehaviour:
13151316
m_Script: {fileID: 11500000, guid: 211a9f6ec51ddc14f908f5acc0cd0423, type: 3}
13161317
m_Name:
13171318
m_EditorClassIdentifier:
1318-
_playerPrefab: {fileID: 4512293259955182956, guid: 7d413700c8c3cec4a99fad3b66e4575e, type: 3}
1319+
_playerPrefab: {fileID: 8576064167479792142, guid: 5dcd0d2279e5288498af3782c92e66cf, type: 3}
13191320
_addToDefaultScene: 1
13201321
Spawns: []

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ MonoBehaviour:
8484
_teleportThreshold: 1
8585
<PrefabId>k__BackingField: 19
8686
<SpawnableCollectionId>k__BackingField: 0
87-
<AssetPathHash>k__BackingField: 7473726319608011331
87+
<AssetPathHash>k__BackingField: 7357667251099481026
8888
<SceneId>k__BackingField: 0
8989
SerializedTransformProperties:
9090
Position: {x: 0, y: 2, z: -2}

0 commit comments

Comments
 (0)