Marro/PacManUdon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed stuff

Browse Source
This commit is contained in:
Marro64
2025-12-24 21:09:26 +01:00
parent 8e9936274f
commit a251763158
9 changed files with 84 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
Assets/Scripts/GameManager.cs
View File

@@ -499,7 +499,7 @@ namespace Marro.PacManUdon
// I'm not redoing this unless I get instantiatable classes before I wrap up this project.
bool currentlyInTimeSequence;
bool waitingForTimeSequencefinish;
bool waitingForTimeSequenceFinish;
PacManTimeSequence currentTimeSequence;
bool hasTimeSequenceQueued;
private DataList timeSequenceQueue;
@@ -600,11 +600,15 @@ namespace Marro.PacManUdon
{
if (Networking.IsOwner(gameObject))
{
TimeSequenceExecuteFinish();
TimeSequenceExecuteFinalize();
if (!hasTimeSequenceQueued)
{
TimeSequenceExecuteFinished();
}
}
else
{
waitingForTimeSequencefinish = true;
waitingForTimeSequenceFinish = true;
}
}
@@ -657,12 +661,58 @@ namespace Marro.PacManUdon
break;
case PacManTimeSequence.AttractScreenWaitToRestart:
case PacManTimeSequence.WaitForStartTimeout:
// These only have a finished state
// These don't have steps
break;
}
}
private void TimeSequenceExecuteFinish()
private void TimeSequenceExecuteFinalize()
{
// Debug.Log($"{gameObject} Triggered time sequence step for sequence {currentTimeSequence} with progress {sequenceProgress}");
switch (currentTimeSequence)
{
default:
Debug.LogError($"{gameObject} No time sequence finalize known for sequence {currentTimeSequence}");
break;
case PacManTimeSequence.AttractScreenIntroduction:
TimeSequenceFinalizeAttractScreenIntroduction();
break;
case PacManTimeSequence.WaitForStart:
TimeSequenceFinalizeWaitForStart();
break;
case PacManTimeSequence.WaitForStartTimeout:
TimeSequenceFinalizeWaitForStart();
break;
case PacManTimeSequence.StartNewGame:
TimeSequenceFinalizeStartNewGame();
break;
case PacManTimeSequence.StartNewLevel:
TimeSequenceFinalizeStartNewLevel();
break;
case PacManTimeSequence.GhostCaught:
TimeSequenceFinalizeGhostCaught();
break;
case PacManTimeSequence.RestartLevel:
TimeSequenceFinalizeRestartLevel();
break;
case PacManTimeSequence.Intermission2:
TimeSequenceFinalizeIntermission2();
break;
case PacManTimeSequence.Intermission3:
TimeSequenceFinalizeIntermission3();
break;
case PacManTimeSequence.AttractScreenDemo:
case PacManTimeSequence.AttractScreenWaitToRestart:
case PacManTimeSequence.GameOver:
case PacManTimeSequence.Intermission1:
case PacManTimeSequence.PacManCaught:
case PacManTimeSequence.BoardClear:
// These don't have a finalize
break;
}
}
private void TimeSequenceExecuteFinished()
{
// Debug.Log($"{gameObject} Triggered time sequence step for sequence {currentTimeSequence} with progress {sequenceProgress}");
switch (currentTimeSequence)
@@ -679,30 +729,12 @@ namespace Marro.PacManUdon
case PacManTimeSequence.AttractScreenWaitToRestart:
TimeSequenceFinishedAttractScreenWaitToRestart();
break;
case PacManTimeSequence.WaitForStart:
TimeSequenceFinishedWaitForStart();
break;
case PacManTimeSequence.WaitForStartTimeout:
TimeSequenceFinishedWaitForStart();
break;
case PacManTimeSequence.StartNewGame:
TimeSequenceFinishedStartNewGame();
break;
case PacManTimeSequence.BoardClear:
TimeSequenceFinishedBoardClear();
break;
case PacManTimeSequence.StartNewLevel:
TimeSequenceFinishedStartNewLevel();
break;
case PacManTimeSequence.GhostCaught:
TimeSequenceFinishedGhostCaught();
break;
case PacManTimeSequence.PacManCaught:
TimeSequenceFinishedPacManCaught();
break;
case PacManTimeSequence.RestartLevel:
TimeSequenceFinishedRestartLevel();
break;
case PacManTimeSequence.GameOver:
TimeSequenceFinishedGameOver();
break;
@@ -715,6 +747,14 @@ namespace Marro.PacManUdon
case PacManTimeSequence.Intermission3:
TimeSequenceFinishedIntermission3();
break;
case PacManTimeSequence.RestartLevel:
case PacManTimeSequence.StartNewLevel:
case PacManTimeSequence.GhostCaught:
case PacManTimeSequence.WaitForStart:
case PacManTimeSequence.WaitForStartTimeout:
case PacManTimeSequence.StartNewGame:
// These don't have a finished
break;
}
}