Skip to content

Y
ygopro2
Commit 29591290 authored by Unicorn369's avatar Unicorn369
Browse files
Options

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

parents b2ed3346 9dd77920
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 153 additions and 157 deletions
Assets/SibylSystem/selectServer/SelectServer.cs
View file @ 29591290
......@@ -24,24 +24,38 @@ public class SelectServer : WindowServantSP
UIHelper.registEvent(gameObject, "face_", onClickFace);
UIHelper.registEvent(gameObject, "join_", onClickJoin);
serversList = UIHelper.getByName<UIPopupList>(gameObject, "server");
serversList.fontSize = 20;
serversList.value = Config.Get("serversPicker", "[OCG]Koishi");
//serversList.fontSize = 30;
serversList.value = Config.Get("serversPicker", "[Custom]");
UIHelper.registEvent(gameObject, "server", pickServer);
UIHelper.getByName<UIInput>(gameObject, "name_").value = Config.Get("name", "YGOPro2 User");
//UIHelper.getByName<UIInput>(gameObject, "name_").defaultText = "昵称不能为空";
list = UIHelper.getByName<UIPopupList>(gameObject, "history_");
UIHelper.registEvent(gameObject, "history_", onSelected);
name = Config.Get("name", "YGOPro2 User");
inputIP = UIHelper.getByName<UIInput>(gameObject, "ip_");
inputIP_ = UIHelper.getByName<UISprite>(gameObject, "ip_");
//inputIP.defaultText = "服务器IP 或 域名";
inputPort = UIHelper.getByName<UIInput>(gameObject, "port_");
inputPort_ = UIHelper.getByName<UISprite>(gameObject, "port_");
//inputPort.defaultText = "端口";
inputPsw = UIHelper.getByName<UIInput>(gameObject, "psw_");
//inputPsw.defaultText = "房间密码";
inputIP_ = UIHelper.getByName<UISprite>(gameObject, "ip_");
inputPort_ = UIHelper.getByName<UISprite>(gameObject, "port_");
//inputVersion = UIHelper.getByName<UIInput>(gameObject, "version_");
set_version("0x" + String.Format("{0:X}", Config.ClientVersion));
if (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");
serversList.items.Add("[TCG]Koishi");
serversList.items.Add("[轮抽服]2Pick");
serversList.items.Add("[OCG&TCG]한국서버");
serversList.items.Add("[Custom]");
SetActiveFalse();
}
......@@ -83,17 +97,6 @@ public class SelectServer : WindowServantSP
inputPort_.enabled = false;
break;
}
case "[222DIY]Koishi":
{
UIHelper.getByName<UIInput>(gameObject, "ip_").value = "koishi.moecube.com";
UIHelper.getByName<UIInput>(gameObject, "port_").value = "222";
Config.Set("serversPicker", "[222DIY]Koishi");
list.enabled = false;
inputIP_.enabled = false;
inputPort_.enabled = false;
break;
}
case "[轮抽服]2Pick":
{
UIHelper.getByName<UIInput>(gameObject, "ip_").value = "2pick.mycard.moe";
......
Assets/transUI/prefab/trans_detailSearch.prefab
View file @ 29591290
......@@ -2614,7 +2614,7 @@ MonoBehaviour:
atlas: {fileID: 11400000, guid: 62adb30369acbf943a67cee0f69267a3, type: 2}
bitmapFont: {fileID: 0}
trueTypeFont: {fileID: 12800000, guid: f775853fdfd14bb47934543e95c3bae3, type: 3}
fontSize: 16
fontSize: 24
fontStyle: 0
backgroundSprite: Button
highlightSprite: Button
......@@ -3219,7 +3219,7 @@ MonoBehaviour:
atlas: {fileID: 11400000, guid: 62adb30369acbf943a67cee0f69267a3, type: 2}
bitmapFont: {fileID: 0}
trueTypeFont: {fileID: 12800000, guid: f775853fdfd14bb47934543e95c3bae3, type: 3}
fontSize: 16
fontSize: 24
fontStyle: 0
backgroundSprite: Button
highlightSprite: Button
......@@ -3458,7 +3458,7 @@ MonoBehaviour:
atlas: {fileID: 11400000, guid: 62adb30369acbf943a67cee0f69267a3, type: 2}
bitmapFont: {fileID: 0}
trueTypeFont: {fileID: 12800000, guid: f775853fdfd14bb47934543e95c3bae3, type: 3}
fontSize: 16
fontSize: 24
fontStyle: 0
backgroundSprite: Button
highlightSprite: Button
......@@ -4262,7 +4262,7 @@ MonoBehaviour:
atlas: {fileID: 11400000, guid: 62adb30369acbf943a67cee0f69267a3, type: 2}
bitmapFont: {fileID: 0}
trueTypeFont: {fileID: 12800000, guid: f775853fdfd14bb47934543e95c3bae3, type: 3}
fontSize: 16
fontSize: 24
fontStyle: 0
backgroundSprite: Button
highlightSprite: Button
......@@ -5103,7 +5103,7 @@ MonoBehaviour:
atlas: {fileID: 11400000, guid: 62adb30369acbf943a67cee0f69267a3, type: 2}
bitmapFont: {fileID: 0}
trueTypeFont: {fileID: 12800000, guid: f775853fdfd14bb47934543e95c3bae3, type: 3}
fontSize: 16
fontSize: 24
fontStyle: 0
backgroundSprite: Button
highlightSprite: Button
......@@ -5342,7 +5342,7 @@ MonoBehaviour:
atlas: {fileID: 11400000, guid: 62adb30369acbf943a67cee0f69267a3, type: 2}
bitmapFont: {fileID: 0}
trueTypeFont: {fileID: 12800000, guid: f775853fdfd14bb47934543e95c3bae3, type: 3}
fontSize: 16
fontSize: 24
fontStyle: 0
backgroundSprite: Button
highlightSprite: Button
......
Assets/transUI/prefab/trans_setting.prefab
View file @ 29591290
......@@ -9139,7 +9139,7 @@ MonoBehaviour:
atlas: {fileID: 11400000, guid: 62adb30369acbf943a67cee0f69267a3, type: 2}
bitmapFont: {fileID: 0}
trueTypeFont: {fileID: 12800000, guid: f775853fdfd14bb47934543e95c3bae3, type: 3}
fontSize: 16
fontSize: 24
fontStyle: 0
backgroundSprite: Button
highlightSprite: Button
......@@ -9705,7 +9705,7 @@ MonoBehaviour:
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 1.122172
aspectRatio: 1.1625
mType: 0
mFillDirection: 4
mFillAmount: 1
......@@ -13731,7 +13731,7 @@ MonoBehaviour:
atlas: {fileID: 11400000, guid: 62adb30369acbf943a67cee0f69267a3, type: 2}
bitmapFont: {fileID: 0}
trueTypeFont: {fileID: 12800000, guid: f775853fdfd14bb47934543e95c3bae3, type: 3}
fontSize: 16
fontSize: 24
fontStyle: 0
backgroundSprite: Button
highlightSprite: Button
......@@ -14220,7 +14220,7 @@ MonoBehaviour:
atlas: {fileID: 11400000, guid: 62adb30369acbf943a67cee0f69267a3, type: 2}
bitmapFont: {fileID: 0}
trueTypeFont: {fileID: 12800000, guid: f775853fdfd14bb47934543e95c3bae3, type: 3}
fontSize: 16
fontSize: 24
fontStyle: 0
backgroundSprite: Button
highlightSprite: Button
......@@ -18624,7 +18624,7 @@ MonoBehaviour:
atlas: {fileID: 11400000, guid: 62adb30369acbf943a67cee0f69267a3, type: 2}
bitmapFont: {fileID: 0}
trueTypeFont: {fileID: 12800000, guid: f775853fdfd14bb47934543e95c3bae3, type: 3}
fontSize: 16
fontSize: 24
fontStyle: 0
backgroundSprite: Button
highlightSprite: Button
......
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