详见Changelog.md

Changelog.md

@@ -22,6 +22,15 @@
     *   [#7389 - 优化Mods按钮的显示](https://github.com/ppy/osu/pull/7389)
     *   [#7222 - 向"WindUp"和"WindDown"Mod添加反向选项](https://github.com/ppy/osu/pull/7222)
     *   [#7334 - 向Catch和Std模式添加"镜像"Mod](https://github.com/ppy/osu/pull/7334)
+    *   [#7316 - 向击打圆圈添加kiai模式下的闪光](https://github.com/ppy/osu/pull/7316)
+    *   [#7317 - 添加"打击结果"误差条](https://github.com/ppy/osu/pull/7317)
+    *   [#7438 - 添加登录占位符](https://github.com/ppy/osu/pull/7438)
+    *   [#7470 - 修复在退出编辑器后音乐速度没有恢复](https://github.com/ppy/osu/pull/7470)
+    *   [#7462 - 调整ctb和mania模式的生命恢复](https://github.com/ppy/osu/pull/7462)
+    *   [#7435 - 删除未使用的"LaneGlowPiece"和"GlowPiece](https://github.com/ppy/osu/pull/7435)
+    *   [#7451 - Mark storyboard sample retrieval test headless](https://github.com/ppy/osu/pull/7451)
+    *   [#7464 - Remove unused variable on DifficultyIcon](https://github.com/ppy/osu/pull/7464)
+    *   [#7458 - Allow scrolling through DimmedLoadingLayer](https://github.com/ppy/osu/pull/7464)
 *   字体增大
     *   [OsuTabControl](osu.Game/Graphics/UserInterface/OsuTabControl.cs)
     *   [OsuTabControlCheckbox](osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs)

osu.Desktop/Overlays/VersionManager.cs

@@ -61,7 +61,7 @@ private void load(OsuColour colours, TextureStore textures, OsuGameBase game)
                             Origin = Anchor.TopCentre,
                             Font = OsuFont.Numeric.With(size: 16),//翻译时修改
                             Colour = colours.Yellow,
-                            Text = @"2020.104.0+matrixfeather 1"
+                            Text = @"2020.104.0+matrixfeather 2"
                         },
                         new Sprite
                         {

osu.Desktop/osu.Desktop.csproj

@@ -9,7 +9,7 @@
     <Product>osu!lazer</Product>
     <ApplicationIcon>lazer.ico</ApplicationIcon>
     <ApplicationManifest>app.manifest</ApplicationManifest>
-    <Version>2020.104.0</Version>
+    <Version>2020.104.0+mf2</Version>
     <FileVersion>0.0.0</FileVersion>
   </PropertyGroup>
   <PropertyGroup>

osu.Game.Rulesets.Catch/Judgements/CatchBananaJudgement.cs

@@ -30,7 +30,7 @@ protected override double HealthIncreaseFor(HitResult result)
                     return 0;
 
                 case HitResult.Perfect:
-                    return 0.008;
+                    return 0.01;
             }
         }
 

osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs

@@ -18,17 +18,5 @@ protected override int NumericResultFor(HitResult result)
                     return 30;
             }
         }
-
-        protected override double HealthIncreaseFor(HitResult result)
-        {
-            switch (result)
-            {
-                default:
-                    return base.HealthIncreaseFor(result);
-
-                case HitResult.Perfect:
-                    return 0.007;
-            }
-        }
     }
 }

osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs

@@ -23,18 +23,6 @@ protected override int NumericResultFor(HitResult result)
             }
         }
 
-        protected override double HealthIncreaseFor(HitResult result)
-        {
-            switch (result)
-            {
-                default:
-                    return -0.02;
-
-                case HitResult.Perfect:
-                    return 0.01;
-            }
-        }
-
         /// <summary>
         /// Whether fruit on the platter should explode or drop.
         /// Note that this is only checked if the owning object is also <see cref="IHasComboInformation.LastInCombo" />

osu.Game.Rulesets.Catch/Judgements/CatchTinyDropletJudgement.cs

@@ -29,7 +29,7 @@ protected override double HealthIncreaseFor(HitResult result)
                     return 0;
 
                 case HitResult.Perfect:
-                    return 0.004;
+                    return 0.02;
             }
         }
     }

osu.Game.Rulesets.Mania/Judgements/HoldNoteTickJudgement.cs

@@ -15,11 +15,11 @@ protected override double HealthIncreaseFor(HitResult result)
         {
             switch (result)
             {
-                case HitResult.Miss:
-                    return 0;
+                case HitResult.Perfect:
+                    return 0.01;
 
                 default:
-                    return 0.040;
+                    return 0;
             }
         }
     }

osu.Game.Rulesets.Mania/Judgements/ManiaJudgement.cs

@@ -29,32 +29,5 @@ protected override int NumericResultFor(HitResult result)
                     return 300;
             }
         }
-
-        protected override double HealthIncreaseFor(HitResult result)
-        {
-            switch (result)
-            {
-                case HitResult.Miss:
-                    return -0.125;
-
-                case HitResult.Meh:
-                    return 0.005;
-
-                case HitResult.Ok:
-                    return 0.010;
-
-                case HitResult.Good:
-                    return 0.035;
-
-                case HitResult.Great:
-                    return 0.055;
-
-                case HitResult.Perfect:
-                    return 0.065;
-
-                default:
-                    return 0;
-            }
-        }
     }
 }

osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/CirclePiece.cs

@@ -35,6 +35,11 @@ private void load(TextureStore textures)
                     Origin = Anchor.Centre,
                     Texture = textures.Get(@"Gameplay/osu/disc"),
                 },
+                new KiaiFlash
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    FlashOpacity = 0.25f,
+                },
                 new TrianglesPiece
                 {
                     RelativeSizeAxes = Axes.Both,

osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/KiaiFlash.cs

@@ -0,0 +1,41 @@
+// 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.Graphics;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics.Containers;
+using osuTK.Graphics;
+
+namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
+{
+    public class KiaiFlash : BeatSyncedContainer
+    {
+        public float FlashOpacity = 1f;
+
+        public KiaiFlash()
+        {
+            EarlyActivationMilliseconds = 80;
+            Blending = BlendingParameters.Additive;
+
+            Child = new Box
+            {
+                RelativeSizeAxes = Axes.Both,
+                Colour = Color4.White,
+                Alpha = 0f,
+            };
+        }
+
+        protected override void OnNewBeat(int beatIndex, Game.Beatmaps.ControlPoints.TimingControlPoint timingPoint, Game.Beatmaps.ControlPoints.EffectControlPoint effectPoint, Framework.Audio.Track.TrackAmplitudes amplitudes)
+        {
+            if (!effectPoint.KiaiMode)
+            {
+                return;
+            }
+
+            Child
+                .FadeTo(FlashOpacity, EarlyActivationMilliseconds, Easing.OutQuint)
+                .Then()
+                .FadeOut(timingPoint.BeatLength - 80, Easing.OutSine);
+        }
+    }
+}

osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs

@@ -9,12 +9,14 @@
 using osu.Framework.Audio.Sample;
 using osu.Framework.IO.Stores;
 using osu.Game.Audio;
+using osu.Framework.Testing;
 using osu.Game.Skinning;
 using osu.Game.Tests.Resources;
 using osu.Game.Tests.Visual;
 
 namespace osu.Game.Tests.Gameplay
 {
+    [HeadlessTest]
     public class TestSceneStoryboardSamples : OsuTestScene
     {
         [Test]