From f1e49ee60effc751e496763e28668d26da019d52 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Tue, 10 Nov 2020 12:26:55 +0800 Subject: [PATCH] =?UTF-8?q?drawableText=E5=88=86=E7=A6=BB=E5=87=BA?= =?UTF-8?q?=E8=AF=AD=E8=A8=80=E6=A8=A1=E5=9D=97=EF=BC=8C=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=96=87=E6=9C=AC=E6=94=AF=E6=8C=81=E5=A4=9A=E8=AF=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LANG/dict_zh.lua | 2 +- LANG/lang_en.lua | 8 ++++++++ LANG/lang_fr.lua | 9 +++++++++ LANG/lang_sp.lua | 8 ++++++++ LANG/lang_yygq.lua | 8 ++++++++ LANG/lang_zh.lua | 8 ++++++++ LANG/lang_zh2.lua | 8 ++++++++ Zframework/languages.lua | 9 --------- modes/c4wtrain_lunatic.lua | 2 +- modes/c4wtrain_normal.lua | 2 +- parts/list.lua | 39 +++++++++++++++++++++++--------------- 11 files changed, 76 insertions(+), 27 deletions(-) diff --git a/LANG/dict_zh.lua b/LANG/dict_zh.lua index 6396b9ce..ea4550b5 100644 --- a/LANG/dict_zh.lua +++ b/LANG/dict_zh.lua @@ -867,7 +867,7 @@ return{ {"gggf", "gggf kissne 127", "name", - "【研究群】「T127」\n40行22.831秒(手机28.229)，MPH40行56秒，tetr.io段位U，top数据约60L85A\n20G规则国内一流玩家，拿到了TGM3几乎全部的最终成就(全世界都没几个)，Tech中20G系列模式Final和PH用PC/手机都通关，Touhoumino的L难度一命无炸通\n其他名称:127 kissne 小柒\n还是车车人，几个正作成绩:永EX NM 1B FS 风L NM", + "【研究群】「T127」\n40行22.831秒(手机27.218)，MPH40行56秒，tetr.io段位U，top数据约60L85A\n20G规则国内一流玩家，拿到了TGM3几乎全部的最终成就(全世界都没几个)，Tech中20G系列模式Final和PH用PC/手机都通关，Touhoumino的L难度一命无炸通\n其他名称:127 kissne 小柒\n还是车车人，几个正作成绩:永EX NM 1B FS 风L NM", "https://space.bilibili.com/287769888", }, {"蕴空之灵", diff --git a/LANG/lang_en.lua b/LANG/lang_en.lua index 63c590be..17403cf7 100644 --- a/LANG/lang_en.lua +++ b/LANG/lang_en.lua @@ -24,6 +24,14 @@ return{ speedup="Speed up!", missionFailed="Wrong Clear", + speedLV="speed level", + line="Lines",atk="Attack",eff="Efficiency", + rpm="RPM",tsd="TSD", + grade="Grade",techrash="Techrash", + wave="Wave",nextWave="Next", + combo="Combo",maxcmb="Max Combo", + pc="Perfect Clear",ko="KO", + win="You Win!", finish="Finish", gameover="Game Over", diff --git a/LANG/lang_fr.lua b/LANG/lang_fr.lua index d762d36f..9d57e0b5 100644 --- a/LANG/lang_fr.lua +++ b/LANG/lang_fr.lua @@ -26,6 +26,15 @@ return{ speedup="Speed up !", missionFailed="Mission échouée", + -- speedLV="speed level", + -- line="Lines",atk="Attack",eff="Efficiency", + -- rpm="RPM",tsd="TSD", + -- grade="Grade",techrash="Techrash", + -- wave="Wave",nextWave="Next", + -- combo="Combo",maxcmb="Max Combo", + -- pc="Perfect Clear",ko="KO", + + win="Gagné !", finish="Terminé", gameover="Fin du jeu", diff --git a/LANG/lang_sp.lua b/LANG/lang_sp.lua index f637af1e..009d9cf8 100644 --- a/LANG/lang_sp.lua +++ b/LANG/lang_sp.lua @@ -26,6 +26,14 @@ return{ speedup="¡Más rápido!", missionFailed="Misión Fallida", + -- speedLV="speed level", + -- line="Lines",atk="Attack",eff="Efficiency", + -- rpm="RPM",tsd="TSD", + -- grade="Grade",techrash="Techrash", + -- wave="Wave",nextWave="Next", + -- combo="Combo",maxcmb="Max Combo", + -- pc="Perfect Clear",ko="KO", + win="Victoria", finish="Fin", gameover="Fin del Juego", diff --git a/LANG/lang_yygq.lua b/LANG/lang_yygq.lua index 37088c26..f15d4df5 100644 --- a/LANG/lang_yygq.lua +++ b/LANG/lang_yygq.lua @@ -17,6 +17,14 @@ return{ continue="您继续", maxspeed="速度封顶", + speedLV="速度等级", + line="行数",atk="攻",eff="效", + rpm="收每分",tsd="T2", + grade="段位",techrash="消四", + wave="波数",nextWave="下一波", + combo="连击",maxcmb="最大连", + pc="消干净了",ko="淘汰", + win="成了", finish="可以的", gameover="挂了", diff --git a/LANG/lang_zh.lua b/LANG/lang_zh.lua index 79be2be6..abf7a2a4 100644 --- a/LANG/lang_zh.lua +++ b/LANG/lang_zh.lua @@ -25,6 +25,14 @@ return{ speedup="速度加快", missionFailed="非任务消除", + speedLV="速度等级", + line="行数",atk="攻击",eff="效率", + rpm="RPM",tsd="T2", + grade="段位",techrash="Techrash", + wave="波数",nextWave="下一波", + combo="Combo",maxcmb="Max Combo", + pc="Perfect Clear",ko="KO", + win="胜利", finish="完成", gameover="游戏结束", diff --git a/LANG/lang_zh2.lua b/LANG/lang_zh2.lua index 5057971a..4a291881 100644 --- a/LANG/lang_zh2.lua +++ b/LANG/lang_zh2.lua @@ -10,6 +10,14 @@ return{ almost="差一点!", continue="继续。", + speedLV="速度等级", + line="行数",atk="攻击",eff="效率", + rpm="收每分",tsd="T2", + grade="段位",techrash="消四", + wave="波数",nextWave="下一波", + combo="连击",maxcmb="最大连击", + pc="全清",ko="淘汰", + finesse_ap="完美极简", finesse_fc="全连击", diff --git a/Zframework/languages.lua b/Zframework/languages.lua index 968f55ee..68c54df3 100644 --- a/Zframework/languages.lua +++ b/Zframework/languages.lua @@ -85,15 +85,6 @@ for i=1,#langList do end end -local drawableTextLoad={ - "anykey", - "replaying", - "next","hold", - "win","finish","gameover","pause", - - "VKTchW","VKOrgW","VKCurW", - "noScore","highScore", -} local LANG={} function LANG.getLen() return #langList diff --git a/modes/c4wtrain_lunatic.lua b/modes/c4wtrain_lunatic.lua index 5bde1875..b23b18df 100644 --- a/modes/c4wtrain_lunatic.lua +++ b/modes/c4wtrain_lunatic.lua @@ -49,7 +49,7 @@ return{ mStr(P.combo,69,380) mStr(P.modeData.point,69,470) mText(drawableText.combo,69,428) - mText(drawableText.mxcmb,69,520) + mText(drawableText.maxcmb,69,520) end, score=function(P)return{min(P.modeData.point,100),P.stat.time}end, scoreDisp=function(D)return D[1].." Combo "..toTime(D[2])end, diff --git a/modes/c4wtrain_normal.lua b/modes/c4wtrain_normal.lua index 133556dd..ac480011 100644 --- a/modes/c4wtrain_normal.lua +++ b/modes/c4wtrain_normal.lua @@ -47,7 +47,7 @@ return{ mStr(P.combo,69,380) mStr(P.modeData.point,69,470) mText(drawableText.combo,69,428) - mText(drawableText.mxcmb,69,520) + mText(drawableText.maxcmb,69,520) end, score=function(P)return{min(P.modeData.point,100),P.stat.time}end, scoreDisp=function(D)return D[1].." Combo "..toTime(D[2])end, diff --git a/parts/list.lua b/parts/list.lua index 48f81255..dc32ad1b 100644 --- a/parts/list.lua +++ b/parts/list.lua @@ -188,25 +188,35 @@ rankColor={ } local function T(s,t)return love.graphics.newText(getFont(s),t)end +drawableTextLoad={ + "anykey", + "replaying", + "next","hold", + "win","finish","gameover","pause", + + "speedLV", + "line","atk","eff", + "rpm","tsd", + "grade","techrash", + "wave","nextWave", + "combo","maxcmb", + "pc","ko", + + "VKTchW","VKOrgW","VKCurW", + "noScore","highScore", +} drawableText={ question=T(100,"?"), small=T(30,"<"),large=T(30,">"), bpm=T(15,"BPM"),kpm=T(15,"KPM"), - speedLV=T(20,"speed level"), - atk=T(20,"Attack"), - eff=T(20,"Efficiency"), - tsd=T(35,"TSD"), - line=T(25,"Lines"), - techrash=T(25,"Techrash"), - grade=T(25,"Grade"), - wave=T(30,"Wave"), - rpm=T(35,"RPM"), - nextWave=T(30,"Next"), - combo=T(20,"Combo"), - mxcmb=T(20,"Max Combo"), - pc=T(20,"Perfect Clear"), - ko=T(25,"KO"), + speedLV=T(20), + 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), + combo=T(20),maxcmb=T(20), + pc=T(20),ko=T(25), modeName=T(30),levelName=T(30), @@ -217,7 +227,6 @@ drawableText={ next=T(40),hold=T(40), win=T(120),finish=T(120), gameover=T(100),pause=T(120), - D=T(100,"D"),C=T(100,"C"),B=T(100,"B"),A=T(100,"A"),S=T(100,"S"), VKTchW=T(30),VKOrgW=T(30),VKCurW=T(30), noScore=T(45),highScore=T(30),