再微调大量模式的左侧信息显示

stack模式左侧信息添加"块数"标签
2021-08-09 03:16:40 +08:00
parent ac889dcba9
commit 20cd27d7f6
33 changed files with 66 additions and 57 deletions
--- a/parts/language/lang_en.lua
+++ b/parts/language/lang_en.lua
@@ -34,7 +34,7 @@ return{
 	missionFailed="Wrong Clear",

 	speedLV="Speed Level",
-	line="Lines",atk="Attack",eff="Efficiency",
+	piece="Piece",line="Lines",atk="Attack",eff="Efficiency",
 	rpm="RPM",tsd="TSD",
 	grade="Grade",techrash="Techrash",
 	wave="Wave",nextWave="Next",
--- a/parts/language/lang_es.lua
+++ b/parts/language/lang_es.lua
@@ -24,7 +24,7 @@ return{
 	missionFailed="Misión Fallida",

 	speedLV="Vel. de juego",
-	line="Líneas",atk="Ataque",eff="Eficiencia",
+	piece="Piezas",line="Líneas",atk="Ataque",eff="Eficiencia",
 	rpm="RPM",tsd="TSD",
 	grade="Grado",techrash="Techrash",
 	wave="Ronda",nextWave="Sig. ronda",
--- a/parts/language/lang_fr.lua
+++ b/parts/language/lang_fr.lua
@@ -24,7 +24,7 @@ return{
 	missionFailed="Mission échouée",

 	speedLV="niveau de vitesse",
-	line="Lignes",atk="Attaque",eff="Efficacité",
+	piece="Pièce",line="Lignes",atk="Attaque",eff="Efficacité",
 	rpm="RPM",tsd="TSD",
 	grade="Grade",techrash="Techrash",
 	wave="Vague",nextWave="Prochain",
--- a/parts/language/lang_pt.lua
+++ b/parts/language/lang_pt.lua
@@ -25,7 +25,7 @@ return{
 	missionFailed="Missão falha",

 	speedLV="Nível de velocidade",
-	line="Linhas",atk="Ataque",eff="Eficiência",
+	piece="Peça",line="Linhas",atk="Ataque",eff="Eficiência",
 	rpm="RPM",tsd="TSD",
 	grade="Grade",techrash="Techrash",
 	wave="Onda",nextWave="Próxima",
--- a/parts/language/lang_yygq.lua
+++ b/parts/language/lang_yygq.lua
@@ -25,7 +25,7 @@ return{
 	maxspeed="速度封顶",

 	speedLV="速度等级",
-	line="行数",atk="攻",eff="效",
+	piece="块数",line="行数",atk="攻",eff="效",
 	rpm="收每分",tsd="T2",
 	grade="段位",techrash="消四",
 	wave="波数",nextWave="下一波",
--- a/parts/language/lang_zh.lua
+++ b/parts/language/lang_zh.lua
@@ -34,7 +34,7 @@ return{
 	missionFailed="非任务消除",

 	speedLV="速度等级",
-	line="行数",atk="攻击",eff="效率",
+	piece="块数",line="行数",atk="攻击",eff="效率",
 	rpm="RPM",tsd="T2",
 	grade="段位",techrash="Techrash",
 	wave="波数",nextWave="下一波",
--- a/parts/language/lang_zh2.lua
+++ b/parts/language/lang_zh2.lua
@@ -11,7 +11,7 @@ return{
 	continue="继续。",

 	speedLV="速度等级",
-	line="行数",atk="攻击",eff="效率",
+	piece="块数",line="行数",atk="攻击",eff="效率",
 	rpm="收每分",tsd="T2",
 	grade="段位",techrash="消四",
 	wave="波数",nextWave="下一波",
--- a/parts/list.lua
+++ b/parts/list.lua
@@ -164,7 +164,7 @@ do--drawableText
 		gamewin=T(100),gameover=T(100),pause=T(120),

 		speedLV=T(20),
-		line=T(25),atk=T(20),eff=T(20),
+		piece=T(25),line=T(25),atk=T(20),eff=T(20),
 		rpm=T(35),tsd=T(35),
 		grade=T(25),techrash=T(25),
 		wave=T(30),nextWave=T(30),
--- a/parts/modes/backfire_h.lua
+++ b/parts/modes/backfire_h.lua
@@ -14,9 +14,9 @@ return{
 		bg='tunnel',bgm='echo',
 	},
 	mesDisp=function(P)
-		setFont(65)
-		mStr(P.stat.atk,63,310)
-		mText(drawableText.atk,63,380)
+		setFont(60)
+		mStr(P.stat.atk,63,280)
+		mText(drawableText.atk,63,350)
 	end,
 	score=function(P)return{math.min(math.floor(P.stat.atk),100),P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Attack  "..STRING.time(D[2])end,
--- a/parts/modes/backfire_l.lua
+++ b/parts/modes/backfire_l.lua
@@ -14,9 +14,9 @@ return{
 		bg='blackhole',bgm='echo',
 	},
 	mesDisp=function(P)
-		setFont(65)
-		mStr(P.stat.atk,63,310)
-		mText(drawableText.atk,63,380)
+		setFont(60)
+		mStr(P.stat.atk,63,280)
+		mText(drawableText.atk,63,350)
 	end,
 	score=function(P)return{math.min(math.floor(P.stat.atk),100),P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Attack  "..STRING.time(D[2])end,
--- a/parts/modes/backfire_n.lua
+++ b/parts/modes/backfire_n.lua
@@ -13,9 +13,9 @@ return{
 		bg='tunnel',bgm='echo',
 	},
 	mesDisp=function(P)
-		setFont(65)
-		mStr(P.stat.atk,63,310)
-		mText(drawableText.atk,63,380)
+		setFont(60)
+		mStr(P.stat.atk,63,280)
+		mText(drawableText.atk,63,350)
 	end,
 	score=function(P)return{math.min(math.floor(P.stat.atk),100),P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Attack  "..STRING.time(D[2])end,
--- a/parts/modes/backfire_u.lua
+++ b/parts/modes/backfire_u.lua
@@ -14,9 +14,9 @@ return{
 		bg='blackhole',bgm='echo',
 	},
 	mesDisp=function(P)
-		setFont(65)
-		mStr(P.stat.atk,63,310)
-		mText(drawableText.atk,63,380)
+		setFont(60)
+		mStr(P.stat.atk,63,280)
+		mText(drawableText.atk,63,350)
 	end,
 	score=function(P)return{math.min(math.floor(P.stat.atk),100),P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Attack  "..STRING.time(D[2])end,
--- a/parts/modes/blind_wtf.lua
+++ b/parts/modes/blind_wtf.lua
@@ -1,3 +1,11 @@
+local boarder=GC.DO{334,620,
+{'setLW',2},
+{'setCL',.97,.97,.975},
+{'dRect',16,1,302,618,5},
+{'fRect',17,612,300,2},
+{'dRect',318,9,15,596,3},
+{'dRect',1,9,15,596,3},
+}
 local gc=love.graphics
 local sin,min=math.sin,math.min
 return{
@@ -30,9 +38,7 @@ return{
 				gc.translate(150,0)
 				gc.setColor(.5,.5,.5)
 				--Frame
-				gc.rectangle('line',-1,-11,302,612)--Boarder
-				gc.rectangle('line',301,-3,15,604)--AtkBuffer boarder
-				gc.rectangle('line',-16,-3,15,604)--B2b bar boarder
+				gc.draw(boarder,-17,-12)
 			end
 			gc.pop()
 		end
--- a/parts/modes/dig_h.lua
+++ b/parts/modes/dig_h.lua
@@ -22,7 +22,7 @@ return{
 		bg='bg2',bgm='shift',
 	},
 	mesDisp=function(P)
-		setFont(65)
+		setFont(60)
 		mStr(P.modeData.wave,63,310)
 		mText(drawableText.wave,63,375)
 	end,
--- a/parts/modes/dig_u.lua
+++ b/parts/modes/dig_u.lua
@@ -21,7 +21,7 @@ return{
 		bg='bg2',bgm='shift',
 	},
 	mesDisp=function(P)
-		setFont(65)
+		setFont(60)
 		mStr(P.modeData.wave,63,310)
 		mText(drawableText.wave,63,375)
 	end,
--- a/parts/modes/pc_h.lua
+++ b/parts/modes/pc_h.lua
@@ -17,7 +17,7 @@ return{

 		setFont(70)
 		mStr(P.stat.pc,63,300)
-		mText(drawableText.pc,63,380)
+		mText(drawableText.pc,63,350)
 	end,
 	score=function(P)return{P.stat.pc,P.stat.time}end,
 	scoreDisp=function(D)return D[1].." PCs   "..STRING.time(D[2])end,
--- a/parts/modes/pc_inf.lua
+++ b/parts/modes/pc_inf.lua
@@ -24,7 +24,7 @@ return{
 	mesDisp=function(P)
 		setFont(70)
 		mStr(P.stat.pc,63,300)
-		mText(drawableText.pc,63,380)
+		mText(drawableText.pc,63,350)
 	end,
 	score=function(P)return{P.stat.pc,P.stat.time}end,
 	scoreDisp=function(D)return D[1].." PCs   "..STRING.time(D[2])end,
--- a/parts/modes/pc_l.lua
+++ b/parts/modes/pc_l.lua
@@ -17,7 +17,7 @@ return{

 		setFont(70)
 		mStr(P.stat.pc,63,300)
-		mText(drawableText.pc,63,380)
+		mText(drawableText.pc,63,350)
 	end,
 	score=function(P)return{P.stat.pc,P.stat.time}end,
 	scoreDisp=function(D)return D[1].." PCs   "..STRING.time(D[2])end,
--- a/parts/modes/pc_n.lua
+++ b/parts/modes/pc_n.lua
@@ -15,7 +15,7 @@ return{

 		setFont(70)
 		mStr(P.stat.pc,63,300)
-		mText(drawableText.pc,63,380)
+		mText(drawableText.pc,63,350)
 	end,
 	score=function(P)return{P.stat.pc,P.stat.time}end,
 	scoreDisp=function(D)return D[1].." PCs   "..STRING.time(D[2])end,
--- a/parts/modes/pctrain_l.lua
+++ b/parts/modes/pctrain_l.lua
@@ -59,7 +59,7 @@ return{
 	mesDisp=function(P)
 		setFont(70)
 		mStr(P.stat.pc,63,300)
-		mText(drawableText.pc,63,380)
+		mText(drawableText.pc,63,350)
 	end,
 	score=function(P)return{P.stat.pc,P.stat.time}end,
 	scoreDisp=function(D)return D[1].." PCs   "..STRING.time(D[2])end,
--- a/parts/modes/pctrain_n.lua
+++ b/parts/modes/pctrain_n.lua
@@ -50,7 +50,7 @@ return{
 	mesDisp=function(P)
 		setFont(70)
 		mStr(P.stat.pc,63,300)
-		mText(drawableText.pc,63,380)
+		mText(drawableText.pc,63,350)
 	end,
 	score=function(P)return{P.stat.pc,P.stat.time}end,
 	scoreDisp=function(D)return D[1].." PCs   "..STRING.time(D[2])end,
--- a/parts/modes/stack_100l.lua
+++ b/parts/modes/stack_100l.lua
@@ -11,8 +11,9 @@ return{
 		bg='none',bgm='there',
 	},
 	mesDisp=function(P)
-		setFont(55)
-		mStr(P.stat.piece,63,265)
+		setFont(60)
+		mStr(P.stat.piece,63,280)
+		mText(drawableText.piece,63,350)
 	end,
 	score=function(P)return{P.stat.piece,P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Pieces".."   "..STRING.time(D[2])end,
--- a/parts/modes/stack_20l.lua
+++ b/parts/modes/stack_20l.lua
@@ -8,8 +8,9 @@ return{
 		bg='none',bgm='there',
 	},
 	mesDisp=function(P)
-		setFont(55)
-		mStr(P.stat.piece,63,265)
+		setFont(60)
+		mStr(P.stat.piece,63,280)
+		mText(drawableText.piece,63,350)
 	end,
 	score=function(P)return{P.stat.piece,P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Pieces".."   "..STRING.time(D[2])end,
--- a/parts/modes/stack_40l.lua
+++ b/parts/modes/stack_40l.lua
@@ -10,8 +10,9 @@ return{
 		bg='none',bgm='there',
 	},
 	mesDisp=function(P)
-		setFont(55)
-		mStr(P.stat.piece,63,265)
+		setFont(60)
+		mStr(P.stat.piece,63,280)
+		mText(drawableText.piece,63,350)
 	end,
 	score=function(P)return{P.stat.piece,P.stat.time}end,
 	scoreDisp=function(D)return D[1].." Pieces".."   "..STRING.time(D[2])end,
--- a/parts/modes/survivor_e.lua
+++ b/parts/modes/survivor_e.lua
@@ -23,8 +23,8 @@ return{
 		bg='glow',bgm='new era',
 	},
 	mesDisp=function(P)
-		setFont(65)
-		mStr(P.modeData.wave,63,310)
+		setFont(60)
+		mStr(P.modeData.wave,63,280)
 		mText(drawableText.wave,63,375)
 	end,
 	score=function(P)return{P.modeData.wave,P.stat.time}end,
--- a/parts/modes/survivor_h.lua
+++ b/parts/modes/survivor_h.lua
@@ -30,8 +30,8 @@ return{
 		bg='glow',bgm='new era',
 	},
 	mesDisp=function(P)
-		setFont(65)
-		mStr(P.modeData.wave,63,310)
+		setFont(60)
+		mStr(P.modeData.wave,63,280)
 		mText(drawableText.wave,63,375)
 	end,
 	score=function(P)return{P.modeData.wave,P.stat.time}end,
--- a/parts/modes/survivor_l.lua
+++ b/parts/modes/survivor_l.lua
@@ -24,8 +24,8 @@ return{
 		bg='glow',bgm='here',
 	},
 	mesDisp=function(P)
-		setFont(65)
-		mStr(P.modeData.wave,63,310)
+		setFont(60)
+		mStr(P.modeData.wave,63,280)
 		mText(drawableText.wave,63,375)
 	end,
 	score=function(P)return{P.modeData.wave,P.stat.time}end,
--- a/parts/modes/survivor_n.lua
+++ b/parts/modes/survivor_n.lua
@@ -29,8 +29,8 @@ return{
 		bg='glow',bgm='new era',
 	},
 	mesDisp=function(P)
-		setFont(65)
-		mStr(P.modeData.wave,63,310)
+		setFont(60)
+		mStr(P.modeData.wave,63,280)
 		mText(drawableText.wave,63,375)
 	end,
 	score=function(P)return{P.modeData.wave,P.stat.time}end,
--- a/parts/modes/survivor_u.lua
+++ b/parts/modes/survivor_u.lua
@@ -29,8 +29,8 @@ return{
 		bg='welcome',bgm='here',
 	},
 	mesDisp=function(P)
-		setFont(65)
-		mStr(P.modeData.wave,63,310)
+		setFont(60)
+		mStr(P.modeData.wave,63,280)
 		mText(drawableText.wave,63,375)
 	end,
 	score=function(P)return{P.modeData.wave,P.stat.time}end,
--- a/parts/modes/tsd_e.lua
+++ b/parts/modes/tsd_e.lua
@@ -19,7 +19,7 @@ return{
 		bg='matrix',bgm='vapor',
 	},
 	mesDisp=function(P)
-		setFont(65)
+		setFont(60)
 		mStr(P.modeData.tsd,63,250)
 		mText(drawableText.tsd,63,315)
 	end,
--- a/parts/modes/tsd_h.lua
+++ b/parts/modes/tsd_h.lua
@@ -19,7 +19,7 @@ return{
 		bg='matrix',bgm='vapor',
 	},
 	mesDisp=function(P)
-		setFont(65)
+		setFont(60)
 		mStr(P.modeData.tsd,63,250)
 		mText(drawableText.tsd,63,315)
 	end,
--- a/parts/modes/tsd_u.lua
+++ b/parts/modes/tsd_u.lua
@@ -28,7 +28,7 @@ return{
 		bg='matrix',bgm='vapor',
 	},
 	mesDisp=function(P)
-		setFont(65)
+		setFont(60)
 		mStr(P.modeData.tsd,63,250)
 		mText(drawableText.tsd,63,315)
 		gc.push('transform')
--- a/parts/player/draw.lua
+++ b/parts/player/draw.lua
@@ -628,7 +628,7 @@ function draw.drawRoyaleInfo(P)
 	gc.print(P.badge,103,227)
 	gc.setColor(.97,.97,.97)
 	setFont(25)
-	mDraw(text.powerUp[P.strength],63,290)
+	mStr(text.powerUp[P.strength],63,290)
 	gc.setColor(1,1,1)
 	for i=1,P.strength do
 		gc.draw(IMG.badgeIcon,16*i+6,260)
@@ -813,12 +813,6 @@ function draw.norm(P)
 		P:drawNext()
 		drawHold(P)

-		--Mode informations
-		if GAME.curMode.mesDisp then
-			gc_setColor(.97,.97,.97)
-			GAME.curMode.mesDisp(P)
-		end
-
 		--Speed dials & FinesseCombo
 		if P.type=='remote'then
 			drawDial(490,520,P.dropSpeed)
@@ -831,6 +825,12 @@ function draw.norm(P)
 			drawFinesseCombo_norm(P)
 		end

+		--Mode informations
+		if GAME.curMode.mesDisp then
+			gc_setColor(.97,.97,.97)
+			GAME.curMode.mesDisp(P)
+		end
+
 		--Score & Time
 		setFont(25)
 		local tm=int(P.stat.time*100)*.01