Commit 39b1637e authored by 神楽坂玲奈's avatar 神楽坂玲奈

remove resize

parent 0e59ad9b
...@@ -26,7 +26,7 @@ public class Setting : WindowServant2D ...@@ -26,7 +26,7 @@ public class Setting : WindowServant2D
setting = gameObject.GetComponentInChildren<LAZYsetting>(); setting = gameObject.GetComponentInChildren<LAZYsetting>();
_screen = UIHelper.getByName<UIPopupList>(gameObject, "screen_"); _screen = UIHelper.getByName<UIPopupList>(gameObject, "screen_");
_screen.items = new[] {new UnityEngine.Resolution {width = 1300, height = 700}}.Concat(Screen.resolutions) _screen.items = new[] { new Resolution { width = 1300, height = 700 } }.Concat(Screen.resolutions)
.Select(r => $"{r.width} x {r.height}") .Select(r => $"{r.width} x {r.height}")
.Distinct() .Distinct()
.ToList(); .ToList();
...@@ -34,7 +34,7 @@ public class Setting : WindowServant2D ...@@ -34,7 +34,7 @@ public class Setting : WindowServant2D
UIHelper.registEvent(gameObject, "exit_", onClickExit); UIHelper.registEvent(gameObject, "exit_", onClickExit);
UIHelper.registEvent(gameObject, "screen_", resizeScreen); UIHelper.registEvent(gameObject, "screen_", resizeScreen);
UIHelper.registEvent(gameObject, "full_", resizeScreen); UIHelper.registEvent(gameObject, "full_", resizeScreen);
UIHelper.registEvent(gameObject, "resize_", resizeScreen); // UIHelper.registEvent(gameObject, "resize_", resizeScreen);
UIHelper.getByName<UIToggle>(gameObject, "full_").value = Screen.fullScreen; UIHelper.getByName<UIToggle>(gameObject, "full_").value = Screen.fullScreen;
UIHelper.getByName<UIToggle>(gameObject, "ignoreWatcher_").value = UIHelper.getByName<UIToggle>(gameObject, "ignoreWatcher_").value =
UIHelper.fromStringToBool(Config.Get("ignoreWatcher_", "0")); UIHelper.fromStringToBool(Config.Get("ignoreWatcher_", "0"));
...@@ -49,8 +49,9 @@ public class Setting : WindowServant2D ...@@ -49,8 +49,9 @@ public class Setting : WindowServant2D
UIHelper.getByName<UIToggle>(gameObject, "handmPosition_").value = UIHelper.getByName<UIToggle>(gameObject, "handmPosition_").value =
UIHelper.fromStringToBool(Config.Get("handmPosition_", "1")); UIHelper.fromStringToBool(Config.Get("handmPosition_", "1"));
UIHelper.getByName<UIToggle>(gameObject, "spyer_").value = UIHelper.fromStringToBool(Config.Get("spyer_", "1")); UIHelper.getByName<UIToggle>(gameObject, "spyer_").value = UIHelper.fromStringToBool(Config.Get("spyer_", "1"));
UIHelper.getByName<UIToggle>(gameObject, "resize_").value = UIHelper.getByName<UIToggle>(gameObject, "resize_").canChange = false;
UIHelper.fromStringToBool(Config.Get("resize_", "0")); // UIHelper.getByName<UIToggle>(gameObject, "resize_").value =
// UIHelper.fromStringToBool(Config.Get("resize_", "0"));
UIHelper.getByName<UIToggle>(gameObject, "longField_").value = UIHelper.getByName<UIToggle>(gameObject, "longField_").value =
UIHelper.fromStringToBool(Config.Get("longField_", "0")); UIHelper.fromStringToBool(Config.Get("longField_", "0"));
if (QualitySettings.GetQualityLevel() < 3) if (QualitySettings.GetQualityLevel() < 3)
...@@ -233,7 +234,7 @@ public class Setting : WindowServant2D ...@@ -233,7 +234,7 @@ public class Setting : WindowServant2D
UIHelper.RestoreWindow(); UIHelper.RestoreWindow();
var mats = UIHelper.getByName<UIPopupList>(gameObject, "screen_").value var mats = UIHelper.getByName<UIPopupList>(gameObject, "screen_").value
.Split(new[] {" x "}, StringSplitOptions.RemoveEmptyEntries); .Split(new[] { " x " }, StringSplitOptions.RemoveEmptyEntries);
Assert.IsTrue(mats.Length == 2); Assert.IsTrue(mats.Length == 2);
Debug.Log(int.Parse(mats[0])); Debug.Log(int.Parse(mats[0]));
Debug.Log(int.Parse(mats[1])); Debug.Log(int.Parse(mats[1]));
...@@ -248,9 +249,9 @@ public class Setting : WindowServant2D ...@@ -248,9 +249,9 @@ public class Setting : WindowServant2D
public void saveWhenQuit() public void saveWhenQuit()
{ {
Config.Set("vol_", ((int) (UIHelper.getByName<UISlider>(gameObject, "vol_").value * 1000)).ToString()); Config.Set("vol_", ((int)(UIHelper.getByName<UISlider>(gameObject, "vol_").value * 1000)).ToString());
Config.Set("size_", ((int) (UIHelper.getByName<UISlider>(gameObject, "size_").value * 1000)).ToString()); Config.Set("size_", ((int)(UIHelper.getByName<UISlider>(gameObject, "size_").value * 1000)).ToString());
Config.Set("vSize_", ((int) (UIHelper.getByName<UISlider>(gameObject, "vSize_").value * 1000)).ToString()); Config.Set("vSize_", ((int)(UIHelper.getByName<UISlider>(gameObject, "vSize_").value * 1000)).ToString());
//Config.Set("alpha_", ((int)(UIHelper.getByName<UISlider>(gameObject, "alpha_").value * 1000)).ToString()); //Config.Set("alpha_", ((int)(UIHelper.getByName<UISlider>(gameObject, "alpha_").value * 1000)).ToString());
Config.Set("longField_", Config.Set("longField_",
UIHelper.fromBoolToString(UIHelper.getByName<UIToggle>(gameObject, "longField_").value)); UIHelper.fromBoolToString(UIHelper.getByName<UIToggle>(gameObject, "longField_").value));
...@@ -260,7 +261,7 @@ public class Setting : WindowServant2D ...@@ -260,7 +261,7 @@ public class Setting : WindowServant2D
Config.Set(collection[i].name, UIHelper.fromBoolToString(collection[i].value)); Config.Set(collection[i].name, UIHelper.fromBoolToString(collection[i].value));
Config.Set("showoffATK", setting.showoffATK.value); Config.Set("showoffATK", setting.showoffATK.value);
Config.Set("showoffStar", setting.showoffStar.value); Config.Set("showoffStar", setting.showoffStar.value);
Config.Set("resize_", UIHelper.fromBoolToString(UIHelper.getByName<UIToggle>(gameObject, "resize_").value)); // Config.Set("resize_", UIHelper.fromBoolToString(UIHelper.getByName<UIToggle>(gameObject, "resize_").value));
Config.Set("maximize_", UIHelper.fromBoolToString(UIHelper.isMaximized())); Config.Set("maximize_", UIHelper.fromBoolToString(UIHelper.isMaximized()));
} }
......
...@@ -32,7 +32,7 @@ public class WindowServantSP : Servant ...@@ -32,7 +32,7 @@ public class WindowServantSP : Servant
if (glass != null) glass.gameObject.SetActive(false); if (glass != null) glass.gameObject.SetActive(false);
} }
resize(); // resize();
} }
public void SetActiveFalse() public void SetActiveFalse()
...@@ -59,24 +59,24 @@ public class WindowServantSP : Servant ...@@ -59,24 +59,24 @@ public class WindowServantSP : Servant
if (glass != null) glass.gameObject.SetActive(true); if (glass != null) glass.gameObject.SetActive(true);
} }
resize(); // resize();
} }
private void resize() // private void resize()
{ // {
if (gameObject != null) // if (gameObject != null)
{ // {
if (Program.I().setting.setting.resize.value) // if (Program.I().setting.setting.resize.value)
{ // {
var f = Screen.height / 700f; // var f = Screen.height / 700f;
gameObject.transform.localScale = new Vector3(f, f, f); // gameObject.transform.localScale = new Vector3(f, f, f);
} // }
else // else
{ // {
gameObject.transform.localScale = new Vector3(1, 1, 1); // gameObject.transform.localScale = new Vector3(1, 1, 1);
} // }
} // }
} // }
public void SetWindow(GameObject mod) public void SetWindow(GameObject mod)
{ {
......
...@@ -2664,7 +2664,7 @@ MonoBehaviour: ...@@ -2664,7 +2664,7 @@ MonoBehaviour:
relative: 1 relative: 1
absolute: -2 absolute: -2
updateAnchors: 2 updateAnchors: 2
mColor: {r: 1, g: 1, b: 1, a: 1} mColor: {r: 0.4, g: 0.4, b: 0.4, a: 1}
mPivot: 3 mPivot: 3
mWidth: 200 mWidth: 200
mHeight: 20 mHeight: 20
...@@ -5100,7 +5100,7 @@ MonoBehaviour: ...@@ -5100,7 +5100,7 @@ MonoBehaviour:
activeAnimation: {fileID: 11172060} activeAnimation: {fileID: 11172060}
animator: {fileID: 0} animator: {fileID: 0}
tween: {fileID: 0} tween: {fileID: 0}
startsActive: 0 startsActive: 1
instantTween: 0 instantTween: 0
optionCanBeNone: 0 optionCanBeNone: 0
onChange: [] onChange: []
...@@ -7886,7 +7886,7 @@ MonoBehaviour: ...@@ -7886,7 +7886,7 @@ MonoBehaviour:
relative: 0.5 relative: 0.5
absolute: 5 absolute: 5
updateAnchors: 2 updateAnchors: 2
mColor: {r: 1, g: 1, b: 1, a: 1} mColor: {r: 0.4, g: 0.4, b: 0.4, a: 1}
mPivot: 4 mPivot: 4
mWidth: 10 mWidth: 10
mHeight: 10 mHeight: 10
...@@ -18946,7 +18946,7 @@ MonoBehaviour: ...@@ -18946,7 +18946,7 @@ MonoBehaviour:
anchorOffset: 0 anchorOffset: 0
softBorderPadding: 1 softBorderPadding: 1
renderQueue: 0 renderQueue: 0
startingRenderQueue: 3017 startingRenderQueue: 3016
mClipTexture: {fileID: 0} mClipTexture: {fileID: 0}
mAlpha: 1 mAlpha: 1
mClipping: 0 mClipping: 0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment