修正分支合并

Zframework/task.lua

@@ -45,13 +45,6 @@ function TASK.removeTask_data(data)
 		end
 	end
 end
-function TASK.checkTask_code(code)
-	for i=#tasks,1,-1 do
-		if tasks[i].code==code then
-			return true
-		end
-	end
-end
 function TASK.clear()
 	local i=#tasks
 	while i>0 do

Zframework/toolfunc.lua

@@ -542,7 +542,7 @@ do--urlencode
 		return out
 	end
 end
-do--httpRequest
+do--httpRequest & wsConnect
 	client=LOADLIB("NETlib")
 	httpRequest=
 	client and function(tick,path,method,header,body)

Zframework/widget.lua

@@ -809,28 +809,26 @@ function WIDGET.lnk_swapScene(t,s)	return function()	SCN.swapTo(t,s)					end end
 function WIDGET.lnk_goNetgame()
 	if LOGIN then
 		if ACCOUNT.access_token then
-			local res=json.encode{
-				email=ACCOUNT.email,
-				access_token=ACCOUNT.access_token,
-			}
 			httpRequest(
 				TICK.httpREQ_checkAccessToken,
 				PATH.api..PATH.access,
 				"GET",
 				{["Content-Type"]="application/json"},
-				res
+				json.encode{
+					email=ACCOUNT.email,
+					access_token=ACCOUNT.access_token,
+				}
 			)
 		else
-			local payload=json.encode{
-				email=ACCOUNT.email,
-				auth_token=ACCOUNT.auth_token,
-			}
 			httpRequest(
 				TICK.httpREQ_getAccessToken,
 				PATH.api..PATH.access,
 				"POST",
 				{["Content-Type"]="application/json"},
-				payload
+				json.encode{
+					email=ACCOUNT.email,
+					auth_token=ACCOUNT.auth_token,
+				}
 			)
 		end
 	else

parts/globalTables.lua

