Merge branch 'master' of https://git.coder.horse/meidomustard/modifiedMM

MultipleMaids/CM3D2/MultipleMaids/Plugin/MultipleMaids.Gui.cs

@@ -109,11 +109,13 @@ namespace CM3D2.MultipleMaids.Plugin
                 GameMain.Instance.MainCamera.SetControl(true);
                 if (!sceneFlg && !faceFlg && !poseFlg && !kankyoFlg && !kankyo2Flg && !isF6 && okFlg)
                 {
-                    if (Input.GetAxis("Mouse ScrollWheel") != 0.0)
+                    if (Input.mouseScrollDelta.y != 0f)
                     {
-                        GameMain.Instance.MainCamera.SetControl(!rectWin.Contains(new Vector2(Input.mousePosition.x,
-                                                                                               Screen.height
-                                                                                              - Input.mousePosition.y)));
+                        if (rectWin.Contains(Event.current.mousePosition))
+                        {
+                            GameMain.Instance.MainCamera.SetControl(false);
+                            Input.ResetInputAxes();
+                        }
                     }
 
                     rectWin = GUI.Window(129, rectWin, MaidCallWindow, "", style);
@@ -215,15 +217,17 @@ namespace CM3D2.MultipleMaids.Plugin
                     if (bgmCombo.isClickedComboButton || bgCombo.isClickedComboButton || doguCombo.isClickedComboButton
                         || parCombo.isClickedComboButton)
                     {
-                        if (Input.GetAxis("Mouse ScrollWheel") != 0.0)
+                        if (Input.mouseScrollDelta.y != 0f)
                         {
-                            GameMain.Instance.MainCamera.SetControl(!rectWin.Contains(new Vector2(Input.mousePosition.x,
-                                                                                                   Screen.height
-                                                                                                  - Input.mousePosition.y)));
+                            if (rectWin.Contains(Event.current.mousePosition))
+                            {
+                                GameMain.Instance.MainCamera.SetControl(false);
+                                Input.ResetInputAxes();
+                            }
                         }
                     }
                     else if (!yotogiFlg && sceneLevel != 3 && sceneLevel != 5
-                             && rectWin.Contains(new Vector2(Input.mousePosition.x, Screen.height - Input.mousePosition.y))
+                             && rectWin.Contains(Event.current.mousePosition)
                              && Input.GetMouseButtonDown(0))
                     {
                         Input.ResetInputAxes();
@@ -233,15 +237,17 @@ namespace CM3D2.MultipleMaids.Plugin
                 }
                 else if (kankyo2Flg)
                 {
-                    if (Input.GetAxis("Mouse ScrollWheel") != 0.0)
+                    if (Input.mouseScrollDelta.y != 0f)
                     {
-                        GameMain.Instance.MainCamera.SetControl(!rectWin.Contains(new Vector2(Input.mousePosition.x,
-                                                                                               Screen.height
-                                                                                              - Input.mousePosition.y)));
+                        if (rectWin.Contains(Event.current.mousePosition))
+                        {
+                            GameMain.Instance.MainCamera.SetControl(false);
+                            Input.ResetInputAxes();
+                        }
                     }
 
                     if (!yotogiFlg && sceneLevel != 3 && sceneLevel != 5
-                        && rectWin.Contains(new Vector2(Input.mousePosition.x, Screen.height - Input.mousePosition.y))
+                        && rectWin.Contains(Event.current.mousePosition)
                         && Input.GetMouseButtonDown(0))
                     {
                         Input.ResetInputAxes();
@@ -253,15 +259,17 @@ namespace CM3D2.MultipleMaids.Plugin
                 {
                     if (poseGroupCombo.isClickedComboButton || poseCombo.isClickedComboButton || itemCombo.isClickedComboButton)
                     {
-                        if (Input.GetAxis("Mouse ScrollWheel") != 0.0)
+                        if (Input.mouseScrollDelta.y != 0f)
                         {
-                            GameMain.Instance.MainCamera.SetControl(!rectWin.Contains(new Vector2(Input.mousePosition.x,
-                                                                                                   Screen.height
-                                                                                                  - Input.mousePosition.y)));
+                            if (rectWin.Contains(Event.current.mousePosition))
+                            {
+                                GameMain.Instance.MainCamera.SetControl(false);
+                                Input.ResetInputAxes();
+                            }
                         }
                     }
                     else if (!yotogiFlg && sceneLevel != 3 && sceneLevel != 5
-                             && rectWin.Contains(new Vector2(Input.mousePosition.x, Screen.height - Input.mousePosition.y))
+                             && rectWin.Contains(Event.current.mousePosition)
                              && Input.GetMouseButtonDown(0))
                     {
                         Input.ResetInputAxes();
@@ -273,15 +281,17 @@ namespace CM3D2.MultipleMaids.Plugin
                 {
                     if (faceCombo.isClickedComboButton)
                     {
-                        if (Input.GetAxis("Mouse ScrollWheel") != 0.0)
+                        if (Input.mouseScrollDelta.y != 0f)
                         {
-                            GameMain.Instance.MainCamera.SetControl(!rectWin.Contains(new Vector2(Input.mousePosition.x,
-                                                                                                   Screen.height
-                                                                                                  - Input.mousePosition.y)));
+                            if (rectWin.Contains(Event.current.mousePosition))
+                            {
+                                GameMain.Instance.MainCamera.SetControl(false);
+                                Input.ResetInputAxes();
+                            }
                         }
                     }
                     else if (!yotogiFlg && sceneLevel != 3 && sceneLevel != 5
-                             && rectWin.Contains(new Vector2(Input.mousePosition.x, Screen.height - Input.mousePosition.y))
+                             && rectWin.Contains(Event.current.mousePosition)
                              && Input.GetMouseButtonDown(0))
                     {
                         Input.ResetInputAxes();