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

CI fixes.

Browse Source
This commit is contained in:
DrabWeb 2017-07-11 01:42:51 -03:00
parent fc7b4ceff1
commit b448603d6c
7 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Desktop.VisualTests/Tests/TestCaseDirect.cs
View File

@ -53,7 +53,7 @@ namespace osu.Desktop.VisualTests.Tests
Covers = new BeatmapSetOnlineCovers Covers = new BeatmapSetOnlineCovers
{ {
Card = @"https://assets.ppy.sh/beatmaps/578332/covers/card.jpg?1494591390", Card = @"https://assets.ppy.sh/beatmaps/578332/covers/card.jpg?1494591390",
Card2x = @"https://assets.ppy.sh/beatmaps/578332/covers/cover.jpg?1494591390", Card2X = @"https://assets.ppy.sh/beatmaps/578332/covers/cover.jpg?1494591390",
}, },
Preview = @"https://b.ppy.sh/preview/578332.mp3", Preview = @"https://b.ppy.sh/preview/578332.mp3",
PlayCount = 97, PlayCount = 97,
@ -83,7 +83,7 @@ namespace osu.Desktop.VisualTests.Tests
Covers = new BeatmapSetOnlineCovers Covers = new BeatmapSetOnlineCovers
{ {
Card = @"https://assets.ppy.sh/beatmaps/599627/covers/card.jpg?1494539318", Card = @"https://assets.ppy.sh/beatmaps/599627/covers/card.jpg?1494539318",
Card2x = @"https://assets.ppy.sh/beatmaps/599627/covers/cover.jpg?1494539318", Card2X = @"https://assets.ppy.sh/beatmaps/599627/covers/cover.jpg?1494539318",
}, },
Preview = @"https//b.ppy.sh/preview/599627.mp3", Preview = @"https//b.ppy.sh/preview/599627.mp3",
PlayCount = 3082, PlayCount = 3082,
@ -113,7 +113,7 @@ namespace osu.Desktop.VisualTests.Tests
Covers = new BeatmapSetOnlineCovers Covers = new BeatmapSetOnlineCovers
{ {
Card = @"https://assets.ppy.sh/beatmaps/513268/covers/card.jpg?1494502863", Card = @"https://assets.ppy.sh/beatmaps/513268/covers/card.jpg?1494502863",
Card2x = @"https://assets.ppy.sh/beatmaps/513268/covers/cover.jpg?1494502863", Card2X = @"https://assets.ppy.sh/beatmaps/513268/covers/cover.jpg?1494502863",
}, },
Preview = @"https//b.ppy.sh/preview/513268.mp3", Preview = @"https//b.ppy.sh/preview/513268.mp3",
PlayCount = 2762, PlayCount = 2762,
@ -158,7 +158,7 @@ namespace osu.Desktop.VisualTests.Tests
Covers = new BeatmapSetOnlineCovers Covers = new BeatmapSetOnlineCovers
{ {
Card = @"https://assets.ppy.sh/beatmaps/586841/covers/card.jpg?1494052741", Card = @"https://assets.ppy.sh/beatmaps/586841/covers/card.jpg?1494052741",
Card2x = @"https://assets.ppy.sh/beatmaps/586841/covers/cover.jpg?1494052741", Card2X = @"https://assets.ppy.sh/beatmaps/586841/covers/cover.jpg?1494052741",
}, },
Preview = @"https//b.ppy.sh/preview/586841.mp3", Preview = @"https//b.ppy.sh/preview/586841.mp3",
PlayCount = 62317, PlayCount = 62317,

4
osu.Desktop.VisualTests/Tests/TestCaseRoomInspector.cs
View File

