框架跟进

Author: MrZ626

Zenitha

@@ -69,22 +69,22 @@ scene.widgetList={
     {name='S4',type='button_invis',pos={1,0},x=-200,y=60,w=150,h=100,cornerR=20,fontSize=70,text=CHAR.icon.bookmark, sound_release='button_soft',onClick=function() if page~='4' then SCN.swapTo('setting_out','none',4) end end},
 
     -- Controls
-    {name='1',type='slider', pos={0,0},x=340, y=220,w=650, fontSize=35,text="ASD",widthLimit=260,axis={0,260,1},smooth=true,disp=TABLE.func_getVal(SETTINGS.game_brik,'asd'),  valueShow=sliderShow_time, code=function(v)
+    {name='1',type='slider', pos={0,0},x=340, y=220,w=650, fontSize=35,text="ASD",widthLimit=260,axis={0,260,1},unit=false,disp=TABLE.func_getVal(SETTINGS.game_brik,'asd'),  valueShow=sliderShow_time, code=function(v)
         SETTINGS.game_brik.asd=v
         SETTINGS.game_brik.asp=math.min(SETTINGS.game_brik.asp,SETTINGS.game_brik.asd)
         SETTINGS.game_brik.adp=math.min(SETTINGS.game_brik.adp,SETTINGS.game_brik.asd)
         SETTINGS.game_brik.ash=math.min(SETTINGS.game_brik.ash,SETTINGS.game_brik.asd)
     end},
-    {name='1',type='slider', pos={0,0},x=340, y=300,w=300, fontSize=35,text="ASP",widthLimit=260,axis={0,120,1},smooth=true,disp=TABLE.func_getVal(SETTINGS.game_brik,'asp'),  valueShow=sliderShow_time, code=function(v)
+    {name='1',type='slider', pos={0,0},x=340, y=300,w=300, fontSize=35,text="ASP",widthLimit=260,axis={0,120,1},unit=false,disp=TABLE.func_getVal(SETTINGS.game_brik,'asp'),  valueShow=sliderShow_time, code=function(v)
         SETTINGS.game_brik.asp=v
         SETTINGS.game_brik.asd=math.max(SETTINGS.game_brik.asd,SETTINGS.game_brik.asp)
     end},
-    {name='1',type='slider', pos={0,0},x=340, y=380,w=300, fontSize=35,text="ADP",widthLimit=260,axis={0,120,1},smooth=true,disp=TABLE.func_getVal(SETTINGS.game_brik,'adp'),  valueShow=sliderShow_time, code=function(v)
+    {name='1',type='slider', pos={0,0},x=340, y=380,w=300, fontSize=35,text="ADP",widthLimit=260,axis={0,120,1},unit=false,disp=TABLE.func_getVal(SETTINGS.game_brik,'adp'),  valueShow=sliderShow_time, code=function(v)
         SETTINGS.game_brik.adp=v
         SETTINGS.game_brik.asd=math.max(SETTINGS.game_brik.asd,SETTINGS.game_brik.adp)
     end},
     {name='1',type='switch', pos={0,0},x=750, y=380,h=40,                   fontSize=35,text=LANG'setting_softdropSkipAsd',disp=TABLE.func_getVal(SETTINGS.game_brik,'softdropSkipAsd'),code=TABLE.func_revVal(SETTINGS.game_brik,'softdropSkipAsd')}, -- visibleTick=function() return page=='1' and SETTINGS.game_brik.asp>0 end
-    {name='1',type='slider', pos={0,0},x=340, y=460,w=650,                  fontSize=35,text="ASH",widthLimit=260,axis={0,260,1},smooth=true,disp=TABLE.func_getVal(SETTINGS.game_brik,'ash'),  valueShow=sliderShow_time, code=function(v) SETTINGS.game_brik.ash=v; SETTINGS.game_brik.asd=math.max(SETTINGS.game_brik.asd,SETTINGS.game_brik.ash) end},
+    {name='1',type='slider', pos={0,0},x=340, y=460,w=650,                  fontSize=35,text="ASH",widthLimit=260,axis={0,260,1},unit=false,disp=TABLE.func_getVal(SETTINGS.game_brik,'ash'),  valueShow=sliderShow_time, code=function(v) SETTINGS.game_brik.ash=v; SETTINGS.game_brik.asd=math.max(SETTINGS.game_brik.asd,SETTINGS.game_brik.ash) end},
     {name='1',type='button', pos={0,0},x=500, y=560,w=360, h=80,cornerR=10, fontSize=40,text=LANG'setting_keymapping',     onClick=WIDGET.c_goScn('keyset_out','fadeHeader')},
     {name='1',type='switch', pos={0,0},x=360, y=700,h=40,                   fontSize=40,text=LANG'setting_enableTouching', disp=TABLE.func_getVal(SETTINGS.system,'touchControl'),code=TABLE.func_revVal(SETTINGS.system,'touchControl')},
     {name='1',type='button', pos={0,0},x=500, y=780,w=360, h=80,cornerR=10, fontSize=40,text=LANG'setting_touching',       onClick=WIDGET.c_goScn'keyset_touch_out',visibleTick=function() return page=='1' and SETTINGS.system.touchControl end},
@@ -109,7 +109,7 @@ scene.widgetList={
 
     -- Video
     {name='3', type='slider_fill',pos={0,0},x=340, y=220,w=500,h=30,text=LANG'setting_hitWavePower',widthLimit=260,axis={0,1},                   disp=TABLE.func_getVal(SETTINGS.system,'hitWavePower'),                          code=TABLE.func_setVal(SETTINGS.system,'hitWavePower')},
-    {name='3', type='slider',     pos={0,0},x=340, y=300,w=500,     text=LANG'setting_maxTPS',      widthLimit=260,axis={120,400,10},smooth=true,disp=TABLE.func_getVal(SETTINGS.system,'maxTPS'),    valueShow=sliderShow_maxTPS,code=TABLE.func_setVal(SETTINGS.system,'maxTPS')},
+    {name='3', type='slider',     pos={0,0},x=340, y=300,w=500,     text=LANG'setting_maxTPS',      widthLimit=260,axis={120,400,10},unit=false,disp=TABLE.func_getVal(SETTINGS.system,'maxTPS'),    valueShow=sliderShow_maxTPS,code=TABLE.func_setVal(SETTINGS.system,'maxTPS')},
     {name='3', type='slider',     pos={0,0},x=340, y=380,w=500,     text=LANG'setting_updateRate',  widthLimit=260,axis={20,100,10},             disp=TABLE.func_getVal(SETTINGS.system,'updateRate'),valueShow=sliderShow_update,code=function(v) SETTINGS.system.updateRate=v; SETTINGS.system.renderRate=math.min(v,SETTINGS.system.renderRate) end},
     {name='3', type='slider',     pos={0,0},x=340, y=460,w=500,     text=LANG'setting_renderRate',  widthLimit=260,axis={20,100,10},             disp=TABLE.func_getVal(SETTINGS.system,'renderRate'),valueShow=sliderShow_render,code=function(v) SETTINGS.system.renderRate=v; SETTINGS.system.updateRate=math.max(v,SETTINGS.system.updateRate) end},
     {name='3', type='slider',     pos={0,0},x=340, y=540,w=500,     text=LANG'setting_stability',   widthLimit=260,axis={-1,1,0.1},              disp=TABLE.func_getVal(SETTINGS.system,'stability'), valueShow=sliderShow_time,  code=TABLE.func_setVal(SETTINGS.system,'stability')},

assets/scene/setting_out.lua

@@ -715,7 +715,7 @@ if SETTINGS.system.portrait then -- Brute fullscreen config for mobile device
 end
 PROGRESS.load()
 PROGRESS.fix()
-VCTRL.importSettings(FILE.load('conf/touch','-json'))
+VCTRL.importSettings(FILE.safeLoad('conf/touch','-json'))
 KEYMAP.brik=KEYMAP.new{
     {act='moveLeft', keys={'left'}},
     {act='moveRight',keys={'right'}},