Skip to content

Commit 9e0f128

Browse files
Merge branch 'develop-2.0.0' into fix/distributed-authority-client-synchronization-updates
2 parents bf01a43 + 8f2981b commit 9e0f128

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

com.unity.netcode.gameobjects/Tests/Runtime/Timing/NetworkTimeSystemTests.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public IEnumerator PlayerLoopTimeTest_WithDifferentTimeScale([Values(0.0f, 0.1f,
6262
public IEnumerator CorrectAmountTicksTest()
6363
{
6464
NetworkTickSystem tickSystem = NetworkManager.Singleton.NetworkTickSystem;
65-
float delta = tickSystem.LocalTime.FixedDeltaTime;
65+
double delta = tickSystem.LocalTime.FixedDeltaTimeAsDouble;
6666
int previous_localTickCalculated = 0;
6767
int previous_serverTickCalculated = 0;
6868

@@ -79,7 +79,6 @@ public IEnumerator CorrectAmountTicksTest()
7979
previous_localTickCalculated++;
8080
}
8181

82-
8382
tickCalculated = NetworkManager.Singleton.ServerTime.Time / delta;
8483
previous_serverTickCalculated = (int)tickCalculated;
8584

com.unity.netcode.gameobjects/Tests/Runtime/Timing/TimeInitializationTest.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,11 @@ public IEnumerator TestClientTimeInitializationOnConnect([Values(0, 1f)] float s
4242
yield return new WaitUntil(() => server.NetworkTickSystem.ServerTime.Tick > 2);
4343

4444
var serverTimePassed = server.NetworkTickSystem.ServerTime.Time;
45-
var expectedServerTickCount = Mathf.FloorToInt((float)(serverTimePassed * 30));
4645

46+
// Use FixedDeltaTimeAsDouble and divide the tick frequency into the time passed to get the accurate tick count
47+
var expectedServerTickCount = (int)System.Math.Floor(serverTimePassed / server.ServerTime.FixedDeltaTimeAsDouble);
4748
var ticksPassed = server.NetworkTickSystem.ServerTime.Tick - serverTick;
48-
Assert.AreEqual(expectedServerTickCount, ticksPassed);
49+
Assert.AreEqual(expectedServerTickCount, ticksPassed, $"Calculated tick failed: Tick ({expectedServerTickCount}) TicksPassed ({ticksPassed}) Server Tick ({server.NetworkTickSystem.ServerTime.Tick}) Prev-Server Tick ({serverTick})");
4950

5051
yield return new WaitForSeconds(clientStartDelay);
5152

0 commit comments

Comments
 (0)