From d953d623a25b1540eb1e4f8efa0c90e63b34b3cd Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Thu, 20 May 2021 14:35:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83=E8=81=94=E7=BD=91=E6=88=BF?= =?UTF-8?q?=E9=97=B4=E5=86=85=E5=87=86=E5=A4=87=E5=89=8Dui=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=AE=E7=9B=98=E5=87=86=E5=A4=87/?= =?UTF-8?q?=E8=A7=82=E6=88=98=E5=BF=AB=E6=8D=B7=E9=94=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/scenes/net_game.lua | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/parts/scenes/net_game.lua b/parts/scenes/net_game.lua index 3528d724..8b7b9452 100644 --- a/parts/scenes/net_game.lua +++ b/parts/scenes/net_game.lua @@ -1,4 +1,4 @@ -local gc,tc=love.graphics,love.touch +local gc,kb,tc=love.graphics,love.keyboard,love.touch local gc_setColor,gc_print=gc.setColor,gc.print local setFont,mStr=setFont,mStr @@ -144,15 +144,10 @@ function scene.keyDown(key) else if key=="space"then if netPLY.getSelfJoinMode()==0 then - _setReady() + (kb.isDown("lctrl","rctrl","lalt","ralt")and _setSpectate or _setReady)() else _setCancel() end - elseif key=="p"then - if netPLY.getSelfJoinMode()==0 then - _setSpectate() - end - elseif key=="s"then _gotoSetting() end end @@ -351,7 +346,7 @@ scene.widgetList={ textBox, inputBox, WIDGET.newKey{name="setting",fText=TEXTURE.setting,x=1200,y=160,w=90,h=90,code=_gotoSetting,hideF=function()return playing or netPLY.getSelfReady()or NET.getlock('ready')end}, - WIDGET.newKey{name="ready",x=950,y=630,w=190,h=80,color='lG',font=35,code=_setReady, + WIDGET.newKey{name="ready",x=1060,y=510,w=370,h=90,color='lG',font=35,code=_setReady, hideF=function() return playing or @@ -359,7 +354,7 @@ scene.widgetList={ netPLY.getSelfReady() or NET.getlock('ready') end}, - WIDGET.newKey{name="spectate",x=1150,y=630,w=190,h=80,color='lO',font=35,code=_setSpectate, + WIDGET.newKey{name="spectate",x=1060,y=610,w=370,h=90,color='lO',font=35,code=_setSpectate, hideF=function() return playing or @@ -367,7 +362,7 @@ scene.widgetList={ netPLY.getSelfReady() or NET.getlock('ready') end}, - WIDGET.newKey{name="cancel",x=1050,y=630,w=390,h=80,color='lH',font=40,code=_setCancel, + WIDGET.newKey{name="cancel",x=1060,y=560,w=370,h=120,color='lH',font=40,code=_setCancel, hideF=function() return playing or