靠边检测

VPet-Simulator.Core/Display/MainLogic.cs

@@ -537,8 +537,12 @@ public void EventTimer_Elapsed()
         /// <returns>是否成功进入侧边隐藏模式</returns>
         private bool MoveSideHideCheck()
         {
+            if(Core.Controller.IfInActivateScreen() == false && Core.Controller.AutoChangeWindow)
+            {
+                Core.Controller.SetNowScreenActivate();
+            }
             //判断是否靠边,如果靠边就进入侧边隐藏模式
-            if (Core.Controller.GetWindowsDistanceLeft() < -50 * Core.Controller.ZoomRatio)
+            if (Core.Controller.GetWindowsDistanceLeft() < -50 * Core.Controller.ZoomRatio && (Core.Controller.IfInActivateScreen() || Core.Controller.GetWindowsDistanceLeft() > -110 * Core.Controller.ZoomRatio))
             {
                 //检查下是否有SideLoad
                 if (Core.Graph.FindName(GraphType.SideHide_Left_Main) != null)
@@ -552,7 +556,7 @@ private bool MoveSideHideCheck()
                     Core.Controller.MoveWindows(-Core.Controller.GetWindowsDistanceLeft() / Core.Controller.ZoomRatio, 0);
                 }
             }
-            else if (Core.Controller.GetWindowsDistanceRight() < -50 * Core.Controller.ZoomRatio)
+            else if (Core.Controller.GetWindowsDistanceRight() < -50 * Core.Controller.ZoomRatio && (Core.Controller.IfInActivateScreen() || Core.Controller.GetWindowsDistanceRight() > -110 * Core.Controller.ZoomRatio))
             {
                 if (Core.Graph.FindName(GraphType.SideHide_Right_Main) != null)
                 {

VPet-Simulator.Core/Handle/IController.cs

@@ -28,6 +28,15 @@ public interface IController
         /// 获取桌宠距离下方的位置
         /// </summary>
         double GetWindowsDistanceDown();
+        /// <summary>
+        /// 获取桌宠所在屏幕是否为活动屏幕
+        /// </summary>
+        /// <returns></returns>
+        bool IfInActivateScreen();
+        /// <summary>
+        /// 将当前屏幕设置为活动屏幕（如果桌宠在多个屏幕上则以主要屏幕为准）
+        /// </summary>
+        void SetNowScreenActivate();
         ///// <summary>
         ///// 窗体宽度
         ///// </summary>
@@ -72,5 +81,10 @@ public interface IController
         /// 是否启用边缘重新定位
         /// </summary>
         bool RePostionActive { get; set; }
+
+        /// <summary>
+        /// 是否自动切换活动屏幕
+        /// </summary>
+        bool AutoChangeWindow { get; }
     }
 }

VPet-Simulator.Windows/Function/MWController.cs

@@ -1,4 +1,5 @@
-using System.Drawing;
+using System;
+using System.Drawing;
 using VPet_Simulator.Core;
 
 namespace VPet_Simulator.Windows
@@ -93,6 +94,63 @@ public void MoveWindows(double X, double Y)
             });
         }
 
+        public bool IfInActivateScreen()
+        {
+            try
+            {
+                if (mw.Dispatcher.HasShutdownStarted || mw.Dispatcher.HasShutdownFinished) return false;
+            }catch { }
+            return mw.Dispatcher.Invoke(() =>
+            {
+
+                try
+                {
+                    var screen = System.Windows.Forms.Screen.FromHandle(new System.Windows.Interop.WindowInteropHelper(mw).Handle);
+                    var screens = System.Windows.Forms.Screen.AllScreens;
+                    for (int i = 0; i < screens.Length; i++)
+                    {
+                        if (screens[i].DeviceName == screen.DeviceName)
+                        {
+                            if(i == mw.Set.GameScreenIndex)
+                            {
+                                return true;
+                            }
+                        }
+                    }
+                    return false;
+                }
+                catch(Exception)
+                {
+                    return true;
+                }
+            });
+        }
+
+        public void SetNowScreenActivate()
+        {
+            mw.Dispatcher.Invoke(() =>
+            {
+                try
+                {
+                    var screen = System.Windows.Forms.Screen.FromHandle(new System.Windows.Interop.WindowInteropHelper(mw).Handle);
+                    var screens = System.Windows.Forms.Screen.AllScreens;
+                    for (int i = 0; i < screens.Length; i++)
+                    {
+                        if (screens[i].DeviceName == screen.DeviceName)
+                        {
+                            mw.Set.GameScreenIndex = i;
+                            ScreenBorder = new Rectangle(screens[i].Bounds.X, screens[i].Bounds.Y, screens[i].Bounds.Width, screens[i].Bounds.Height);
+                            break;
+                        }
+                    }
+                }
+                catch (Exception)
+                {
+                    mw.Set.GameScreenIndex = 0;
+                }
+            });
+        }
+
         public void ShowSetting()
         {
             mw.Topmost = false;
@@ -144,5 +202,6 @@ public bool CheckPosition() => mw.Dispatcher.Invoke(() =>
 
         public int InteractionCycle => mw.Set.InteractionCycle;
 
+        public bool AutoChangeWindow => mw.Set.AutoChangeWindow;
     }
 }

