Commit e4a6da30 authored by Unicorn369's avatar Unicorn369

Merge branch 'Test' of https://github.com/Unicorn369/YGOPro2_Droid into Android

parents e2cc2dcd 96ac4767
......@@ -95,9 +95,9 @@ public class Menu : WindowServantSP
Program.I().quit();
Program.Running = false;
TcpHelper.SaveRecord();
#if !UNITY_EDITOR || UNITY_ANDROID || UNITY_IPHONE // IL2CPP 使用此方法才能退出
#if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IPHONE) // IL2CPP 使用此方法才能退出
Application.Quit();
#elif
#else
Process.GetCurrentProcess().Kill();
#endif
}
......@@ -134,10 +134,10 @@ public class Menu : WindowServantSP
void onClickJoinQQ()
{
#if !UNITY_EDITOR || UNITY_ANDROID //Android
#if !UNITY_EDITOR && UNITY_ANDROID //Android
AndroidJavaObject jo = new AndroidJavaObject("cn.unicorn369.library.API");
jo.Call("doJoinQQGroup", "UHm3h3hSrmgp-iYqMiZcc2zO5J1Q8OyW");
#elif
#else
Application.OpenURL("https://jq.qq.com/?_wv=1027&k=50MZVQA");
#endif
}
......
......@@ -32,12 +32,6 @@ public class selectDeck : WindowServantSP
UIHelper.registEvent(gameObject, "copy_", onCopy);
UIHelper.registEvent(gameObject, "rename_", onRename);
UIHelper.registEvent(gameObject, "code_", onCode);
if (Application.systemLanguage == SystemLanguage.Chinese || Application.systemLanguage == SystemLanguage.ChineseSimplified || Application.systemLanguage == SystemLanguage.ChineseTraditional)
{
UIHelper.getByName<UILabel>(gameObject, "!default").text = "搜索卡组";
} else {
UIHelper.getByName<UILabel>(gameObject, "!default").text = "Search";
}
searchInput = UIHelper.getByName<UIInput>(gameObject, "search_");
superScrollView.install();
for (int i = 0; i < quickCards.Length; i++)
......
......@@ -9,6 +9,7 @@ public class WindowServant2D : Servant
UIHelper.clearITWeen(gameObject);
iTween.MoveTo(gameObject, Program.camera_main_2d.ScreenToWorldPoint(new Vector3(Screen.width / 2, Screen.height * 1.5f, 0)), 0.6f);
}
resize();
}
public override void applyShowArrangement()
......@@ -18,6 +19,23 @@ public class WindowServant2D : Servant
UIHelper.clearITWeen(gameObject);
iTween.MoveTo(gameObject, Program.camera_main_2d.ScreenToWorldPoint(new Vector3(Screen.width / 2, Screen.height / 2, 0)), 0.6f);
}
resize();
}
void resize()
{
if (gameObject != null)
{
if (Program.I().setting.setting.resize.value)
{
float f = Screen.height / 700f;
gameObject.transform.localScale = new Vector3(f, f, f);
}
else
{
gameObject.transform.localScale = new Vector3(1, 1, 1);
}
}
}
public override void hide()
......
......@@ -44,15 +44,6 @@ public class SelectServer : WindowServantSP
//inputVersion = UIHelper.getByName<UIInput>(gameObject, "version_");
set_version("0x" + String.Format("{0:X}", Config.ClientVersion));
if (Application.systemLanguage == SystemLanguage.Chinese || Application.systemLanguage == SystemLanguage.ChineseSimplified || Application.systemLanguage == SystemLanguage.ChineseTraditional)
{}
else //如果非要改成其他语言的话
{
UIHelper.getByName<UIInput>(gameObject, "name_").defaultText = "Name cannot be blank";
inputIP.defaultText = "IP address or domain name";
inputPort.defaultText = "Port";
inputPsw.defaultText = "Room password";
}
//方便免修改 [selectServerWithRoomlist.prefab]
serversList.items.Add("[OCG]Mercury233");
serversList.items.Add("[OCG]Koishi");
......
......@@ -140,7 +140,7 @@ GameObject:
- component: {fileID: 432674}
- component: {fileID: 11475334}
m_Layer: 18
m_Name: Label
m_Name: '!default'
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
......@@ -432,7 +432,7 @@ GameObject:
- component: {fileID: 442912}
- component: {fileID: 11401100}
m_Layer: 18
m_Name: Label
m_Name: '!default'
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
......@@ -535,7 +535,7 @@ GameObject:
- component: {fileID: 406588}
- component: {fileID: 11435380}
m_Layer: 18
m_Name: Label
m_Name: '!default'
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
......@@ -567,7 +567,7 @@ GameObject:
- component: {fileID: 442160}
- component: {fileID: 11473318}
m_Layer: 18
m_Name: Label
m_Name: '!default'
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
......@@ -2781,7 +2781,7 @@ MonoBehaviour:
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 12800000, guid: f775853fdfd14bb47934543e95c3bae3, type: 3}
mFont: {fileID: 0}
mText: "\u670D\u52A1\u5668IP \u6216 \u57DF\u540D"
mText: "\u670D\u52A1\u5668IP\u6216\u57DF\u540D"
mFontSize: 18
mFontStyle: 0
mAlignment: 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