当BeatmapPiece在不可用的情况下被点击时摇晃内容; 优化Mvis屏幕光标隐藏条件

MATRIX-feather · Feb 9, 2021 · 82e9656 · 82e9656
1 parent 42edae9
commit 82e9656
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/osu.Game/Screens/Mvis/Collections/Interface/BeatmapPiece.cs b/osu.Game/Screens/Mvis/Collections/Interface/BeatmapPiece.cs
@@ -38,7 +38,7 @@ public class BeatmapPiece : CompositeDrawable
         private Box hover;
         private FillFlowContainer maskFillFlow;
         private Box bgBox;
-        private Container content;
+        private ShakeContainer content;
 
         public BeatmapPiece(WorkingBeatmap b)
         {
@@ -51,7 +51,7 @@ public BeatmapPiece(WorkingBeatmap b)
         [BackgroundDependencyLoader]
         private void load()
         {
-            InternalChild = content = new Container
+            InternalChild = content = new ShakeContainer
             {
                 RelativeSizeAxes = Axes.Both,
                 Anchor = Anchor.Centre,
@@ -242,6 +242,8 @@ protected override bool OnClick(ClickEvent e)
                 b.Value = Beatmap;
                 controller.Play();
             }
+            else
+                content.Shake();
 
             return base.OnClick(e);
         }

diff --git a/osu.Game/Screens/Mvis/MvisScreen.cs b/osu.Game/Screens/Mvis/MvisScreen.cs
@@ -52,9 +52,10 @@ namespace osu.Game.Screens.Mvis
     public class MvisScreen : ScreenWithBeatmapBackground, IKeyBindingHandler<GlobalAction>
     {
         public override bool HideOverlaysOnEnter => true;
-        private bool allowCursor;
         public override bool AllowBackButton => false;
-        public override bool CursorVisible => allowCursor;
+
+        public override bool CursorVisible => !overlaysHidden || sidebar.State.Value == Visibility.Visible; //隐藏界面或侧边栏可见，显示光标
+
         public override bool AllowRateAdjustments => true;
 
         private bool canReallyHide =>
@@ -121,7 +122,12 @@ protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnl
         #region overlay
 
         private LoadingSpinner loadingSpinner;
-        private Sidebar sidebar;
+
+        private readonly Sidebar sidebar = new Sidebar
+        {
+            Name = "Sidebar Container",
+            Padding = new MarginPadding { Right = HORIZONTAL_OVERFLOW_PADDING }
+        };
 
         #endregion
 
@@ -269,11 +275,7 @@ private void load(MConfigManager config, IdleTracker idleTracker)
                             Origin = Anchor.BottomCentre,
                             Margin = new MarginPadding(115)
                         },
-                        sidebar = new Sidebar
-                        {
-                            Name = "Sidebar Container",
-                            Padding = new MarginPadding { Right = HORIZONTAL_OVERFLOW_PADDING }
-                        },
+                        sidebar,
                         skinnableBbBackground = new FullScreenSkinnableComponent("MBottomBar-background",
                             confineMode: ConfineMode.ScaleToFill,
                             masking: true,
@@ -830,7 +832,6 @@ private void hideOverlays(bool force)
             progressBar.MoveToY(5, duration, Easing.OutQuint);
             bottomBar.FadeOut(duration, Easing.OutQuint);
 
-            allowCursor = false;
             overlaysHidden = true;
             updateIdleVisuals();
         }
@@ -852,7 +853,6 @@ private void showOverlays(bool force)
             progressBar.MoveToY(0, duration, Easing.OutQuint);
             bottomBar.FadeIn(duration, Easing.OutQuint);
 
-            allowCursor = true;
             overlaysHidden = false;
 
             applyBackgroundBrightness();