Skip to content
This repository has been archived by the owner on Jun 11, 2023. It is now read-only.

Commit

Permalink
详见Changelog.md
Browse files Browse the repository at this point in the history
  • Loading branch information
MATRIX-feather committed Jan 30, 2020
1 parent a330842 commit 0478f7b
Show file tree
Hide file tree
Showing 12 changed files with 399 additions and 215 deletions.
57 changes: 30 additions & 27 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -175,35 +175,38 @@
* [effectSection](osu.Game/Screens/Edit/Timing/EffectSection.cs)

* 整合更新
* [m] [#7623 - Fix crash due to misordered selection events](https://github.com/ppy/osu/pull/7623)
* [m] [#7432 - Implement ability to create OverlayHeader with no TabControl](https://github.com/ppy/osu/pull/7432)
* [M] [#7623 - Fix crash due to misordered selection events](https://github.com/ppy/osu/pull/7623)
* [M] [#7432 - Implement ability to create OverlayHeader with no TabControl](https://github.com/ppy/osu/pull/7432)
* [M] [#7638 - Use type switch in SerializationWriter](https://github.com/ppy/osu/pull/7638)
* [m] [#7637 - Refactor background creation in OverlayHeader](https://github.com/ppy/osu/pull/7637)
* [m] [#7650 - Change default method style for better IDE autocompletion](https://github.com/ppy/osu/pull/7650)
* [m] [#7636 - Make CommentsContainer use OverlayColourProvider](https://github.com/ppy/osu/pull/7636)
* [m] [#7645 - Allow OsuSliderBar tooltip to show as percentage as needed](https://github.com/ppy/osu/pull/7645)
* [m] [#7659 - Fix random PlaySongSelect test failures](https://github.com/ppy/osu/pull/7659)
* [m] [#7653 - Fix navigation test crashing when raw input is disabled](https://github.com/ppy/osu/pull/7653)
* [m] [#7652 - Fix key count being incorrectly adjusted by hard/easy mods](https://github.com/ppy/osu/pull/7652)
* [m] [#7634 - Add beat ticks to editor timeline](https://github.com/ppy/osu/pull/7634)
* [M] [#7637 - Refactor background creation in OverlayHeader](https://github.com/ppy/osu/pull/7637)
* [M] [#7650 - Change default method style for better IDE autocompletion](https://github.com/ppy/osu/pull/7650)
* [M] [#7636 - Make CommentsContainer use OverlayColourProvider](https://github.com/ppy/osu/pull/7636)
* [M] [#7645 - Allow OsuSliderBar tooltip to show as percentage as needed](https://github.com/ppy/osu/pull/7645)
* [M] [#7659 - Fix random PlaySongSelect test failures](https://github.com/ppy/osu/pull/7659)
* [M] [#7653 - Fix navigation test crashing when raw input is disabled](https://github.com/ppy/osu/pull/7653)
* [M] [#7652 - Fix key count being incorrectly adjusted by hard/easy mods](https://github.com/ppy/osu/pull/7652)
* [M] [#7634 - Add beat ticks to editor timeline](https://github.com/ppy/osu/pull/7634)

## 2020.130.1
### 2020/1/30:
* 整合更新
* [m] [#7675 - Fix possible crash when searching with no channel topic](https://github.com/ppy/osu/pull/7675)
* [m] [#7593 - Minor cleanups for Legacy Storyboard/Beatmap decoder](https://github.com/ppy/osu/pull/7593)
* [m] [#7647 - Move select tool to an actual tool implementation](https://github.com/ppy/osu/pull/7647)
* [m] [#7671 - Rename and tidy up DeletedCommentsCounter](https://github.com/ppy/osu/pull/7671)
* [m] [#7642 - Fix beat snap implementation being incorrect](https://github.com/ppy/osu/pull/7642)
* [m] [#7644 - Standardise editor timeline zoom across maps of all lengths](https://github.com/ppy/osu/pull/7644)
* [!_与一个现有更新冲突] #7643 - Distance snap grid correct colouring
* Ensure selection tool correctly matches selection state #7649
* Allow selecting composition tools using 1-4 keys #7648
* [M] [#7675 - Fix possible crash when searching with no channel topic](https://github.com/ppy/osu/pull/7675)
* [M] [#7593 - Minor cleanups for Legacy Storyboard/Beatmap decoder](https://github.com/ppy/osu/pull/7593)
* [M] [#7647 - Move select tool to an actual tool implementation](https://github.com/ppy/osu/pull/7647)
* [M] [#7671 - Rename and tidy up DeletedCommentsCounter](https://github.com/ppy/osu/pull/7671)
* [M] [#7642 - Fix beat snap implementation being incorrect](https://github.com/ppy/osu/pull/7642)
* [M] [#7644 - Standardise editor timeline zoom across maps of all lengths](https://github.com/ppy/osu/pull/7644)
* [#7643 - Distance snap grid correct colouring](https://github.com/ppy/osu/pull/7643)
* [M] [#7649 - Ensure selection tool correctly matches selection state](https://github.com/ppy/osu/pull/7649)
* [M] [#7648 - Allow selecting composition tools using 1-4 keys](https://github.com/ppy/osu/pull/7648)
* [!_有变动,需要重新描述这个更新] [O->M] [#7222 - 向"WindUp"和"WindDown"Mod添加反向选项](https://github.com/ppy/osu/pull/7222)
* Fix osu!catch not handling all vertical space #7673
* Bring UserProfileOverlay colour scheme in line with web #7670
* Fix negative replay frames being played back incorrectly #7676
* Fix editor being accessible for multiplayer song select #7667
* Fix presenting a beatmap from a different ruleset not working #7663
* Move navigation / game test scenes to new namespace #7661
* Remove build target from Fastfile #7613
* Fix percentage-formatted displays containing a space #7664
* [M] [#7673 - Fix osu!catch not handling all vertical space](https://github.com/ppy/osu/pull/7673)
* [M] [#7670 - Bring UserProfileOverlay colour scheme in line with web](https://github.com/ppy/osu/pull/7670)
* [M] [#7676 - Fix negative replay frames being played back incorrectly](https://github.com/ppy/osu/pull/7676)
* [M] [#7667 - Fix editor being accessible for multiplayer song select](https://github.com/ppy/osu/pull/7667)
* [M] [#7663 - Fix presenting a beatmap from a different ruleset not working](https://github.com/ppy/osu/pull/7663)
* [M] [#7661 - Move navigation / game test scenes to new namespace](https://github.com/ppy/osu/pull/7661)
* [M] [#7613 - Remove build target from Fastfile](https://github.com/ppy/osu/pull/7613)
* [M] [#7664 - Fix percentage-formatted displays containing a space](https://github.com/ppy/osu/pull/7664)
* [M] [#7554 - Update profile scores in line with the web design](https://github.com/ppy/osu/pull/7554)
* [M] [#7654 - Add a method to recycle test storage between runs #7654](https://github.com/ppy/osu/pull/7654)
4 changes: 2 additions & 2 deletions osu.Desktop/Overlays/VersionManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ private void load(OsuColour colours, TextureStore textures, OsuGameBase game)
Origin = Anchor.TopCentre,
Font = OsuFont.Numeric.With(size: 16),//翻译时修改
Colour = colours.Yellow,
// Text = @"2020.125.0+matrixfeather 2"
Text = "早期开发版本"
Text = @"2020.130.0+matrixfeather 1"
//Text = "早期开发版本"
},
new Sprite
{
Expand Down
4 changes: 2 additions & 2 deletions osu.Desktop/osu.Desktop.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<Product>osu!lazer</Product>
<ApplicationIcon>lazer.ico</ApplicationIcon>
<ApplicationManifest>app.manifest</ApplicationManifest>
<Version>0.0.0</Version>
<!--<Version>2020.125.2</Version>-->
<!--<Version>0.0.0</Version>-->
<Version>2020.130.1</Version>
<FileVersion>0.0.0</FileVersion>
</PropertyGroup>
<PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions osu.Game/Graphics/DrawableDate.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ public DateTimeOffset Date
}
}

public DrawableDate(DateTimeOffset date)
public DrawableDate(DateTimeOffset date, float textSize = OsuFont.DEFAULT_FONT_SIZE)
{
Font = OsuFont.GetFont(weight: FontWeight.Regular, italics: true);
Font = OsuFont.GetFont(weight: FontWeight.Regular, size: textSize, italics: true);
Date = date;
}

Expand Down
63 changes: 63 additions & 0 deletions osu.Game/Overlays/Profile/ProfileItemContainer.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.

using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Input.Events;
using osuTK.Graphics;

namespace osu.Game.Overlays.Profile.Sections
{
public class ProfileItemContainer : Container
{
private const int hover_duration = 200;

protected override Container<Drawable> Content => content;

private Color4 idleColour;
private Color4 hoverColour;

private readonly Box background;
private readonly Container content;

public ProfileItemContainer()
{
RelativeSizeAxes = Axes.Both;
Masking = true;
CornerRadius = 6;

AddRangeInternal(new Drawable[]
{
background = new Box
{
RelativeSizeAxes = Axes.Both,
},
content = new Container
{
RelativeSizeAxes = Axes.Both,
}
});
}

[BackgroundDependencyLoader]
private void load(OverlayColourProvider colourProvider)
{
background.Colour = idleColour = colourProvider.Background4;
hoverColour = colourProvider.Background3;
}

protected override bool OnHover(HoverEvent e)
{
background.FadeColour(hoverColour, hover_duration, Easing.OutQuint);
return base.OnHover(e);
}

protected override void OnHoverLost(HoverLostEvent e)
{
base.OnHoverLost(e);
background.FadeColour(idleColour, hover_duration, Easing.OutQuint);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Localisation;
using osu.Game.Beatmaps;
Expand All @@ -13,32 +12,25 @@
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites;
using osuTK;
using System.Collections.Generic;
using osu.Framework.Graphics.Cursor;

namespace osu.Game.Overlays.Profile.Sections.Historical
{
public class DrawableMostPlayedBeatmap : OsuHoverContainer
public class DrawableMostPlayedBeatmap : CompositeDrawable
{
private const int cover_width = 100;
private const int corner_radius = 6;
private const int height = 50;

private readonly BeatmapInfo beatmap;
private readonly int playCount;

private Box background;

protected override IEnumerable<Drawable> EffectTargets => new[] { background };

public DrawableMostPlayedBeatmap(BeatmapInfo beatmap, int playCount)
{
this.beatmap = beatmap;
this.playCount = playCount;
Enabled.Value = true; //manually enabled, because we have no action

RelativeSizeAxes = Axes.X;
Height = height;
Height = 50;

Masking = true;
CornerRadius = corner_radius;
Expand All @@ -47,10 +39,7 @@ public DrawableMostPlayedBeatmap(BeatmapInfo beatmap, int playCount)
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
IdleColour = colours.GreySeafoam;
HoverColour = colours.GreySeafoamLight;

Children = new Drawable[]
AddRangeInternal(new Drawable[]
{
new UpdateableBeatmapSetCover
{
Expand All @@ -72,46 +61,48 @@ private void load(OsuColour colours)
CornerRadius = corner_radius,
Children = new Drawable[]
{
background = new Box { RelativeSizeAxes = Axes.Both },
new Container
new ProfileItemContainer
{
RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding(10),
Children = new Drawable[]
Child = new Container
{
new FillFlowContainer
RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding(10),
Children = new Drawable[]
{
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
AutoSizeAxes = Axes.Both,
Direction = FillDirection.Vertical,
Children = new Drawable[]
new FillFlowContainer
{
new MostPlayedBeatmapMetadataContainer(beatmap),
new LinkFlowContainer(t => t.Font = OsuFont.GetFont(size: 16, weight: FontWeight.Regular))
{
AutoSizeAxes = Axes.Both,
Direction = FillDirection.Horizontal,
Colour = colours.GreySeafoamLighter
}.With(d =>
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
AutoSizeAxes = Axes.Both,
Direction = FillDirection.Vertical,
Children = new Drawable[]
{
d.AddText("作图者: ");
d.AddUserLink(beatmap.Metadata.Author);
}),
}
},
new PlayCountText(playCount)
{
Anchor = Anchor.CentreRight,
Origin = Anchor.CentreRight
},
}
},
new MostPlayedBeatmapMetadataContainer(beatmap),
new LinkFlowContainer(t => t.Font = OsuFont.GetFont(size: 16, weight: FontWeight.Regular))
{
AutoSizeAxes = Axes.Both,
Direction = FillDirection.Horizontal,
Colour = colours.GreySeafoamLighter
}.With(d =>
{
d.AddText("作图者 ");
d.AddUserLink(beatmap.Metadata.Author);
}),
}
},
new PlayCountText(playCount)
{
Anchor = Anchor.CentreRight,
Origin = Anchor.CentreRight
},
}
},
}
}
}
}
}
};
});
}

private class MostPlayedBeatmapMetadataContainer : BeatmapMetadataContainer
Expand All @@ -132,7 +123,7 @@ public MostPlayedBeatmapMetadataContainer(BeatmapInfo beatmap)
},
new OsuSpriteText
{
Text = "艺术家:" + new LocalisedString((beatmap.Metadata.ArtistUnicode, beatmap.Metadata.Artist)),
Text = "by " + new LocalisedString((beatmap.Metadata.ArtistUnicode, beatmap.Metadata.Artist)),
Font = OsuFont.GetFont(weight: FontWeight.Regular)
},
};
Expand Down Expand Up @@ -179,4 +170,4 @@ private void load(OsuColour colours)
}
}
}
}
}

This file was deleted.

Loading

0 comments on commit 0478f7b

Please sign in to comment.