Commit c6bd434d authored by mercury233's avatar mercury233

disable changing version

parent af15e869
...@@ -318,7 +318,7 @@ public static class TcpHelper ...@@ -318,7 +318,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);
......
...@@ -560,9 +560,9 @@ public class Room : WindowServantSP ...@@ -560,9 +560,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);
} }
} }
......
...@@ -27,6 +27,7 @@ public class SelectServer : WindowServantSP ...@@ -27,6 +27,7 @@ public class SelectServer : WindowServantSP
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();
} }
...@@ -75,7 +76,7 @@ public class SelectServer : WindowServantSP ...@@ -75,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()
...@@ -142,11 +143,6 @@ public class SelectServer : WindowServantSP ...@@ -142,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);
} }
......
...@@ -558,7 +558,7 @@ Transform: ...@@ -558,7 +558,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 146030} m_GameObject: {fileID: 146030}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -35, y: 12, z: 0} m_LocalPosition: {x: 4, y: 12, 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: 459106} m_Father: {fileID: 459106}
...@@ -655,7 +655,7 @@ Transform: ...@@ -655,7 +655,7 @@ Transform:
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 165948} m_GameObject: {fileID: 165948}
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: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
...@@ -671,7 +671,7 @@ Transform: ...@@ -671,7 +671,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 196120} m_GameObject: {fileID: 196120}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 60.5, y: 0, z: 0} m_LocalPosition: {x: 0, 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: 476020} m_Father: {fileID: 476020}
...@@ -715,7 +715,7 @@ Transform: ...@@ -715,7 +715,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 172044} m_GameObject: {fileID: 172044}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 2, y: 95, z: 0} m_LocalPosition: {x: 2, y: 96, 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: 437450} m_Father: {fileID: 437450}
...@@ -785,7 +785,7 @@ Transform: ...@@ -785,7 +785,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 120982} m_GameObject: {fileID: 120982}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 241, y: 0, z: 0} m_LocalPosition: {x: -60, 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: 403976} - {fileID: 403976}
...@@ -852,7 +852,7 @@ Transform: ...@@ -852,7 +852,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 178178} m_GameObject: {fileID: 178178}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -71, y: 11, z: 0} m_LocalPosition: {x: -113, y: 11, 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: 487848} m_Father: {fileID: 487848}
...@@ -878,7 +878,7 @@ Transform: ...@@ -878,7 +878,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 142072} m_GameObject: {fileID: 142072}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 122, y: 2, z: 0} m_LocalPosition: {x: 266, y: 2, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 430856} - {fileID: 430856}
...@@ -935,7 +935,7 @@ Transform: ...@@ -935,7 +935,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000} m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 168808} m_GameObject: {fileID: 168808}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 121, y: 0, z: 0} m_LocalPosition: {x: 163, 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: 471372} - {fileID: 471372}
...@@ -992,8 +992,8 @@ BoxCollider: ...@@ -992,8 +992,8 @@ BoxCollider:
m_IsTrigger: 0 m_IsTrigger: 0
m_Enabled: 1 m_Enabled: 1
serializedVersion: 2 serializedVersion: 2
m_Size: {x: 23.99976, y: 24, z: 0} m_Size: {x: 24, y: 24, z: 0}
m_Center: {x: 61.096924, y: 0, z: 0} m_Center: {x: 0, y: 0, z: 0}
--- !u!65 &6519690 --- !u!65 &6519690
BoxCollider: BoxCollider:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -1005,7 +1005,7 @@ BoxCollider: ...@@ -1005,7 +1005,7 @@ BoxCollider:
m_Enabled: 1 m_Enabled: 1
serializedVersion: 2 serializedVersion: 2
m_Size: {x: 206.00713, y: 32, z: 0} m_Size: {x: 206.00713, y: 32, z: 0}
m_Center: {x: -14.996368, y: -0.0000038146973, z: 0} m_Center: {x: -14.996368, y: 0, z: 0}
--- !u!65 &6530906 --- !u!65 &6530906
BoxCollider: BoxCollider:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -1052,7 +1052,7 @@ BoxCollider: ...@@ -1052,7 +1052,7 @@ BoxCollider:
m_IsTrigger: 1 m_IsTrigger: 1
m_Enabled: 1 m_Enabled: 1
serializedVersion: 2 serializedVersion: 2
m_Size: {x: 80, y: 34, z: 0} m_Size: {x: 2, y: 34, z: 0}
m_Center: {x: 0, y: 0, z: 0} m_Center: {x: 0, y: 0, z: 0}
--- !u!65 &6576416 --- !u!65 &6576416
BoxCollider: BoxCollider:
...@@ -1100,7 +1100,7 @@ BoxCollider: ...@@ -1100,7 +1100,7 @@ BoxCollider:
m_IsTrigger: 1 m_IsTrigger: 1
m_Enabled: 1 m_Enabled: 1
serializedVersion: 2 serializedVersion: 2
m_Size: {x: 124.15951, y: 32, z: 0} m_Size: {x: 206, y: 32, z: 0}
m_Center: {x: -14.210312, y: 0, z: 0} m_Center: {x: -14.210312, y: 0, z: 0}
--- !u!111 &11107992 --- !u!111 &11107992
Animation: Animation:
...@@ -1245,17 +1245,17 @@ MonoBehaviour: ...@@ -1245,17 +1245,17 @@ MonoBehaviour:
updateAnchors: 1 updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 0.40392157} mColor: {r: 1, g: 1, b: 1, a: 0.40392157}
mPivot: 0 mPivot: 0
mWidth: 70 mWidth: 2
mHeight: 24 mHeight: 24
mDepth: 21 mDepth: 21
autoResizeBoxCollider: 0 autoResizeBoxCollider: 0
hideIfOffScreen: 0 hideIfOffScreen: 0
keepAspectRatio: 0 keepAspectRatio: 0
aspectRatio: 2.9166667 aspectRatio: 0.083333336
keepCrispWhenShrunk: 1 keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 12800000, guid: f775853fdfd14bb47934543e95c3bae3, type: 3} mTrueTypeFont: {fileID: 12800000, guid: f775853fdfd14bb47934543e95c3bae3, type: 3}
mFont: {fileID: 0} mFont: {fileID: 0}
mText: 0x1349 mText: 0
mFontSize: 18 mFontSize: 18
mFontStyle: 0 mFontStyle: 0
mAlignment: 1 mAlignment: 1
...@@ -1427,13 +1427,13 @@ MonoBehaviour: ...@@ -1427,13 +1427,13 @@ MonoBehaviour:
updateAnchors: 1 updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 0.40392157} mColor: {r: 1, g: 1, b: 1, a: 0.40392157}
mPivot: 0 mPivot: 0
mWidth: 119 mWidth: 202
mHeight: 22 mHeight: 22
mDepth: 21 mDepth: 21
autoResizeBoxCollider: 0 autoResizeBoxCollider: 0
hideIfOffScreen: 0 hideIfOffScreen: 0
keepAspectRatio: 0 keepAspectRatio: 0
aspectRatio: 5.409091 aspectRatio: 9.181818
keepCrispWhenShrunk: 1 keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 12800000, guid: f775853fdfd14bb47934543e95c3bae3, type: 3} mTrueTypeFont: {fileID: 12800000, guid: f775853fdfd14bb47934543e95c3bae3, type: 3}
mFont: {fileID: 0} mFont: {fileID: 0}
...@@ -1559,13 +1559,13 @@ MonoBehaviour: ...@@ -1559,13 +1559,13 @@ MonoBehaviour:
updateAnchors: 1 updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1} mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4 mPivot: 4
mWidth: 146 mWidth: 24
mHeight: 24 mHeight: 24
mDepth: 100 mDepth: 100
autoResizeBoxCollider: 0 autoResizeBoxCollider: 0
hideIfOffScreen: 0 hideIfOffScreen: 0
keepAspectRatio: 0 keepAspectRatio: 0
aspectRatio: 6.0833335 aspectRatio: 1
--- !u!114 &11435072 --- !u!114 &11435072
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -1920,13 +1920,13 @@ MonoBehaviour: ...@@ -1920,13 +1920,13 @@ MonoBehaviour:
updateAnchors: 1 updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1} mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4 mPivot: 4
mWidth: 80 mWidth: 2
mHeight: 34 mHeight: 34
mDepth: 20 mDepth: -99
autoResizeBoxCollider: 1 autoResizeBoxCollider: 1
hideIfOffScreen: 0 hideIfOffScreen: 0
keepAspectRatio: 0 keepAspectRatio: 0
aspectRatio: 2.3529413 aspectRatio: 0.05882353
mType: 1 mType: 1
mFillDirection: 4 mFillDirection: 4
mFillAmount: 1 mFillAmount: 1
...@@ -2519,13 +2519,13 @@ MonoBehaviour: ...@@ -2519,13 +2519,13 @@ MonoBehaviour:
updateAnchors: 1 updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1} mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4 mPivot: 4
mWidth: 152 mWidth: 236
mHeight: 34 mHeight: 34
mDepth: 20 mDepth: 20
autoResizeBoxCollider: 0 autoResizeBoxCollider: 0
hideIfOffScreen: 0 hideIfOffScreen: 0
keepAspectRatio: 0 keepAspectRatio: 0
aspectRatio: 4.470588 aspectRatio: 6.9411764
mType: 1 mType: 1
mFillDirection: 4 mFillDirection: 4
mFillAmount: 1 mFillAmount: 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