Commit f3f87c63 authored by mercury233's avatar mercury233 Committed by Unicorn369

disable changing version

parent 01104343
...@@ -333,7 +333,7 @@ public static class TcpHelper ...@@ -333,7 +333,7 @@ public static class TcpHelper
deckStrings.Clear(); deckStrings.Clear();
Package message = new Package(); Package message = new Package();
message.Fuction = (int)CtosMessage.JoinGame; message.Fuction = (int)CtosMessage.JoinGame;
Config.ClientVersion = (uint)GameStringManager.helper_stringToInt(version); //Config.ClientVersion = (uint)GameStringManager.helper_stringToInt(version);
message.Data.writer.Write((Int16)Config.ClientVersion); message.Data.writer.Write((Int16)Config.ClientVersion);
message.Data.writer.Write((byte)204); message.Data.writer.Write((byte)204);
message.Data.writer.Write((byte)204); message.Data.writer.Write((byte)204);
......
...@@ -748,9 +748,9 @@ public class Room : WindowServantSP ...@@ -748,9 +748,9 @@ public class Room : WindowServantSP
r.ReadByte(); r.ReadByte();
r.ReadByte(); r.ReadByte();
code = r.ReadInt32(); code = r.ReadInt32();
string hexOutput = "0x"+String.Format("{0:X}", code); //string hexOutput = "0x"+String.Format("{0:X}", code);
Program.I().selectServer.set_version(hexOutput); //Program.I().selectServer.set_version(hexOutput);
RMSshow_none(InterString.Get("你输入的版本号和服务器不一致,[7CFC00]YGOPro2已经智能切换版本号[-],请重新链接。")); //RMSshow_none(InterString.Get("你输入的版本号和服务器不一致,[7CFC00]YGOPro2已经智能切换版本号[-],请重新链接。"));
break; break;
default: default:
break; break;
......
...@@ -53,7 +53,7 @@ public class PrecyOcg ...@@ -53,7 +53,7 @@ public class PrecyOcg
} }
else else
{ {
Config.ClientVersion = 0x233c; //Config.ClientVersion = 0x233c;
Program.I().shiftToServant(Program.I().ocgcore); Program.I().shiftToServant(Program.I().ocgcore);
} }
((CardDescription)Program.I().cardDescription).setTitle(path); ((CardDescription)Program.I().cardDescription).setTitle(path);
...@@ -78,7 +78,7 @@ public class PrecyOcg ...@@ -78,7 +78,7 @@ public class PrecyOcg
} }
else else
{ {
Config.ClientVersion = 0x233c; //Config.ClientVersion = 0x233c;
Program.I().shiftToServant(Program.I().ocgcore); Program.I().shiftToServant(Program.I().ocgcore);
} }
} }
......
...@@ -19,7 +19,6 @@ public class SelectServer : WindowServantSP ...@@ -19,7 +19,6 @@ public class SelectServer : WindowServantSP
UIHelper.registEvent(gameObject, "exit_", onClickExit); UIHelper.registEvent(gameObject, "exit_", onClickExit);
UIHelper.registEvent(gameObject, "face_", onClickFace); UIHelper.registEvent(gameObject, "face_", onClickFace);
UIHelper.registEvent(gameObject, "join_", onClickJoin); UIHelper.registEvent(gameObject, "join_", onClickJoin);
//UIHelper.registEvent(gameObject, "roomList_", onClickRoomList);
UIHelper.getByName<UIInput>(gameObject, "name_").value = Config.Get("name","一秒一喵机会"); UIHelper.getByName<UIInput>(gameObject, "name_").value = Config.Get("name","一秒一喵机会");
list = UIHelper.getByName<UIPopupList>(gameObject, "history_"); list = UIHelper.getByName<UIPopupList>(gameObject, "history_");
UIHelper.registEvent(gameObject,"history_", onSelected); UIHelper.registEvent(gameObject,"history_", onSelected);
...@@ -27,7 +26,8 @@ public class SelectServer : WindowServantSP ...@@ -27,7 +26,8 @@ public class SelectServer : WindowServantSP
inputIP = UIHelper.getByName<UIInput>(gameObject, "ip_"); inputIP = UIHelper.getByName<UIInput>(gameObject, "ip_");
inputPort = UIHelper.getByName<UIInput>(gameObject, "port_"); inputPort = UIHelper.getByName<UIInput>(gameObject, "port_");
inputPsw = UIHelper.getByName<UIInput>(gameObject, "psw_"); inputPsw = UIHelper.getByName<UIInput>(gameObject, "psw_");
inputVersion = UIHelper.getByName<UIInput>(gameObject, "version_"); //inputVersion = UIHelper.getByName<UIInput>(gameObject, "version_");
set_version("0x" + String.Format("{0:X}", Config.ClientVersion));
SetActiveFalse(); SetActiveFalse();
} }
...@@ -76,7 +76,7 @@ public class SelectServer : WindowServantSP ...@@ -76,7 +76,7 @@ public class SelectServer : WindowServantSP
inputIP.value = ip; inputIP.value = ip;
inputPort.value = port; inputPort.value = port;
inputPsw.value = psw; inputPsw.value = psw;
inputVersion.value = version; //inputVersion.value = version;
} }
public override void show() public override void show()
...@@ -143,11 +143,6 @@ public class SelectServer : WindowServantSP ...@@ -143,11 +143,6 @@ public class SelectServer : WindowServantSP
string portString = UIHelper.getByName<UIInput>(gameObject, "port_").value; string portString = UIHelper.getByName<UIInput>(gameObject, "port_").value;
string pswString = UIHelper.getByName<UIInput>(gameObject, "psw_").value; string pswString = UIHelper.getByName<UIInput>(gameObject, "psw_").value;
string versionString = UIHelper.getByName<UIInput>(gameObject, "version_").value; string versionString = UIHelper.getByName<UIInput>(gameObject, "version_").value;
if (versionString=="")
{
UIHelper.getByName<UIInput>(gameObject, "version_").value = "0x1349";
versionString = "0x1349";
}
KF_onlineGame(Name, ipString, portString, versionString, pswString); KF_onlineGame(Name, ipString, portString, versionString, pswString);
} }
...@@ -162,11 +157,6 @@ public class SelectServer : WindowServantSP ...@@ -162,11 +157,6 @@ public class SelectServer : WindowServantSP
string portString = UIHelper.getByName<UIInput>(gameObject, "port_").value; string portString = UIHelper.getByName<UIInput>(gameObject, "port_").value;
string pswString = "L"; string pswString = "L";
string versionString = UIHelper.getByName<UIInput>(gameObject, "version_").value; string versionString = UIHelper.getByName<UIInput>(gameObject, "version_").value;
if (versionString == "")
{
UIHelper.getByName<UIInput>(gameObject, "version_").value = "0x1348";
versionString = "0x1348";
}
KF_onlineGame(Name, ipString, portString, versionString, pswString); KF_onlineGame(Name, ipString, portString, versionString, pswString);
} }
......
...@@ -594,7 +594,7 @@ Transform: ...@@ -594,7 +594,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 195152} m_GameObject: {fileID: 195152}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 300, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 419752} - {fileID: 419752}
...@@ -745,7 +745,7 @@ Transform: ...@@ -745,7 +745,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 196122} m_GameObject: {fileID: 196122}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 3, y: 0, z: 0} m_LocalPosition: {x: 303, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 428902} m_Father: {fileID: 428902}
...@@ -1762,7 +1762,7 @@ MonoBehaviour: ...@@ -1762,7 +1762,7 @@ MonoBehaviour:
keepCrispWhenShrunk: 1 keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} mTrueTypeFont: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
mFont: {fileID: 0} mFont: {fileID: 0}
mText: "\u623F\u95F4\u540D\uFF1A" mText: "\u623F\u95F4\u5BC6\u7801\uFF1A"
mFontSize: 25 mFontSize: 25
mFontStyle: 0 mFontStyle: 0
mAlignment: 1 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