h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-30 03:42:56 +08:00
Code Issues Releases Wiki Activity

Use BindableListConverter to deserialize control points

Browse Source
This commit is contained in:
tsunyoku 2023-10-15 13:27:07 +01:00
parent 5ef4ac3f7a
commit 6c8f4addb8
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Beatmaps/ControlPoints/ControlPointGroup.cs
View File

@ -3,7 +3,9 @@
using System; using System;
using System.Linq; using System.Linq;
using Newtonsoft.Json;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Game.IO.Serialization.Converters;
namespace osu.Game.Beatmaps.ControlPoints namespace osu.Game.Beatmaps.ControlPoints
{ {
@ -17,8 +19,11 @@ namespace osu.Game.Beatmaps.ControlPoints
/// </summary> /// </summary>
public double Time { get; } public double Time { get; }
[JsonIgnore]
public IBindableList<ControlPoint> ControlPoints => controlPoints; public IBindableList<ControlPoint> ControlPoints => controlPoints;
[JsonConverter(typeof(BindableListConverter<ControlPoint>))]
[JsonProperty]
private readonly BindableList<ControlPoint> controlPoints = new BindableList<ControlPoint>(); private readonly BindableList<ControlPoint> controlPoints = new BindableList<ControlPoint>();
public ControlPointGroup(double time) public ControlPointGroup(double time)

3
osu.Game/Beatmaps/ControlPoints/ControlPointInfo.cs
View File

@ -22,9 +22,10 @@ namespace osu.Game.Beatmaps.ControlPoints
/// <summary> /// <summary>
/// All control points grouped by time. /// All control points grouped by time.
/// </summary> /// </summary>
[JsonProperty] [JsonIgnore]
public IBindableList<ControlPointGroup> Groups => groups; public IBindableList<ControlPointGroup> Groups => groups;
[JsonProperty]
private readonly BindableList<ControlPointGroup> groups = new BindableList<ControlPointGroup>(); private readonly BindableList<ControlPointGroup> groups = new BindableList<ControlPointGroup>();
/// <summary> /// <summary>