diff --git a/document/mode.txt b/document/mode.txt index 41e0f936..d8ea995d 100644 --- a/document/mode.txt +++ b/document/mode.txt @@ -26,7 +26,6 @@ ihs:提前Hold irs:提前旋转 ims:提前移动 - maxNext:最大next数 skin:方块颜色,包含25个整数(1~16)的table face:方块朝向,包含25个整数(0~3)的table diff --git a/parts/gametoolfunc.lua b/parts/gametoolfunc.lua index de81d635..97bc370f 100644 --- a/parts/gametoolfunc.lua +++ b/parts/gametoolfunc.lua @@ -9,7 +9,6 @@ local default_setting={ "das","arr", "sddas","sdarr", "ihs","irs","ims", - "maxNext", "swap", --"face","skin", } diff --git a/parts/globalTables.lua b/parts/globalTables.lua index 906c29a1..7a90ee97 100644 --- a/parts/globalTables.lua +++ b/parts/globalTables.lua @@ -226,7 +226,6 @@ SETTING={ das=10,arr=2,dascut=0, sddas=0,sdarr=2, ihs=true,irs=true,ims=true, - maxNext=6, RS="TRS", swap=true, diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index f138d188..6a32f5c1 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -259,7 +259,6 @@ return{ key="Key Mappings", touch="Touch Settings", reTime="Start Delay", - maxNext="Next Queue Length", RS="Rotation System", layout="Layout", autoPause="Pause when focus is lost", diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index d9c1b67f..0e734ab4 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -239,7 +239,6 @@ return{ key="Touches", touch="Boutons virtuels", reTime="Délai de démarrage", - maxNext="Nombre de prévisualisations de pièces", -- RS="Rotation System", layout="Skin, orientations, etc.", autoPause="Mettre en pause en cas de perte de focus", diff --git a/parts/language/lang_sp.lua b/parts/language/lang_sp.lua index a2d1a1cf..8d014910 100644 --- a/parts/language/lang_sp.lua +++ b/parts/language/lang_sp.lua @@ -242,7 +242,6 @@ return{ key="Teclas", touch="Controles Táctiles", reTime="Retraso de Inicio", - maxNext="Cantidad de Pzas. Siguientes", -- RS="Rotation System", layout="Diseño", autoPause="Pausar cuando la ventana no está enfocada", diff --git a/parts/language/lang_symbol.lua b/parts/language/lang_symbol.lua index 16b73d5e..983fd9f0 100644 --- a/parts/language/lang_symbol.lua +++ b/parts/language/lang_symbol.lua @@ -141,7 +141,6 @@ return{ key="=?", touch="_?", reTime="3-2-1", - maxNext="=123", RS="''?", layout="=-=-=", autoPause="A||", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 12ea1f81..7fe0a56b 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -262,7 +262,6 @@ return{ key="键位设置", touch="触屏设置", reTime="开局等待时间", - maxNext="最大预览数量", RS="旋转系统", layout="外观", autoPause="失去焦点自动暂停", diff --git a/parts/player/init.lua b/parts/player/init.lua index 8cbff88a..0836181b 100644 --- a/parts/player/init.lua +++ b/parts/player/init.lua @@ -268,7 +268,6 @@ local function applyGameEnv(P)--Finish gameEnv processing ENV.das=max(ENV.das,ENV.mindas) ENV.arr=max(ENV.arr,ENV.minarr) ENV.sdarr=max(ENV.sdarr,ENV.minsdarr) - ENV.nextCount=min(ENV.nextCount,SETTING.maxNext) if ENV.sequence~="bag"and ENV.sequence~="loop"then ENV.bagLine=false diff --git a/parts/scenes/setting_game.lua b/parts/scenes/setting_game.lua index c685a1b1..4a609b13 100644 --- a/parts/scenes/setting_game.lua +++ b/parts/scenes/setting_game.lua @@ -27,8 +27,7 @@ scene.widgetList={ WIDGET.newButton{name="key", x=640, y=220, w=320,h=80, color="lGreen", font=35,code=WIDGET.lnk_goScene("setting_key")}, WIDGET.newButton{name="touch", x=990, y=220, w=320,h=80, color="lBlue", font=35,code=WIDGET.lnk_goScene("setting_touch")}, WIDGET.newSlider{name="reTime", x=350, y=340, w=300,unit=10, font=30,disp=WIDGET.lnk_SETval("reTime"), code=WIDGET.lnk_SETsto("reTime"),show=function(S)return(.5+S.disp()*.25).."s"end}, - WIDGET.newSlider{name="maxNext", x=350, y=440, w=300,unit=6, font=30,disp=WIDGET.lnk_SETval("maxNext"), code=WIDGET.lnk_SETsto("maxNext")}, - WIDGET.newSelector{name="RS", x=300, y=540, w=300,color="sea",list={"TRS","SRS","C2","C2sym","Classic","None"},disp=WIDGET.lnk_SETval("RS"),code=WIDGET.lnk_SETsto("RS")}, + WIDGET.newSelector{name="RS", x=500, y=420, w=300,color="sea",list={"TRS","SRS","C2","C2sym","Classic","None"},disp=WIDGET.lnk_SETval("RS"),code=WIDGET.lnk_SETsto("RS")}, WIDGET.newButton{name="layout", x=580, y=540, w=200,h=70, font=35,code=WIDGET.lnk_goScene("setting_skin")}, WIDGET.newSwitch{name="autoPause", x=1080, y=320, font=20,disp=WIDGET.lnk_SETval("autoPause"),code=WIDGET.lnk_SETrev("autoPause")}, WIDGET.newSwitch{name="swap", x=1080, y=380, font=20,disp=WIDGET.lnk_SETval("swap"), code=WIDGET.lnk_SETrev("swap")},