From a0a959e901834689d202d6cf4f94f44cf77883d2 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Thu, 27 May 2021 02:14:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=BB=9A=E5=8A=A8=E6=8E=A7?= =?UTF-8?q?=E4=BB=B6=E5=8A=9F=E8=83=BD=E6=95=B4=E7=90=86=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/language/lang_en.lua | 27 +++++---- parts/language/lang_fr.lua | 28 ++++----- parts/language/lang_pt.lua | 27 +++++---- parts/language/lang_sp.lua | 27 +++++---- parts/language/lang_symbol.lua | 27 +++++---- parts/language/lang_yygq.lua | 4 +- parts/language/lang_zh.lua | 27 +++++---- parts/scenes/setting_sound.lua | 14 ++--- parts/scenes/setting_touch.lua | 2 +- parts/scenes/setting_touchSwitch.lua | 82 +++++++++++++++------------ parts/scenes/setting_trackSetting.lua | 20 ------- parts/scenes/setting_video.lua | 55 +++++++++--------- 12 files changed, 164 insertions(+), 176 deletions(-) delete mode 100644 parts/scenes/setting_trackSetting.lua diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index e46a651a..727d7ee6 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -318,15 +318,15 @@ return{ score="Score Pop-up", bufferWarn="Buffer Alert", showSpike="Spike Counter", - highCam="Screen Scrolling", - nextPos="Next Preview", - fullscreen="Full Screen", - power="Power Info", - clickFX="Click FX", - bg="Background", + highCam="Screen Scrolling", warn="Danger Alert", + + clickFX="Click FX", + power="Power Info", clean="Fast Draw", + fullscreen="Full Screen", + bg="Background", }, setting_sound={ title="Sound Settings", @@ -334,11 +334,11 @@ return{ game="←Game", graphic="Video→", + bgm="BGM", sfx="SFX", + stereo="Stereo", spawn="Spawn Sounds", warn="Warning", - bgm="BGM", - stereo="Stereo", vib="Vibration", voc="Voice", cv="Voice Pack", @@ -401,18 +401,17 @@ return{ b9= "Function1:", b10="Function2:", b11="Instant Left:",b12="Instant Right:", b13="Sonic Drop:", b14="Down 1:", b15="Down 4:", b16="Down 10:", b17="Left Drop:", b18="Right Drop:", b19="Left Zangi:", b20="Right Zangi:", + norm="Normal", pro="Professional", hide="Show Virtual Keys", - track="Auto Track", + icon="Icon", sfx="SFX", vib="VIB", - icon="Icon", - tkset="Track Settings", alpha="Alpha", - }, - setting_trackSetting={ - VKDodge="Auto Dodge", + + track="Auto Track", + dodge="Auto Dodge", }, customGame={ title="Custom Game", diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index 650a5ec6..27be470d 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -289,15 +289,16 @@ return{ text="Texte d'action", score="Pop-up de score", -- bufferWarn="Buffer Alert", - highCam="Vue d'oiseau", - + -- showSpike="Spike Counter", nextPos="Prévisualisation de position", - fullscreen="Plein écran", - power="Infos d'alimentation", - -- clickFX="Click FX", - bg="Arrière-plan", + highCam="Vue d'oiseau", warn="Alerte de danger", + + -- clickFX="Click FX", + power="Infos d'alimentation", -- clean="Fast Draw", + fullscreen="Plein écran", + bg="Arrière-plan", }, setting_sound={ title="Paramètres du son", @@ -305,11 +306,11 @@ return{ game="←Jeu", graphic="Vidéo→", + bgm="Musique", sfx="Sons", + stereo="Stéréo", spawn="Apparition", warn="Alerte de danger", - bgm="Musique", - stereo="Stéréo", vib="Vibration", voc="Voix", }, @@ -372,18 +373,17 @@ return{ b11="Déplacement instantané vers la gauche :",b12="Déplacement instantané vers la droite :", b13="Chute sonique :",b14="Descendre de 1 :",b15="Descendre de 4 :",b16="Descendre de 10:", b17="Chute à gauche :",b18="Chute à droite :",b19="Zangi Gauche :",b20="Zangi Droite :", + norm="Normal", pro="Professionel", hide="Montrer les touches virtuelles", - track="Auto Track", + icon="Icône", sfx="Sons", vib="Vib.", - icon="Icône", - tkset="Paramètres des tracks", alpha="Alpha", - }, - setting_trackSetting={ - VKDodge="Auto-esquive", + + track="Auto Track", + dodge="Auto-esquive", }, customGame={ title="Mode personnalisé", diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index bd8da3a0..60eab817 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -317,15 +317,15 @@ return{ score="Pop-up de pontos", -- bufferWarn="Buffer Alert", -- showSpike="Spike Counter", - highCam="Vista Olho-de-pássaro", - nextPos="Próxima Pos.", - fullscreen="Tela cheia", - power="Informação bateria", - -- clickFX="Click FX", - bg="Fundo", + highCam="Vista Olho-de-pássaro", warn="Alerta de perigo", + + -- clickFX="Click FX", + power="Informação bateria", -- clean="Fast Draw", + fullscreen="Tela cheia", + bg="Fundo", }, setting_sound={ title="Config. de sons", @@ -333,11 +333,11 @@ return{ game="←Jogo", graphic="Vídeo→", + bgm="BGM", sfx="SFX", + stereo="Stereo", spawn="Nascida", warn="Alerta de perigo", - bgm="BGM", - stereo="Stereo", vib="Vibração", voc="Voz", cv="Pacote de voz", @@ -400,18 +400,17 @@ return{ b9= "Função:", b10="Reiniciar Jogo:", b11="Esq. Imediata:",b12="Dir. Imediata:", b13="Queda Sonic:", b14="Queda 1:", b15="Queda 4:", b16="Queda 10:", b17="Queda Esq.:", b18="Queda Dir.:", b19="Zangi Esq.:", b20="Zangi Dir.:", + norm="Normal", pro="Professional", hide="Mostrar tecla virtual", - track="Localizar Auto", + icon="Icone", sfx="SFX", vib="VIB", - icon="Icone", - tkset="Config. localizacao", alpha="Transparência", - }, - setting_trackSetting={ - VKDodge="Auto Dodge", + + track="Localizar Auto", + dodge="Auto Dodge", }, customGame={ title="Jogo person.", diff --git a/parts/language/lang_sp.lua b/parts/language/lang_sp.lua index cfe5ed93..65e5d33d 100644 --- a/parts/language/lang_sp.lua +++ b/parts/language/lang_sp.lua @@ -295,26 +295,26 @@ return{ score="Puntaje en Pantalla", -- bufferWarn="Buffer Alert", -- showSpike="Spike Counter", - highCam="Cám. Vista Aérea", - nextPos="Ver Spawn de Pza. Sig.", - fullscreen="Pant. Completa", - power="Inf. de Batería", - -- clickFX="Click FX", - bg="Fondo", + highCam="Cám. Vista Aérea", warn="Alerta de Peligro", + + -- clickFX="Click FX", + power="Inf. de Batería", clean="Fast Draw", + fullscreen="Pant. Completa", + bg="Fondo", }, setting_sound={ title="Ajustes de Sonido", game="←Juego", graphic="Video→", + bgm="BGM", sfx="SFX", + stereo="Estéreo", spawn="Spawn de Pzas.", warn="Alerta de Peligro", - bgm="BGM", - stereo="Estéreo", vib="Vibración", voc="Voces", }, @@ -374,18 +374,17 @@ return{ b9= "Función1:",b10="Función2:",b11="Izq. Instant.:",b12="Der. Instant.:", b13="Sonic Drop:",b14="Abajo 1:",b15="Abajo 4:",b16="Abajo 10:", b17="Soltar a Izq.:",b18="Soltar a Der.:",b19="Zangi a Izq.:",b20="Zangi a Der.:", + norm="Normal", pro="Profesional", hide="Mostrar Tec. Virtual", - track="Música Autom.", + icon="Ícono", sfx="SFX", vib="Vibr.", - icon="Ícono", - tkset="Ajustes de Canción", alpha="Alpha", - }, - setting_trackSetting={ - VKDodge="Autoskip", + + track="Música Autom.", + dodge="Autoskip", }, customGame={ title="Juego Personalizado", diff --git a/parts/language/lang_symbol.lua b/parts/language/lang_symbol.lua index eec337e1..50aee89c 100644 --- a/parts/language/lang_symbol.lua +++ b/parts/language/lang_symbol.lua @@ -169,15 +169,15 @@ return{ score="+123", bufferWarn="^+", showSpike="→→+", - highCam="↑__↑", - nextPos="???←", - fullscreen="|←→|", - power="+.", - clickFX="_.~", - bg="__?__", + highCam="↑__↑", warn="!↑↑↑!", + + clickFX="_.~", + power="+.", clean="[]→→O", + fullscreen="|←→|", + bg="__?__", }, setting_sound={ title="(~~)", @@ -185,11 +185,11 @@ return{ game="←Game", graphic="Video→", + bgm="#~#", sfx="#!#", + stereo="←~→", spawn="#[]#", warn="!↑↑↑!", - bgm="#~#", - stereo="←~→", vib="=~=", voc="~~~", }, @@ -249,18 +249,17 @@ return{ b9="F1:", b10="F2:", b11="←←:", b12="→→:", b13="↓_:", b14="↓1:", b15="↓4:", b16="↓10:", b17="←↓→↓:", b18="→↓↓:", b19="←↓→↓:",b20="→↓←↓:", + norm="-", pro="+", hide="--?", - track="~=?", + icon="@?", sfx="#!#", vib="=~=", - icon="@?", - tkset="_~=_", alpha="+?", - }, - setting_trackSetting={ - VKDodge="←_→", + + track="~=?", + dodge="←_→", }, customGame={ title="!@#$%^&*", diff --git a/parts/language/lang_yygq.lua b/parts/language/lang_yygq.lua index f46f842a..cb4a780d 100644 --- a/parts/language/lang_yygq.lua +++ b/parts/language/lang_yygq.lua @@ -84,8 +84,8 @@ return{ text="招式名", score="跳分", - highCam="拉镜", warn="要死", + highCam="拉镜", }, setting_sound={ title="改声音", @@ -93,9 +93,9 @@ return{ game="←游戏设置", graphic="改画面→", + bgm="曲", spawn="出块", warn="警告", - bgm="曲", vib="嗡嗡", cv="谁", }, diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 145ca7ad..7e494020 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -318,26 +318,26 @@ return{ score="分数动画", bufferWarn="缓冲预警", showSpike="爆发累计", - highCam="超屏视野", - nextPos="生成预览", - fullscreen="全屏", - power="电量显示", - clickFX="点按特效", - bg="背景", + highCam="超屏视野", warn="死亡预警", + + clickFX="点按特效", + power="电量显示", clean="绘制优化", + fullscreen="全屏", + bg="背景", }, setting_sound={ title="声音设置", game="←游戏设置", graphic="画面设置→", + bgm="音乐", sfx="音效", + stereo="立体声", spawn="方块生成", warn="危险警告", - bgm="音乐", - stereo="立体声", vib="振动", voc="语音", cv="语音包", @@ -400,18 +400,17 @@ return{ b9= "功能键1:", b10="功能键2:",b11="左瞬移:", b12="右瞬移:", b13="软降到底:",b14="软降一格:",b15="软降四格:", b16="软降十格:", b17="落在最左:",b18="落在最右:",b19="列在最左:", b20="列在最右:", + norm="标准", pro="专业", hide="显示虚拟按键", - track="按键自动跟踪", + icon="图标", sfx="按键音效", vib="按键振动", - icon="图标", - tkset="跟踪设置", alpha="不透明度", - }, - setting_trackSetting={ - VKDodge="自动避让", + + track="按键自动跟踪", + dodge="自动避让", }, customGame={ title="自定义游戏", diff --git a/parts/scenes/setting_sound.lua b/parts/scenes/setting_sound.lua index 77f39c15..1b36a8c6 100644 --- a/parts/scenes/setting_sound.lua +++ b/parts/scenes/setting_sound.lua @@ -60,13 +60,13 @@ scene.widgetList={ WIDGET.newButton{name="game", x=200, y=80,w=240,h=80,color='lC',font=35,code=swapScene('setting_game','swipeR')}, WIDGET.newButton{name="graphic",x=1080, y=80,w=240,h=80,color='lC',font=35,code=swapScene('setting_video','swipeL')}, - WIDGET.newSlider{name="sfx", x=220, y=200,w=360, font=35,change=function()SFX.play('blip_1')end,disp=SETval("sfx"),code=SETsto("sfx")}, - WIDGET.newSlider{name="spawn", x=220, y=300,w=360, font=25,change=function()SFX.fplay("spawn_"..math.random(7),SETTING.sfx_spawn)end,disp=SETval("sfx_spawn"),code=SETsto("sfx_spawn")}, - WIDGET.newSlider{name='warn', x=220, y=400,w=360, font=30,change=function()SFX.fplay("warning",SETTING.sfx_warn)end,disp=SETval("sfx_warn"),code=SETsto("sfx_warn")}, - WIDGET.newSlider{name="bgm", x=220, y=500,w=360, font=35,disp=SETval("bgm"),code=function(v)SETTING.bgm=v BGM.freshVolume()end}, - WIDGET.newSlider{name="stereo", x=220, y=600,w=360, font=35,change=function()SFX.play('move',1,-1)SFX.play('lock',1,1)end,disp=SETval("stereo"),code=SETsto("stereo"),hideF=function()return SETTING.sx==0 end}, - WIDGET.newSlider{name="vib", x=800, y=200,w=360,unit=5, font=30,change=function()VIB(2)end,disp=SETval("vib"),code=SETsto("vib")}, - WIDGET.newSlider{name="voc", x=800, y=300,w=360, font=35,change=function()VOC.play('test')end,disp=SETval("voc"),code=SETsto("voc")}, + WIDGET.newSlider{name="bgm", x=300, y=190,w=420, disp=SETval("bgm"),code=function(v)SETTING.bgm=v BGM.freshVolume()end}, + WIDGET.newSlider{name="sfx", x=300, y=260,w=420, change=function()SFX.play('blip_1')end,disp=SETval("sfx"),code=SETsto("sfx")}, + WIDGET.newSlider{name="stereo", x=300, y=330,w=420, change=function()SFX.play('move',1,-1)SFX.play('lock',1,1)end,disp=SETval("stereo"),code=SETsto("stereo"),hideF=function()return SETTING.sx==0 end}, + WIDGET.newSlider{name="spawn", x=300, y=400,w=420, change=function()SFX.fplay("spawn_"..math.random(7),SETTING.sfx_spawn)end,disp=SETval("sfx_spawn"),code=SETsto("sfx_spawn")}, + WIDGET.newSlider{name='warn', x=300, y=470,w=420, change=function()SFX.fplay("warning",SETTING.sfx_warn)end,disp=SETval("sfx_warn"),code=SETsto("sfx_warn")}, + WIDGET.newSlider{name="vib", x=300, y=540,w=420,unit=5, change=function()VIB(2)end,disp=SETval("vib"),code=SETsto("vib")}, + WIDGET.newSlider{name="voc", x=300, y=610,w=420, change=function()VOC.play('test')end,disp=SETval("voc"),code=SETsto("voc")}, WIDGET.newSelector{name="cv", x=1100, y=380,w=200, list={'miya','naki'},disp=function()return cv end,code=function(i)cv=i end}, WIDGET.newButton{name="apply", x=1100, y=460,w=180,h=80, code=function()SETTING.cv=cv VOC.loadAll()end,hideF=function()return SETTING.cv==cv end}, WIDGET.newButton{name="back", x=1140, y=640,w=170,h=80, font=40,code=backScene}, diff --git a/parts/scenes/setting_touch.lua b/parts/scenes/setting_touch.lua index a41712f0..09e2b115 100644 --- a/parts/scenes/setting_touch.lua +++ b/parts/scenes/setting_touch.lua @@ -85,7 +85,7 @@ end function scene.draw() gc.setColor(1,1,1) gc.setLineWidth(3) - gc.rectangle('line',490,85,300,600) + gc.rectangle('line',490,65,300,610) VK.preview(selected) if snapUnit>=10 then gc.setLineWidth(3) diff --git a/parts/scenes/setting_touchSwitch.lua b/parts/scenes/setting_touchSwitch.lua index 2e11de83..c8be552d 100644 --- a/parts/scenes/setting_touchSwitch.lua +++ b/parts/scenes/setting_touchSwitch.lua @@ -4,45 +4,57 @@ function scene.sceneInit() BG.set('matrix') end +function scene.draw() + if SETTING.VKSwitch and SETTING.VKTrack then + love.graphics.setColor(1,1,1) + setFont(30) + mStr(text.VKTchW,140+500*SETTING.VKTchW,800-WIDGET.scrollPos) + mStr(text.VKOrgW,140+500*SETTING.VKTchW+500*SETTING.VKCurW,870-WIDGET.scrollPos) + mStr(text.VKCurW,640+500*SETTING.VKCurW,950-WIDGET.scrollPos) + end +end + local function VKAdisp(n)return function()return VK_org[n].ava end end local function VKAcode(n)return function()VK_org[n].ava=not VK_org[n].ava end end +local function notShow()return not SETTING.VKSwitch end +local function notTrack()return not(SETTING.VKSwitch and SETTING.VKTrack)end +scene.widgetBoxHeight=340 scene.widgetList={ - WIDGET.newSwitch{name="b1", x=280, y=80, font=35,disp=VKAdisp(1),code=VKAcode(1)}, - WIDGET.newSwitch{name="b2", x=280, y=140, font=35,disp=VKAdisp(2),code=VKAcode(2)}, - WIDGET.newSwitch{name="b3", x=280, y=200, font=35,disp=VKAdisp(3),code=VKAcode(3)}, - WIDGET.newSwitch{name="b4", x=280, y=260, font=35,disp=VKAdisp(4),code=VKAcode(4)}, - WIDGET.newSwitch{name="b5", x=280, y=320, font=35,disp=VKAdisp(5),code=VKAcode(5)}, - WIDGET.newSwitch{name="b6", x=280, y=380, font=35,disp=VKAdisp(6),code=VKAcode(6)}, - WIDGET.newSwitch{name="b7", x=280, y=440, font=35,disp=VKAdisp(7),code=VKAcode(7)}, - WIDGET.newSwitch{name="b8", x=280, y=500, font=35,disp=VKAdisp(8),code=VKAcode(8)}, - WIDGET.newSwitch{name="b9", x=280, y=560, font=35,disp=VKAdisp(9),code=VKAcode(9)}, - WIDGET.newSwitch{name="b10", x=280, y=620, font=35,disp=VKAdisp(10),code=VKAcode(10)}, - WIDGET.newSwitch{name="b11", x=580, y=80, font=35,disp=VKAdisp(11),code=VKAcode(11)}, - WIDGET.newSwitch{name="b12", x=580, y=140, font=35,disp=VKAdisp(12),code=VKAcode(12)}, - WIDGET.newSwitch{name="b13", x=580, y=200, font=35,disp=VKAdisp(13),code=VKAcode(13)}, - WIDGET.newSwitch{name="b14", x=580, y=260, font=35,disp=VKAdisp(14),code=VKAcode(14)}, - WIDGET.newSwitch{name="b15", x=580, y=320, font=35,disp=VKAdisp(15),code=VKAcode(15)}, - WIDGET.newSwitch{name="b16", x=580, y=380, font=35,disp=VKAdisp(16),code=VKAcode(16)}, - WIDGET.newSwitch{name="b17", x=580, y=440, font=35,disp=VKAdisp(17),code=VKAcode(17)}, - WIDGET.newSwitch{name="b18", x=580, y=500, font=35,disp=VKAdisp(18),code=VKAcode(18)}, - WIDGET.newSwitch{name="b19", x=580, y=560, font=35,disp=VKAdisp(19),code=VKAcode(19)}, - WIDGET.newSwitch{name="b20", x=580, y=620, font=35,disp=VKAdisp(20),code=VKAcode(20)}, - WIDGET.newButton{name="norm", x=840, y=100, w=240,h=80, font=35,code=function()for i=1,20 do VK_org[i].ava=i<11 end end}, - WIDGET.newButton{name="pro", x=1120, y=100, w=240,h=80, font=35,code=function()for i=1,20 do VK_org[i].ava=true end end}, - WIDGET.newSwitch{name="hide", x=1170, y=200, font=40,disp=SETval("VKSwitch"),code=SETrev("VKSwitch")}, - WIDGET.newSwitch{name="track", x=1170, y=300, font=35,disp=SETval("VKTrack"),code=SETrev("VKTrack")}, - WIDGET.newSlider{name="sfx", x=800, y=380, w=180, font=35,change=function()SFX.play('virtualKey',SETTING.VKSFX)end,disp=SETval("VKSFX"),code=SETsto("VKSFX")}, - WIDGET.newSlider{name="vib", x=800, y=460, w=180,unit=2,font=35,change=function()VIB(SETTING.VKVIB)end,disp=SETval("VKVIB"),code=SETsto("VKVIB")}, - WIDGET.newSwitch{name="icon", x=850, y=300, font=40,disp=SETval("VKIcon"),code=SETrev("VKIcon")}, - WIDGET.newButton{name="tkset", x=1120, y=420, w=240,h=80, - code=function() - SCN.go('setting_trackSetting') - end, - hideF=function() - return not SETTING.VKTrack - end}, - WIDGET.newSlider{name="alpha", x=840, y=540, w=400,font=40,disp=SETval("VKAlpha"),code=SETsto("VKAlpha")}, + WIDGET.newSwitch{name="b1", x=280, y=80, disp=VKAdisp(1),code=VKAcode(1)}, + WIDGET.newSwitch{name="b2", x=280, y=140, disp=VKAdisp(2),code=VKAcode(2)}, + WIDGET.newSwitch{name="b3", x=280, y=200, disp=VKAdisp(3),code=VKAcode(3)}, + WIDGET.newSwitch{name="b4", x=280, y=260, disp=VKAdisp(4),code=VKAcode(4)}, + WIDGET.newSwitch{name="b5", x=280, y=320, disp=VKAdisp(5),code=VKAcode(5)}, + WIDGET.newSwitch{name="b6", x=280, y=380, disp=VKAdisp(6),code=VKAcode(6)}, + WIDGET.newSwitch{name="b7", x=280, y=440, disp=VKAdisp(7),code=VKAcode(7)}, + WIDGET.newSwitch{name="b8", x=280, y=500, disp=VKAdisp(8),code=VKAcode(8)}, + WIDGET.newSwitch{name="b9", x=280, y=560, disp=VKAdisp(9),code=VKAcode(9)}, + WIDGET.newSwitch{name="b10", x=280, y=620, disp=VKAdisp(10),code=VKAcode(10)}, + WIDGET.newSwitch{name="b11", x=580, y=80, disp=VKAdisp(11),code=VKAcode(11)}, + WIDGET.newSwitch{name="b12", x=580, y=140, disp=VKAdisp(12),code=VKAcode(12)}, + WIDGET.newSwitch{name="b13", x=580, y=200, disp=VKAdisp(13),code=VKAcode(13)}, + WIDGET.newSwitch{name="b14", x=580, y=260, disp=VKAdisp(14),code=VKAcode(14)}, + WIDGET.newSwitch{name="b15", x=580, y=320, disp=VKAdisp(15),code=VKAcode(15)}, + WIDGET.newSwitch{name="b16", x=580, y=380, disp=VKAdisp(16),code=VKAcode(16)}, + WIDGET.newSwitch{name="b17", x=580, y=440, disp=VKAdisp(17),code=VKAcode(17)}, + WIDGET.newSwitch{name="b18", x=580, y=500, disp=VKAdisp(18),code=VKAcode(18)}, + WIDGET.newSwitch{name="b19", x=580, y=560, disp=VKAdisp(19),code=VKAcode(19)}, + WIDGET.newSwitch{name="b20", x=580, y=620, disp=VKAdisp(20),code=VKAcode(20)}, + + WIDGET.newButton{name="norm", x=840, y=80, w=240,h=80, font=35,code=function()for i=1,20 do VK_org[i].ava=i<11 end end}, + WIDGET.newButton{name="pro", x=1120, y=80, w=240,h=80, font=35,code=function()for i=1,20 do VK_org[i].ava=true end end}, + WIDGET.newSwitch{name="hide", x=1150, y=200, font=40,disp=SETval("VKSwitch"),code=SETrev("VKSwitch")}, + WIDGET.newSwitch{name="icon", x=1150, y=300, font=40,disp=SETval("VKIcon"),code=SETrev("VKIcon"),hideF=notShow}, + WIDGET.newSlider{name="sfx", x=830, y=380, w=400, font=35,change=function()SFX.play('virtualKey',SETTING.VKSFX)end,disp=SETval("VKSFX"),code=SETsto("VKSFX"),hideF=notShow}, + WIDGET.newSlider{name="vib", x=830, y=450, w=400,unit=2,font=35,change=function()VIB(SETTING.VKVIB)end,disp=SETval("VKVIB"),code=SETsto("VKVIB"),hideF=notShow}, + WIDGET.newSlider{name="alpha", x=830, y=520, w=400, font=40,disp=SETval("VKAlpha"),code=SETsto("VKAlpha"),hideF=notShow}, + + WIDGET.newSwitch{name="track", x=360, y=720, font=35,disp=SETval("VKTrack"),code=SETrev("VKTrack"),hideF=notShow}, + WIDGET.newSwitch{name="dodge", x=800, y=720, font=35,disp=SETval("VKDodge"),code=SETrev("VKDodge"),hideF=notTrack}, + WIDGET.newSlider{name="tchW", x=140, y=860, w=1000, font=35,disp=SETval("VKTchW"),code=function(i)SETTING.VKTchW=i SETTING.VKCurW=math.max(SETTING.VKCurW,i)end,hideF=notTrack}, + WIDGET.newSlider{name="curW", x=140, y=930, w=1000, font=35,disp=SETval("VKCurW"),code=function(i)SETTING.VKCurW=i SETTING.VKTchW=math.min(SETTING.VKTchW,i)end,hideF=notTrack}, + WIDGET.newButton{name="back", x=1140, y=640, w=170,h=80,font=40,code=backScene}, } diff --git a/parts/scenes/setting_trackSetting.lua b/parts/scenes/setting_trackSetting.lua deleted file mode 100644 index 3e612c51..00000000 --- a/parts/scenes/setting_trackSetting.lua +++ /dev/null @@ -1,20 +0,0 @@ -local gc=love.graphics - -local scene={} - -function scene.draw() - gc.setColor(1,1,1) - setFont(30) - mStr(text.VKTchW,140+500*SETTING.VKTchW,260) - mStr(text.VKOrgW,140+500*SETTING.VKTchW+500*SETTING.VKCurW,330) - mStr(text.VKCurW,640+500*SETTING.VKCurW,410) -end - -scene.widgetList={ - WIDGET.newSwitch{name="VKDodge",x=400,y=530,font=35,disp=SETval("VKDodge"),code=SETrev("VKDodge")}, - WIDGET.newSlider{name="VKTchW",x=140,y=320,w=1000,font=35,disp=SETval("VKTchW"),code=function(i)SETTING.VKTchW=i SETTING.VKCurW=math.max(SETTING.VKCurW,i)end}, - WIDGET.newSlider{name="VKCurW",x=140,y=390,w=1000,font=35,disp=SETval("VKCurW"),code=function(i)SETTING.VKCurW=i SETTING.VKTchW=math.min(SETTING.VKTchW,i)end}, - WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,font=40,code=backScene}, -} - -return scene \ No newline at end of file diff --git a/parts/scenes/setting_video.lua b/parts/scenes/setting_video.lua index f2e99d75..7bd0cbdb 100644 --- a/parts/scenes/setting_video.lua +++ b/parts/scenes/setting_video.lua @@ -7,48 +7,49 @@ function scene.sceneBack() FILE.save(SETTING,'conf/settings') end +scene.widgetBoxHeight=620 scene.widgetList={ WIDGET.newText{name="title", x=640,y=15,font=80}, WIDGET.newButton{name="sound", x=200,y=80,w=240,h=80,color='lC',font=35,code=swapScene('setting_sound','swipeR')}, WIDGET.newButton{name="game", x=1080,y=80,w=240,h=80,color='lC',font=35,code=swapScene('setting_game','swipeL')}, - WIDGET.newSwitch{name="block", x=270,y=160,disp=SETval("block"),code=SETrev("block")}, - WIDGET.newSwitch{name="smooth", x=270,y=210,disp=SETval("smooth"),code=SETrev("smooth")}, - WIDGET.newSwitch{name="upEdge", x=270,y=260,disp=SETval("upEdge"),code=SETrev("upEdge")}, - WIDGET.newSwitch{name="bagLine", x=270,y=310,disp=SETval("bagLine"),code=SETrev("bagLine")}, + WIDGET.newSwitch{name="block", x=380,y=180,disp=SETval("block"),code=SETrev("block")}, + WIDGET.newSwitch{name="smooth", x=380,y=230,disp=SETval("smooth"),code=SETrev("smooth")}, + WIDGET.newSwitch{name="upEdge", x=380,y=280,disp=SETval("upEdge"),code=SETrev("upEdge")}, + WIDGET.newSwitch{name="bagLine", x=380,y=330,disp=SETval("bagLine"),code=SETrev("bagLine")}, - WIDGET.newSlider{name="ghost", x=610,y=180,w=320,unit=.6, disp=SETval("ghost"),show="percent",code=SETsto("ghost")}, - WIDGET.newSlider{name="grid", x=610,y=240,w=320,unit=.4, disp=SETval("grid"),show="percent", code=SETsto("grid")}, - WIDGET.newSlider{name="center", x=610,y=300,w=320,unit=1, disp=SETval("center"), code=SETsto("center")}, + WIDGET.newSlider{name="ghost", x=740,y=180,w=350,unit=.6, disp=SETval("ghost"),show="percent",code=SETsto("ghost")}, + WIDGET.newSlider{name="grid", x=740,y=260,w=350,unit=.4, disp=SETval("grid"),show="percent", code=SETsto("grid")}, + WIDGET.newSlider{name="center", x=740,y=340,w=350,unit=1, disp=SETval("center"), code=SETsto("center")}, - 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=415,w=380,unit=5, disp=SETval("dropFX"), code=SETsto("dropFX")}, - WIDGET.newSlider{name="moveFX", x=220,y=465,w=380,unit=5, disp=SETval("moveFX"), code=SETsto("moveFX")}, - WIDGET.newSlider{name="clearFX", x=220,y=515,w=380,unit=5, disp=SETval("clearFX"), code=SETsto("clearFX")}, - WIDGET.newSlider{name="splashFX", x=220,y=565,w=380,unit=5, disp=SETval("splashFX"),code=SETsto("splashFX")}, - WIDGET.newSlider{name="shakeFX", x=220,y=615,w=380,unit=5, disp=SETval("shakeFX"), code=SETsto("shakeFX")}, - WIDGET.newSlider{name="atkFX", x=220,y=665,w=380,unit=5, disp=SETval("atkFX"), code=SETsto("atkFX")}, - WIDGET.newSelector{name="frame", x=830,y=640,w=360,list={8,10,13,17,22,29,37,47,62,80,100},disp=SETval("frameMul"),code=SETsto("frameMul")}, + WIDGET.newSlider{name="lockFX", x=330,y=400,w=540,unit=5, disp=SETval("lockFX"), code=SETsto("lockFX")}, + WIDGET.newSlider{name="dropFX", x=330,y=460,w=540,unit=5, disp=SETval("dropFX"), code=SETsto("dropFX")}, + WIDGET.newSlider{name="moveFX", x=330,y=520,w=540,unit=5, disp=SETval("moveFX"), code=SETsto("moveFX")}, + WIDGET.newSlider{name="clearFX", x=330,y=580,w=540,unit=5, disp=SETval("clearFX"), code=SETsto("clearFX")}, + WIDGET.newSlider{name="splashFX", x=330,y=640,w=540,unit=5, disp=SETval("splashFX"),code=SETsto("splashFX")}, + WIDGET.newSlider{name="shakeFX", x=330,y=700,w=540,unit=5, disp=SETval("shakeFX"), code=SETsto("shakeFX")}, + WIDGET.newSlider{name="atkFX", x=330,y=760,w=540,unit=5, disp=SETval("atkFX"), code=SETsto("atkFX")}, + WIDGET.newSelector{name="frame", x=600,y=830,w=460,list={8,10,13,17,22,29,37,47,62,80,100},disp=SETval("frameMul"),code=SETsto("frameMul")}, - WIDGET.newSwitch{name="text", x=900,y=360,disp=SETval("text"), code=SETrev("text")}, - WIDGET.newSwitch{name="score", x=900,y=410,disp=SETval("score"), code=SETrev("score")}, - WIDGET.newSwitch{name="bufferWarn", x=900,y=460,disp=SETval('bufferWarn'), code=SETrev('bufferWarn')}, - WIDGET.newSwitch{name="showSpike", x=900,y=510,disp=SETval('showSpike'), code=SETrev('showSpike')}, - WIDGET.newSwitch{name="highCam", x=900,y=560,disp=SETval("highCam"), code=SETrev("highCam")}, + WIDGET.newSwitch{name="text", x=420,y=920,disp=SETval("text"), code=SETrev("text")}, + WIDGET.newSwitch{name="score", x=420,y=970,disp=SETval("score"), code=SETrev("score")}, + WIDGET.newSwitch{name="bufferWarn", x=420,y=1040,disp=SETval('bufferWarn'), code=SETrev('bufferWarn')}, + WIDGET.newSwitch{name="showSpike", x=420,y=1090,disp=SETval('showSpike'), code=SETrev('showSpike')}, + WIDGET.newSwitch{name="nextPos", x=420,y=1160,disp=SETval("nextPos"), code=SETrev("nextPos")}, + WIDGET.newSwitch{name="highCam", x=420,y=1210,disp=SETval("highCam"), code=SETrev("highCam")}, + WIDGET.newSwitch{name="warn", x=420,y=1280,disp=SETval("warn"), code=SETrev("warn")}, - WIDGET.newSwitch{name="nextPos", x=1180,y=260,disp=SETval("nextPos"), code=SETrev("nextPos")}, - WIDGET.newSwitch{name="fullscreen", x=1180,y=310,disp=SETval("fullscreen"), code=switchFullscreen}, - WIDGET.newSwitch{name="power", x=1180,y=360,disp=SETval("powerInfo"), code=SETrev("powerInfo")}, - WIDGET.newSwitch{name="clickFX", x=1180,y=410,disp=SETval("clickFX"), code=SETrev("clickFX")}, - WIDGET.newSwitch{name="bg", x=1180,y=460,disp=SETval("bg"), + WIDGET.newSwitch{name="clickFX", x=1000,y=920,disp=SETval("clickFX"), code=SETrev("clickFX")}, + WIDGET.newSwitch{name="power", x=1000,y=1010,disp=SETval("powerInfo"), code=SETrev("powerInfo")}, + WIDGET.newSwitch{name="clean", x=1000,y=1100,disp=SETval("cleanCanvas"),code=SETrev("cleanCanvas")}, + WIDGET.newSwitch{name="fullscreen", x=1000,y=1190,disp=SETval("fullscreen"), code=switchFullscreen}, + WIDGET.newSwitch{name="bg", x=1000,y=1280,disp=SETval("bg"), code=function() BG.set('none') SETTING.bg=not SETTING.bg BG.set() end}, - WIDGET.newSwitch{name="clean", x=1180,y=510,disp=SETval("cleanCanvas"),code=SETrev("cleanCanvas")}, - WIDGET.newSwitch{name="warn", x=1180,y=560,disp=SETval("warn"), code=SETrev("warn")}, WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=40,code=backScene}, }