diff --git a/LANG/lang_en.lua b/LANG/lang_en.lua index 59bd9bdf..5cf0efd5 100644 --- a/LANG/lang_en.lua +++ b/LANG/lang_en.lua @@ -439,6 +439,9 @@ return{ }, sound={ title="SE Room", + sfx="SFX", + voc="VOICE", + move="Move", lock="Lock", drop="Drop", @@ -448,6 +451,7 @@ return{ hold="Hold", prerotate="Prerotate", prehold="Prehold", + _pc="PC", _1="Clear 1", _2="Clear 2", diff --git a/LANG/lang_symbol.lua b/LANG/lang_symbol.lua index 26695fa6..6bf2dec4 100644 --- a/LANG/lang_symbol.lua +++ b/LANG/lang_symbol.lua @@ -439,6 +439,9 @@ return{ }, sound={ title="SE Room", + sfx="#!#", + voc="~~~", + move="←→", lock="Lock", drop="Drop", @@ -448,6 +451,7 @@ return{ hold="[ ]", prerotate="!''", prehold="![ ]", + _pc="#<>#", _1="1", _2="2", diff --git a/LANG/lang_yygq.lua b/LANG/lang_yygq.lua index a1d3143b..9c9c239a 100644 --- a/LANG/lang_yygq.lua +++ b/LANG/lang_yygq.lua @@ -392,6 +392,9 @@ return{ }, sound={ title="音效室", + sfx="音效", + voc="语音", + move="移动", lock="锁定", drop="硬降", @@ -401,6 +404,7 @@ return{ hold="暂存", prerotate="提前旋转", prehold="提前暂存", + _pc="消干净了", _1="消一", _2="消二", diff --git a/LANG/lang_zh.lua b/LANG/lang_zh.lua index 2c361b2a..07f951cc 100644 --- a/LANG/lang_zh.lua +++ b/LANG/lang_zh.lua @@ -441,6 +441,9 @@ return{ }, sound={ title="音效室", + sfx="音效", + voc="语音", + move="移动", lock="锁定", drop="硬降", @@ -450,6 +453,7 @@ return{ hold="Hold", prerotate="提前旋转", prehold="提前Hold", + _pc="全消", _1="消1", _2="消2", diff --git a/LANG/lang_zh2.lua b/LANG/lang_zh2.lua index 6fe83cc4..7e5dbea4 100644 --- a/LANG/lang_zh2.lua +++ b/LANG/lang_zh2.lua @@ -376,6 +376,9 @@ return{ }, sound={ title="音效室", + sfx="音效", + voc="语音", + move="移动", lock="锁定", drop="硬降", @@ -385,6 +388,7 @@ return{ hold="暂存", prerotate="提前旋转", prehold="提前暂存", + _pc="全消", _1="消一", _2="消二", diff --git a/Zframework/widgetList.lua b/Zframework/widgetList.lua index db5322c3..9711b115 100644 --- a/Zframework/widgetList.lua +++ b/Zframework/widgetList.lua @@ -690,62 +690,65 @@ local Widgets={ }, sound={ newText({name="title", x=30, y=15,font=70,align="L"}), + newSlider({name="sfx", x=760, y=60,w=400,font=35,change=function()SFX.play("blip_1")end,disp=SETval("sfx"),code=SETsto("sfx")}), + newSlider({name="voc", x=760, y=120,w=400,font=35,change=function()VOC.play("test")end,disp=SETval("voc"),code=SETsto("voc")}), - newKey({name="move", x=100, y=140,w=140,h=50,code=function()SFX.play("move")end}), - newKey({name="lock", x=100, y=205,w=140,h=50,code=function()SFX.play("lock")end}), - newKey({name="drop", x=100, y=270,w=140,h=50,code=function()SFX.play("drop")end}), - newKey({name="fall", x=100, y=335,w=140,h=50,code=function()SFX.play("fall")end}), - newKey({name="rotate", x=100, y=400,w=140,h=50,code=function()SFX.play("rotate")end}), - newKey({name="rotatekick", x=100, y=465,w=140,h=50,code=function()SFX.play("rotatekick")end}), - newKey({name="hold", x=100, y=530,w=140,h=50,code=function()SFX.play("hold")end}), - newKey({name="prerotate", x=100, y=595,w=140,h=50,code=function()SFX.play("prerotate")end}), - newKey({name="prehold", x=100, y=660,w=140,h=50,code=function()SFX.play("prehold")end}), + newKey({name="move", x=110, y=140,w=160,h=50,code=function()SFX.play("move")end}), + newKey({name="lock", x=110, y=205,w=160,h=50,code=function()SFX.play("lock")end}), + newKey({name="drop", x=110, y=270,w=160,h=50,code=function()SFX.play("drop")end}), + newKey({name="fall", x=110, y=335,w=160,h=50,code=function()SFX.play("fall")end}), + newKey({name="rotate", x=110, y=400,w=160,h=50,code=function()SFX.play("rotate")end}), + newKey({name="rotatekick", x=110, y=465,w=160,h=50,code=function()SFX.play("rotatekick")end}), + newKey({name="hold", x=110, y=530,w=160,h=50,code=function()SFX.play("hold")end}), + newKey({name="prerotate", x=110, y=595,w=160,h=50,code=function()SFX.play("prerotate")end}), + newKey({name="prehold", x=110, y=660,w=160,h=50,code=function()SFX.play("prehold")end}), - newKey({name="_1", x=260, y=140,w=140,h=50,code=function()SFX.play("clear_1")end}), - newKey({name="_2", x=260, y=205,w=140,h=50,code=function()SFX.play("clear_2")end}), - newKey({name="_3", x=260, y=270,w=140,h=50,code=function()SFX.play("clear_3")end}), - newKey({name="_4", x=260, y=335,w=140,h=50,code=function()SFX.play("clear_4")end}), - newKey({name="spin0", x=260, y=400,w=140,h=50,code=function()SFX.play("spin_0")end}), - newKey({name="spin1", x=260, y=465,w=140,h=50,code=function()SFX.play("spin_1")end}), - newKey({name="spin2", x=260, y=530,w=140,h=50,code=function()SFX.play("spin_2")end}), - newKey({name="spin3", x=260, y=595,w=140,h=50,code=function()SFX.play("spin_3")end}), + newKey({name="_1", x=280, y=140,w=160,h=50,code=function()SFX.play("clear_1")end}), + newKey({name="_2", x=280, y=205,w=160,h=50,code=function()SFX.play("clear_2")end}), + newKey({name="_3", x=280, y=270,w=160,h=50,code=function()SFX.play("clear_3")end}), + newKey({name="_4", x=280, y=335,w=160,h=50,code=function()SFX.play("clear_4")end}), + newKey({name="spin0", x=280, y=400,w=160,h=50,code=function()SFX.play("spin_0")end}), + newKey({name="spin1", x=280, y=465,w=160,h=50,code=function()SFX.play("spin_1")end}), + newKey({name="spin2", x=280, y=530,w=160,h=50,code=function()SFX.play("spin_2")end}), + newKey({name="spin3", x=280, y=595,w=160,h=50,code=function()SFX.play("spin_3")end}), + newKey({name="_pc", x=280, y=660,w=160,h=50,code=function()SFX.play("clear")end}), - newKey({name="z0", x=660, y=80,w=140,h=50,code=pressKey(10)}), - newKey({name="z1", x=660, y=145,w=140,h=50,code=pressKey(11)}), - newKey({name="z2", x=660, y=210,w=140,h=50,code=pressKey(12)}), - newKey({name="z3", x=660, y=275,w=140,h=50,code=pressKey(13)}), - newKey({name="t0", x=660, y=340,w=140,h=50,code=pressKey(50)}), - newKey({name="t1", x=660, y=405,w=140,h=50,code=pressKey(51)}), - newKey({name="t2", x=660, y=470,w=140,h=50,code=pressKey(52)}), - newKey({name="t3", x=660, y=535,w=140,h=50,code=pressKey(53)}), + newKey({name="z0", x=650, y=205,w=140,h=50,code=pressKey(10)}), + newKey({name="z1", x=650, y=270,w=140,h=50,code=pressKey(11)}), + newKey({name="z2", x=650, y=335,w=140,h=50,code=pressKey(12)}), + newKey({name="z3", x=650, y=400,w=140,h=50,code=pressKey(13)}), + newKey({name="t0", x=650, y=465,w=140,h=50,code=pressKey(50)}), + newKey({name="t1", x=650, y=530,w=140,h=50,code=pressKey(51)}), + newKey({name="t2", x=650, y=595,w=140,h=50,code=pressKey(52)}), + newKey({name="t3", x=650, y=660,w=140,h=50,code=pressKey(53)}), - newKey({name="s0", x=820, y=80,w=140,h=50,code=pressKey(20)}), - newKey({name="s1", x=820, y=145,w=140,h=50,code=pressKey(21)}), - newKey({name="s2", x=820, y=210,w=140,h=50,code=pressKey(22)}), - newKey({name="s3", x=820, y=275,w=140,h=50,code=pressKey(23)}), - newKey({name="o0", x=820, y=340,w=140,h=50,code=pressKey(60)}), - newKey({name="o1", x=820, y=405,w=140,h=50,code=pressKey(61)}), - newKey({name="o2", x=820, y=470,w=140,h=50,code=pressKey(62)}), - newKey({name="o3", x=820, y=535,w=140,h=50,code=pressKey(63)}), + newKey({name="s0", x=810, y=205,w=140,h=50,code=pressKey(20)}), + newKey({name="s1", x=810, y=270,w=140,h=50,code=pressKey(21)}), + newKey({name="s2", x=810, y=335,w=140,h=50,code=pressKey(22)}), + newKey({name="s3", x=810, y=400,w=140,h=50,code=pressKey(23)}), + newKey({name="o0", x=810, y=465,w=140,h=50,code=pressKey(60)}), + newKey({name="o1", x=810, y=530,w=140,h=50,code=pressKey(61)}), + newKey({name="o2", x=810, y=595,w=140,h=50,code=pressKey(62)}), + newKey({name="o3", x=810, y=660,w=140,h=50,code=pressKey(63)}), - newKey({name="j0", x=980, y=80,w=140,h=50,code=pressKey(30)}), - newKey({name="j1", x=980, y=145,w=140,h=50,code=pressKey(31)}), - newKey({name="j2", x=980, y=210,w=140,h=50,code=pressKey(32)}), - newKey({name="j3", x=980, y=275,w=140,h=50,code=pressKey(33)}), - newKey({name="i0", x=980, y=340,w=140,h=50,code=pressKey(70)}), - newKey({name="i1", x=980, y=405,w=140,h=50,code=pressKey(71)}), - newKey({name="i2", x=980, y=470,w=140,h=50,code=pressKey(72)}), - newKey({name="i3", x=980, y=535,w=140,h=50,code=pressKey(73)}), + newKey({name="j0", x=970, y=205,w=140,h=50,code=pressKey(30)}), + newKey({name="j1", x=970, y=270,w=140,h=50,code=pressKey(31)}), + newKey({name="j2", x=970, y=335,w=140,h=50,code=pressKey(32)}), + newKey({name="j3", x=970, y=400,w=140,h=50,code=pressKey(33)}), + newKey({name="i0", x=970, y=465,w=140,h=50,code=pressKey(70)}), + newKey({name="i1", x=970, y=530,w=140,h=50,code=pressKey(71)}), + newKey({name="i2", x=970, y=595,w=140,h=50,code=pressKey(72)}), + newKey({name="i3", x=970, y=660,w=140,h=50,code=pressKey(73)}), - newKey({name="l0", x=1140, y=80,w=140,h=50,code=pressKey(40)}), - newKey({name="l1", x=1140, y=145,w=140,h=50,code=pressKey(41)}), - newKey({name="l2", x=1140, y=210,w=140,h=50,code=pressKey(42)}), - newKey({name="l3", x=1140, y=275,w=140,h=50,code=pressKey(43)}), + newKey({name="l0", x=1130, y=205,w=140,h=50,code=pressKey(40)}), + newKey({name="l1", x=1130, y=270,w=140,h=50,code=pressKey(41)}), + newKey({name="l2", x=1130, y=335,w=140,h=50,code=pressKey(42)}), + newKey({name="l3", x=1130, y=400,w=140,h=50,code=pressKey(43)}), - newSwitch({name="mini", x=380, y=660,disp=STPval("mini"),code=pressKey("1")}), - newSwitch({name="b2b", x=560, y=660,disp=STPval("b2b"),code=pressKey("2")}), - newSwitch({name="b3b", x=740, y=660,disp=STPval("b3b"),code=pressKey("3")}), - newSwitch({name="pc", x=940, y=660,disp=STPval("pc"),code=pressKey("4")}), + newSwitch({name="mini", x=515, y=465,disp=STPval("mini"),code=pressKey("1")}), + newSwitch({name="b2b", x=515, y=530,disp=STPval("b2b"),code=pressKey("2")}), + newSwitch({name="b3b", x=515, y=595,disp=STPval("b3b"),code=pressKey("3")}), + newSwitch({name="pc", x=515, y=660,disp=STPval("pc"),code=pressKey("4")}), newButton({name="back", x=1140, y=640,w=170,h=80,font=40,code=BACK}), },