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-05-16 03:16:07 +08:00
parent 93f854e6e4
commit b9c5599f95
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
parts/scenes/net_game.lua
View File

@@ -1,5 +1,7 @@
local gc,tc,kb=love.graphics,love.touch,love.keyboard local gc,tc=love.graphics,love.touch
local ins=table.insert local ins=table.insert
local SCR,VK,NET,netPLY=SCR,VK,NET,netPLY local SCR,VK,NET,netPLY=SCR,VK,NET,netPLY
local PLAYERS,GAME=PLAYERS,GAME local PLAYERS,GAME=PLAYERS,GAME
@@ -13,6 +15,15 @@ local lastBackTime=0
local noTouch,noKey=false,false local noTouch,noKey=false,false
local touchMoveLastFrame=false local touchMoveLastFrame=false
local function _switchReady()
NET.signal_ready(not netPLY.getSelfReady())
end
local function _gotoSetting()
if not(netPLY.getSelfReady()or NET.getlock('ready'))then
SCN.go('setting_game')
end
end
local scene={} local scene={}
function scene.sceneInit(org) function scene.sceneInit(org)
@@ -112,11 +123,9 @@ function scene.keyDown(key)
end end
else else
if key=="space"then if key=="space"then
NET.signal_ready(not netPLY.getSelfReady()) _switchReady()
elseif key=="s"then elseif key=="s"then
if not(netPLY.getSelfReady()or NET.getlock('ready'))then _gotoSetting()
SCN.go('setting_game')
end
end end
end end
end end
@@ -301,8 +310,8 @@ end
scene.widgetList={ scene.widgetList={
textBox, textBox,
inputBox, inputBox,
WIDGET.newKey{name="setting",fText=TEXTURE.setting,x=1200,y=160,w=90,h=90,code=pressKey"s",hideF=function()return playing or netPLY.getSelfReady()or NET.getlock('ready')end}, 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=1060,y=630,w=300,h=80,color='lB',font=40,code=pressKey"space", WIDGET.newKey{name="ready",x=1060,y=630,w=300,h=80,color='lB',font=40,code=_switchReady,
hideF=function() hideF=function()
return return
playing or playing or
@@ -310,7 +319,7 @@ scene.widgetList={
netPLY.getSelfReady()or netPLY.getSelfReady()or
NET.getlock('ready') NET.getlock('ready')
end}, end},
WIDGET.newKey{name="cancel",x=1060,y=630,w=300,h=80,color='H',font=40,code=pressKey"space", WIDGET.newKey{name="cancel",x=1060,y=630,w=300,h=80,color='H',font=40,code=_switchReady,
hideF=function() hideF=function()
return return
playing or playing or