@@ -283,7 +283,7 @@ SETTING={
 }
 
 STAT={
-	version=VERSION_NAME,
+	version=VERSION_CODE,
 	run=0,game=0,time=0,frame=0,
 	key=0,rotate=0,hold=0,
 	extraPiece=0,finesseRate=0,

parts/scenes/chat.lua

@@ -1,32 +1,40 @@
 local function socketWrite(message)
-	if not WSCONN then
+	if WSCONN then
+		local writeErr=client.write(WSCONN,message)
+		if writeErr then print(writeErr,"warn")end
+	else
 		LOG.print("尚未连接到服务器","warn")
-		return
 	end
-	local writeErr = client.write(WSCONN, message)
-	if writeErr then
-		print(writeErr, "warn")
-	end
-	return true
 end
 
-local function send()
+local function sendMessage()
 	local W=WIDGET.active.text
-	socketWrite(W.value)
+	if #W.value>0 then
-	W.value=""
+		socketWrite(W.value)
+		W.value=""
+	end
 end
 
 function sceneInit.chat()
 	BG.set("none")
 	wsConnect(
 		TICK.wsCONN_connect,
-		PATH.socket..PATH.chat.."?email="..urlEncode(ACCOUNT.email).."&access_token="..urlEncode(ACCOUNT.access_token),
+		PATH.socket..PATH.chat.."?email="..urlEncode(ACCOUNT.email).."&access_token="..urlEncode(ACCOUNT.access_token)
-		{}
 	)
 end
 
+function keyDown.chat(k)
+	if k=="return"then
+		sendMessage()
+	elseif k=="escape"then
+		SCN.back()
+	else
+		WIDGET.keyPressed(k)
+	end
+end
+
 WIDGET.init("chat",{
 	WIDGET.newTextBox{name="text",	x=40,	y=500,w=980,h=180,font=40},
-	WIDGET.newButton{name="send",	x=1140,	y=540,w=170,h=80,font=40,code=send},
+	WIDGET.newButton{name="send",	x=1140,	y=540,w=170,h=80,font=40,code=sendMessage},
 	WIDGET.newButton{name="back",	x=1140,	y=640,w=170,h=80,font=40,code=WIDGET.lnk_BACK},
 })

parts/scenes/load.lua

@@ -118,19 +118,16 @@ function Tmr.load()
 			VOC.play("welcome_voc")
 			httpRequest(TICK.httpREQ_launch,PATH.api..PATH.appInfo)
 			if ACCOUNT.auth_token and ACCOUNT.email then
-				local res=json.encode{
+				httpRequest(
-					email=ACCOUNT.email,
+					TICK.httpREQ_autoLogin,
-					auth_token=ACCOUNT.auth_token,
+					PATH.api..PATH.auth,
-				}
+					"GET",
-				if res then
+					{["Content-Type"]="application/json"},
-					httpRequest(
+					json.encode{
-						TICK.httpREQ_autoLogin,
+						email=ACCOUNT.email,
-						PATH.api..PATH.auth,
+						auth_token=ACCOUNT.auth_token,
-						"GET",
+					}
-						{["Content-Type"]="application/json"},
+				)
-						res
-					)
-				end
 			end
 		end
 		if S.tar then

parts/scenes/login.lua

@@ -7,19 +7,16 @@ function keyDown.login(key)
 		elseif #password==0 then
 			LOG.print(text.noPassword)return
 		end
-		local res=json.encode{
+		httpRequest(
-			email=email,
+			TICK.httpREQ_newLogin,
-			password=password,
+			PATH.api..PATH.auth,
-		}
+			"GET",
-		if res then
+			{["Content-Type"]="application/json"},
-			httpRequest(
+			json.encode{
-				TICK.httpREQ_newLogin,
+				email=email,
-				PATH.api..PATH.auth,
+				password=password,
-				"GET",
+			}
-				{["Content-Type"]="application/json"},
+		)
-				res
-			)
-		end
 	elseif key=="escape"then
 		SCN.back()
 	else

parts/scenes/register.lua

@@ -13,20 +13,17 @@ function keyDown.register(key)
 		elseif password~=password2 then
 			LOG.print(text.diffPassword)return
 		end
-		local res=json.encode{
+		httpRequest(
-			username=username,
+			TICK.httpREQ_register,
-			email=email,
+			PATH.api..PATH.auth,
-			password=password,
+			"POST",
-		}
+			{["Content-Type"]="application/json"},
-		if res then
+			json.encode{
-			httpRequest(
+				username=username,
-				TICK.httpREQ_register,
+				email=email,
-				PATH.api..PATH.auth,
+				password=password,
-				"POST",
+			}
-				{["Content-Type"]="application/json"},
+		)
-				res
-			)
-		end
 	elseif key=="escape"then
 		SCN.back()
 	else

parts/tick.lua

@@ -146,16 +146,15 @@ function Tick.httpREQ_newLogin(data)
 				ACCOUNT.auth_token=res.auth_token
 				FILE.save(ACCOUNT,"account","")
 
-				local payload=json.encode{
-					email=ACCOUNT.email,
-					auth_token=ACCOUNT.auth_token,
-				}
 				httpRequest(
 					TICK.httpREQ_getAccessToken,
 					PATH.api..PATH.access,
 					"POST",
 					{["Content-Type"]="application/json"},
-					payload
+					json.encode{
+						email=ACCOUNT.email,
+						auth_token=ACCOUNT.auth_token,
+					}
 				)
 			else
 				LOG.print(text.netErrorCode..response.code..": "..res.message,"warn")
@@ -199,16 +198,15 @@ function Tick.httpREQ_checkAccessToken(data)
 			SCN.pop()
 			SCN.go("netgame")
 		elseif response.code==403 or response.code==401 then
-			local payload=json.encode{
-				email=ACCOUNT.email,
-				auth_token=ACCOUNT.auth_token,
-			}
 			httpRequest(
 				TICK.httpREQ_getAccessToken,
 				PATH.api..PATH.access,
 				"POST",
 				{["Content-Type"]="application/json"},
-				payload
+				json.encode{
+					email=ACCOUNT.email,
+					auth_token=ACCOUNT.auth_token,
+				}
 			)
 		else
 			local err=json.decode(response.body)
@@ -264,7 +262,7 @@ function Tick.wsCONN_connect(data)
 		local wsconn,connErr=client.poll(data.wsconntask)
 		if wsconn then
 			WSCONN = wsconn
-			TASK.new(Tick.wsCONN_read,{net=true})
+			TASK.new(Tick.wsCONN_read)
 			return true
 		elseif connErr then
 			LOG.print(text.wsFailed..": "..connErr,"warn")
@@ -273,10 +271,7 @@ function Tick.wsCONN_connect(data)
 	end
 	return checkTimeout(data,360)
 end
-function Tick.wsCONN_read(data)
+function Tick.wsCONN_read()
-	if not data.net then
-		return true
-	end
 	local messages,readErr=client.read(WSCONN)
 	if messages then
 		if messages[1] then