Browse Source

Show scrollbars when MM window is too small

Simplified face sliders have been removed as well which makes the
"hair_details" option in multiplemaids.ini obsolete
habeebweeb 4 years ago
parent
commit
da8a2fcb44

+ 1 - 6
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;
         }
     }
-}
+}

File diff suppressed because it is too large
+ 414 - 688
MultipleMaids/CM3D2/MultipleMaids/Plugin/MultipleMaids.Gui.cs


+ 12 - 2
MultipleMaids/CM3D2/MultipleMaids/Plugin/MultipleMaids.Init.cs

@@ -446,7 +446,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);
+            saveSceneScrollPos = 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 +972,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);
+            saveSceneScrollPos = 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>();

+ 9 - 2
MultipleMaids/CM3D2/MultipleMaids/Plugin/MultipleMaids.Update.cs

@@ -1,4 +1,4 @@
-using ExIni;
+using ExIni;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -8,6 +8,7 @@ using UnityEngine;
 using UnityEngine.PostProcessing;
 using UnityEngine.Rendering;
 using Object = UnityEngine.Object;
+using Util;
 
 namespace CM3D2.MultipleMaids.Plugin
 {
@@ -6210,7 +6211,13 @@ 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);
+                        saveSceneScrollPos = new Vector2(0.0f, 0.0f);
+                        bg2ScrollPos = new Vector2(0.0f, 0.0f);
+
                         if (!isVR)
                         {
                             Vignetting component = GameMain.Instance.MainCamera.gameObject.GetComponent<Vignetting>();

+ 6 - 2
MultipleMaids/CM3D2/MultipleMaids/Plugin/MultipleMaids.cs

@@ -4232,7 +4232,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;
@@ -4873,7 +4872,12 @@ 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 saveSceneScrollPos = new Vector2(0.0f, 0.0f);
+        private Vector2 bg2ScrollPos = new Vector2(0.0f, 0.0f);
         private int selectLightIndex;
         private ArrayList selectList;
         private int selectMaidIndex;