升级task模块和使用模块的网络相关函数，ws连接任务不再与未完成的http请求冲突

2021-02-09 17:59:27 +08:00
parent cab826ba34
commit 5073fe5363
3 changed files with 22 additions and 5 deletions
--- a/Zframework/toolfunc.lua
+++ b/Zframework/toolfunc.lua
@@ -559,7 +559,7 @@ do--httpRequest & wsConnect
 		end

 		function wsConnect(tick,path,header)
-			if TASK.netTaskCount>0 then
+			if TASK.wsConnecting then
 				LOG.print(text.waitNetTask,"message")
 				return
 			end
@@ -569,7 +569,7 @@ do--httpRequest & wsConnect
 				header=header,
 			}
 			if task then
-				TASK.newNet(tick,task)
+				TASK.newWS(tick,task)
 			else
 				LOG.print("NETlib error: "..err,"warn")
 			end