|
@@ -100,13 +100,13 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
}
|
|
}
|
|
else if (sceneFlg)
|
|
else if (sceneFlg)
|
|
{
|
|
{
|
|
- rectWin = GUI.Window(129, rectWin, GuiFunc5, "", style);
|
|
|
|
- Rect rect = new Rect(0.0f, 0.0f, 0.0f, 0.0f);
|
|
|
|
|
|
+ rectWin = GUI.Window(129, rectWin, SaveSceneWindow, "", style);
|
|
|
|
+ Rect rect = default;
|
|
dispNo = 0;
|
|
dispNo = 0;
|
|
for (int index = 0; index < 10; ++index)
|
|
for (int index = 0; index < 10; ++index)
|
|
{
|
|
{
|
|
rect = new Rect(0.0f, 0.0f, GetPix(170), GetPix(36));
|
|
rect = new Rect(0.0f, 0.0f, GetPix(170), GetPix(36));
|
|
- rect.x = screenSize.x - rect.width;
|
|
|
|
|
|
+ rect.x = rectWin.x;
|
|
rect.y = rectWin.y + GetPix(64 + 50 * index);
|
|
rect.y = rectWin.y + GetPix(64 + 50 * index);
|
|
if (rect.Contains(new Vector2(Input.mousePosition.x, Screen.height - Input.mousePosition.y)))
|
|
if (rect.Contains(new Vector2(Input.mousePosition.x, Screen.height - Input.mousePosition.y)))
|
|
{
|
|
{
|
|
@@ -170,6 +170,21 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
position3.y -= num;
|
|
position3.y -= num;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ if (position1.y < 0)
|
|
|
|
+ {
|
|
|
|
+ position3.y -= position1.y;
|
|
|
|
+ position2.y -= position1.y;
|
|
|
|
+ position1.y -= position1.y;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (rect.x + rect.width / 2 <= Screen.width / 2)
|
|
|
|
+ {
|
|
|
|
+ float offset = texture2D.width + rect.width + GetPix(24);
|
|
|
|
+ position1.x += offset;
|
|
|
|
+ position2.x += offset;
|
|
|
|
+ position3.x += offset;
|
|
|
|
+ }
|
|
|
|
+
|
|
GUI.DrawTexture(position3, waku2);
|
|
GUI.DrawTexture(position3, waku2);
|
|
GUI.DrawTexture(position1, waku);
|
|
GUI.DrawTexture(position1, waku);
|
|
GUI.DrawTexture(position2, texture2D);
|
|
GUI.DrawTexture(position2, texture2D);
|
|
@@ -265,10 +280,10 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
rectWin2.Set(0.0f, 0.0f, Screen.width * 0.4f, Screen.height * 0.15f);
|
|
rectWin2.Set(0.0f, 0.0f, Screen.width * 0.4f, Screen.height * 0.15f);
|
|
rectWin2.x = (float)(screenSize.x / 2.0 - rectWin2.width / 2.0);
|
|
rectWin2.x = (float)(screenSize.x / 2.0 - rectWin2.width / 2.0);
|
|
rectWin2.y = sceneLevel != 5 ? screenSize.y - rectWin2.height : screenSize.y * 0.94f - rectWin2.height;
|
|
rectWin2.y = sceneLevel != 5 ? screenSize.y - rectWin2.height : screenSize.y * 0.94f - rectWin2.height;
|
|
- rectWin2 = GUI.Window(129, rectWin2, new GUI.WindowFunction(GuiFunc3), "", style);
|
|
|
|
|
|
+ rectWin2 = GUI.Window(129, rectWin2, MessageWindow, "", style);
|
|
}
|
|
}
|
|
|
|
|
|
- private void GuiFunc5(int winID)
|
|
|
|
|
|
+ private void SaveSceneWindow(int winID)
|
|
{
|
|
{
|
|
GUI.DragWindow(new Rect(0, 0, rectWin.width, DRAG_BAR_HEIGHT));
|
|
GUI.DragWindow(new Rect(0, 0, rectWin.width, DRAG_BAR_HEIGHT));
|
|
GUI.Box(new Rect(0, 0, rectWin.width, DRAG_BAR_HEIGHT), "");
|
|
GUI.Box(new Rect(0, 0, rectWin.width, DRAG_BAR_HEIGHT), "");
|
|
@@ -9090,7 +9105,7 @@ namespace CM3D2.MultipleMaids.Plugin
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- private void GuiFunc3(int winID)
|
|
|
|
|
|
+ private void MessageWindow(int winID)
|
|
{
|
|
{
|
|
GUI.DragWindow(new Rect(0, 0, rectWin.width, DRAG_BAR_HEIGHT));
|
|
GUI.DragWindow(new Rect(0, 0, rectWin.width, DRAG_BAR_HEIGHT));
|
|
GUI.Box(new Rect(0, 0, rectWin.width, DRAG_BAR_HEIGHT), "");
|
|
GUI.Box(new Rect(0, 0, rectWin.width, DRAG_BAR_HEIGHT), "");
|