Task模块全部改用协程

Zframework/task.lua

@@ -1,4 +1,6 @@
 local rem=table.remove
+local ct=coroutine
+local assert=assert
 local tasks={}
 
 local TASK={
@@ -10,24 +12,40 @@ end
 function TASK.update()
 	for i=#tasks,1,-1 do
 		local T=tasks[i]
-		if T.code(T.data)then
+		assert(ct.resume(T.thread))
-			if T.data.net then
+		if ct.status(T.thread)=="dead"then
+			if T.net then
 				TASK.netTaskCount=TASK.netTaskCount-1
 			end
 			rem(tasks,i)
 		end
 	end
 end
-function TASK.new(code,data)
+function TASK.new(code,...)
+	local thread=ct.create(code)
+	if ...~=nil then ct.resume(thread,...)end
+	if ct.status(thread)~="dead"then
 		tasks[#tasks+1]={
+			thread=thread,
 			code=code,
-		data=data,
 		}
 	end
+end
+function TASK.newNet(code,...)
+	local thread=ct.create(code)
+	if ...~=nil then ct.resume(thread,...)end
+	if ct.status(thread)~="dead"then
+		tasks[#tasks+1]={
+			thread=thread,
+			code=code,
+			net=true,
+		}
+	end
+end
 function TASK.changeCode(c1,c2)
 	for i=#tasks,1,-1 do
-		if tasks[i].code==c1 then
+		if tasks[i].thread==c1 then
-			tasks[i].code=c2
+			tasks[i].thread=c2
 		end
 	end
 end

Zframework/toolfunc.lua

@@ -548,13 +548,12 @@ do--httpRequest & wsConnect
 	client and function(tick,path,method,header,body)
 		local task,err=client.httpraw{
 			url="http://krakens.tpddns.cn:10026"..path,
-			-- url="http://127.0.0.1:10026"..path,
 			method=method or"GET",
 			header=header,
 			body=body,
 		}
 		if task then
-			TASK.new(tick,{task=task,time=0,net=true})
+			TASK.newNet(tick,task)
 		else
 			LOG.print("NETlib error: "..err,"warn")
 		end
@@ -569,12 +568,10 @@ do--httpRequest & wsConnect
 		local task,err=client.wsraw{
 			url="ws://krakens.tpddns.cn:10026"..path,
 			origin="krakens.tpddns.cn",
-			-- url="ws://127.0.0.1:10026"..path,
-			-- origin="127.0.0.1",
 			header=header,
 		}
 		if task then
-			TASK.new(tick,{wsconntask=task,time=0,net=true})
+			TASK.newNet(tick,task)
 		else
 			LOG.print("NETlib error: "..err,"warn")
 		end

parts/gametoolfunc.lua

@@ -487,7 +487,7 @@ function resetGameData(replaying)
 	STAT.game=STAT.game+1
 	FREEROW.reset(30*#PLAYERS)
 	TASK.removeTask_code(TICK.showMods)
-	TASK.new(TICK.showMods,{0})
+	TASK.new(TICK.showMods)
 	SFX.play("ready")
 	collectgarbage()
 end

parts/modes/GM.lua

@@ -23,11 +23,14 @@ return{
 		freshLimit=15,
 		dropPiece=score,
 		task=function(P)
+			while true do
+				coroutine.yield()
 				if P.stat.frame>=53.5*60 then
 					P.modeData.point=min(P.modeData.point+16,80)
 					P.modeData.event=sectionName[int(P.modeData.point*.1)+1]
 					P:win("finish")
-				return true
+					return
+				end	
 			end
 		end,
 		bg="tunnel",bgm="far",

parts/modes/attacker_hard.lua

@@ -6,8 +6,9 @@ return{
 		freshLimit=15,
 		pushSpeed=2,
 		task=function(P)
-			if not(P.control and SCN.cur=="play")then return end
+			while true do
-			if P.atkBuffer.sum==0 then
+				coroutine.yield()
+				if P.control and SCN.cur=="play"and P.atkBuffer.sum==0 then
 					local p=#P.atkBuffer+1
 					local B,D=P.atkBuffer,P.modeData
 					local t
@@ -32,6 +33,7 @@ return{
 						end
 					end
 				end
+			end
 		end,
 		bg="rainbow2",bgm="shining terminal",
 	},

parts/modes/attacker_ultimate.lua

@@ -5,8 +5,9 @@ return{
 		fall=8,
 		freshLimit=15,
 		task=function(P)
-			if not(P.control and SCN.cur=="play")then return end
+			while true do
-			if P.atkBuffer.sum<4 then
+				coroutine.yield()
+				if P.control and SCN.cur=="play"and P.atkBuffer.sum<4 then
 					local p=#P.atkBuffer+1
 					local B,D=P.atkBuffer,P.modeData
 					local s
@@ -39,6 +40,7 @@ return{
 						end
 					end
 				end
+			end
 		end,
 		bg="rainbow2",bgm="shining terminal",
 	},

parts/modes/defender_lunatic.lua

@@ -8,7 +8,9 @@ return{
 		freshLimit=15,
 		pushSpeed=2,
 		task=function(P)
-			if not(P.control and SCN.cur=="play")then return end
+			while true do
+				coroutine.yield()
+				if P.control and SCN.cur=="play"then
 					P.modeData.counter=P.modeData.counter+1
 					local t=240-2*P.modeData.event
 					if P.modeData.counter>=t then
@@ -36,6 +38,8 @@ return{
 							end
 						end
 					end
+				end
+			end
 		end,
 		bg="rainbow2",bgm="storm",
 	},

parts/modes/defender_normal.lua

@@ -8,7 +8,9 @@ return{
 		freshLimit=15,
 		pushSpeed=1,
 		task=function(P)
-			if not(P.control and SCN.cur=="play")then return end
+			while true do
+				coroutine.yield()
+				if P.control and SCN.cur=="play"then
 					P.modeData.counter=P.modeData.counter+1
 					local t=360-P.modeData.event*2
 					if P.modeData.counter>=t then
@@ -36,6 +38,8 @@ return{
 							end
 						end
 					end
+				end	
+			end
 		end,
 		bg="rainbow2",bgm="storm",
 	},

parts/modes/dig_hard.lua

@@ -1,4 +1,3 @@
-local max=math.max
 return{
 	color=COLOR.magenta,
 	env={
@@ -6,15 +5,19 @@ return{
 		fall=20,
 		freshLimit=15,
 		task=function(P)
-			if not(P.control and SCN.cur=="play")then return end
+			while true do
+				coroutine.yield()
+				if P.control and SCN.cur=="play"then
 					local D=P.modeData
 					D.counter=D.counter+1
-			if D.counter>=max(90,180-D.event)then
+					if D.counter>=math.max(90,180-D.event)then
 						P:garbageRise(21,1,P:getHolePos())
 						P.stat.recv=P.stat.recv+1
 						D.counter=0
 						D.event=D.event+1
 					end
+				end
+			end
 		end,
 		bg="bg2",bgm="down",
 	},

parts/modes/dig_ultimate.lua

@@ -1,19 +1,22 @@
-local max=math.max
 return{
 	color=COLOR.lYellow,
 	env={
 		drop=10,lock=30,
 		freshLimit=15,
 		task=function(P)
-			if not(P.control and SCN.cur=="play")then return end
+			while true do
+				coroutine.yield()
+				if P.control and SCN.cur=="play"then
 					local D=P.modeData
 					D.counter=D.counter+1
-			if D.counter>=max(30,80-.3*D.event)then
+					if D.counter>=math.max(30,80-.3*D.event)then
 						P:garbageRise(20+D.event%5,1,P:getHolePos())
 						P.stat.recv=P.stat.recv+1
 						D.counter=0
 						D.event=D.event+1
 					end
+				end	
+			end
 		end,
 		bg="bg2",bgm="down",
 	},

parts/modes/pctrain_lunatic.lua

@@ -7,14 +7,17 @@ local PClist=require"parts/modes/PClist"
 local PCtype={[0]=1,2,3,2,3}
 
 local function task_PC(P)
-	P.modeData.counter=P.modeData.counter+1
+	local D=P.modeData
-	if P.modeData.counter==26 then
+	while true do
-		local base=PCbase[P.modeData.type]
+		coroutine.yield()
-		P:pushLineList(base[P:RND(#base)],P.modeData.symmetry)
+		D.counter=D.counter+1
-		return true
+		if D.counter==26 then
+			local base=PCbase[D.type]
+			P:pushLineList(base[P:RND(#base)],D.symmetry)
 		end
 	end
-local function newPC(P)
+end
+local function check(P)
 	local r=P.field
 	if r[1]then
 		r=r[#r]
@@ -55,7 +58,7 @@ return{
 		fall=20,
 		sequence="none",
 		freshLimit=15,
-		dropPiece=newPC,
+		dropPiece=check,
 		RS="SRS",
 		ospin=false,
 		bg="rgb",bgm="oxygen",
@@ -63,7 +66,7 @@ return{
 	pauseLimit=true,
 	load=function()
 		PLY.newPlayer(1,340,15)
-		newPC(PLAYERS[1])
+		check(PLAYERS[1])
 	end,
 	mesDisp=function(P)
 		setFont(75)

parts/modes/pctrain_normal.lua

@@ -13,14 +13,17 @@ local PCtype={
 	3,
 }
 local function task_PC(P)
-	P.modeData.counter=P.modeData.counter+1
+	local D=P.modeData
-	if P.modeData.counter==26 then
+	while true do
-		local base=PCbase[P.modeData.type]
+		D.counter=D.counter+1
-		P:pushLineList(base[P:RND(#base)],P.modeData.symmetry)
+		if D.counter==26 then
-		return true
+			local base=PCbase[D.type]
+			P:pushLineList(base[P:RND(#base)],D.symmetry)
+		end
+		coroutine.yield()
 	end
 end
-local function newPC(P)
+local function check(P)
 	local r=P.field
 	if r[1]then
 		r=r[#r]
@@ -47,7 +50,7 @@ return{
 		drop=120,lock=180,
 		fall=20,
 		sequence="none",
-		dropPiece=newPC,
+		dropPiece=check,
 		RS="SRS",
 		ospin=false,
 		bg="rgb",bgm="oxygen",
@@ -55,7 +58,7 @@ return{
 	pauseLimit=true,
 	load=function()
 		PLY.newPlayer(1,340,15)
-		newPC(PLAYERS[1])
+		check(PLAYERS[1])
 	end,
 	mesDisp=function(P)
 		setFont(75)

parts/modes/survivor_easy.lua

@@ -1,13 +1,14 @@
-local max=math.max
 return{
 	color=COLOR.cyan,
 	env={
 		drop=30,lock=45,
 		freshLimit=10,
 		task=function(P)
-			if not(P.control and SCN.cur=="play")then return end
+			while true do
+				coroutine.yield()
+				if P.control and SCN.cur=="play"then
 					P.modeData.counter=P.modeData.counter+1
-			if P.modeData.counter>=max(60,150-2*P.modeData.event)and P.atkBuffer.sum<4 then
+					if P.modeData.counter>=math.max(60,150-2*P.modeData.event)and P.atkBuffer.sum<4 then
 						P.atkBuffer[#P.atkBuffer+1]={pos=P:RND(10),amount=1,countdown=30,cd0=30,time=0,sent=false,lv=1}
 						P.atkBuffer.sum=P.atkBuffer.sum+1
 						P.stat.recv=P.stat.recv+1
@@ -15,6 +16,8 @@ return{
 						P.modeData.counter=0
 						P.modeData.event=P.modeData.event+1
 					end
+				end
+			end
 		end,
 		bg="glow",bgm="new era",
 	},

parts/modes/survivor_hard.lua

@@ -1,14 +1,15 @@
-local max=math.max
 return{
 	color=COLOR.magenta,
 	env={
 		drop=30,lock=45,
 		freshLimit=10,
 		task=function(P)
-			if not(P.control and SCN.cur=="play")then return end
+			while true do
+				coroutine.yield()
+				if P.control and SCN.cur=="play"then
 					P.modeData.counter=P.modeData.counter+1
 					local B=P.atkBuffer
-			if P.modeData.counter>=max(60,180-2*P.modeData.event)and B.sum<15 then
+					if P.modeData.counter>=math.max(60,180-2*P.modeData.event)and B.sum<15 then
 						B[#B+1]=
 							P.modeData.event%3<2 and
 								{pos=P:RND(10),amount=1,countdown=0,cd0=0,time=0,sent=false,lv=1}
@@ -21,6 +22,8 @@ return{
 						P.modeData.counter=0
 						P.modeData.event=P.modeData.event+1
 					end
+				end
+			end
 		end,
 		bg="glow",bgm="secret7th",
 	},

parts/modes/survivor_lunatic.lua

@@ -1,14 +1,15 @@
-local max=math.max
 return{
 	color=COLOR.red,
 	env={
 		drop=30,lock=45,
 		freshLimit=10,
 		task=function(P)
-			if not(P.control and SCN.cur=="play")then return end
+			while true do
+				coroutine.yield()
+				if P.control and SCN.cur=="play"then
 					P.modeData.counter=P.modeData.counter+1
-			if P.modeData.counter>=max(60,150-P.modeData.event)and P.atkBuffer.sum<20 then
+					if P.modeData.counter>=math.max(60,150-P.modeData.event)and P.atkBuffer.sum<20 then
-				local t=max(60,90-P.modeData.event)
+						local t=math.max(60,90-P.modeData.event)
 						P.atkBuffer[#P.atkBuffer+1]={pos=P:RND(10),amount=4,countdown=t,cd0=t,time=0,sent=false,lv=3}
 						P.atkBuffer.sum=P.atkBuffer.sum+4
 						P.stat.recv=P.stat.recv+4
@@ -16,6 +17,8 @@ return{
 						P.modeData.counter=0
 						P.modeData.event=P.modeData.event+1
 					end
+				end
+			end
 		end,
 		bg="glow",bgm="storm",
 	},

parts/modes/survivor_normal.lua

@@ -1,13 +1,14 @@
-local max=math.max
 return{
 	color=COLOR.green,
 	env={
 		drop=30,lock=45,
 		freshLimit=10,
 		task=function(P)
-			if not(P.control and SCN.cur=="play")then return end
+			while true do
+				coroutine.yield()
+				if P.control and SCN.cur=="play"then
 					P.modeData.counter=P.modeData.counter+1
-			if P.modeData.counter>=max(90,180-2*P.modeData.event)and P.atkBuffer.sum<8 then
+					if P.modeData.counter>=math.max(90,180-2*P.modeData.event)and P.atkBuffer.sum<8 then
 						local d=P.modeData.event+1
 						P.atkBuffer[#P.atkBuffer+1]=
 							d%4==0 and{pos=P:RND(10),amount=1,countdown=60,cd0=60,time=0,sent=false,lv=1}or
@@ -20,6 +21,8 @@ return{
 						P.modeData.counter=0
 						P.modeData.event=d
 					end
+				end
+			end
 		end,
 		bg="glow",bgm="secret8th",
 	},

parts/modes/survivor_ultimate.lua

@@ -1,4 +1,3 @@
-local max=math.max
 return{
 	color=COLOR.lYellow,
 	env={
@@ -7,10 +6,12 @@ return{
 		freshLimit=15,
 		pushSpeed=2,
 		task=function(P)
-			if not(P.control and SCN.cur=="play")then return end
+			while true do
+				coroutine.yield()
+				if P.control and SCN.cur=="play"then
 					P.modeData.counter=P.modeData.counter+1
-			if P.modeData.counter>=max(300,600-10*P.modeData.event)and P.atkBuffer.sum<20 then
+					if P.modeData.counter>=math.max(300,600-10*P.modeData.event)and P.atkBuffer.sum<20 then
-				local t=max(300,480-12*P.modeData.event)
+						local t=math.max(300,480-12*P.modeData.event)
 						local p=#P.atkBuffer+1
 							P.atkBuffer[p]	={pos=P:RND(10),amount=4,countdown=t,cd0=t,time=0,sent=false,lv=2}
 							P.atkBuffer[p+1]={pos=P:RND(10),amount=4,countdown=t,cd0=t,time=0,sent=false,lv=3}
@@ -22,6 +23,8 @@ return{
 						P.modeData.counter=0
 						P.modeData.event=P.modeData.event+1
 					end
+				end
+			end
 		end,
 		bg="welcome",bgm="storm",
 	},

parts/modes/ultra.lua

@@ -8,6 +8,8 @@ return{
 		drop=60,lock=60,
 		fall=20,
 		task=function(P)
+			while true do
+				coroutine.yield()
 				local _=P.modeData.counter+1
 				if P.stat.frame>=warnTime[_]*60 then
 					if _<9 then
@@ -16,7 +18,8 @@ return{
 					else
 						SFX.play("start")
 						P:win("finish")
-					return true
+						return
+					end
 				end
 			end
 		end,

parts/player/player.lua

@@ -7,6 +7,7 @@ local Player={}--Player class
 local int,ceil,rnd=math.floor,math.ceil,math.random
 local max,min=math.max,math.min
 local ins,rem=table.insert,table.remove
+local ct=coroutine
 
 local kickList=require"parts/kickList"
 local scs=spinCenters
@@ -124,12 +125,11 @@ function Player.RND(P,a,b)
 	local R=P.randGen
 	return R:random(a,b)
 end
-function Player.newTask(P,code,data)
+function Player.newTask(P,code)
 	local L=P.tasks
-	ins(L,{
+	local thread=ct.create(code)
-		code=code,
+	ct.resume(thread,P)
-		data=data,
+	L[#L+1]=thread
-	})
 end
 
 function Player.set20G(P,if20g,init)--Only set init=true when initialize CC, do not use it
@@ -1453,7 +1453,7 @@ function Player.win(P,result)
 	end
 	if P.human then
 		gameOver()
-		TASK.new(TICK.autoPause,{0})
+		TASK.new(TICK.autoPause)
 		if MARKING then
 			P:showTextF(text.marking,0,-226,25,"appear",.4,.0626)
 		end
@@ -1532,7 +1532,7 @@ function Player.lose(P,force)
 				end
 				P.lastRecv=A
 				if P.id==1 or A.id==1 then
-					TASK.new(TICK.throwBadge,{A.ai,P,max(3,P.badge)*4})
+					TASK.new(TICK.throwBadge,A.ai,P,max(3,P.badge)*4)
 				end
 			end
 		else
@@ -1561,7 +1561,7 @@ function Player.lose(P,force)
 		end
 		gameOver()
 		P:newTask(#PLAYERS>1 and TICK.lose or TICK.finish)
-		TASK.new(TICK.autoPause,{0})
+		TASK.new(TICK.autoPause)
 		if MARKING then
 			P:showTextF(text.marking,0,-226,25,"appear",.4,.0626)
 		end

parts/player/update.lua

@@ -1,5 +1,7 @@
 local int,max,min,abs=math.floor,math.max,math.min,math.abs
 local rem=table.remove
+local ct=coroutine
+local assert=assert
 
 local function updateLine(P)--Attacks, line pushing, cam moving
 	local bf=P.atkBuffer
@@ -95,7 +97,10 @@ end
 local function updateTasks(P)
 	local L=P.tasks
 	for i=#L,1,-1 do
-		if L[i].code(P,L[i].data)then rem(L,i)end
+		assert(ct.resume(L[i]))
+		if ct.status(L[i])=="dead"then
+			rem(L,i)
+		end
 	end
 end
 

parts/tick.lua

@@ -1,24 +1,24 @@
-local function checkTimeout(data,time)
+local yield=coroutine.yield
-	data.time=data.time+1
+
-	if data.time==time then
-		LOG.print(text.httpTimeout,"message")
-		return true
-	end
-end
 local Tick={}
-function Tick.showMods(data)
+function Tick.showMods()
-	local d=data[1]+1
+	local time=0
-	if d%20==0 then
+	while true do
-		local M=GAME.mod[d/20]
+		yield()
+		time=time+1
+		if time%20==0 then
+			local M=GAME.mod[time/20]
 			if M then
-			TEXT.show(M.id,700+(d-20)%120*4,36,45,"spin",.5)
+				TEXT.show(M.id,700+(time-20)%120*4,36,45,"spin",.5)
 			else
-			return true
+				return
+			end
 		end
 	end
-	data[1]=d
 end
 function Tick.finish(P)
+	while true do
+		yield()
 		P.endCounter=P.endCounter+1
 		if P.endCounter<40 then
 			--Make field visible
@@ -26,10 +26,13 @@ function Tick.finish(P)
 				if P.visTime[j][i]<20 then P.visTime[j][i]=P.visTime[j][i]+.5 end
 			end end
 		elseif P.endCounter==60 then
-		return true
+			return
+		end
 	end
 end
 function Tick.lose(P)
+	while true do
+		yield()
 		P.endCounter=P.endCounter+1
 		if P.endCounter<40 then
 			--Make field visible
@@ -50,7 +53,7 @@ function Tick.lose(P)
 					FREEROW.discard(P.visTime[_])
 					P.field[_],P.visTime[_]=nil
 				end
-			return true
+				return
 			end
 		end
 		if not GAME.modeEnv.royaleMode and #PLAYERS>1 then
@@ -58,10 +61,13 @@ function Tick.lose(P)
 			P.absFieldY=P.absFieldY+P.endCounter*.26
 		end
 	end
-function Tick.throwBadge(data)--{ifAI,Sender,timer}
+end
-	data[3]=data[3]-1
+function Tick.throwBadge(ifAI,sender,time)
-	if data[3]%4==0 then
+	while true do
-		local S,R=data[2],data[2].lastRecv
+		yield()
+		time=time-1
+		if time%4==0 then
+			local S,R=sender,sender.lastRecv
 			local x1,y1,x2,y2
 			if S.small then
 				x1,y1=S.centerX,S.centerY
@@ -77,24 +83,31 @@ function Tick.throwBadge(data)--{ifAI,Sender,timer}
 			--Generate badge object
 			SYSFX.newBadge(x1,y1,x2,y2)
 
-		if not data[1]and data[3]%8==0 then
+			if not ifAI and time%8==0 then
 				SFX.play("collect")
 			end
 		end
-	if data[3]<=0 then return true end
+		if time<=0 then return end
 	end
-function Tick.autoPause(data)
+end
-	data[1]=data[1]+1
+function Tick.autoPause()
-	if SCN.cur~="play"then return true end
+	local time=0
-	if data[1]==120 then
+	while true do
-		if SCN.cur=="play"then
+		yield()
+		time=time+1
+		if SCN.cur~="play"then
+			return
+		elseif time==120 then
 			pauseGame()
-		end
+			return
-		return true
 		end
 	end
-function Tick.httpREQ_launch(data)
+end
-	local response,request_error=client.poll(data.task)
+function Tick.httpREQ_launch(task)
+	local time=0
+	while true do
+		yield()
+		local response,request_error=client.poll(task)
 		if response then
 			local res=json.decode(response.body)
 			if res then
@@ -109,15 +122,23 @@ function Tick.httpREQ_launch(data)
 					LOG.print(text.netErrorCode..response.code..": "..res.message,"warn")
 				end
 			end
-		return true
+			return
 		elseif request_error then
 			LOG.print(text.getNoticeFail..": "..request_error,"warn")
-		return true
+			return
 		end
-	return checkTimeout(data,260)
+		time=time+1
+		if time>360 then
+			LOG.print(text.httpTimeout,"message")
+			return
 		end
-function Tick.httpREQ_register(data)
+	end
-	local response,request_error=client.poll(data.task)
+end
+function Tick.httpREQ_register(task)
+	local time=0
+	while true do
+		yield()
+		local response,request_error=client.poll(task)
 		if response then
 			local res=json.decode(response.body)
 			if res then
@@ -127,15 +148,23 @@ function Tick.httpREQ_register(data)
 					LOG.print(text.netErrorCode..response.code..": "..res.message,"warn")
 				end
 			end
-		return true
+			return
 		elseif request_error then
 			LOG.print(text.loginFailed..": "..request_error,"warn")
-		return true
+			return
 		end
-	return checkTimeout(data,360)
+		time=time+1
+		if time>360 then
+			LOG.print(text.httpTimeout,"message")
+			return
 		end
-function Tick.httpREQ_newLogin(data)
+	end
-	local response,request_error=client.poll(data.task)
+end
+function Tick.httpREQ_newLogin(task)
+	local time=0
+	while true do
+		yield()
+		local response,request_error=client.poll(task)
 		if response then
 			local res=json.decode(response.body)
 			LOGIN=response.code==200
@@ -160,15 +189,23 @@ function Tick.httpREQ_newLogin(data)
 					LOG.print(text.netErrorCode..response.code..": "..res.message,"warn")
 				end
 			end
-		return true
+			return
 		elseif request_error then
 			LOG.print(text.loginFailed..": "..request_error,"warn")
-		return true
+			return
 		end
-	return checkTimeout(data,360)
+		time=time+1
+		if time>360 then
+			LOG.print(text.httpTimeout,"message")
+			return
 		end
-function Tick.httpREQ_autoLogin(data)
+	end
-	local response,request_error=client.poll(data.task)
+end
+function Tick.httpREQ_autoLogin(task)
+	local time=0
+	while true do
+		yield()
+		local response,request_error=client.poll(task)
 		if response then
 			if response.code==200 then
 				LOGIN=true
@@ -183,15 +220,23 @@ function Tick.httpREQ_autoLogin(data)
 					LOG.print(text.loginFailed..": "..text.netErrorCode..response.code.."-"..err.message,"warn")
 				end
 			end
-		return true
+			return
 		elseif request_error then
 			LOG.print(text.loginFailed..": "..request_error,"warn")
-		return true
+			return
 		end
-	return checkTimeout(data,360)
+		time=time+1
+		if time>360 then
+			LOG.print(text.httpTimeout,"message")
+			return
 		end
-function Tick.httpREQ_checkAccessToken(data)
+	end
-	local response,request_error=client.poll(data.task)
+end
+function Tick.httpREQ_checkAccessToken(task)
+	local time=0
+	while true do
+		yield()
+		local response,request_error=client.poll(task)
 		if response then
 			if response.code==200 then
 				LOG.print(text.accessSuccessed)
@@ -214,15 +259,23 @@ function Tick.httpREQ_checkAccessToken(data)
 					LOG.print(text.netErrorCode..response.code..": "..err.message,"warn")
 				end
 			end
-		return true
+			return
 		elseif request_error then
 			LOG.print(text.loginFailed..": "..request_error,"warn")
-		return true
+			return
 		end
-	return checkTimeout(data,360)
+		time=time+1
+		if time>360 then
+			LOG.print(text.httpTimeout,"message")
+			return
 		end
-function Tick.httpREQ_getAccessToken(data)
+	end
-	local response,request_error=client.poll(data.task)
+end
+function Tick.httpREQ_getAccessToken(task)
+	local time=0
+	while true do
+		yield()
+		local response,request_error=client.poll(task)
 		if response then
 			if response.code==200 then
 				local res=json.decode(response.body)
@@ -250,28 +303,41 @@ function Tick.httpREQ_getAccessToken(data)
 				SCN.pop()
 				SCN.go("main")
 			end
-		return true
+			return
 		elseif request_error then
 			LOG.print(text.loginFailed..": "..request_error,"warn")
-		return true
+			return
 		end
-	return checkTimeout(data,360)
+		time=time+1
+		if time>360 then
+			LOG.print(text.httpTimeout,"message")
+			return
 		end
-function Tick.wsCONN_connect(data)
+	end
-	if data.wsconntask then
+end
-		local wsconn,connErr=client.poll(data.wsconntask)
+function Tick.wsCONN_connect(task)
+	local time=0
+	while true do
+		yield()
+		local wsconn,connErr=client.poll(task)
 		if wsconn then
 			WSCONN=wsconn
 			TASK.new(Tick.wsCONN_read)
-			return true
+			return
 		elseif connErr then
 			LOG.print(text.wsFailed..": "..connErr,"warn")
-			return true
+			return
+		end
+		time=time+1
+		if time>360 then
+			LOG.print(text.httpTimeout,"message")
+			return
 		end
 	end
-	return checkTimeout(data,360)
 end
 function Tick.wsCONN_read()
+	while true do
+		yield()
 		local messages,readErr=client.read(WSCONN)
 		if messages then
 			if messages[1]then
@@ -283,18 +349,20 @@ function Tick.wsCONN_read()
 				LOG.print("Socket closed!","warn")
 			end
 			WSCONN=nil
-		return true
+			return
 		end
 	end
--- function Tick.wsCONN_write(data)
+end
--- 	if not data.net then
+-- function Tick.wsCONN_write()
--- 		return true
+-- 	while true do
--- 	end
+-- 		local message=yield()
--- 	local writeErr=client.write(WSCONN,data.message)
+-- 		if message then
+-- 			local writeErr=client.write(WSCONN,message)
 -- 			if writeErr then
 -- 				print(writeErr,"warn")
 -- 			end
--- 	return true
+-- 		end
+-- 	end
 -- end
 
 return Tick