From 91e33495da659f3fcf65fc1b21efb025b886b88c Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Tue, 11 May 2021 18:03:01 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=98=E5=88=B6=E5=B8=A7=E7=8E=87=E4=BB=8E?= =?UTF-8?q?=E6=BB=91=E6=9D=A1=E6=94=B9=E4=B8=BA=E9=80=89=E6=8B=A9=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.lua | 3 +++ parts/scenes/setting_video.lua | 24 +++++++++--------------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/main.lua b/main.lua index 2cff4615..144543b9 100644 --- a/main.lua +++ b/main.lua @@ -276,6 +276,9 @@ do fs.remove("conf/user") autoRestart=true end + if not TABLE.find({8,10,13,17,22,29,37,47,62,80,100},SETTING.frameMul)then + SETTING.frameMul=100 + end SETTING.appLock=nil for _,v in next,VK_org do v.color=nil end diff --git a/parts/scenes/setting_video.lua b/parts/scenes/setting_video.lua index 93ecc429..6bdfe085 100644 --- a/parts/scenes/setting_video.lua +++ b/parts/scenes/setting_video.lua @@ -22,27 +22,21 @@ scene.widgetList={ WIDGET.newSlider{name="grid", x=600,y=240,w=200,unit=.4, disp=SETval("grid"),show="percent", code=SETsto("grid")}, WIDGET.newSlider{name="center", x=600,y=300,w=200,unit=1, disp=SETval("center"), code=SETsto("center")}, - WIDGET.newSlider{name="lockFX", x=250,y=375,w=373,unit=5, disp=SETval("lockFX"), code=SETsto("lockFX")}, - WIDGET.newSlider{name="dropFX", x=250,y=420,w=373,unit=5, disp=SETval("dropFX"), code=SETsto("dropFX")}, - WIDGET.newSlider{name="moveFX", x=250,y=465,w=373,unit=5, disp=SETval("moveFX"), code=SETsto("moveFX")}, - WIDGET.newSlider{name="clearFX", x=250,y=510,w=373,unit=5, disp=SETval("clearFX"), code=SETsto("clearFX")}, - WIDGET.newSlider{name="splashFX", x=250,y=555,w=373,unit=5, disp=SETval("splashFX"),code=SETsto("splashFX")}, - WIDGET.newSlider{name="shakeFX", x=250,y=600,w=373,unit=5, disp=SETval("shakeFX"), code=SETsto("shakeFX")}, - WIDGET.newSlider{name="atkFX", x=250,y=645,w=373,unit=5, disp=SETval("atkFX"), code=SETsto("atkFX")}, - WIDGET.newSlider{name="frame", x=350,y=690,w=373,unit=10, - disp=function() - return SETTING.frameMul>35 and SETTING.frameMul/10 or SETTING.frameMul/5-4 - end, - code=function(i) - SETTING.frameMul=i<5 and 5*i+20 or 10*i - end}, + WIDGET.newSlider{name="lockFX", x=220,y=365,w=380,unit=5, disp=SETval("lockFX"), code=SETsto("lockFX")}, + WIDGET.newSlider{name="dropFX", x=220,y=405,w=380,unit=5, disp=SETval("dropFX"), code=SETsto("dropFX")}, + WIDGET.newSlider{name="moveFX", x=220,y=445,w=380,unit=5, disp=SETval("moveFX"), code=SETsto("moveFX")}, + WIDGET.newSlider{name="clearFX", x=220,y=485,w=380,unit=5, disp=SETval("clearFX"), code=SETsto("clearFX")}, + WIDGET.newSlider{name="splashFX", x=220,y=525,w=380,unit=5, disp=SETval("splashFX"),code=SETsto("splashFX")}, + WIDGET.newSlider{name="shakeFX", x=220,y=565,w=380,unit=5, disp=SETval("shakeFX"), code=SETsto("shakeFX")}, + WIDGET.newSlider{name="atkFX", x=220,y=605,w=380,unit=5, disp=SETval("atkFX"), code=SETsto("atkFX")}, + WIDGET.newSelector{name="frame", x=410,y=660,w=360,list={8,10,13,17,22,29,37,47,62,80,100},disp=SETval("frameMul"),code=SETsto("frameMul")}, WIDGET.newSwitch{name="text", x=1140,y=160,font=35,disp=SETval("text"), code=SETrev("text")}, WIDGET.newSwitch{name="score", x=1140,y=210,font=35,disp=SETval("score"), code=SETrev("score")}, WIDGET.newSwitch{name='warn', x=1140,y=260,font=35,disp=SETval('warn'), code=SETrev('warn')}, WIDGET.newSwitch{name="highCam", x=1140,y=310,font=35,disp=SETval("highCam"), code=SETrev("highCam")}, WIDGET.newSwitch{name="nextPos", x=1140,y=360,font=35,disp=SETval("nextPos"), code=SETrev("nextPos")}, - WIDGET.newSwitch{name="fullscreen", x=1140,y=410,disp=SETval("fullscreen"), code=switchFullscreen}, + WIDGET.newSwitch{name="fullscreen", x=1140,y=410,font=35,disp=SETval("fullscreen"), code=switchFullscreen}, WIDGET.newSwitch{name="power", x=1140,y=460,font=35,disp=SETval("powerInfo"), code=SETrev("powerInfo")}, WIDGET.newSwitch{name="clickFX", x=1140,y=510,font=35,disp=SETval("clickFX"), code=SETrev("clickFX")}, WIDGET.newSwitch{name="bg", x=1140,y=560,font=35,disp=SETval("bg"),