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-03-30 12:02:51 +08:00
parent 0efdb7dc33
commit ec63618bea
4 changed files with 189 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

198
parts/gametoolfunc.lua
View File

@@ -1060,202 +1060,4 @@ do--CUS/SETXXX(k)
function SETrev(k)return function()s[k]=not s[k]end end
function CUSsto(k)return function(i)c[k]=i end end
function SETsto(k)return function(i)s[k]=i end end
end
--Network funcs
do
--[[
register:
if response.message=="OK"then
NET.login=true
USER.name=res.name
USER.id=res.id
USER.motto=res.motto
USER.avatar=res.avatar
FILE.save(USER,"conf/user","q")
LOG.print(text.registerSuccessed..": "..res.message)
else
LOG.print(text.httpCode..response.code..": "..res.message,"warn")
end
goChatRoom:
if res.message=="OK"then
SCN.go("net_chat")
LOG.print(text.wsSuccessed,"warn")
else
LOG.print(text.wsFailed..": "..connErr,"warn")
end
]]
function TICK_WS_app()
local retryTime=5
while true do
YIELD()
local status=WS.status("app")
if status=="running"then
local message,op=WS.read("app")
if message then
if op=="ping"then
NET.pong("app",message)
elseif op=="pong"then
elseif op=="close"then
NET.wsCloseMessage(message)
return
else
local res=JSON.decode(message)
if res then
if VERSION_CODE>=res.lowest then
NET.allow_online=true
end
if VERSION_CODE<res.newestCode then
LOG.print(text.oldVersion:gsub("$1",res.newestName),180,COLOR.sky)
end
LOG.print(res.notice,300,COLOR.sky)
else
WS.alert("app")
end
end
end
elseif status=="dead"then
retryTime=retryTime-1
if retryTime==0 then return end
for _=1,120 do YIELD()end
WS.connect("app","/app")
end
end
end
function TICK_WS_user()
while true do
YIELD()
local status=WS.status("user")
if status=="running"then
local message,op=WS.read("user")
if message then
if op=="ping"then
NET.pong("user",message)
elseif op=="pong"then
elseif op=="close"then
NET.wsCloseMessage(message)
return
else
local res=JSON.decode(message)
if res then
if res.message=="Connected"then
NET.login=true
if res.id then
USER.id=res.id
USER.authToken=res.authToken
SCN.back()
end
FILE.save(USER,"conf/user","q")
LOG.print(text.loginSuccessed)
--Get self infos
NET.getSelfInfo()
elseif res.action==0 then--Get accessToken
USER.accessToken=res.accessToken
LOG.print(text.accessSuccessed)
NET.wsConnectPlay()
NET.unlock("accessToken")
elseif res.action==1 then--Get userInfo
if res.id==USER.id then--Own
USER.name=res.username
USER.motto=res.motto
USER.avatar=res.avatar
FILE.save(USER,"conf/user")
NET.unlock("getSelfInfo")
else--Others
LOG.print("Get user info: "..USER.id)
end
end
else
WS.alert("user")
end
end
end
end
end
end
function TICK_WS_play()
while true do
YIELD()
local status=WS.status("play")
if status=="running"then
local message,op=WS.read("play")
if message then
if op=="ping"then
NET.pong("play",message)
elseif op=="pong"then
elseif op=="close"then
NET.wsCloseMessage(message)
return
else
local res=JSON.decode(message)
if res then
if res.message=="Connected"then
NET.unlock("connectPlay")
SCN.go("net_menu")
elseif res.action==0 then--Fetch rooms
NET.roomList=res.roomList
elseif res.action==2 then--Join(create) room
loadGame("netBattle",true,true)
NET.unlock("enterRoom")
elseif res.action==3 then--Leave room
SCN.back()
end
else
WS.alert("play")
end
end
end
end
end
end
function TICK_WS_stream()
while true do
YIELD()
local status=WS.status("stream")
if status=="running"then
local message,op=WS.read("stream")
if message then
if op=="ping"then
NET.pong("stream",message)
elseif op=="pong"then
elseif op=="close"then
NET.wsCloseMessage(message)
return
else
--TODO
end
end
end
end
end
function TICK_WS_chat()
while true do
YIELD()
local status=WS.status("chat")
if status=="running"then
local message,op=WS.read("chat")
if message then
if op=="ping"then
NET.pong("chat",message)
elseif op=="pong"then
elseif op=="close"then
NET.wsCloseMessage(message)
return
else
local res=JSON.decode(message)
if res then
--TODO
else
WS.alert("chat")
end
end
end
end
end
end
end

3
parts/globalTables.lua
View File

