mirror of
https://github.com/ppy/osu.git
synced 2024-12-14 19:22:54 +08:00
Add deep cloning support to Score
/ScoreInfo
/Replay
This commit is contained in:
parent
3c028ce05c
commit
e507faef29
33
osu.Game.Tests/NonVisual/ScoreInfoTest.cs
Normal file
33
osu.Game.Tests/NonVisual/ScoreInfoTest.cs
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
// 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.
|
||||||
|
|
||||||
|
using NUnit.Framework;
|
||||||
|
using osu.Game.Rulesets.Scoring;
|
||||||
|
using osu.Game.Scoring;
|
||||||
|
|
||||||
|
namespace osu.Game.Tests.NonVisual
|
||||||
|
{
|
||||||
|
[TestFixture]
|
||||||
|
public class ScoreInfoTest
|
||||||
|
{
|
||||||
|
[Test]
|
||||||
|
public void TestDeepClone()
|
||||||
|
{
|
||||||
|
var score = new ScoreInfo();
|
||||||
|
|
||||||
|
score.Statistics.Add(HitResult.Good, 10);
|
||||||
|
score.Rank = ScoreRank.B;
|
||||||
|
|
||||||
|
var scoreCopy = score.DeepClone();
|
||||||
|
|
||||||
|
score.Statistics[HitResult.Good]++;
|
||||||
|
score.Rank = ScoreRank.X;
|
||||||
|
|
||||||
|
Assert.That(scoreCopy.Statistics[HitResult.Good], Is.EqualTo(10));
|
||||||
|
Assert.That(score.Statistics[HitResult.Good], Is.EqualTo(11));
|
||||||
|
|
||||||
|
Assert.That(scoreCopy.Rank, Is.EqualTo(ScoreRank.B));
|
||||||
|
Assert.That(score.Rank, Is.EqualTo(ScoreRank.X));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -2,11 +2,13 @@
|
|||||||
// 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.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
using osu.Game.Rulesets.Replays;
|
using osu.Game.Rulesets.Replays;
|
||||||
|
using osu.Game.Utils;
|
||||||
|
|
||||||
namespace osu.Game.Replays
|
namespace osu.Game.Replays
|
||||||
{
|
{
|
||||||
public class Replay
|
public class Replay : IDeepCloneable<Replay>
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Whether all frames for this replay have been received.
|
/// Whether all frames for this replay have been received.
|
||||||
@ -15,5 +17,15 @@ namespace osu.Game.Replays
|
|||||||
public bool HasReceivedAllFrames = true;
|
public bool HasReceivedAllFrames = true;
|
||||||
|
|
||||||
public List<ReplayFrame> Frames = new List<ReplayFrame>();
|
public List<ReplayFrame> Frames = new List<ReplayFrame>();
|
||||||
|
|
||||||
|
public Replay DeepClone()
|
||||||
|
{
|
||||||
|
return new Replay
|
||||||
|
{
|
||||||
|
HasReceivedAllFrames = HasReceivedAllFrames,
|
||||||
|
// individual frames are mutable for now but hopefully this will not be a thing in the future.
|
||||||
|
Frames = Frames.ToList(),
|
||||||
|
};
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2,12 +2,22 @@
|
|||||||
// 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 osu.Game.Replays;
|
using osu.Game.Replays;
|
||||||
|
using osu.Game.Utils;
|
||||||
|
|
||||||
namespace osu.Game.Scoring
|
namespace osu.Game.Scoring
|
||||||
{
|
{
|
||||||
public class Score
|
public class Score : IDeepCloneable<Score>
|
||||||
{
|
{
|
||||||
public ScoreInfo ScoreInfo = new ScoreInfo();
|
public ScoreInfo ScoreInfo = new ScoreInfo();
|
||||||
public Replay Replay = new Replay();
|
public Replay Replay = new Replay();
|
||||||
|
|
||||||
|
public Score DeepClone()
|
||||||
|
{
|
||||||
|
return new Score
|
||||||
|
{
|
||||||
|
ScoreInfo = ScoreInfo.DeepClone(),
|
||||||
|
Replay = Replay.DeepClone(),
|
||||||
|
};
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -18,7 +18,7 @@ using osu.Game.Utils;
|
|||||||
|
|
||||||
namespace osu.Game.Scoring
|
namespace osu.Game.Scoring
|
||||||
{
|
{
|
||||||
public class ScoreInfo : IHasFiles<ScoreFileInfo>, IHasPrimaryKey, ISoftDelete, IEquatable<ScoreInfo>
|
public class ScoreInfo : IHasFiles<ScoreFileInfo>, IHasPrimaryKey, ISoftDelete, IEquatable<ScoreInfo>, IDeepCloneable<ScoreInfo>
|
||||||
{
|
{
|
||||||
public int ID { get; set; }
|
public int ID { get; set; }
|
||||||
|
|
||||||
@ -242,6 +242,15 @@ namespace osu.Game.Scoring
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public ScoreInfo DeepClone()
|
||||||
|
{
|
||||||
|
var clone = (ScoreInfo)MemberwiseClone();
|
||||||
|
|
||||||
|
clone.Statistics = new Dictionary<HitResult, int>(clone.Statistics);
|
||||||
|
|
||||||
|
return clone;
|
||||||
|
}
|
||||||
|
|
||||||
public override string ToString() => $"{User} playing {Beatmap}";
|
public override string ToString() => $"{User} playing {Beatmap}";
|
||||||
|
|
||||||
public bool Equals(ScoreInfo other)
|
public bool Equals(ScoreInfo other)
|
||||||
|
Loading…
Reference in New Issue
Block a user