sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-29 17:37:23 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix non-convert slider and spinner serialization

Browse Source
This commit is contained in:
Dean Herbert 2020-09-14 17:08:22 +09:00
parent 3e7f70e225
commit a8b405791a
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
osu.Game.Rulesets.Osu/Objects/Slider.cs
View File

@ -7,6 +7,7 @@ using System.Collections.Generic;
using osu.Game.Rulesets.Objects; using osu.Game.Rulesets.Objects;
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
using Newtonsoft.Json;
using osu.Framework.Caching; using osu.Framework.Caching;
using osu.Game.Audio; using osu.Game.Audio;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
@ -21,6 +22,7 @@ namespace osu.Game.Rulesets.Osu.Objects
{ {
public double EndTime => StartTime + this.SpanCount() * Path.Distance / Velocity; public double EndTime => StartTime + this.SpanCount() * Path.Distance / Velocity;
[JsonIgnore]
public double Duration public double Duration
{ {
get => EndTime - StartTime; get => EndTime - StartTime;
@ -112,8 +114,11 @@ namespace osu.Game.Rulesets.Osu.Objects
/// </summary> /// </summary>
public double TickDistanceMultiplier = 1; public double TickDistanceMultiplier = 1;
public HitCircle HeadCircle; [JsonIgnore]
public SliderTailCircle TailCircle; public HitCircle HeadCircle { get; protected set; }
[JsonIgnore]
public SliderTailCircle TailCircle { get; protected set; }
public Slider() public Slider()
{ {

2
osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs
View File

@ -3,6 +3,7 @@
using osu.Game.Rulesets.Objects.Types; using osu.Game.Rulesets.Objects.Types;
using System.Collections.Generic; using System.Collections.Generic;
using Newtonsoft.Json;
using osu.Game.Audio; using osu.Game.Audio;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Beatmaps.ControlPoints; using osu.Game.Beatmaps.ControlPoints;
@ -29,6 +30,7 @@ namespace osu.Game.Rulesets.Objects.Legacy
public List<IList<HitSampleInfo>> NodeSamples { get; set; } public List<IList<HitSampleInfo>> NodeSamples { get; set; }
public int RepeatCount { get; set; } public int RepeatCount { get; set; }
[JsonIgnore]
public double Duration public double Duration
{ {
get => this.SpanCount() * Distance / Velocity; get => this.SpanCount() * Distance / Velocity;

3
osu.Game/Rulesets/Objects/PathControlPoint.cs
View File

@ -2,6 +2,7 @@
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using System; using System;
using Newtonsoft.Json;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Game.Rulesets.Objects.Types; using osu.Game.Rulesets.Objects.Types;
using osuTK; using osuTK;
@ -13,12 +14,14 @@ namespace osu.Game.Rulesets.Objects
/// <summary> /// <summary>
/// The position of this <see cref="PathControlPoint"/>. /// The position of this <see cref="PathControlPoint"/>.
/// </summary> /// </summary>
[JsonProperty]
public readonly Bindable<Vector2> Position = new Bindable<Vector2>(); public readonly Bindable<Vector2> Position = new Bindable<Vector2>();
/// <summary> /// <summary>
/// The type of path segment starting at this <see cref="PathControlPoint"/>. /// The type of path segment starting at this <see cref="PathControlPoint"/>.
/// If null, this <see cref="PathControlPoint"/> will be a part of the previous path segment. /// If null, this <see cref="PathControlPoint"/> will be a part of the previous path segment.
/// </summary> /// </summary>
[JsonProperty]
public readonly Bindable<PathType?> Type = new Bindable<PathType?>(); public readonly Bindable<PathType?> Type = new Bindable<PathType?>();
/// <summary> /// <summary>

3
osu.Game/Rulesets/Objects/Types/IHasDuration.cs
View File

@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using Newtonsoft.Json;
namespace osu.Game.Rulesets.Objects.Types namespace osu.Game.Rulesets.Objects.Types
{ {
/// <summary> /// <summary>
@ -28,7 +26,6 @@ namespace osu.Game.Rulesets.Objects.Types
/// <summary> /// <summary>
/// The duration of the HitObject. /// The duration of the HitObject.
/// </summary> /// </summary>
[JsonIgnore]
new double Duration { get; set; } new double Duration { get; set; }
} }
} }