h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-15 16:13:20 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into more_context_menus

Browse Source
This commit is contained in:
Dan Balasescu 2017-09-14 19:21:29 +09:00 committed by GitHub
commit 77d2b1e478
5 changed files with 13 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Desktop.Deploy/Program.cs
View File

@ -17,8 +17,8 @@ namespace osu.Desktop.Deploy
{ {
internal static class Program internal static class Program
{ {
private const string nuget_path = @"packages\NuGet.CommandLine.4.1.0\tools\NuGet.exe"; private const string nuget_path = @"packages\NuGet.CommandLine.4.3.0\tools\NuGet.exe";
private const string squirrel_path = @"packages\squirrel.windows.1.7.5\tools\Squirrel.exe"; private const string squirrel_path = @"packages\squirrel.windows.1.7.8\tools\Squirrel.exe";
private const string msbuild_path = @"C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe"; private const string msbuild_path = @"C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe";
public static string StagingFolder = ConfigurationManager.AppSettings["StagingFolder"]; public static string StagingFolder = ConfigurationManager.AppSettings["StagingFolder"];

9
osu.Desktop.Tests/Visual/TestCaseUserProfile.cs
View File

@ -33,13 +33,10 @@ namespace osu.Desktop.Tests.Visual
Rank = 2148, Rank = 2148,
PP = 4567.89m PP = 4567.89m
}, },
AllRankHistories = new User.RankHistories RankHistory = new User.RankHistoryData
{ {
Osu = new User.RankHistory Mode = @"osu",
{ Data = Enumerable.Range(2345, 45).Concat(Enumerable.Range(2109, 40)).ToArray()
Mode = @"osu",
Data = Enumerable.Range(2345,45).Concat(Enumerable.Range(2109,40)).ToArray()
}
} }
}, false)); }, false));
AddStep("Show ppy", () => profile.ShowUser(new User AddStep("Show ppy", () => profile.ShowUser(new User

4
osu.Desktop/osu.Desktop.csproj
View File

@ -69,7 +69,8 @@
<DebugType>none</DebugType> <DebugType>none</DebugType>
<Optimize>true</Optimize> <Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath> <OutputPath>bin\Release\</OutputPath>
<DefineConstants>CuttingEdge NoUpdate</DefineConstants> <DefineConstants>
</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<NoStdLib>true</NoStdLib> <NoStdLib>true</NoStdLib>
@ -104,6 +105,7 @@
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<StartArguments>--tests</StartArguments> <StartArguments>--tests</StartArguments>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="DeltaCompressionDotNet, Version=1.1.0.0, Culture=neutral, PublicKeyToken=1d14d6e5194e7f4a, processorArchitecture=MSIL"> <Reference Include="DeltaCompressionDotNet, Version=1.1.0.0, Culture=neutral, PublicKeyToken=1d14d6e5194e7f4a, processorArchitecture=MSIL">

2
osu.Game/Overlays/Profile/RankChart.cs
View File

@ -70,7 +70,7 @@ namespace osu.Game.Overlays.Profile
} }
}; };
ranks = user.AllRankHistories?.Osu?.Data ?? new[] { user.Statistics.Rank }; ranks = user.RankHistory?.Data ?? new[] { user.Statistics.Rank };
} }
private void updateRankTexts() private void updateRankTexts()

23
osu.Game/Users/User.cs
View File

@ -122,25 +122,10 @@ namespace osu.Game.Users
public int Available; public int Available;
} }
[JsonProperty(@"defaultStatistics")] [JsonProperty(@"statistics")]
public UserStatistics Statistics; public UserStatistics Statistics;
public class RankHistories public class RankHistoryData
{
[JsonProperty(@"osu")]
public RankHistory Osu;
[JsonProperty(@"taiko")]
public RankHistory Taiko;
[JsonProperty(@"fruits")]
public RankHistory Fruits;
[JsonProperty(@"mania")]
public RankHistory Mania;
}
public class RankHistory
{ {
[JsonProperty(@"mode")] [JsonProperty(@"mode")]
public string Mode; public string Mode;
@ -149,7 +134,7 @@ namespace osu.Game.Users
public int[] Data; public int[] Data;
} }
[JsonProperty(@"allRankHistories")] [JsonProperty(@"rankHistory")]
public RankHistories AllRankHistories; public RankHistoryData RankHistory;
} }
} }