SweetSea/Techmino
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

整理代码，配合修改一个联网命令类型，修改联网相关场景背景

Browse Source
This commit is contained in:
MrZ626
2021-04-04 01:36:43 +08:00
parent 7d325bd0db
commit 5268ad041f
5 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
parts/modes/netBattle.lua
View File

@@ -4,6 +4,7 @@ return{
drop=30,
freshLimit=15,
noMod=true,
bg="space",
},
load=function()
PLY.newPlayer(1)

18
parts/net.lua
View File

@@ -7,7 +7,7 @@ local NET={
}
local mesType={
Connected=true,
Connect=true,
Self=true,
Broadcast=true,
Private=true,
@@ -175,7 +175,7 @@ function NET.quitChat()
end
--WS tick funcs
function NET.TICK_WS_app()
function NET.updateWS_app()
local retryTime=5
while true do
YIELD()
@@ -212,7 +212,7 @@ function NET.TICK_WS_app()
end
end
end
function NET.TICK_WS_user()
function NET.updateWS_user()
while true do
YIELD()
local status=WS.status("user")
@@ -228,7 +228,7 @@ function NET.TICK_WS_user()
else
local res=_parse(message)
if res then
if res.type=="Connected"then
if res.type=="Connect"then
NET.login=true
if res.id then
USER.id=res.id
@@ -256,7 +256,7 @@ function NET.TICK_WS_user()
end
end
end
function NET.TICK_WS_play()
function NET.updateWS_play()
while true do
YIELD()
local status=WS.status("play")
@@ -272,7 +272,7 @@ function NET.TICK_WS_play()
else
local res=_parse(message)
if res then
if res.type=="Connected"then
if res.type=="Connect"then
SCN.go("net_menu")
_unlock("connectPlay")
elseif res.action==0 then--Fetch rooms
@@ -306,7 +306,7 @@ function NET.TICK_WS_play()
end
end
end
function NET.TICK_WS_stream()
function NET.updateWS_stream()
while true do
YIELD()
local status=WS.status("stream")
@@ -322,7 +322,7 @@ function NET.TICK_WS_stream()
else
local res=_parse(message)
if res then
if res.type=="Connected"then
if res.type=="Connect"then
--?
elseif res.action==0 then--Game start
SCN.socketRead("Begin",res.data)
@@ -345,7 +345,7 @@ function NET.TICK_WS_stream()
end
end
end
function NET.TICK_WS_chat()
function NET.updateWS_chat()
while true do
YIELD()
local status=WS.status("chat")

6
parts/scenes/load.lua
View File

@@ -177,9 +177,9 @@ local loadingThread=coroutine.wrap(function()
STAT.run=STAT.run+1
--Connect to server
TASK.new(NET.TICK_WS_app)
TASK.new(NET.TICK_WS_user)
TASK.new(NET.TICK_WS_play)
TASK.new(NET.updateWS_app)
TASK.new(NET.updateWS_user)
TASK.new(NET.updateWS_play)
WS.connect("app","/app")
if USER.authToken then
WS.connect("user","/user",JSON.encode{

6
parts/scenes/net_menu.lua
View File

@@ -1,13 +1,13 @@
local scene={}
function scene.sceneInit()
BG.set("matrix")
BG.set("space")
end
scene.widgetList={
WIDGET.newButton{name="ffa", x=640, y=200,w=350,h=120,font=40,code=NULL},
-- WIDGET.newButton{name="ffa", x=640, y=200,w=350,h=120,font=40,code=NULL},
WIDGET.newButton{name="rooms", x=640, y=360,w=350,h=120,font=40,code=goScene"net_rooms"},
WIDGET.newButton{name="chat", x=640, y=540,w=350,h=120,font=40,code=goScene"net_chat",hide=function()return WS.status("chat")~="running"end},
-- WIDGET.newButton{name="chat", x=640, y=540,w=350,h=120,font=40,code=goScene"net_chat"},
WIDGET.newButton{name="back", x=1140, y=640,w=170,h=80,font=40,code=backScene},
}

2
parts/scenes/net_rooms.lua
View File

@@ -14,7 +14,7 @@ end
local scene={}
function scene.sceneInit()
BG.set("bg1")
BG.set("space")
scrollPos=0
selected=1
fetchRoom()