From f78856c58e20131b8a5619212aa3c9e97eb6a72b Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Thu, 17 Jun 2021 22:35:15 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=88=BF=E9=97=B4?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E8=AE=BE=E7=BD=AE=E5=AF=86=E7=A0=81(?= =?UTF-8?q?=E6=9A=82=E6=97=B6=E4=B8=8D=E5=8F=AF=E5=8A=A0=E5=85=A5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/language/lang_en.lua | 3 ++- parts/language/lang_es.lua | 3 ++- parts/language/lang_fr.lua | 3 ++- parts/language/lang_pt.lua | 3 ++- parts/language/lang_zh.lua | 3 ++- parts/scenes/net_newRoom.lua | 23 ++++++++++++++++------- 6 files changed, 26 insertions(+), 12 deletions(-) diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index b5650e7e..c38114ce 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -252,7 +252,8 @@ return{ net_newRoom={ title="Room config", roomName="Room name(default to username's room)", - roomDescription="Room description", + password="Password", + description="Room description", life="Lives", pushSpeed="Push Speed", diff --git a/parts/language/lang_es.lua b/parts/language/lang_es.lua index 5ce82d51..6f262ac6 100644 --- a/parts/language/lang_es.lua +++ b/parts/language/lang_es.lua @@ -227,7 +227,8 @@ return{ net_newRoom={ title="Ajustes de sala", roomName="Nombre (Por defecto: *usuario*'s room)", - roomDescription="Descripción", + password="Password", + description="Descripción", life="Vida", pushSpeed="Velocidad de Subida", diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index 0b099850..472170b5 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -223,7 +223,8 @@ return{ net_newRoom={ -- title="Room config", -- roomName="Room name(default to username's room)", - -- roomDescription="Room description", + -- password="Password", + -- description="Room description", life="Vie", -- pushSpeed="Push Speed", diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index 91a3e2fb..eee60e54 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -251,7 +251,8 @@ return{ net_newRoom={ -- title="Room config", -- roomName="Room name(default to username's room)", - -- roomDescription="Room description", + -- password="Password", + -- description="Room description", life="Vidas", pushSpeed="Garbage Speed", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 72c887cd..14c51274 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -252,7 +252,8 @@ return{ net_newRoom={ title="房间参数", roomName="房间名 (留空默认 用户名's room)", - roomDescription="房间描述", + password="密码", + description="房间描述", life="命数", pushSpeed="上涨速度", diff --git a/parts/scenes/net_newRoom.lua b/parts/scenes/net_newRoom.lua index 4459b470..25543eb2 100644 --- a/parts/scenes/net_newRoom.lua +++ b/parts/scenes/net_newRoom.lua @@ -1,9 +1,11 @@ local ROOMENV=ROOMENV -local roomName=WIDGET.newText{name="roomName",x=40,y=150,align='L'} -local roomNameBox=WIDGET.newInputBox{name="roomNameBox",x=40,y=200,w=640,h=60} -local description=WIDGET.newText{name="roomDescription",x=700,y=50,align='L'} -local descriptionBox=WIDGET.newInputBox{name="descriptionBox",x=700,y=100,w=550,h=160,font=25} +local roomName=WIDGET.newText {name="roomName", x=40,y=130,align='L'} +local roomNameBox=WIDGET.newInputBox {name="roomNameBox", x=40,y=180,w=540,h=60} +local password=WIDGET.newText {name="password", x=40,y=250,align='L'} +local passwordBox=WIDGET.newInputBox {name="passwordBox", x=40,y=300,w=540,h=60} +local description=WIDGET.newText {name="description", x=650,y=50,align='L'} +local descriptionBox=WIDGET.newInputBox {name="descriptionBox", x=650,y=100,w=550,h=160,font=25} local sList={ visible={"show","easy","slow","medium","fast","none"}, @@ -23,12 +25,17 @@ local sList={ local scene={} local function createRoom() + local pw=passwordBox.value + if pw==""then pw=nil end local roomname=STRING.trim(roomNameBox.value) if #roomname==0 then roomname=(USERS.getUsername(USER.uid)or"Anonymous").."'s room"end NET.createRoom( roomname, descriptionBox.value, - ROOMENV.capacity,"normal",ROOMENV + ROOMENV.capacity, + "normal", + ROOMENV, + pw ) end @@ -56,14 +63,16 @@ scene.widgetScrollHeight=400 scene.widgetList={ WIDGET.newText{name="title",x=40,y=15,font=70,align='L'}, - --Room name + --Room name/password/description roomName, roomNameBox, + password, + passwordBox, description, descriptionBox, --Selectors - WIDGET.newSelector{name="life", x=170,y=370,w=260,color='R',list=sList.life, disp=ROOMval("life"), code=ROOMsto("life")}, + WIDGET.newSelector{name="life", x=170,y=410,w=260,color='R',list=sList.life, disp=ROOMval("life"), code=ROOMsto("life")}, WIDGET.newSelector{name="pushSpeed", x=170,y=520,w=260,color='V',list=sList.pushSpeed, disp=ROOMval("pushSpeed"), code=ROOMsto("pushSpeed")}, WIDGET.newSelector{name="garbageSpeed", x=170,y=600,w=260,color='V',list=sList.pushSpeed, disp=ROOMval("garbageSpeed"),code=ROOMsto("garbageSpeed")}, WIDGET.newSelector{name="visible", x=170,y=710,w=260,color='lB',list=sList.visible, disp=ROOMval("visible"), code=ROOMsto("visible")},