diff --git a/Assets/Scripts/Games/TossBoys/TossBoys.cs b/Assets/Scripts/Games/TossBoys/TossBoys.cs index 4a77582d..fe5c003a 100644 --- a/Assets/Scripts/Games/TossBoys/TossBoys.cs +++ b/Assets/Scripts/Games/TossBoys/TossBoys.cs @@ -466,8 +466,15 @@ namespace HeavenStudio.Games if (passBallDict.TryGetValue(beat + lastLength, out var e)) { if (e.datamodel == "tossBoys/pop") return; - curReceiver = e["who"]; blurSet = e.datamodel == "tossBoys/blur"; + if (blurSet) + { + curReceiver = (int)WhichTossKid.None; + } + else + { + curReceiver = e["who"]; + } currentLength = e.length; nextIsSpecial = IsSpecialEvent(e.datamodel); eventDatamodel = e.datamodel; diff --git a/Assets/Scripts/Util/BeatAction.cs b/Assets/Scripts/Util/BeatAction.cs index d9d75c7b..2c6ef034 100644 --- a/Assets/Scripts/Util/BeatAction.cs +++ b/Assets/Scripts/Util/BeatAction.cs @@ -58,7 +58,14 @@ namespace HeavenStudio.Util if (behaviour == null || !(conductor.isPlaying || conductor.isPaused)) return; - actions[idx].function.Invoke(); + try + { + actions[idx].function.Invoke(); + } + catch (System.Exception e) + { + Debug.LogError($"Exception thrown while executing BeatAction: {e}"); + } idx++; } } diff --git a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset index bba5cd3c..3b88676c 100644 --- a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset +++ b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset @@ -35,5 +35,7 @@ MonoBehaviour: - Assets/Scripts/Games/KarateMan/KarateMan.cs - Assets/Scripts/Games/KarateMan/KarateManJoe.cs - Assets/Scripts/Games/KarateMan/KarateManNoriController.cs + - Assets/Scripts/Util/BeatAction.cs + - Assets/Scripts/Games/TossBoys/TossBoys.cs PathsToSkipImportEvent: [] PathsToIgnoreOverwriteSettingOnAttribute: []