Commit 8189014a authored by Unicorn369's avatar Unicorn369

fix

parent 7d11bfde
......@@ -8,7 +8,7 @@ public class LAZYsetting : MonoBehaviour {
public UISlider sliderAlpha;
public UIPopupList showoffATK;
public UIPopupList showoffStar;
public UIPopupList showoffFPS;
public UIPopupList LimFPS;
public UIToggle mouseEffect;
public UIToggle closeUp;
public UIToggle showoff;
......
......@@ -285,7 +285,9 @@ public class Program : MonoBehaviour
void initialize()
{
#if !UNITY_EDITOR && UNITY_ANDROID
AndroidJavaObject jo = new AndroidJavaObject("cn.unicorn369.library.API");
#endif
#if UNITY_EDITOR || UNITY_STANDALONE_WIN //编译器、Windows
//Environment.CurrentDirectory = System.Windows.Forms.Application.StartupPath;
//System.IO.Directory.SetCurrentDirectory(System.Windows.Forms.Application.StartupPath);
......@@ -338,7 +340,11 @@ public class Program : MonoBehaviour
InterString.initialize("config" + AppLanguage.LanguageDir() + "/translation.conf"); //System Language
GameTextureManager.initialize();
Config.initialize("config/config.conf");
GameStringManager.initialize("config/strings.conf");
//GameStringManager.initialize("config/strings.conf");
if (File.Exists("config" + AppLanguage.LanguageDir() + "/strings.conf"))
{
GameStringManager.initialize("config" + AppLanguage.LanguageDir() + "/strings.conf");
}
if (File.Exists("cdb/strings.conf"))
{
GameStringManager.initialize("cdb/strings.conf");
......@@ -393,7 +399,7 @@ public class Program : MonoBehaviour
initializeALLservants();
loadResources();
#if UNITY_ANDROID //Android Java Test
#if !UNITY_EDITOR && UNITY_ANDROID //Android Java Test
if (!File.Exists("updates/image_version1.1.txt"))//用于检查更新
{
if (File.Exists("pics.zip")) {
......
......@@ -64,10 +64,10 @@ public class Setting : WindowServant2D
}
setting.showoffATK.value = Config.Get("showoffATK", "1800");
setting.showoffStar.value = Config.Get("showoffStar", "5");
setting.showoffFPS.value = Config.Get("showoffFPS", "60");
setting.LimFPS.value = Config.Get("LimFPS", "60");
UIHelper.registEvent(setting.showoffATK.gameObject, onchangeClose);
UIHelper.registEvent(setting.showoffStar.gameObject, onchangeClose);
UIHelper.registEvent(setting.showoffFPS.gameObject, onchangeFPS);
UIHelper.registEvent(setting.LimFPS.gameObject, onchangeFPS);
UIHelper.registEvent(setting.mouseEffect.gameObject, onchangeMouse);
UIHelper.registEvent(setting.closeUp.gameObject, onchangeCloseUp);
UIHelper.registEvent(setting.cloud.gameObject, onchangeCloud);
......@@ -81,10 +81,10 @@ public class Setting : WindowServant2D
private void onchangeFPS()
{
if (setting.showoffFPS.value == "无限制") {
if (setting.LimFPS.value == "Auto") {
Application.targetFrameRate = -1;
} else {
int FPS = int.Parse(setting.showoffFPS.value);
int FPS = int.Parse(setting.LimFPS.value);
Application.targetFrameRate = FPS;
}
}
......@@ -244,7 +244,7 @@ public class Setting : WindowServant2D
}
Config.Set("showoffATK", setting.showoffATK.value.ToString());
Config.Set("showoffStar", setting.showoffStar.value.ToString());
Config.Set("showoffFPS", setting.showoffFPS.value.ToString());
Config.Set("LimFPS", setting.LimFPS.value.ToString());
Config.Set("resize_", UIHelper.fromBoolToString(UIHelper.getByName<UIToggle>(gameObject, "resize_").value));
}
......
......@@ -9980,7 +9980,7 @@ MonoBehaviour:
sliderAlpha: {fileID: 11468830}
showoffATK: {fileID: 11465400}
showoffStar: {fileID: 114122206682793576}
showoffFPS: {fileID: 11461176}
LimFPS: {fileID: 11461176}
mouseEffect: {fileID: 11460026}
closeUp: {fileID: 11451290}
showoff: {fileID: 11470560}
......@@ -13744,7 +13744,7 @@ MonoBehaviour:
- 40
- 50
- 60
- "\u65E0\u9650\u5236"
- Auto
padding: {x: 4, y: 4}
textColor: {r: 1, g: 1, b: 1, a: 1}
backgroundColor: {r: 0, g: 0, b: 0, a: 1}
......
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