fix weird edge case in toss boys autodispense

let beataction throw exceptions
This commit is contained in:
minenice55 2024-01-21 00:15:06 -05:00
parent 5b6b6b0e46
commit 8388a87cd7
3 changed files with 18 additions and 2 deletions

View file

@ -466,8 +466,15 @@ namespace HeavenStudio.Games
if (passBallDict.TryGetValue(beat + lastLength, out var e)) if (passBallDict.TryGetValue(beat + lastLength, out var e))
{ {
if (e.datamodel == "tossBoys/pop") return; if (e.datamodel == "tossBoys/pop") return;
curReceiver = e["who"];
blurSet = e.datamodel == "tossBoys/blur"; blurSet = e.datamodel == "tossBoys/blur";
if (blurSet)
{
curReceiver = (int)WhichTossKid.None;
}
else
{
curReceiver = e["who"];
}
currentLength = e.length; currentLength = e.length;
nextIsSpecial = IsSpecialEvent(e.datamodel); nextIsSpecial = IsSpecialEvent(e.datamodel);
eventDatamodel = e.datamodel; eventDatamodel = e.datamodel;

View file

@ -58,7 +58,14 @@ namespace HeavenStudio.Util
if (behaviour == null || !(conductor.isPlaying || conductor.isPaused)) if (behaviour == null || !(conductor.isPlaying || conductor.isPaused))
return; return;
try
{
actions[idx].function.Invoke(); actions[idx].function.Invoke();
}
catch (System.Exception e)
{
Debug.LogError($"Exception thrown while executing BeatAction: {e}");
}
idx++; idx++;
} }
} }

View file

@ -35,5 +35,7 @@ MonoBehaviour:
- Assets/Scripts/Games/KarateMan/KarateMan.cs - Assets/Scripts/Games/KarateMan/KarateMan.cs
- Assets/Scripts/Games/KarateMan/KarateManJoe.cs - Assets/Scripts/Games/KarateMan/KarateManJoe.cs
- Assets/Scripts/Games/KarateMan/KarateManNoriController.cs - Assets/Scripts/Games/KarateMan/KarateManNoriController.cs
- Assets/Scripts/Util/BeatAction.cs
- Assets/Scripts/Games/TossBoys/TossBoys.cs
PathsToSkipImportEvent: [] PathsToSkipImportEvent: []
PathsToIgnoreOverwriteSettingOnAttribute: [] PathsToIgnoreOverwriteSettingOnAttribute: []