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

Merge remote-tracking branch 'origin/master' into profile-header-update

Browse Source 
# Conflicts:
#	osu-resources
#	osu.Game/Overlays/Profile/Components/GradeBadge.cs
#	osu.Game/Overlays/Profile/Header/BadgeContainer.cs
#	osu.Game/Overlays/Profile/Header/RankGraph.cs
#	osu.Game/Overlays/Profile/Header/SupporterIcon.cs
#	osu.Game/Overlays/Profile/ProfileHeader.cs
This commit is contained in:
smoogipoo
2019-03-06 15:53:30 +09:00
parent 648ed0e467 00cdb3a44a
commit ee1f9d4981
756 changed files with 12703 additions and 5718 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game/Users/Avatar.cs
View File

@ -3,7 +3,7 @@
using System;
using osu.Framework.Allocation;
using osu.Framework.Configuration;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Cursor;
@ -65,7 +65,7 @@ namespace osu.Game.Users
private void openProfile()
{
if (!OpenOnClick)
if (!OpenOnClick.Value)
return;
if (user != null)
@ -78,8 +78,9 @@ namespace osu.Game.Users
protected override bool OnClick(ClickEvent e)
{
if (!Enabled)
if (!Enabled.Value)
return false;
return base.OnClick(e);
}
}

3
osu.Game/Users/Country.cs
View File

@ -33,9 +33,10 @@ namespace osu.Game.Users
private TextureStore textures;
private Country country;
public Country Country
{
get { return country; }
get => country;
set
{
if (value == country)

4
osu.Game/Users/UpdateableAvatar.cs
View File

@ -1,7 +1,7 @@
// 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 osu.Framework.Configuration;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
@ -23,7 +23,7 @@ namespace osu.Game.Users
public User User
{
get { return user; }
get => user;
set
{
if (user?.Id == value?.Id)

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

@ -5,7 +5,7 @@ using System;
using System.ComponentModel;
using System.Linq;
using Newtonsoft.Json;
using osu.Framework.Configuration;
using osu.Framework.Bindables;
namespace osu.Game.Users
{
@ -36,8 +36,8 @@ namespace osu.Game.Users
[JsonProperty(@"cover_url")]
public string CoverUrl
{
get { return Cover?.Url; }
set { Cover = new UserCover { Url = value }; }
get => Cover?.Url;
set => Cover = new UserCover { Url = value };
}
[JsonProperty(@"cover")]

11
osu.Game/Users/UserPanel.cs
View File

@ -5,7 +5,7 @@ using System;
using osuTK;
using osuTK.Graphics;
using osu.Framework.Allocation;
using osu.Framework.Configuration;
using osu.Framework.Bindables;
using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
@ -116,8 +116,7 @@ namespace osu.Game.Users
new OsuSpriteText
{
Text = user.Username,
TextSize = 18,
Font = @"Exo2.0-SemiBoldItalic",
Font = OsuFont.GetFont(weight: FontWeight.SemiBold, size: 18, italics: true),
},
infoContainer = new FillFlowContainer
{
@ -173,7 +172,7 @@ namespace osu.Game.Users
{
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
Font = @"Exo2.0-Semibold",
Font = OsuFont.GetFont(weight: FontWeight.SemiBold),
},
},
},
@ -191,8 +190,8 @@ namespace osu.Game.Users
});
}
Status.ValueChanged += displayStatus;
Status.ValueChanged += status => statusBg.FadeColour(status?.GetAppropriateColour(colours) ?? colours.Gray5, 500, Easing.OutQuint);
Status.ValueChanged += status => displayStatus(status.NewValue);
Status.ValueChanged += status => statusBg.FadeColour(status.NewValue?.GetAppropriateColour(colours) ?? colours.Gray5, 500, Easing.OutQuint);
base.Action = ViewProfile = () =>
{

5
osu.Game/Users/UserStatistics.cs
View File

@ -25,7 +25,10 @@ namespace osu.Game.Users
public decimal? PP;
[JsonProperty(@"pp_rank")] // the API sometimes only returns this value in condensed user responses
private int rank { set => Ranks.Global = value; }
private int rank
{
set => Ranks.Global = value;
}
[JsonProperty(@"rank")]
public UserRanks Ranks;

2
osu.Game/Users/UserStatus.cs
View File

@ -39,7 +39,7 @@ namespace osu.Game.Users
public override string Message => @"in Multiplayer Lobby";
}
public class UserStatusSoloGame : UserStatusBusy
public class UserStatusSoloGame : UserStatusBusy
{
public override string Message => @"Solo Game";
}