diff --git a/parts/globalTables.lua b/parts/globalTables.lua index 4c4d9443..c4a628cb 100644 --- a/parts/globalTables.lua +++ b/parts/globalTables.lua @@ -347,8 +347,8 @@ VK_org=FILE.load("conf/virtualkey")or{--Virtualkey layout, refresh all VKs' posi {ava=true, x=200, y=720-320, r=80,color=COLOR.cyan},--hardDrop {ava=true, x=200, y=720-80, r=80,color=COLOR.sea},--softDrop {ava=true, x=1280-320, y=720-200, r=80,color=COLOR.yellow},--hold - {ava=true, x=1280-80, y=280, r=80,color=COLOR.lRed},--func - {ava=true, x=80, y=280, r=80,color=COLOR.lMagenta},--restart + {ava=true, x=1280-80, y=280, r=80,color=COLOR.lRed},--func1 + {ava=true, x=80, y=280, r=80,color=COLOR.lMagenta},--func2 {ava=false, x=100, y=50, r=80,color=COLOR.water},--insLeft {ava=false, x=200, y=50, r=80,color=COLOR.water},--insRight {ava=false, x=300, y=50, r=80,color={COLOR.rainbow(3.5)}},--insDown diff --git a/parts/scenes/setting_touch.lua b/parts/scenes/setting_touch.lua index 42fb90b1..04eaeed6 100644 --- a/parts/scenes/setting_touch.lua +++ b/parts/scenes/setting_touch.lua @@ -116,8 +116,8 @@ local virtualkeySet={ {6, 200, 720-320, 80},--hardDrop {7, 200, 720-80, 80},--softDrop {8, 1280-320, 720-200, 80},--hold - {9, 1280-80, 280, 80},--func - {10,80, 280, 80},--restart + {9, 80, 280, 80},--func1 + {10,1280-80, 280, 80},--func2 },--Farter's tetr.js set { {1, 1280-320, 720-200, 80},--moveLeft @@ -128,8 +128,8 @@ local virtualkeySet={ {6, 1280-200, 720-320, 80},--hardDrop {7, 1280-200, 720-80, 80},--softDrop {8, 320, 720-200, 80},--hold - {9, 80, 280, 80},--func - {10,1280-80, 280, 80},--restart + {9, 1280-80, 280, 80},--func1 + {10,80, 280, 80},--func2 },--Mirrored tetr.js set { {1, 80, 720-80, 80},--moveLeft @@ -140,8 +140,8 @@ local virtualkeySet={ {6, 1280-80, 720-80, 80},--hardDrop {7, 1280-80, 720-240, 80},--softDrop {8, 1280-80, 720-400, 80},--hold - {9, 80, 360, 80},--func - {10,80, 80, 80},--restart + {9, 80, 720-240, 80},--func1 + {10,240, 720-240, 80},--func2 },--Author's set, not recommend { {1, 1280-400, 720-80, 80},--moveLeft @@ -151,13 +151,13 @@ local virtualkeySet={ {5, 240, 720-240, 80},--rot180 {6, 1280-240, 720-240, 80},--hardDrop {7, 1280-240, 720-80, 80},--softDrop - {8, 1280-80, 720-240, 80},--hold - {9, 80, 720-240, 80},--func - {10,80, 320, 80},--restart + {8, 400, 720-80, 80},--hold + {9, 80, 720-240, 80},--func1 + {10,80, 720-400, 80},--func2 },--Keyboard set { - {10,70, 50,30},--restart - {9, 130, 50,30},--func + {9, 70, 50,30},--func1 + {10,130, 50,30},--func2 {4, 190, 50,30},--rotLeft {3, 250, 50,30},--rotRight {5, 310, 50,30},--rot180 @@ -195,9 +195,9 @@ scene.widgetList={ B.x,B.y,B.r=T[2],T[3],T[4] end end + LOG.print("[ "..defaultSetSelect.." ]") defaultSetSelect=defaultSetSelect%5+1 selected=false - LOG.print("[ "..defaultSetSelect.." ]") end}, WIDGET.newSelector{name="snap", x=760,y=90,w=200,h=80,color="yellow",list={1,10,20,40,60,80},disp=function()return snapUnit end,code=function(i)snapUnit=i end}, WIDGET.newButton{name="option", x=520,y=190,w=200,h=80,font=40,