修正分支合并

Zframework/toolfunc.lua

@@ -190,9 +190,7 @@ do--httpRequest
 	wsConnect=
 	client and function(tick,path,header)
 		local task,err=client.wsraw{
-			-- url="http://krakens.tpddns.cn:10026"..path,
+			url="http://krakens.tpddns.cn:10026"..path,
-			url="ws://127.0.0.1:10026"..path,
-			origin = "127.0.0.1",
 			header=header,
 		}
 		if task then

parts/language/lang_en.lua

@@ -485,10 +485,6 @@ return{
 			password="Password",
 			password2="Reenter password",
 		},
-		netgame={
-			title="Online game",
-			test="Test",
-		},
 		account={
 			title="Account",
 		},

parts/language/lang_fr.lua

@@ -482,10 +482,6 @@ return{
 			password="Mot de passe",
 			password2="Confirmer le mot de passe",
 		},
-		netgame={ -- TODO: translation
-			title="Online game",
-			test="Test",
-		},
 		account={
 			title="Compte",
 		},

parts/language/lang_sp.lua

@@ -487,10 +487,6 @@ return{
 			password="Contraseña",
 			password2="Repetir Contr.",
 		},
-		netgame={ -- TODO: translation
-			title="Online game",
-			test="Test",
-		},
 		account={
 			title="Cuenta",
 		},

parts/language/lang_zh.lua

@@ -508,10 +508,6 @@ return{
 			password="密码",
 			password2="确认密码",
 		},
-		netgame={
-			title="在线游戏",
-			test="测试",
-		},
 		account={
 			title="账户",
 		},