Skip to content

Commit

Permalink
Trigger should use GetJSON/RestoreFromJSON with arguments
Browse files Browse the repository at this point in the history
  • Loading branch information
acidbubbles committed Aug 30, 2021
1 parent b05f652 commit 9618716
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/AtomAnimations/Animatables/Triggers/CustomTrigger.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,17 @@ public void Leave()

#region JSON

public override JSONClass GetJSON()
public override JSONClass GetJSON(string subScenePrefix = null)
{
var jSON = base.GetJSON();
jSON["startTime"].AsFloat = startTime;
jSON["endTime"].AsFloat = endTime;
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)
Expand Down

0 comments on commit 9618716

Please sign in to comment.