缓冲垃圾行数预览可开关，调整视频设置的ui

2021-05-11 18:31:17 +08:00
parent 91e33495da
commit 99ba68fce8
11 changed files with 45 additions and 25 deletions
--- a/parts/globalTables.lua
+++ b/parts/globalTables.lua
@@ -275,6 +275,7 @@ SETTING={--Settings
 	text=true,
 	score=true,
 	warn=true,
+	bufferWarn=false,
 	highCam=false,
 	nextPos=false,
 	fullscreen=true,
--- a/parts/language/lang_en.lua
+++ b/parts/language/lang_en.lua
@@ -307,7 +307,9 @@ return{
 			text="Line Clear Pop-up",
 			score="Score Pop-up",
 			warn="Danger Alert",
+			bufferWarn="Buffer Alert",
 			highCam="Screen Scrolling",
+
 			nextPos="Next Preview",
 			fullscreen="Full Screen",
 			power="Power Info",
--- a/parts/language/lang_fr.lua
+++ b/parts/language/lang_fr.lua
@@ -279,7 +279,9 @@ return{
 			text="Texte d'action",
 			score="Pop-up de score",
 			warn="Alerte de danger",
+			-- bufferWarn="Buffer Alert",
 			highCam="Vue d'oiseau",
+
 			nextPos="Prévisualisation de position",
 			fullscreen="Plein écran",
 			power="Infos d'alimentation",
--- a/parts/language/lang_pt.lua
+++ b/parts/language/lang_pt.lua
@@ -307,7 +307,9 @@ return{
 			text="Texto de ação",
 			score="Pop-up de pontos",
 			warn="Alerta de perigo",
+			-- bufferWarn="Buffer Alert",
 			highCam="Vista Olho-de-pássaro",
+
 			nextPos="Próxima Pos.",
 			fullscreen="Tela cheia",
 			power="Informação bateria",
--- a/parts/language/lang_sp.lua
+++ b/parts/language/lang_sp.lua
@@ -284,7 +284,9 @@ return{
 			text="Texto de Acciones",
 			score="Puntaje en Pantalla",
 			warn="Alerta de Peligro",
+			-- bufferWarn="Buffer Alert",
 			highCam="Cám. Vista Aérea",
+
 			nextPos="Ver Spawn de Pza. Sig.",
 			fullscreen="Pant. Completa",
 			power="Inf. de Batería",
--- a/parts/language/lang_symbol.lua
+++ b/parts/language/lang_symbol.lua
@@ -168,7 +168,9 @@ return{
 			text="ABC",
 			score="+123",
 			warn="!↑↑↑!",
+			-- bufferWarn="Buffer Alert",
 			highCam="↑__↑",
+
 			nextPos="???←",
 			fullscreen="|←→|",
 			power="+.",
--- a/parts/language/lang_yygq.lua
+++ b/parts/language/lang_yygq.lua
@@ -83,6 +83,8 @@ return{

 			text="招式名",
 			score="跳分",
+			warn="要死",
+			bufferWarn="离死差多远",
 			highCam="拉镜",
 		},
 		setting_sound={
--- a/parts/language/lang_zh.lua
+++ b/parts/language/lang_zh.lua
@@ -307,7 +307,9 @@ return{
 			text="消行文本",
 			score="分数动画",
 			warn="死亡预警",
+			bufferWarn="缓冲预警",
 			highCam="超屏视野",
+
 			nextPos="生成预览",
 			fullscreen="全屏",
 			power="电量显示",
--- a/parts/player/draw.lua
+++ b/parts/player/draw.lua
@@ -271,15 +271,17 @@ local function drawBuffer(P)
 		end
 		h=h+bar
 	end
-	local sum=P.atkBufferSum1
-	if sum>=8 then
-		gc_push('transform')
-		gc_translate(300,max(0,600-30*sum))
-		gc_scale(min(.2+sum/50,1))
-		setFont(100)
-		gc_setColor(1,.2+min(sum*.02,.8)*(.5+.5*sin(TIME()*min(sum,32))),.2,min(sum/30,.8))
-		gc_printf(int(P.atkBufferSum1),-300,-20,292,'right')
-		gc_pop()
+	if P.gameEnv.bufferWarn then
+		local sum=P.atkBufferSum1
+		if sum>=8 then
+			gc_push('transform')
+			gc_translate(300,max(0,600-30*sum))
+			gc_scale(min(.2+sum/50,1))
+			setFont(100)
+			gc_setColor(1,.2+min(sum*.02,.8)*(.5+.5*sin(TIME()*min(sum,32))),.2,min(sum/30,.8))
+			gc_printf(int(P.atkBufferSum1),-300,-20,292,'right')
+			gc_pop()
+		end
 	end
 end
 local function drawB2Bbar(P)
--- a/parts/player/gameEnv0.lua
+++ b/parts/player/gameEnv0.lua
@@ -23,6 +23,7 @@ return{
 	shakeFX=2,
 	atkFX=2,

+	bufferWarn=false,
 	highCam=false,
 	nextPos=false,
 	hideBoard=false,
--- a/parts/scenes/setting_video.lua
+++ b/parts/scenes/setting_video.lua
@@ -13,14 +13,14 @@ 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=290,y=165,disp=SETval("block"),code=SETrev("block")},
-	WIDGET.newSwitch{name="smooth",		x=290,y=215,disp=SETval("smooth"),code=SETrev("smooth")},
-	WIDGET.newSwitch{name="upEdge",		x=290,y=265,disp=SETval("upEdge"),code=SETrev("upEdge")},
-	WIDGET.newSwitch{name="bagLine",	x=290,y=315,disp=SETval("bagLine"),code=SETrev("bagLine")},
+	WIDGET.newSwitch{name="block",		x=350,y=165,disp=SETval("block"),code=SETrev("block")},
+	WIDGET.newSwitch{name="smooth",		x=350,y=215,disp=SETval("smooth"),code=SETrev("smooth")},
+	WIDGET.newSwitch{name="upEdge",		x=350,y=265,disp=SETval("upEdge"),code=SETrev("upEdge")},
+	WIDGET.newSwitch{name="bagLine",	x=350,y=315,disp=SETval("bagLine"),code=SETrev("bagLine")},

-	WIDGET.newSlider{name="ghost",		x=600,y=180,w=200,unit=.6,	disp=SETval("ghost"),show="percent",code=SETsto("ghost")},
-	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="ghost",		x=600,y=180,w=480,unit=.6,	disp=SETval("ghost"),show="percent",code=SETsto("ghost")},
+	WIDGET.newSlider{name="grid",		x=600,y=240,w=480,unit=.4,	disp=SETval("grid"),show="percent",	code=SETsto("grid")},
+	WIDGET.newSlider{name="center",		x=600,y=300,w=480,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")},
@@ -31,15 +31,17 @@ scene.widgetList={
 	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,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"),
+	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="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"),
 		code=function()
 			BG.set('none')
 			SETTING.bg=not SETTING.bg