SweetSea/Techmino
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加spike计数器开关，调整画面设置界面布局

Browse Source
This commit is contained in:
MrZ626
2021-05-16 20:56:13 +08:00
parent bcb5d3eba4
commit 9d8feab2cc
11 changed files with 41 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
parts/globalTables.lua
View File

@@ -281,14 +281,15 @@ SETTING={--Settings
text=true, text=true,
score=true, score=true,
warn=true,
bufferWarn=true, bufferWarn=true,
showSpike=true,
highCam=true, highCam=true,
nextPos=true, nextPos=true,
fullscreen=true, fullscreen=true,
bg=true, bg=true,
powerInfo=false, powerInfo=false,
clickFX=true, clickFX=true,
warn=true,
--Sound --Sound
sfx=1, sfx=1,

3
parts/language/lang_en.lua
View File

@@ -311,8 +311,8 @@ return{
text="Line Clear Pop-up", text="Line Clear Pop-up",
score="Score Pop-up", score="Score Pop-up",
warn="Danger Alert",
bufferWarn="Buffer Alert", bufferWarn="Buffer Alert",
showSpike="Spike Counter",
highCam="Screen Scrolling", highCam="Screen Scrolling",
nextPos="Next Preview", nextPos="Next Preview",
@@ -320,6 +320,7 @@ return{
power="Power Info", power="Power Info",
clickFX="Click FX", clickFX="Click FX",
bg="Background", bg="Background",
warn="Danger Alert",
clean="Fast Draw", clean="Fast Draw",
}, },
setting_sound={ setting_sound={

2
parts/language/lang_fr.lua
View File

@@ -283,7 +283,6 @@ return{
text="Texte d'action", text="Texte d'action",
score="Pop-up de score", score="Pop-up de score",
warn="Alerte de danger",
-- bufferWarn="Buffer Alert", -- bufferWarn="Buffer Alert",
highCam="Vue d'oiseau", highCam="Vue d'oiseau",
@@ -292,6 +291,7 @@ return{
power="Infos d'alimentation", power="Infos d'alimentation",
-- clickFX="Click FX", -- clickFX="Click FX",
bg="Arrière-plan", bg="Arrière-plan",
warn="Alerte de danger",
-- clean="Fast Draw", -- clean="Fast Draw",
}, },
setting_sound={ setting_sound={

3
parts/language/lang_pt.lua
View File

@@ -311,8 +311,8 @@ return{
text="Texto de ação", text="Texto de ação",
score="Pop-up de pontos", score="Pop-up de pontos",
warn="Alerta de perigo",
-- bufferWarn="Buffer Alert", -- bufferWarn="Buffer Alert",
-- showSpike="Spike Counter",
highCam="Vista Olho-de-pássaro", highCam="Vista Olho-de-pássaro",
nextPos="Próxima Pos.", nextPos="Próxima Pos.",
@@ -320,6 +320,7 @@ return{
power="Informação bateria", power="Informação bateria",
-- clickFX="Click FX", -- clickFX="Click FX",
bg="Fundo", bg="Fundo",
warn="Alerta de perigo",
-- clean="Fast Draw", -- clean="Fast Draw",
}, },
setting_sound={ setting_sound={

3
parts/language/lang_sp.lua
View File

@@ -288,8 +288,8 @@ return{
text="Texto de Acciones", text="Texto de Acciones",
score="Puntaje en Pantalla", score="Puntaje en Pantalla",
warn="Alerta de Peligro",
-- bufferWarn="Buffer Alert", -- bufferWarn="Buffer Alert",
-- showSpike="Spike Counter",
highCam="Cám. Vista Aérea", highCam="Cám. Vista Aérea",
nextPos="Ver Spawn de Pza. Sig.", nextPos="Ver Spawn de Pza. Sig.",
@@ -297,6 +297,7 @@ return{
power="Inf. de Batería", power="Inf. de Batería",
-- clickFX="Click FX", -- clickFX="Click FX",
bg="Fondo", bg="Fondo",
warn="Alerta de Peligro",
clean="Fast Draw", clean="Fast Draw",
}, },
setting_sound={ setting_sound={

5
parts/language/lang_symbol.lua
View File

@@ -168,8 +168,8 @@ return{
text="ABC", text="ABC",
score="+123", score="+123",
warn="!↑↑↑!", bufferWarn="^+",
-- bufferWarn="Buffer Alert", showSpike="→→+",
highCam="↑__↑", highCam="↑__↑",
nextPos="???←", nextPos="???←",
@@ -177,6 +177,7 @@ return{
power="+.", power="+.",
clickFX="_.~", clickFX="_.~",
bg="__?__", bg="__?__",
warn="!↑↑↑!",
clean="[]→→O", clean="[]→→O",
}, },
setting_sound={ setting_sound={

3
parts/language/lang_yygq.lua
View File

@@ -83,9 +83,8 @@ return{
text="招式名", text="招式名",
score="跳分", score="跳分",
warn="要死",
bufferWarn="离死差多远",
highCam="拉镜", highCam="拉镜",
warn="要死",
}, },
setting_sound={ setting_sound={
title="改声音", title="改声音",

3
parts/language/lang_zh.lua
View File

@@ -311,8 +311,8 @@ return{
text="消行文本", text="消行文本",
score="分数动画", score="分数动画",
warn="死亡预警",
bufferWarn="缓冲预警", bufferWarn="缓冲预警",
showSpike="爆发累计",
highCam="超屏视野", highCam="超屏视野",
nextPos="生成预览", nextPos="生成预览",
@@ -320,6 +320,7 @@ return{
power="电量显示", power="电量显示",
clickFX="点按特效", clickFX="点按特效",
bg="背景", bg="背景",
warn="死亡预警",
clean="绘制优化", clean="绘制优化",
}, },
setting_sound={ setting_sound={

2
parts/player/draw.lua
View File

@@ -673,7 +673,7 @@ function draw.norm(P)
end end
--Spike --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)) 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)) mDraw(P.spikeText,150,100,nil,min(.3+(P.spike/26)*.4+P.spikeTime/100*.3,1))
end end

2
parts/player/gameEnv0.lua
View File

@@ -22,6 +22,8 @@ return{
bufferWarn=false, bufferWarn=false,
highCam=false, highCam=false,
nextPos=false, nextPos=false,
showSpike=false,
hideBoard=false, hideBoard=false,
flipBoard=false, flipBoard=false,

45
parts/scenes/setting_video.lua
View File

@@ -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="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.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="block", x=270,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="smooth", x=270,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="upEdge", x=270,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="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="ghost", x=610,y=180,w=320,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="grid", x=610,y=240,w=320,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="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="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="dropFX", x=220,y=415,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="moveFX", x=220,y=465,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="clearFX", x=220,y=515,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="splashFX", x=220,y=565,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="shakeFX", x=220,y=615,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.newSlider{name="atkFX", x=220,y=665,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.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="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="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=460,disp=SETval('bufferWarn'), code=SETrev('bufferWarn')},
WIDGET.newSwitch{name="bufferWarn", x=900,y=510,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="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="nextPos", x=1180,y=260,disp=SETval("nextPos"), code=SETrev("nextPos")},
WIDGET.newSwitch{name="fullscreen", x=1180,y=410,disp=SETval("fullscreen"), code=switchFullscreen}, WIDGET.newSwitch{name="fullscreen", x=1180,y=310,disp=SETval("fullscreen"), code=switchFullscreen},
WIDGET.newSwitch{name="power", x=1180,y=460,disp=SETval("powerInfo"), code=SETrev("powerInfo")}, WIDGET.newSwitch{name="power", x=1180,y=360,disp=SETval("powerInfo"), code=SETrev("powerInfo")},
WIDGET.newSwitch{name="clickFX", x=1180,y=510,disp=SETval("clickFX"), code=SETrev("clickFX")}, WIDGET.newSwitch{name="clickFX", x=1180,y=410,disp=SETval("clickFX"), code=SETrev("clickFX")},
WIDGET.newSwitch{name="bg", x=1180,y=560,disp=SETval("bg"), WIDGET.newSwitch{name="bg", x=1180,y=460,disp=SETval("bg"),
code=function() code=function()
BG.set('none') BG.set('none')
SETTING.bg=not SETTING.bg SETTING.bg=not SETTING.bg
BG.set() BG.set()
end}, 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}, WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=40,code=backScene},
} }