This commit is contained in:
2026-06-11 12:05:12 +02:00
parent e7968a5753
commit e75452b145
4 changed files with 36 additions and 8 deletions

View File

@@ -423,16 +423,16 @@ namespace Marro.PacManUdon
if (eventType == NetworkEventType.TimeSequenceSync) if (eventType == NetworkEventType.TimeSequenceSync)
{ {
var currentlyInTimeSequence = data.ReadBool(ref index); var currentlyInTimeSequence = data.ReadBool(ref index);
if (!currentlyInTimeSequence) if (currentlyInTimeSequence)
{
TimeSequenceTryEndCurrent();
}
else
{ {
var currentTimeSequence = (PacManTimeSequence)data.ReadByte(ref index); var currentTimeSequence = (PacManTimeSequence)data.ReadByte(ref index);
var timeSequenceSecondsPassed = data.ReadFloat(ref index); var timeSequenceSecondsPassed = data.ReadFloat(ref index);
TimeSequenceSyncWithRemote(currentTimeSequence, timeSequenceSecondsPassed); TimeSequenceSyncWithRemote(currentTimeSequence, timeSequenceSecondsPassed);
} }
else
{
TimeSequenceTryEndCurrent();
}
} }
//SetGameState((PacManGameState)data[offset++]); //SetGameState((PacManGameState)data[offset++]);

View File

@@ -36,6 +36,11 @@ namespace Marro.PacManUdon
data.Append(GetDirection(), ref index); data.Append(GetDirection(), ref index);
} }
public void PadSyncedData(byte[] data, ref int index, NetworkEventType eventType)
{
index += 16;
}
public override bool WriteSyncedData(byte[] data, ref int index, NetworkEventType eventType) public override bool WriteSyncedData(byte[] data, ref int index, NetworkEventType eventType)
{ {
SetPosition(data.ReadVector2(ref index)); SetPosition(data.ReadVector2(ref index));
@@ -43,5 +48,12 @@ namespace Marro.PacManUdon
return true; return true;
} }
public bool ConsumeSyncedData(byte[] data, ref int index, NetworkEventType eventType)
{
index += 16;
return true;
}
} }
} }

View File

@@ -340,11 +340,18 @@ namespace Marro.PacManUdon
public override void CollectSyncedData(byte[] data, ref int index, NetworkEventType eventType) public override void CollectSyncedData(byte[] data, ref int index, NetworkEventType eventType)
{ {
if (eventType != NetworkEventType.PacManTurn || kinematic || frozen || !enabled) if (eventType != NetworkEventType.PacManTurn)
{ {
return; return;
} }
if (kinematic || frozen || !enabled)
{
index += 8;
base.PadSyncedData(data, ref index, eventType);
return;
}
data.Append(targetDirection, ref index); data.Append(targetDirection, ref index);
base.CollectSyncedData(data, ref index, eventType); base.CollectSyncedData(data, ref index, eventType);
@@ -352,11 +359,17 @@ namespace Marro.PacManUdon
public override bool WriteSyncedData(byte[] data, ref int index, NetworkEventType eventType) public override bool WriteSyncedData(byte[] data, ref int index, NetworkEventType eventType)
{ {
if (eventType != NetworkEventType.PacManTurn || kinematic || frozen || !enabled) if (eventType != NetworkEventType.PacManTurn)
{ {
return true; return true;
} }
if (kinematic || frozen || !enabled)
{
index += 8;
base.ConsumeSyncedData(data, ref index, eventType);
}
SetTargetDirection(data.ReadVector2(ref index)); SetTargetDirection(data.ReadVector2(ref index));
return base.WriteSyncedData(data, ref index, eventType); return base.WriteSyncedData(data, ref index, eventType);

View File

@@ -18,7 +18,10 @@ public class NetworkManagerTester : UdonSharpBehaviour
foreach (var networkManager in networkManagers) foreach (var networkManager in networkManagers)
{ {
networkManager.SetNetworkManagerTester(this); networkManager.SetNetworkManagerTester(this);
networkManager.Reset(); if (networkManager.Ready)
{
networkManager.Reset();
}
} }
} }