VPet-Simulator.Windows/Function/Setting.cs

@@ -302,6 +302,16 @@ public bool EnableFunction
                 this["gameconfig"].SetBool("nofunction", !value);
             }
         }
+        bool autochangewindow;
+        public bool AutoChangeWindow
+        {
+            get => autochangewindow;
+            set
+            {
+                autochangewindow = value;
+                this["gameconfig"].SetBool("autochangewindow", value);
+            }
+        }
         /// <summary>
         /// 智能移动周期 (秒)
         /// </summary>
@@ -517,6 +527,12 @@ public bool OpacityHitThrough
             set => this["gameconfig"].SetBool("opacityhitthrough", !value);
         }
 
+        public int GameScreenIndex
+        {
+            get => this["gameconfig"].GetInt("gamescreenindex", 0);
+            set => this["gameconfig"].SetInt("gamescreenindex", value);
+        }
+
         /// <summary>
         /// 读写自定义游戏设置(给mod准备的接口)
         /// </summary>

VPet-Simulator.Windows/MutiPlayer/MPController.cs

@@ -1,4 +1,5 @@
-using VPet_Simulator.Core;
+using System;
+using VPet_Simulator.Core;
 
 namespace VPet_Simulator.Windows
 {
@@ -109,5 +110,44 @@ public bool CheckPosition() => mp.Dispatcher.Invoke(() =>
 
         public int InteractionCycle => mw.Set.InteractionCycle;
 
+        public bool AutoChangeWindow => mw.Set.AutoChangeWindow;
+
+        public bool IfInActivateScreen()
+        {
+            try
+            {
+                if (mp.Dispatcher.HasShutdownStarted || mp.Dispatcher.HasShutdownFinished) return false;
+            }
+            catch { }
+            return mp.Dispatcher.Invoke(() =>
+            {
+
+                try
+                {
+                    var screen = System.Windows.Forms.Screen.FromHandle(new System.Windows.Interop.WindowInteropHelper(mp).Handle);
+                    var screens = System.Windows.Forms.Screen.AllScreens;
+                    for (int i = 0; i < screens.Length; i++)
+                    {
+                        if (screens[i].DeviceName == screen.DeviceName)
+                        {
+                            if (i == mw.Set.GameScreenIndex)
+                            {
+                                return true;
+                            }
+                        }
+                    }
+                    return false;
+                }
+                catch (Exception)
+                {
+                    return true;
+                }
+            });
+        }
+
+        public void SetNowScreenActivate()
+        {
+
+        }
     }
 }

VPet-Simulator.Windows/WinDesign/winGameSetting.xaml.cs

@@ -815,6 +815,24 @@ private void BtnSetMoveArea_DetectScreen_Click(object sender, RoutedEventArgs e)
                     // 如果无法获取 DPI 信息，回退到未调整的边界
                     mwCtrl.ScreenBorder = currentScreen.Bounds;
             }
+
+            try
+            {
+                var screens = System.Windows.Forms.Screen.AllScreens;
+                for (int i = 0; i < screens.Length; i++)
+                {
+                    if (screens[i].DeviceName == currentScreen.DeviceName)
+                    {
+                        mw.Set.GameScreenIndex = i;
+                        break;
+                    }
+                }
+            }
+            catch
+            {
+                mw.Set.GameScreenIndex = 0;
+            }
+
             UpdateMoveAreaText();
         }