@ -45,7 +45,7 @@ namespace osu.Desktop.VisualTests.Tests
{ {
Covers = new BeatmapSetOnlineCovers Covers = new BeatmapSetOnlineCovers
{ {
Cover2x = @"https://assets.ppy.sh/beatmaps/560573/covers/cover.jpg?1492722343", Cover2X = @"https://assets.ppy.sh/beatmaps/560573/covers/cover.jpg?1492722343",
}, },
}, },
}, },
@ -112,7 +112,7 @@ namespace osu.Desktop.VisualTests.Tests
{ {
Covers = new BeatmapSetOnlineCovers Covers = new BeatmapSetOnlineCovers
{ {
Cover2x = @"https://assets.ppy.sh/beatmaps/39804/covers/cover.jpg?1456506845", Cover2X = @"https://assets.ppy.sh/beatmaps/39804/covers/cover.jpg?1456506845",
}, },
}, },
}, },

6
osu.Game/Database/BeatmapSetOnlineInfo.cs
View File

@ -40,16 +40,16 @@ namespace osu.Game.Database
public string Cover { get; set; } public string Cover { get; set; }
[JsonProperty(@"cover@2x")] [JsonProperty(@"cover@2x")]
public string Cover2x { get; set; } public string Cover2X { get; set; }
public string Card { get; set; } public string Card { get; set; }
[JsonProperty(@"card@2x")] [JsonProperty(@"card@2x")]
public string Card2x { get; set; } public string Card2X { get; set; }
public string List { get; set; } public string List { get; set; }
[JsonProperty(@"list@2x")] [JsonProperty(@"list@2x")]
public string List2x { get; set; } public string List2X { get; set; }
} }
} }

2
osu.Game/Overlays/Direct/DirectPanel.cs
View File

@ -103,7 +103,7 @@ namespace osu.Game.Overlays.Direct
private void load(TextureStore textures) private void load(TextureStore textures)
{ {
if (set.OnlineInfo?.Covers?.Card != null) if (set.OnlineInfo?.Covers?.Card != null)
Texture = textures.Get(doubleSize ? set.OnlineInfo.Covers.Card2x : set.OnlineInfo.Covers.Card); Texture = textures.Get(doubleSize ? set.OnlineInfo.Covers.Card2X : set.OnlineInfo.Covers.Card);
} }
} }
} }

6
osu.Game/Overlays/Direct/Header.cs
View File

@ -30,10 +30,10 @@ namespace osu.Game.Overlays.Direct
{ {
Search, Search,
[Description("Newest Maps")] [Description("Newest Maps")]
NewestMaps = (int)DirectSortCriteria.Ranked, NewestMaps = DirectSortCriteria.Ranked,
[Description("Top Rated")] [Description("Top Rated")]
TopRated = (int)DirectSortCriteria.Rating, TopRated = DirectSortCriteria.Rating,
[Description("Most Played")] [Description("Most Played")]
MostPlayed = (int)DirectSortCriteria.Plays, MostPlayed = DirectSortCriteria.Plays,
} }
} }

1
osu.Game/Overlays/DirectOverlay.cs
View File

@ -195,6 +195,7 @@ namespace osu.Game.Overlays
getSetsRequest.Success += r => getSetsRequest.Success += r =>
{ {
BeatmapSets = r?.Select(response => response.ToBeatmapSet(rulesets)); BeatmapSets = r?.Select(response => response.ToBeatmapSet(rulesets));
if (BeatmapSets == null) return;
var artists = new List<string>(); var artists = new List<string>();
var songs = new List<string>(); var songs = new List<string>();

4
osu.Game/Screens/Multiplayer/RoomInspector.cs
View File

@ -539,8 +539,8 @@ namespace osu.Game.Screens.Multiplayer
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(TextureStore textures) private void load(TextureStore textures)
{ {
if (set.OnlineInfo?.Covers?.Cover2x != null) if (set.OnlineInfo?.Covers?.Cover2X != null)
Texture = textures.Get(set.OnlineInfo.Covers.Cover2x); Texture = textures.Get(set.OnlineInfo.Covers.Cover2X);
} }
} }
} }