From 2dfbee784dcdbb41a385eb5be58b213003f226ae Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Fri, 12 Mar 2021 15:40:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8C=96=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E9=AB=98=E7=BA=A7=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/globalTables.lua | 5 ----- parts/language/lang_en.lua | 4 ---- parts/language/lang_fr.lua | 4 ---- parts/language/lang_pt.lua | 4 ---- parts/language/lang_sp.lua | 4 ---- parts/language/lang_symbol.lua | 4 ---- parts/language/lang_zh.lua | 4 ---- parts/language/lang_zh2.lua | 4 ---- parts/scenes/custom_advance.lua | 14 +++++--------- 9 files changed, 5 insertions(+), 42 deletions(-) diff --git a/parts/globalTables.lua b/parts/globalTables.lua index 6a2d3b43..7da2d980 100644 --- a/parts/globalTables.lua +++ b/parts/globalTables.lua @@ -154,9 +154,6 @@ CUSTOMENV={--gameEnv for cutsom game fall=0, --Control - mindas=0, - minarr=0, - minsdarr=0, nextCount=6, holdCount=1, infHold=false, @@ -170,7 +167,6 @@ CUSTOMENV={--gameEnv for cutsom game fieldH=20, ospin=true, - noTele=false, fineKill=false, b2bKill=false, easyFresh=true, @@ -182,7 +178,6 @@ CUSTOMENV={--gameEnv for cutsom game opponent="X", life=0, - garbageSpeed=1, pushSpeed=3, missionKill=false, diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index 28d66ebd..dcf2faff 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -426,10 +426,6 @@ return{ phyHold="Physical Hold", bone="Bone Blocks", - mindas="Min. DAS", - minarr="Min. ARR", - minsdarr="Min. SDARR", - noTele="No Teleportation", fieldH="Field height", ospin="O-Spin", deepDrop="Deep Drop", diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index 6be1178b..57841181 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -402,10 +402,6 @@ return{ -- phyHold="Physical Hold", bone="Crochets", - mindas="DAS minimum", - minarr="ARR minimum", - minsdarr="SDARR minimum", - noTele="Pas de téléportation", -- fieldH="Field height", ospin="O-spin", -- deepDrop="Deep Drop", diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index 666c1500..028ab00d 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -426,10 +426,6 @@ return{ -- phyHold="Physical Hold", bone="Bone Blocks", - mindas="Min. DAS", - minarr="Min. ARR", - minsdarr="Min. SDARR", - noTele="Sem teleporte", -- fieldH="Field height", ospin="O-Spin", -- deepDrop="Deep Drop", diff --git a/parts/language/lang_sp.lua b/parts/language/lang_sp.lua index 841933a2..783593e5 100644 --- a/parts/language/lang_sp.lua +++ b/parts/language/lang_sp.lua @@ -402,10 +402,6 @@ return{ -- phyHold="Physical Hold", bone="Bone Block", - mindas="DAS Mínimo", - minarr="ARR Mínimo", - minsdarr="SDARR Mínimo", - noTele="Sin Teleport", -- fieldH="Field height", ospin="O-Spin", -- deepDrop="Deep Drop", diff --git a/parts/language/lang_symbol.lua b/parts/language/lang_symbol.lua index a0c5fc49..d049b481 100644 --- a/parts/language/lang_symbol.lua +++ b/parts/language/lang_symbol.lua @@ -283,10 +283,6 @@ return{ phyHold="P-[ ]", bone="[]", - mindas="mDAS", - minarr="mARR", - minsdarr="msdARR", - noTele="X→→X", fieldH="↑[]↓", ospin="O→Any", deepDrop="\\↓↓/", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index bcf1e4d5..345a16ca 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -426,10 +426,6 @@ return{ phyHold="物理Hold", bone="骨块", - mindas="最小DAS", - minarr="最小ARR", - minsdarr="最小软降ARR", - noTele="禁止瞬移", fieldH="场地高度", ospin="O-spin", deepDrop="穿墙软降", diff --git a/parts/language/lang_zh2.lua b/parts/language/lang_zh2.lua index 6c9e5e5e..c2f8cdb7 100644 --- a/parts/language/lang_zh2.lua +++ b/parts/language/lang_zh2.lua @@ -85,10 +85,6 @@ return{ holdCount="暂存个数", infHold="无限暂存", phyHold="物理暂存", - - mindas="最小首次移动延迟", - minarr="最小移动重复延迟", - minsdarr="最小软降重复延迟", }, music={ bgm="音乐", diff --git a/parts/scenes/custom_advance.lua b/parts/scenes/custom_advance.lua index 28ece82b..e2c31f7d 100644 --- a/parts/scenes/custom_advance.lua +++ b/parts/scenes/custom_advance.lua @@ -5,16 +5,13 @@ scene.widgetList={ WIDGET.newText{name="subTitle", x=530,y=50,font=35,align="L",color="grey"}, --Control - WIDGET.newSlider{name="mindas", x=180, y=150,w=400,unit=15,font=25,disp=lnk_CUSval("mindas"), code=lnk_CUSsto("mindas")}, - WIDGET.newSlider{name="minarr", x=180, y=220,w=400,unit=10,font=25,disp=lnk_CUSval("minarr"), code=lnk_CUSsto("minarr")}, - WIDGET.newSlider{name="minsdarr", x=180, y=290,w=200,unit=4, font=20,disp=lnk_CUSval("minsdarr"),code=lnk_CUSsto("minsdarr")}, - WIDGET.newSlider{name="nextCount", x=180, y=380,w=200,unit=6, disp=lnk_CUSval("nextCount"),code=lnk_CUSsto("nextCount")}, - WIDGET.newSlider{name="holdCount", x=180, y=450,w=200,unit=6, disp=lnk_CUSval("holdCount"),code=lnk_CUSsto("holdCount")}, - WIDGET.newSwitch{name="infHold", x=280, y=530, disp=lnk_CUSval("infHold"), code=lnk_CUSrev("infHold"),hide=function()return CUSTOMENV.holdCount==0 end}, - WIDGET.newSwitch{name="phyHold", x=280, y=620, disp=lnk_CUSval("phyHold"), code=lnk_CUSrev("phyHold"),hide=function()return CUSTOMENV.holdCount==0 end}, + WIDGET.newSlider{name="nextCount", x=200, y=150, w=200,unit=6,disp=lnk_CUSval("nextCount"),code=lnk_CUSsto("nextCount")}, + WIDGET.newSlider{name="holdCount", x=200, y=240, w=200,unit=6,disp=lnk_CUSval("holdCount"),code=lnk_CUSsto("holdCount")}, + WIDGET.newSwitch{name="infHold", x=350, y=340, disp=lnk_CUSval("infHold"), code=lnk_CUSrev("infHold"),hide=function()return CUSTOMENV.holdCount==0 end}, + WIDGET.newSwitch{name="phyHold", x=350, y=430, disp=lnk_CUSval("phyHold"), code=lnk_CUSrev("phyHold"),hide=function()return CUSTOMENV.holdCount==0 end}, --Rule - WIDGET.newSelector{name="fieldH", x=550, y=520, w=260,color="sky", list={1,2,3,4,6,8,10,15,20,30,50,100},disp=lnk_CUSval("fieldH"),code=lnk_CUSsto("fieldH")}, + WIDGET.newSelector{name="fieldH", x=270, y=520, w=260,color="sky", list={1,2,3,4,6,8,10,15,20,30,50,100},disp=lnk_CUSval("fieldH"),code=lnk_CUSsto("fieldH")}, WIDGET.newSelector{name="visible", x=840, y=60, w=260,color="lBlue",list={"show","easy","slow","medium","fast","none"},disp=lnk_CUSval("visible"),code=lnk_CUSsto("visible")}, WIDGET.newSelector{name="target", x=840, y=160, w=260,color="green",list={10,20,40,100,200,500,1000,1e99}, disp=lnk_CUSval("target"),code=lnk_CUSsto("target")}, @@ -24,7 +21,6 @@ scene.widgetList={ WIDGET.newSelector{name="pushSpeed",x=1120, y=260, w=260,color="red", list={1,2,3,5,15}, disp=lnk_CUSval("pushSpeed"),code=lnk_CUSsto("pushSpeed")}, WIDGET.newSwitch{name="ospin", x=870, y=350, font=30,disp=lnk_CUSval("ospin"), code=lnk_CUSrev("ospin")}, - WIDGET.newSwitch{name="noTele", x=870, y=440, font=25,disp=lnk_CUSval("noTele"), code=lnk_CUSrev("noTele")}, WIDGET.newSwitch{name="fineKill", x=870, y=530, font=20,disp=lnk_CUSval("fineKill"),code=lnk_CUSrev("fineKill")}, WIDGET.newSwitch{name="b2bKill", x=870, y=620, font=20,disp=lnk_CUSval("b2bKill"), code=lnk_CUSrev("b2bKill")}, WIDGET.newSwitch{name="easyFresh", x=1160, y=350, font=20,disp=lnk_CUSval("easyFresh"),code=lnk_CUSrev("easyFresh")},