音效室增加普通消除语音

LANG/lang_en.lua

@@ -462,15 +462,19 @@ return{
 			prehold="Prehold",
 			_pc="PC",
 
-			_1="Clear 1",
+			clear1="clear 1",
-			_2="Clear 2",
+			clear2="clear 2",
-			_3="Clear 3",
+			clear3="clear 3",
-			_4="Clear 4",
+			clear4="clear 4",
 			spin0="spin 0",
 			spin1="spin 1",
 			spin2="spin 2",
 			spin3="spin 3",
 
+			_1="Single",
+			_2="Double",
+			_3="Triple",
+			_4="Techrash",
 			z0="Z-spin",
 			z1="Z-spin 1",
 			z2="Z-spin 2",

LANG/lang_fr.lua

@@ -457,15 +457,19 @@ return{
 			-- prehold="Prehold",
 			-- _pc="PC",
 
-			-- _1="Clear 1",
+			-- clear1="clear 1",
-			-- _2="Clear 2",
+			-- clear2="clear 2",
-			-- _3="Clear 3",
+			-- clear3="clear 3",
-			-- _4="Clear 4",
+			-- clear4="clear 4",
 			-- spin0="spin 0",
 			-- spin1="spin 1",
 			-- spin2="spin 2",
 			-- spin3="spin 3",
 
+			-- _1="Single",
+			-- _2="Double",
+			-- _3="Triple",
+			-- _4="Techrash",
 			-- z0="Z-spin",
 			-- z1="Z-spin 1",
 			-- z2="Z-spin 2",

LANG/lang_sp.lua

@@ -462,15 +462,19 @@ return{
 			-- prehold="Prehold",
 			-- _pc="PC",
 
-			-- _1="Clear 1",
+			-- clear1="clear 1",
-			-- _2="Clear 2",
+			-- clear2="clear 2",
-			-- _3="Clear 3",
+			-- clear3="clear 3",
-			-- _4="Clear 4",
+			-- clear4="clear 4",
 			-- spin0="spin 0",
 			-- spin1="spin 1",
 			-- spin2="spin 2",
 			-- spin3="spin 3",
 
+			-- _1="Single",
+			-- _2="Double",
+			-- _3="Triple",
+			-- _4="Techrash",
 			-- z0="Z-spin",
 			-- z1="Z-spin 1",
 			-- z2="Z-spin 2",

LANG/lang_symbol.lua

@@ -413,15 +413,19 @@ return{
 			prehold="![ ]",
 			_pc="#<>#",
 
-			_1="1",
+			clear1="1",
-			_2="2",
+			clear2="2",
-			_3="3",
+			clear3="3",
-			_4="4",
+			clear4="4",
 			spin0="~0",
 			spin1="~1",
 			spin2="~2",
 			spin3="~3",
 
+			_1="1",
+			_2="2",
+			_3="3",
+			_4="4",
 			z0="Z ~",
 			z1="Z ~ 1",
 			z2="Z ~ 2",

LANG/lang_yygq.lua

@@ -117,10 +117,6 @@ return{
 			prehold="提前暂存",
 			_pc="消干净了",
 
-			_1="消一",
-			_2="消二",
-			_3="消三",
-			_4="消四",
 			spin0="空旋转",
 			spin1="旋转消一",
 			spin2="旋转消二",

LANG/lang_zh.lua

@@ -463,15 +463,19 @@ return{
 			prehold="提前Hold",
 			_pc="全消",
 
-			_1="消1",
+			clear1="Single",
-			_2="消2",
+			clear2="Double",
-			_3="消3",
+			clear3="Triple",
-			_4="消4",
+			clear4="Techrash",
 			spin0="spin 0",
 			spin1="spin 1",
 			spin2="spin 2",
 			spin3="spin 3",
 
+			_1="Single",
+			_2="Double",
+			_3="Triple",
+			_4="Techrash",
 			z0="Z-spin",
 			z1="Z-spin 1",
 			z2="Z-spin 2",

LANG/lang_zh2.lua

@@ -59,15 +59,19 @@ return{
 			bgm="音乐",
 		},
 		sound={
-			_1="消一",
+			clear1="消一",
-			_2="消二",
+			clear2="消二",
-			_3="消三",
+			clear3="消三",
-			_4="消四",
+			clear4="消四",
 			spin0="空旋转",
 			spin1="旋转消一",
 			spin2="旋转消二",
 			spin3="旋转消三",
 
+			_1="消一",
+			_2="消二",
+			_3="消三",
+			_4="消四",
 			z0="Z旋",
 			z1="Z旋消一",
 			z2="Z旋消二",

parts/scenes/sound.lua

@@ -10,11 +10,7 @@ function sceneInit.sound()
 end
 
 local blockName={"z","s","j","l","t","o","i"}
-local lineCount={
+local lineCount={"single","double","triple","techrash"}
-	"single",
-	"double",
-	"triple",
-}
 function keyDown.sound(key)
 	local S=sceneTemp
 	if key=="1"then
@@ -33,8 +29,10 @@ function keyDown.sound(key)
 		if S.b2b then VOC.play("b2b",CHN)
 		elseif S.b3b then VOC.play("b3b",CHN)
 		end
+		if key>10 then
 			VOC.play(blockName[int(key/10)].."spin",CHN)
-		if key%10>0 then VOC.play(lineCount[key%10],CHN)end
+		end
+		if lineCount[key%10]then VOC.play(lineCount[key%10],CHN)end
 		if S.pc then VOC.play("perfect_clear",CHN)end
 	elseif key=="escape"then
 		SCN.back()
@@ -43,8 +41,8 @@ end
 
 WIDGET.init("sound",{
 	WIDGET.newText({name="title",	x=30,	y=15,font=70,align="L"}),
-	WIDGET.newSlider({name="sfx",	x=760,	y=60,w=400,font=35,change=function()SFX.play("blip_1")end,disp=WIDGET.lnk.SETval("sfx"),code=WIDGET.lnk.SETsto("sfx")}),
+	WIDGET.newSlider({name="sfx",	x=510,	y=60,w=330,font=35,change=function()SFX.play("blip_1")end,disp=WIDGET.lnk.SETval("sfx"),code=WIDGET.lnk.SETsto("sfx")}),
-	WIDGET.newSlider({name="voc",	x=760,	y=120,w=400,font=35,change=function()VOC.play("test")end,disp=WIDGET.lnk.SETval("voc"),code=WIDGET.lnk.SETsto("voc")}),
+	WIDGET.newSlider({name="voc",	x=510,	y=120,w=330,font=35,change=function()VOC.play("test")end,disp=WIDGET.lnk.SETval("voc"),code=WIDGET.lnk.SETsto("voc")}),
 
 	WIDGET.newKey({name="move",		x=110,	y=140,w=160,h=50,code=function()SFX.play("move")end}),
 	WIDGET.newKey({name="lock",		x=110,	y=205,w=160,h=50,code=function()SFX.play("lock")end}),
@@ -56,16 +54,21 @@ WIDGET.init("sound",{
 	WIDGET.newKey({name="prerotate",x=110,	y=595,w=160,h=50,code=function()SFX.play("prerotate")end}),
 	WIDGET.newKey({name="prehold",	x=110,	y=660,w=160,h=50,code=function()SFX.play("prehold")end}),
 
-	WIDGET.newKey({name="_1",		x=280,	y=140,w=160,h=50,code=function()SFX.play("clear_1")end}),
+	WIDGET.newKey({name="clear1",	x=280,	y=140,w=160,h=50,code=function()SFX.play("clear_1")end}),
-	WIDGET.newKey({name="_2",		x=280,	y=205,w=160,h=50,code=function()SFX.play("clear_2")end}),
+	WIDGET.newKey({name="clear2",	x=280,	y=205,w=160,h=50,code=function()SFX.play("clear_2")end}),
-	WIDGET.newKey({name="_3",		x=280,	y=270,w=160,h=50,code=function()SFX.play("clear_3")end}),
+	WIDGET.newKey({name="clear3",	x=280,	y=270,w=160,h=50,code=function()SFX.play("clear_3")end}),
-	WIDGET.newKey({name="_4",		x=280,	y=335,w=160,h=50,code=function()SFX.play("clear_4")end}),
+	WIDGET.newKey({name="clear4",	x=280,	y=335,w=160,h=50,code=function()SFX.play("clear_4")end}),
 	WIDGET.newKey({name="spin0",	x=280,	y=400,w=160,h=50,code=function()SFX.play("spin_0")end}),
 	WIDGET.newKey({name="spin1",	x=280,	y=465,w=160,h=50,code=function()SFX.play("spin_1")end}),
 	WIDGET.newKey({name="spin2",	x=280,	y=530,w=160,h=50,code=function()SFX.play("spin_2")end}),
 	WIDGET.newKey({name="spin3",	x=280,	y=595,w=160,h=50,code=function()SFX.play("spin_3")end}),
 	WIDGET.newKey({name="_pc",		x=280,	y=660,w=160,h=50,code=function()SFX.play("clear")end}),
 
+	WIDGET.newKey({name="_1",		x=970,	y=75,w=140,h=50,code=WIDGET.lnk.pressKey(1)}),
+	WIDGET.newKey({name="_2",		x=1130,	y=75,w=140,h=50,code=WIDGET.lnk.pressKey(2)}),
+	WIDGET.newKey({name="_3",		x=970,	y=140,w=140,h=50,code=WIDGET.lnk.pressKey(3)}),
+	WIDGET.newKey({name="_4",		x=1130,	y=140,w=140,h=50,code=WIDGET.lnk.pressKey(4)}),
+
 	WIDGET.newKey({name="z0",		x=650,	y=205,w=140,h=50,code=WIDGET.lnk.pressKey(10)}),
 	WIDGET.newKey({name="z1",		x=650,	y=270,w=140,h=50,code=WIDGET.lnk.pressKey(11)}),
 	WIDGET.newKey({name="z2",		x=650,	y=335,w=140,h=50,code=WIDGET.lnk.pressKey(12)}),