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

Make corrections to camera zoom and scrollbars

MultipleMaids/CM3D2/MultipleMaids/Plugin/MultipleMaids.Config.cs

@@ -46,11 +46,6 @@ namespace CM3D2.MultipleMaids.Plugin
                 skirtyure4 = 0.1f;
             }
 
-            if (Preferences["config"]["hair_details"].Value == "true")
-            {
-                isShosai = true;
-            }
-
             IniKey iniKey3 = Preferences["config"]["vr_scroll"];
             if (iniKey3.Value == "false")
             {
@@ -119,4 +114,4 @@ namespace CM3D2.MultipleMaids.Plugin
             maxPage /= 10;
         }
     }
-}
+}

MultipleMaids/CM3D2/MultipleMaids/Plugin/MultipleMaids.Init.cs

@@ -446,7 +446,11 @@ namespace CM3D2.MultipleMaids.Plugin
             itemCombo2.selectedItemIndex = 0;
             slotCombo.selectedItemIndex = 0;
             sortList.Clear();
-            scrollPos = new Vector2(0.0f, 0.0f);
+            maidCallScrollPos = new Vector2(0.0f, 0.0f);
+            poseScrollPos = new Vector2(0.0f, 0.0f);
+            faceScrollPos = new Vector2(0.0f, 0.0f);
+            bgScrollPos = new Vector2(0.0f, 0.0f);
+            bg2ScrollPos = new Vector2(0.0f, 0.0f);
             Vignetting component = GameMain.Instance.MainCamera.gameObject.GetComponent<Vignetting>();
             component.mode = Vignetting.AberrationMode.Simple;
             component.intensity = -3.98f;
@@ -967,7 +971,11 @@ namespace CM3D2.MultipleMaids.Plugin
             itemCombo2.selectedItemIndex = 0;
             slotCombo.selectedItemIndex = 0;
             sortList.Clear();
-            scrollPos = new Vector2(0.0f, 0.0f);
+            maidCallScrollPos = new Vector2(0.0f, 0.0f);
+            poseScrollPos = new Vector2(0.0f, 0.0f);
+            faceScrollPos = new Vector2(0.0f, 0.0f);
+            bgScrollPos = new Vector2(0.0f, 0.0f);
+            bg2ScrollPos = new Vector2(0.0f, 0.0f);
             if (!GameMain.Instance.VRMode)
             {
                 Vignetting component = GameMain.Instance.MainCamera.gameObject.GetComponent<Vignetting>();

MultipleMaids/CM3D2/MultipleMaids/Plugin/MultipleMaids.Update.cs

@@ -8,6 +8,7 @@ using UnityEngine;
 using UnityEngine.PostProcessing;
 using UnityEngine.Rendering;
 using Object = UnityEngine.Object;
+using Util;
 
 namespace CM3D2.MultipleMaids.Plugin
 {
@@ -20,6 +21,21 @@ namespace CM3D2.MultipleMaids.Plugin
                 return;
             }
 
+            if (bGui)
+            {
+                if (Input.mouseScrollDelta.y != 0f)
+                {
+                    if (rectWin.Contains(Event.current.mousePosition)
+                        || (sceneFlg && sceneManagerRect.Contains(Event.current.mousePosition))
+                        || (manageSceneFlag && sceneModalRect.Contains(Event.current.mousePosition)))
+                    {
+                        GameMain.Instance.MainCamera.SetControl(false);
+                        Input.ResetInputAxes();
+                    }
+                }
+
+            }
+
             if (allowUpdate)
             {
                 MaidUpdate();
@@ -4674,7 +4690,12 @@ namespace CM3D2.MultipleMaids.Plugin
                         itemCombo2.selectedItemIndex = 0;
                         slotCombo.selectedItemIndex = 0;
                         sortList.Clear();
-                        scrollPos = new Vector2(0.0f, 0.0f);
+                        maidCallScrollPos = new Vector2(0.0f, 0.0f);
+                        poseScrollPos = new Vector2(0.0f, 0.0f);
+                        faceScrollPos = new Vector2(0.0f, 0.0f);
+                        bgScrollPos = new Vector2(0.0f, 0.0f);
+                        bg2ScrollPos = new Vector2(0.0f, 0.0f);
+
                         if (!isVR)
                         {
                             Vignetting component = GameMain.Instance.MainCamera.gameObject.GetComponent<Vignetting>();

MultipleMaids/CM3D2/MultipleMaids/Plugin/MultipleMaids.cs

@@ -4230,7 +4230,6 @@ namespace CM3D2.MultipleMaids.Plugin
         private bool isShift;
         private bool isShock;
         private bool isShoes;
-        private bool isShosai;
         private bool isSkirt;
         private bool isSkirtSetting;
         private bool isSkirtyure;
@@ -4867,7 +4866,11 @@ namespace CM3D2.MultipleMaids.Plugin
         private bool sceneFlg;
         private int sceneLevel;
         private Vector2 screenSize = new Vector2(0.0f, 0.0f);
-        private Vector2 scrollPos = new Vector2(0.0f, 0.0f);
+        private Vector2 maidCallScrollPos = new Vector2(0.0f, 0.0f);
+        private Vector2 poseScrollPos = new Vector2(0.0f, 0.0f);
+        private Vector2 faceScrollPos = new Vector2(0.0f, 0.0f);
+        private Vector2 bgScrollPos = new Vector2(0.0f, 0.0f);
+        private Vector2 bg2ScrollPos = new Vector2(0.0f, 0.0f);
         private int selectLightIndex;
         private ArrayList selectList;
         private int selectMaidIndex;