From 9d5204d1acda2940f4eec2a397082a60491ce334 Mon Sep 17 00:00:00 2001 From: MrZ_26 <1046101471@qq.com> Date: Thu, 2 May 2024 23:42:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83=E5=AE=9D=E7=9F=B3=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E9=94=AE=E4=BD=8D=20=E4=BF=AEexterior=E6=B0=94?= =?UTF-8?q?=E6=B3=A1=E9=94=AE=E4=BD=8D=E8=AE=BE=E7=BD=AE=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=B8=83=E5=B1=80=E9=94=99=E8=AF=AF=20exterior=E9=94=AE?= =?UTF-8?q?=E4=BD=8D=E8=AE=BE=E7=BD=AE=E4=B9=9F=E6=94=AF=E6=8C=81=E4=B8=B4?= =?UTF-8?q?=E6=97=B6=E8=A7=A3=E9=94=81=E5=85=A8=E9=83=A8=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/scene/keyset_out.lua | 8 +++++++- main.lua | 10 +++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/assets/scene/keyset_out.lua b/assets/scene/keyset_out.lua index 8c1abf70..26621e58 100644 --- a/assets/scene/keyset_out.lua +++ b/assets/scene/keyset_out.lua @@ -36,6 +36,12 @@ end function scene.keyDown(key,isRep) if isRep then return end + if key=='`' and isAltPressed then + scene.widgetList.Sgem._visible=true + scene.widgetList.Spuyo._visible=true + scene.widgetList.Smino._visible=true + scene.widgetList.Ssys._visible=true + end if KEYMAP.sys:getAction(key)=='back' then SCN.back('fadeHeader') end @@ -88,7 +94,7 @@ scene.widgetList={ {type='button',name='puyo',x=140,y=460,w=200,h=60,text=LANG"keyset_puyo_rotate180", fontSize=20, color='lG',code=selAct('puyo','rotate180')}, {type='button',name='puyo',x=140,y=530,w=200,h=60,text=LANG"keyset_puyo_softDrop", fontSize=20, color='lG',code=selAct('puyo','softDrop' )}, {type='button',name='puyo',x=140,y=600,w=200,h=60,text=LANG"keyset_puyo_hardDrop", fontSize=20, color='lG',code=selAct('puyo','hardDrop' )}, - {type='button',name='puyo',x=140,y=950,w=200,h=60,text=LANG"keyset_puyo_skip", fontSize=20, color='lG',code=selAct('puyo','skip' )}, + {type='button',name='puyo',x=140,y=670,w=200,h=60,text=LANG"keyset_puyo_skip", fontSize=20, color='lG',code=selAct('puyo','skip' )}, {type='button',name='puyo',x=900,y=180,w=200,h=60,text=LANG"keyset_func1", fontSize=20, color='lY',code=selAct('puyo','func1')}, {type='button',name='puyo',x=900,y=250,w=200,h=60,text=LANG"keyset_func2", fontSize=20, color='lY',code=selAct('puyo','func2')}, {type='button',name='puyo',x=900,y=320,w=200,h=60,text=LANG"keyset_func3", fontSize=20, color='lY',code=selAct('puyo','func3')}, diff --git a/main.lua b/main.lua index ad0c5cb6..a601b912 100644 --- a/main.lua +++ b/main.lua @@ -340,11 +340,11 @@ KEYMAP.gem=KEYMAP.new{ {act='moveUp', keys={'w'}}, {act='moveDown', keys={'s'}}, {act='skip', keys={'space'}}, - {act='func1', keys={'x'}}, - {act='func2', keys={'c'}}, - {act='func3', keys={'v'}}, - {act='func4', keys={'f'}}, - {act='func5', keys={'r'}}, + {act='func1', keys={'r'}}, + {act='func2', keys={'f'}}, + {act='func3', keys={'c'}}, + {act='func4', keys={'x'}}, + {act='func5', keys={'v'}}, } KEYMAP.sys=KEYMAP.new{ {act='view', keys={'lshift'}},