Commit 4436e983 authored by Unicorn369's avatar Unicorn369

fix

parent 3b49de06
...@@ -58,6 +58,7 @@ updates/ ...@@ -58,6 +58,7 @@ updates/
cards.cdb cards.cdb
lflist.conf lflist.conf
strings.conf strings.conf
commamd.shell
AI_core_vs2017solution/core.VC.db AI_core_vs2017solution/core.VC.db
AI_core_vs2017solution/core.VC.VC.opendb AI_core_vs2017solution/core.VC.VC.opendb
AI_core_vs2017solution/System.Servicemodel.Faltexception.dll AI_core_vs2017solution/System.Servicemodel.Faltexception.dll
......
...@@ -17,6 +17,8 @@ public class SelectServer : WindowServantSP ...@@ -17,6 +17,8 @@ public class SelectServer : WindowServantSP
UISprite inputIP_; UISprite inputIP_;
UISprite inputPort_; UISprite inputPort_;
static bool EditIpAndPort;
public override void initialize() public override void initialize()
{ {
createWindow(Program.I().new_ui_selectServer); createWindow(Program.I().new_ui_selectServer);
...@@ -81,7 +83,7 @@ public class SelectServer : WindowServantSP ...@@ -81,7 +83,7 @@ public class SelectServer : WindowServantSP
UIHelper.getByName<UIInput>(gameObject, "port_").value = "233"; UIHelper.getByName<UIInput>(gameObject, "port_").value = "233";
Config.Set("serversPicker", "[OCG]Mercury233"); Config.Set("serversPicker", "[OCG]Mercury233");
list.enabled = false; EditIpAndPort = false;
inputIP_.enabled = false; inputIP_.enabled = false;
inputPort_.enabled = false; inputPort_.enabled = false;
break; break;
...@@ -92,7 +94,7 @@ public class SelectServer : WindowServantSP ...@@ -92,7 +94,7 @@ public class SelectServer : WindowServantSP
UIHelper.getByName<UIInput>(gameObject, "port_").value = "7210"; UIHelper.getByName<UIInput>(gameObject, "port_").value = "7210";
Config.Set("serversPicker", "[OCG]Koishi"); Config.Set("serversPicker", "[OCG]Koishi");
list.enabled = false; EditIpAndPort = false;
inputIP_.enabled = false; inputIP_.enabled = false;
inputPort_.enabled = false; inputPort_.enabled = false;
break; break;
...@@ -103,7 +105,7 @@ public class SelectServer : WindowServantSP ...@@ -103,7 +105,7 @@ public class SelectServer : WindowServantSP
UIHelper.getByName<UIInput>(gameObject, "port_").value = "1311"; UIHelper.getByName<UIInput>(gameObject, "port_").value = "1311";
Config.Set("serversPicker", "[TCG]Koishi"); Config.Set("serversPicker", "[TCG]Koishi");
list.enabled = false; EditIpAndPort = false;
inputIP_.enabled = false; inputIP_.enabled = false;
inputPort_.enabled = false; inputPort_.enabled = false;
break; break;
...@@ -114,7 +116,7 @@ public class SelectServer : WindowServantSP ...@@ -114,7 +116,7 @@ public class SelectServer : WindowServantSP
UIHelper.getByName<UIInput>(gameObject, "port_").value = "765"; UIHelper.getByName<UIInput>(gameObject, "port_").value = "765";
Config.Set("serversPicker", "[轮抽服]2Pick"); Config.Set("serversPicker", "[轮抽服]2Pick");
list.enabled = false; EditIpAndPort = false;
inputIP_.enabled = false; inputIP_.enabled = false;
inputPort_.enabled = false; inputPort_.enabled = false;
break; break;
...@@ -125,7 +127,7 @@ public class SelectServer : WindowServantSP ...@@ -125,7 +127,7 @@ public class SelectServer : WindowServantSP
UIHelper.getByName<UIInput>(gameObject, "port_").value = "17225"; UIHelper.getByName<UIInput>(gameObject, "port_").value = "17225";
Config.Set("serversPicker", "[OCG&TCG]한국서버"); Config.Set("serversPicker", "[OCG&TCG]한국서버");
list.enabled = false; EditIpAndPort = false;
inputIP_.enabled = false; inputIP_.enabled = false;
inputPort_.enabled = false; inputPort_.enabled = false;
break; break;
...@@ -136,7 +138,7 @@ public class SelectServer : WindowServantSP ...@@ -136,7 +138,7 @@ public class SelectServer : WindowServantSP
UIHelper.getByName<UIInput>(gameObject, "port_").value = "7911"; UIHelper.getByName<UIInput>(gameObject, "port_").value = "7911";
Config.Set("serversPicker", "[OCG&TCG]YGOhollow (JP)"); Config.Set("serversPicker", "[OCG&TCG]YGOhollow (JP)");
list.enabled = false; EditIpAndPort = false;
inputIP_.enabled = false; inputIP_.enabled = false;
inputPort_.enabled = false; inputPort_.enabled = false;
break; break;
...@@ -150,7 +152,7 @@ public class SelectServer : WindowServantSP ...@@ -150,7 +152,7 @@ public class SelectServer : WindowServantSP
Config.Set("serversPicker", "[Custom]"); Config.Set("serversPicker", "[Custom]");
} }
list.enabled = true; EditIpAndPort = true;
inputIP_.enabled = true; inputIP_.enabled = true;
inputPort_.enabled = true; inputPort_.enabled = true;
break; break;
...@@ -201,8 +203,11 @@ public class SelectServer : WindowServantSP ...@@ -201,8 +203,11 @@ public class SelectServer : WindowServantSP
catch (Exception) catch (Exception)
{ {
} }
inputIP.value = ip; if (EditIpAndPort)
inputPort.value = port; {
inputIP.value = ip;
inputPort.value = port;
}
inputPsw.value = psw; inputPsw.value = psw;
//inputVersion.value = version; //inputVersion.value = version;
} }
......
...@@ -12,7 +12,7 @@ We use Yu-Gi-Oh card game only to test our engine, and the game is not for comme ...@@ -12,7 +12,7 @@ We use Yu-Gi-Oh card game only to test our engine, and the game is not for comme
# How to compile the game? # How to compile the game?
1. Download Unity 5.6.7f1 (https://unity3d.com/cn/get-unity/download/archive). 1. Download Unity 5.6.7 (https://unity3d.com/get-unity/download/archive).
2. Clone the repository. 2. Clone the repository.
......
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