From 9d8feab2cc3ffeb2e90d17f40539555ee2c5cfc5 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Sun, 16 May 2021 20:56:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0spike=E8=AE=A1=E6=95=B0?= =?UTF-8?q?=E5=99=A8=E5=BC=80=E5=85=B3=EF=BC=8C=E8=B0=83=E6=95=B4=E7=94=BB?= =?UTF-8?q?=E9=9D=A2=E8=AE=BE=E7=BD=AE=E7=95=8C=E9=9D=A2=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/globalTables.lua | 3 ++- parts/language/lang_en.lua | 3 ++- parts/language/lang_fr.lua | 2 +- parts/language/lang_pt.lua | 3 ++- parts/language/lang_sp.lua | 3 ++- parts/language/lang_symbol.lua | 5 ++-- parts/language/lang_yygq.lua | 3 +-- parts/language/lang_zh.lua | 3 ++- parts/player/draw.lua | 2 +- parts/player/gameEnv0.lua | 2 ++ parts/scenes/setting_video.lua | 45 +++++++++++++++++----------------- 11 files changed, 41 insertions(+), 33 deletions(-) diff --git a/parts/globalTables.lua b/parts/globalTables.lua index 6d895fcc..cef88b83 100644 --- a/parts/globalTables.lua +++ b/parts/globalTables.lua @@ -281,14 +281,15 @@ SETTING={--Settings text=true, score=true, - warn=true, bufferWarn=true, + showSpike=true, highCam=true, nextPos=true, fullscreen=true, bg=true, powerInfo=false, clickFX=true, + warn=true, --Sound sfx=1, diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index 23aa926f..afaf7082 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -311,8 +311,8 @@ return{ text="Line Clear Pop-up", score="Score Pop-up", - warn="Danger Alert", bufferWarn="Buffer Alert", + showSpike="Spike Counter", highCam="Screen Scrolling", nextPos="Next Preview", @@ -320,6 +320,7 @@ return{ power="Power Info", clickFX="Click FX", bg="Background", + warn="Danger Alert", clean="Fast Draw", }, setting_sound={ diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index f91f08fd..8fe4124d 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -283,7 +283,6 @@ return{ text="Texte d'action", score="Pop-up de score", - warn="Alerte de danger", -- bufferWarn="Buffer Alert", highCam="Vue d'oiseau", @@ -292,6 +291,7 @@ return{ power="Infos d'alimentation", -- clickFX="Click FX", bg="Arrière-plan", + warn="Alerte de danger", -- clean="Fast Draw", }, setting_sound={ diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index 97174082..4e75dee1 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -311,8 +311,8 @@ return{ text="Texto de ação", score="Pop-up de pontos", - warn="Alerta de perigo", -- bufferWarn="Buffer Alert", + -- showSpike="Spike Counter", highCam="Vista Olho-de-pássaro", nextPos="Próxima Pos.", @@ -320,6 +320,7 @@ return{ power="Informação bateria", -- clickFX="Click FX", bg="Fundo", + warn="Alerta de perigo", -- clean="Fast Draw", }, setting_sound={ diff --git a/parts/language/lang_sp.lua b/parts/language/lang_sp.lua index 6969a303..112381d2 100644 --- a/parts/language/lang_sp.lua +++ b/parts/language/lang_sp.lua @@ -288,8 +288,8 @@ return{ text="Texto de Acciones", score="Puntaje en Pantalla", - warn="Alerta de Peligro", -- bufferWarn="Buffer Alert", + -- showSpike="Spike Counter", highCam="Cám. Vista Aérea", nextPos="Ver Spawn de Pza. Sig.", @@ -297,6 +297,7 @@ return{ power="Inf. de Batería", -- clickFX="Click FX", bg="Fondo", + warn="Alerta de Peligro", clean="Fast Draw", }, setting_sound={ diff --git a/parts/language/lang_symbol.lua b/parts/language/lang_symbol.lua index 043b1e87..f3f00f24 100644 --- a/parts/language/lang_symbol.lua +++ b/parts/language/lang_symbol.lua @@ -168,8 +168,8 @@ return{ text="ABC", score="+123", - warn="!↑↑↑!", - -- bufferWarn="Buffer Alert", + bufferWarn="^+", + showSpike="→→+", highCam="↑__↑", nextPos="???←", @@ -177,6 +177,7 @@ return{ power="+.", clickFX="_.~", bg="__?__", + warn="!↑↑↑!", clean="[]→→O", }, setting_sound={ diff --git a/parts/language/lang_yygq.lua b/parts/language/lang_yygq.lua index f8006821..0f31b99d 100644 --- a/parts/language/lang_yygq.lua +++ b/parts/language/lang_yygq.lua @@ -83,9 +83,8 @@ return{ text="招式名", score="跳分", - warn="要死", - bufferWarn="离死差多远", highCam="拉镜", + warn="要死", }, setting_sound={ title="改声音", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index a9d62e35..bdd125e6 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -311,8 +311,8 @@ return{ text="消行文本", score="分数动画", - warn="死亡预警", bufferWarn="缓冲预警", + showSpike="爆发累计", highCam="超屏视野", nextPos="生成预览", @@ -320,6 +320,7 @@ return{ power="电量显示", clickFX="点按特效", bg="背景", + warn="死亡预警", clean="绘制优化", }, setting_sound={ diff --git a/parts/player/draw.lua b/parts/player/draw.lua index c2feafab..10cddad9 100644 --- a/parts/player/draw.lua +++ b/parts/player/draw.lua @@ -673,7 +673,7 @@ function draw.norm(P) end --Spike - if P.spikeTime>0 and P.spike>=10 then + if ENV.showSpike and P.spikeTime>0 and P.spike>=10 then gc_setColor(1,1,1,min(P.spikeTime/30,.8)) mDraw(P.spikeText,150,100,nil,min(.3+(P.spike/26)*.4+P.spikeTime/100*.3,1)) end diff --git a/parts/player/gameEnv0.lua b/parts/player/gameEnv0.lua index 07f4e4b0..f5173eb9 100644 --- a/parts/player/gameEnv0.lua +++ b/parts/player/gameEnv0.lua @@ -22,6 +22,8 @@ return{ bufferWarn=false, highCam=false, nextPos=false, + showSpike=false, + hideBoard=false, flipBoard=false, diff --git a/parts/scenes/setting_video.lua b/parts/scenes/setting_video.lua index e31b31f7..03b9bd97 100644 --- a/parts/scenes/setting_video.lua +++ b/parts/scenes/setting_video.lua @@ -13,41 +13,42 @@ scene.widgetList={ 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=350,y=160,disp=SETval("block"),code=SETrev("block")}, - WIDGET.newSwitch{name="smooth", x=350,y=210,disp=SETval("smooth"),code=SETrev("smooth")}, - WIDGET.newSwitch{name="upEdge", x=350,y=260,disp=SETval("upEdge"),code=SETrev("upEdge")}, - WIDGET.newSwitch{name="bagLine", x=350,y=310,disp=SETval("bagLine"),code=SETrev("bagLine")}, + 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.newSlider{name="ghost", x=700,y=180,w=380,unit=.6, disp=SETval("ghost"),show="percent",code=SETsto("ghost")}, - WIDGET.newSlider{name="grid", x=700,y=240,w=380,unit=.4, disp=SETval("grid"),show="percent", code=SETsto("grid")}, - WIDGET.newSlider{name="center", x=700,y=300,w=380,unit=1, disp=SETval("center"), code=SETsto("center")}, + 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="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.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.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="warn", x=900,y=460,disp=SETval('warn'), code=SETrev('warn')}, - WIDGET.newSwitch{name="bufferWarn", x=900,y=510,disp=SETval('bufferWarn'), code=SETrev('bufferWarn')}, + 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="nextPos", x=1180,y=360,disp=SETval("nextPos"), code=SETrev("nextPos")}, - WIDGET.newSwitch{name="fullscreen", x=1180,y=410,disp=SETval("fullscreen"), code=switchFullscreen}, - WIDGET.newSwitch{name="power", x=1180,y=460,disp=SETval("powerInfo"), code=SETrev("powerInfo")}, - WIDGET.newSwitch{name="clickFX", x=1180,y=510,disp=SETval("clickFX"), code=SETrev("clickFX")}, - WIDGET.newSwitch{name="bg", x=1180,y=560,disp=SETval("bg"), + 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"), code=function() BG.set('none') SETTING.bg=not SETTING.bg BG.set() end}, - WIDGET.newSwitch{name="clean", x=990,y=640,font=35,disp=SETval("cleanCanvas"),code=SETrev("cleanCanvas")}, + 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}, }