@@ -224,14 +224,13 @@ USER=FILE.load("conf/user")or{--User infomation
name=false,
id=false,
email=false,
motto=false,
avatar=false,
authToken=false,
accessToken=false,
--Local data
xp=0,lv=1,
}
USERS=FILE.load("conf/users")or{}
SETTING={--Settings
--Tuning
das=10,arr=2,dascut=0,

193
parts/net.lua
View File

@@ -38,15 +38,28 @@ function NET.getAccessToken()
WS.send("user",JSON.encode{action=0})
end
end
function NET.getSelfInfo()
if NET.lock("getSelfInfo")then
WS.send("user",JSON.encode{
action=1,
data={
id=USER.id,
},
})
function NET.getUserInfo(id,ifDetail)
WS.send("user",JSON.encode{
action=1,
data={
id=id or USER.id,
detailed=ifDetail or false,
},
})
end
function NET.storeUserInfo(res)
local user
if not USERS[res.id]then
user={}
user.email=res.email
user.name=res.username
USERS[res.id]=user
else
user=USERS[res.id]
if not user.motto then user.motto=res.motto end
if not user.avatar then user.avatar=res.avatar end
end
-- FILE.save(USERS,"conf/users")
end
--Play
@@ -116,4 +129,168 @@ function NET.quitChat()
WS.send("chat","Q")
end
--WS tick funcs
function NET.TICK_WS_app()
local retryTime=5
while true do
YIELD()
local status=WS.status("app")
if status=="running"then
local message,op=WS.read("app")
if message then
if op=="ping"then
NET.pong("app",message)
elseif op=="pong"then
elseif op=="close"then
NET.wsCloseMessage(message)
return
else
local res=JSON.decode(message)
if res then
if VERSION_CODE>=res.lowest then
NET.allow_online=true
end
if VERSION_CODE<res.newestCode then
LOG.print(text.oldVersion:gsub("$1",res.newestName),180,COLOR.sky)
end
LOG.print(res.notice,300,COLOR.sky)
else
WS.alert("app")
end
end
end
elseif status=="dead"then
retryTime=retryTime-1
if retryTime==0 then return end
for _=1,120 do YIELD()end
WS.connect("app","/app")
end
end
end
function NET.TICK_WS_user()
while true do
YIELD()
local status=WS.status("user")
if status=="running"then
local message,op=WS.read("user")
if message then
if op=="ping"then
NET.pong("user",message)
elseif op=="pong"then
elseif op=="close"then
NET.wsCloseMessage(message)
return
else
local res=JSON.decode(message)
if res then
if res.message=="Connected"then
NET.login=true
if res.id then
USER.id=res.id
USER.authToken=res.authToken
SCN.back()
end
FILE.save(USER,"conf/user","q")
LOG.print(text.loginSuccessed)
--Get self infos
NET.getUserInfo()
elseif res.action==0 then--Get accessToken
USER.accessToken=res.accessToken
LOG.print(text.accessSuccessed)
NET.wsConnectPlay()
NET.unlock("accessToken")
elseif res.action==1 then--Get userInfo
NET.storeUserInfo(res)
FILE.save(USER,"conf/user")
end
else
WS.alert("user")
end
end
end
end
end
end
function NET.TICK_WS_play()
while true do
YIELD()
local status=WS.status("play")
if status=="running"then
local message,op=WS.read("play")
if message then
if op=="ping"then
NET.pong("play",message)
elseif op=="pong"then
elseif op=="close"then
NET.wsCloseMessage(message)
return
else
local res=JSON.decode(message)
if res then
if res.message=="Connected"then
NET.unlock("connectPlay")
SCN.go("net_menu")
elseif res.action==0 then--Fetch rooms
NET.roomList=res.roomList
elseif res.action==2 then--Join(create) room
loadGame("netBattle",true,true)
NET.unlock("enterRoom")
elseif res.action==3 then--Leave room
SCN.back()
end
else
WS.alert("play")
end
end
end
end
end
end
function NET.TICK_WS_stream()
while true do
YIELD()
local status=WS.status("stream")
if status=="running"then
local message,op=WS.read("stream")
if message then
if op=="ping"then
NET.pong("stream",message)
elseif op=="pong"then
elseif op=="close"then
NET.wsCloseMessage(message)
return
else
--TODO
end
end
end
end
end
function NET.TICK_WS_chat()
while true do
YIELD()
local status=WS.status("chat")
if status=="running"then
local message,op=WS.read("chat")
if message then
if op=="ping"then
NET.pong("chat",message)
elseif op=="pong"then
elseif op=="close"then
NET.wsCloseMessage(message)
return
else
local res=JSON.decode(message)
if res then
--TODO
else
WS.alert("chat")
end
end
end
end
end
end
return NET

6
parts/scenes/load.lua
View File

@@ -178,9 +178,9 @@ local loadingThread=coroutine.create(function()
LOADED=true
--Connect to server
TASK.new(TICK_WS_app)
TASK.new(TICK_WS_user)
TASK.new(TICK_WS_play)
TASK.new(NET.TICK_WS_app)
TASK.new(NET.TICK_WS_user)
TASK.new(NET.TICK_WS_play)
WS.connect("app","/app")
if USER.authToken then
WS.connect("user","/user",JSON.encode{