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-11 13:36:04 +08:00
parent ed3521cc53
commit 18c1c9c69a
10 changed files with 53 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
parts/language/lang_en.lua
View File

@@ -601,6 +601,7 @@ return{
email="Email Address",
password="Password",
password2="Re-enter Password",
register="Register",
},
account={
title="Account",

1
parts/language/lang_fr.lua
View File

@@ -512,6 +512,7 @@ return{
email="E-mail",
password="Mot de passe",
password2="Confirmer le mot de passe",
register="Enregistrement",
},
account={
title="Compte",

3
parts/language/lang_pt.lua
View File

@@ -595,11 +595,12 @@ return{
},
register={
title="Registrar",
login="Registrar",
login="Log in",
username="Nome De Usuário",
email="Endereço De Email",
password="Senha",
password2="Entre Senha Novamente",
register="Registrar",
},
account={
title="Conta",

1
parts/language/lang_sp.lua
View File

@@ -515,6 +515,7 @@ return{
email="Correo Elec.",
password="Contraseña",
password2="Repetir Contr.",
register="Registrarse",
},
account={
title="Cuenta",

1
parts/language/lang_symbol.lua
View File

@@ -444,6 +444,7 @@ return{
email="@",
password="*",
password2="*",
register="Sign up",
},
account={
title="@_@",

2
parts/language/lang_yygq.lua
View File

@@ -113,7 +113,7 @@ return{
qq="QQ对线",
},
register={
password2="你觉得应该填啥",
password2="你猜该填啥",
},
sound={
title="音效室",

1
parts/language/lang_zh.lua
View File

@@ -599,6 +599,7 @@ return{
email="邮箱",
password="密码",
password2="确认密码",
register="注册",
},
account={
title="账户",

31
parts/net.lua
View File

@@ -121,6 +121,18 @@ function NET.wsclose_stream()
end
--Account
function NET.register(username,email,password)
if NET.lock("register")then
WS.send("app",JSON.encode{
action=2,
data={
username=username,
email=email,
password=password,
}
})
end
end
function NET.pong(wsName,message)
WS.send(wsName,message,"pong")
end
@@ -245,12 +257,21 @@ function NET.updateWS_app()
else
local res=_parse(message)
if res then
NET.connected=true
NET.allow_online=VERSION.code>=res.lowest
if VERSION.code<res.newestCode then
LOG.print(text.oldVersion:gsub("$1",res.newestName),180,COLOR.sky)
if res.type=="Connect"then
NET.connected=true
NET.allow_online=VERSION.code>=res.lowest
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)
elseif res.action==0 then--Get new version info
--?
elseif res.action==1 then--Get notice
--?
elseif res.action==2 then--Register
LOG.print(res.data.message,300,COLOR.sky)
NET.unlock("register")
end
LOG.print(res.notice,300,COLOR.sky)
else
WS.alert("app")
end

2
parts/scenes/login.lua
View File

@@ -13,7 +13,7 @@ local scene={}
scene.widgetList={
WIDGET.newText{name="title", x=80, y=50,font=70,align="L"},
-- WIDGET.newButton{name="register",x=1140, y=100,w=170,h=80,color="green",code=function()SCN.swapTo("register","swipeR")end},
WIDGET.newButton{name="register", x=1140, y=100,w=170,h=80,color="lY",code=function()SCN.swapTo("register","swipeR")end},
WIDGET.newInputBox{name="email", x=380, y=200,w=500,h=60,regex="[0-9A-Za-z@._-]"},
WIDGET.newInputBox{name="password", x=380, y=300,w=626,h=60,secret=true,regex="[ -~]"},
WIDGET.newKey{name="login", x=1140, y=540,w=170,h=80,font=40,code=login},

47
parts/scenes/register.lua
View File

@@ -1,41 +1,30 @@
local scene={}
function scene.keyDown(key)
if key=="return"then
local username= WIDGET.active.username.value
local email= WIDGET.active.email.value
local password= WIDGET.active.password.value
local password2=WIDGET.active.password2.value
if #username==0 then
LOG.print(text.noUsername)return
elseif not email:match("^[a-zA-Z0-9_]+@[a-zA-Z0-9_-]+%.[a-zA-Z0-9_]+$")then
LOG.print(text.wrongEmail)return
elseif #password==0 or #password2==0 then
LOG.print(text.noPassword)return
elseif password~=password2 then
LOG.print(text.diffPassword)return
end
--[[
JSON.encode{
username=username,
email=email,
password=password,
}
]]
elseif key=="escape"then
SCN.back()
else
WIDGET.keyPressed(key)
local function register()
local username= WIDGET.active.username.value
local email= WIDGET.active.email.value
local password= WIDGET.active.password.value
local password2=WIDGET.active.password2.value
if #username==0 then
LOG.print(text.noUsername)return
elseif not email:match("^[a-zA-Z0-9_]+@[a-zA-Z0-9_-]+%.[a-zA-Z0-9_]+$")then
LOG.print(text.wrongEmail)return
elseif #password==0 or #password2==0 then
LOG.print(text.noPassword)return
elseif password~=password2 then
LOG.print(text.diffPassword)return
end
NET.register(username,email,password)
end
scene.widgetList={
WIDGET.newText{name="title", x=80, y=50,font=70,align="L"},
WIDGET.newButton{name="login", x=1140, y=100,w=170,h=80,color="green",code=function()SCN.swapTo("login","swipeL")end},
WIDGET.newButton{name="login", x=1140, y=100,w=170,h=80,color="lY",code=function()SCN.swapTo("login","swipeL")end},
WIDGET.newInputBox{name="username", x=380, y=200,w=500,h=60,regex="[0-9A-Za-z_]"},
WIDGET.newInputBox{name="email", x=380, y=300,w=626,h=60,regex="[0-9A-Za-z@._-]"},
WIDGET.newInputBox{name="email", x=380, y=300,w=626,h=60,regex="[0-9A-Za-z@._-]"},
WIDGET.newInputBox{name="password", x=380, y=400,w=626,h=60,secret=true,regex="[ -~]"},
WIDGET.newInputBox{name="password2", x=380, y=500,w=626,h=60,secret=true,regex="[ -~]"},
WIDGET.newInputBox{name="password2",x=380, y=500,w=626,h=60,secret=true,regex="[ -~]"},
WIDGET.newKey{name="register", x=1140, y=540,w=170,h=80,font=40,code=register},
WIDGET.newButton{name="back", x=1140, y=640,w=170,h=80,font=40,code=backScene},
}