From 961871652379331afcfa057e32412aee8c3b2e53 Mon Sep 17 00:00:00 2001 From: Acid Bubbles Date: Mon, 30 Aug 2021 16:33:42 -0400 Subject: [PATCH] Trigger should use GetJSON/RestoreFromJSON with arguments --- src/AtomAnimations/Animatables/Triggers/CustomTrigger.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/AtomAnimations/Animatables/Triggers/CustomTrigger.cs b/src/AtomAnimations/Animatables/Triggers/CustomTrigger.cs index ce88fb67..c6ccf631 100644 --- a/src/AtomAnimations/Animatables/Triggers/CustomTrigger.cs +++ b/src/AtomAnimations/Animatables/Triggers/CustomTrigger.cs @@ -37,7 +37,7 @@ public void Leave() #region JSON - public override JSONClass GetJSON() + public override JSONClass GetJSON(string subScenePrefix = null) { var jSON = base.GetJSON(); jSON["startTime"].AsFloat = startTime; @@ -45,9 +45,9 @@ public override JSONClass GetJSON() return jSON; } - public override void RestoreFromJSON(JSONClass jc) + public override void RestoreFromJSON(JSONClass jc, string subScenePrefix, bool isMerge) { - base.RestoreFromJSON(jc); + base.RestoreFromJSON(jc, subScenePrefix, isMerge); if (jc["startTime"] != null) startTime = jc["startTime"].AsFloat; if (jc["endTime"] != null)