h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-21 06:52:55 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into fix-fail-pause-conflict

Browse Source
This commit is contained in:
Dean Herbert 2017-05-17 23:32:41 +09:00 committed by GitHub
commit 8084c575ef
6 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/OsuGameBase.cs
View File

@ -146,7 +146,7 @@ namespace osu.Game
{ {
base.LoadComplete(); base.LoadComplete();
AddInternal(ratioContainer = new RatioAdjust base.Content.Add(ratioContainer = new RatioAdjust
{ {
Children = new Drawable[] Children = new Drawable[]
{ {

10
osu.Game/Overlays/ChatOverlay.cs
View File

@ -206,18 +206,12 @@ namespace osu.Game.Overlays
private long? lastMessageId; private long? lastMessageId;
private List<Channel> careChannels; private readonly List<Channel> careChannels = new List<Channel>();
private readonly List<DrawableChannel> loadedChannels = new List<DrawableChannel>(); private readonly List<DrawableChannel> loadedChannels = new List<DrawableChannel>();
private void initializeChannels() private void initializeChannels()
{ {
currentChannelContainer.Clear();
loadedChannels.Clear();
careChannels = new List<Channel>();
SpriteText loading; SpriteText loading;
Add(loading = new OsuSpriteText Add(loading = new OsuSpriteText
{ {
@ -232,8 +226,6 @@ namespace osu.Game.Overlays
ListChannelsRequest req = new ListChannelsRequest(); ListChannelsRequest req = new ListChannelsRequest();
req.Success += delegate (List<Channel> channels) req.Success += delegate (List<Channel> channels)
{ {
Debug.Assert(careChannels.Count == 0);
Scheduler.Add(delegate Scheduler.Add(delegate
{ {
loading.FadeOut(100); loading.FadeOut(100);

6
osu.Game/Screens/Select/BeatmapCarousel.cs
View File

@ -107,6 +107,8 @@ namespace osu.Game.Screens.Select
return; return;
} }
if (beatmap == SelectedBeatmap) return;
foreach (BeatmapGroup group in groups) foreach (BeatmapGroup group in groups)
{ {
var panel = group.BeatmapPanels.FirstOrDefault(p => p.Beatmap.Equals(beatmap)); var panel = group.BeatmapPanels.FirstOrDefault(p => p.Beatmap.Equals(beatmap));
@ -204,7 +206,7 @@ namespace osu.Game.Screens.Select
if (selectedGroup == null || selectedGroup.State == BeatmapGroupState.Hidden) if (selectedGroup == null || selectedGroup.State == BeatmapGroupState.Hidden)
SelectNext(); SelectNext();
else else
selectGroup(selectedGroup); selectGroup(selectedGroup, selectedPanel);
}; };
filterTask?.Cancel(); filterTask?.Cancel();
@ -339,6 +341,8 @@ namespace osu.Game.Screens.Select
selectedGroup.State = BeatmapGroupState.Collapsed; selectedGroup.State = BeatmapGroupState.Collapsed;
group.State = BeatmapGroupState.Expanded; group.State = BeatmapGroupState.Expanded;
group.SelectedPanel = panel;
panel.State = PanelSelectedState.Selected; panel.State = PanelSelectedState.Selected;
if (selectedPanel == panel) return; if (selectedPanel == panel) return;

2
osu.Game/Screens/Select/BeatmapDetails.cs
View File

@ -49,6 +49,8 @@ namespace osu.Game.Screens.Select
get { return beatmap; } get { return beatmap; }
set set
{ {
if (beatmap == value) return;
beatmap = value; beatmap = value;
pendingBeatmapSwitch?.Cancel(); pendingBeatmapSwitch?.Cancel();

2
osu.Game/Screens/Select/Leaderboards/Leaderboard.cs
View File

@ -100,6 +100,8 @@ namespace osu.Game.Screens.Select.Leaderboards
get { return beatmap; } get { return beatmap; }
set set
{ {
if (beatmap == value) return;
beatmap = value; beatmap = value;
Scores = null; Scores = null;

6
osu.Game/Screens/Select/SongSelect.cs
View File

@ -313,8 +313,9 @@ namespace osu.Game.Screens.Select
{ {
bool beatmapSetChange = false; bool beatmapSetChange = false;
if (!beatmap.Equals(Beatmap?.BeatmapInfo)) if (beatmap.Equals(Beatmap?.BeatmapInfo))
{ return;
if (beatmap.BeatmapSetInfoID == selectionChangeNoBounce?.BeatmapSetInfoID) if (beatmap.BeatmapSetInfoID == selectionChangeNoBounce?.BeatmapSetInfoID)
sampleChangeDifficulty.Play(); sampleChangeDifficulty.Play();
else else
@ -322,7 +323,6 @@ namespace osu.Game.Screens.Select
sampleChangeBeatmap.Play(); sampleChangeBeatmap.Play();
beatmapSetChange = true; beatmapSetChange = true;
} }
}
selectionChangeNoBounce = beatmap; selectionChangeNoBounce = beatmap;