From df5c16e05ff1a6dde1d91c245baa2f039b70f7ac Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Mon, 12 Apr 2021 21:25:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=88=98=E6=88=BF=E9=97=B4=E7=9A=84?= =?UTF-8?q?=E5=87=86=E5=A4=87=E6=8C=89=E9=92=AE=E9=A2=9C=E8=89=B2=E5=92=8C?= =?UTF-8?q?=E6=96=87=E6=9C=AC=E4=BC=9A=E9=9A=8F=E7=8A=B6=E6=80=81=E6=94=B9?= =?UTF-8?q?=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/language/lang_en.lua | 3 ++- parts/language/lang_fr.lua | 3 ++- parts/language/lang_pt.lua | 3 ++- parts/language/lang_sp.lua | 1 + parts/language/lang_zh.lua | 3 ++- parts/scenes/net_game.lua | 8 ++++++++ 6 files changed, 17 insertions(+), 4 deletions(-) diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index f61a7155..72dc7a42 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -259,7 +259,8 @@ return{ down="↓", }, net_game={ - ready="Ready/Cancel", + ready="Ready", + cancel="Cancel", }, net_chat={ send="Send", diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index d1a6952b..0a945e6d 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -231,7 +231,8 @@ return{ down="↓", }, net_game={ - -- ready="Ready/Cancel", + -- ready="Ready", + -- cancel="Cancel", }, net_chat={ send="Envoyer", diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index 896a60f4..961e7295 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -259,7 +259,8 @@ return{ down="↓", }, net_game={ - -- ready="Ready/Cancel", + -- ready="Ready", + -- cancel="Cancel", }, net_chat={ send="Mandar", diff --git a/parts/language/lang_sp.lua b/parts/language/lang_sp.lua index 297b6514..745f5fac 100644 --- a/parts/language/lang_sp.lua +++ b/parts/language/lang_sp.lua @@ -238,6 +238,7 @@ return{ }, net_game={ ready="Estoy Listo", + -- cancel="Cancel", }, net_chat={ send="Enviar", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 2d501eb7..1ed97ae4 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -259,7 +259,8 @@ return{ down="↓", }, net_game={ - ready="准备/取消", + ready="准备", + cancel="取消", }, net_chat={ send="发送", diff --git a/parts/scenes/net_game.lua b/parts/scenes/net_game.lua index 35354a46..d84a45cc 100644 --- a/parts/scenes/net_game.lua +++ b/parts/scenes/net_game.lua @@ -275,6 +275,14 @@ scene.widgetList={ return playing or not textBox.hide or + PLY_NET[1].ready or + NET.getlock("ready") + end}, + WIDGET.newKey{name="cancel",x=900,y=560,w=400,h=100,color="grey",font=40,code=pressKey"space",hide=function() + return + playing or + not textBox.hide or + not PLY_NET[1].ready or NET.getlock("ready") end}, WIDGET.newKey{name="hideChat",fText="...",x=380,y=35,w=60,font=35,code=pressKey"\\"},