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

Rename 2X resources to be defaults

Browse Source
This commit is contained in:
Dean Herbert 2017-07-13 10:27:39 +09:00
parent 56c817e4b6
commit 2c1f3de47a
4 changed files with 14 additions and 14 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", Cover = @"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", Cover = @"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", Cover = @"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", Cover = @"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", Cover = @"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", Cover = @"https://assets.ppy.sh/beatmaps/39804/covers/cover.jpg?1456506845",
}, },
}, },
}, },

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

@ -37,19 +37,19 @@ namespace osu.Game.Database
public class BeatmapSetOnlineCovers public class BeatmapSetOnlineCovers
{ {
public string Cover { get; set; } public string CoverLowRes { get; set; }
[JsonProperty(@"cover@2x")] [JsonProperty(@"cover@2x")]
public string Cover2X { get; set; } public string Cover { get; set; }
public string Card { get; set; } public string CardLowRes { get; set; }
[JsonProperty(@"card@2x")] [JsonProperty(@"card@2x")]
public string Card2X { get; set; } public string Card { get; set; }
public string List { get; set; } public string ListLowRes { get; set; }
[JsonProperty(@"list@2x")] [JsonProperty(@"list@2x")]
public string List2X { get; set; } public string List { get; set; }
} }
} }

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?.Cover != null)
Texture = textures.Get(set.OnlineInfo.Covers.Cover2X); Texture = textures.Get(set.OnlineInfo.Covers.Cover);
} }
} }
} }