diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index d180bb73..994405c4 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -792,8 +792,8 @@ return{ "车万方块是一家(暴论", "吃键?真的吗?建议回放看看到底按没按到,按了多久", "凑数tip什么时候能站起来!", - "打铁.png", - "打铁", + "打块多是一件美事啊", + "打铁.mp4", "大概还是有人会看tip的", "大家认为的俄罗斯方块很可能不是你以为的俄罗斯方块,场合合适的时候可以适当提醒一下哦", "大满贯10连击消四全清!", @@ -1061,6 +1061,7 @@ return{ "健康小贴士[05]长期睡眠不足会引起不可逆的脑损伤(变傻)", "群友名言[001]“玩了Techmino之后发现打字速度变快了”", "群友名言[002]“我要陪伴着tech一步步成长,然后就可以疯狂的享受他”", + "群友名言[003]“太super啦,不愧是guideline”", "Frt评[01]“成天被夸赞‘好玩’的”", "Frt评[02]“可以形成方块圈子小中心话题,同作者一起衍生一些概念与梗的”", "Frt评[03]“论方块的软工意义(就算这么小个范围内,各种取舍蒙混翻车现象都总会以很易懂的方式出现(”", diff --git a/parts/net.lua b/parts/net.lua index 2da98420..1a8188ab 100644 --- a/parts/net.lua +++ b/parts/net.lua @@ -86,7 +86,7 @@ local function _parseNotice(str) str[m:sub(1,m:find("=")-1)]=m:sub(m:find("=")+1) end end - return str[SETTING.locale]or str[SETTING.locale:find'zh'and'zh'or'en'] + return str[SETTING.locale]or SETTING.locale:find'zh'and str.zh or str.en else return str end diff --git a/parts/netPlayer.lua b/parts/netPlayer.lua index 4d6768aa..e09e9413 100644 --- a/parts/netPlayer.lua +++ b/parts/netPlayer.lua @@ -223,7 +223,7 @@ function NETPLY.draw() gc_setLineWidth(2) gc_rectangle('line',0,0,p.w,p.h) if p.connected then - local c=COLOR[p.mode==1 and'N'or'F'] + local c=p.mode==1 and COLOR.N or COLOR.F gc_setColor(c[1],c[2],c[3],.26) gc_rectangle('fill',0,0,p.w,p.h) end diff --git a/parts/scenes/game.lua b/parts/scenes/game.lua index 0291e218..b632f5ea 100644 --- a/parts/scenes/game.lua +++ b/parts/scenes/game.lua @@ -373,7 +373,7 @@ function scene.draw() if replaying or tas then setFont(20) gc_setColor(1,1,TIME()%.8>.4 and 1 or 0) - mStr(text[replaying and'replaying'or'tasUsing'],770,6) + mStr(replaying and text.replaying or text.tasUsing,770,6) gc_setColor(1,1,1,.8) mStr(("%s %sf"):format(repRateStrings[gameRate],PLAYERS[1].frameRun),770,31) end diff --git a/parts/scenes/pause.lua b/parts/scenes/pause.lua index 40e7da7a..b702a876 100644 --- a/parts/scenes/pause.lua +++ b/parts/scenes/pause.lua @@ -30,7 +30,7 @@ function scene.sceneInit() local frameLostRate=(S.frame/S.time/60-1)*100 form={ - {COLOR.Z,STRING.time(S.time),COLOR[frameLostRate>10 and'R'or frameLostRate>3 and'Y'or'H'],(" (%.2f%%)"):format(frameLostRate)}, + {COLOR.Z,STRING.time(S.time),frameLostRate>10 and COLOR.R or frameLostRate>3 and COLOR.Y or COLOR.H,(" (%.2f%%)"):format(frameLostRate)}, ("%d/%d/%d"):format(S.key,S.rotate,S.hold), ("%d %.2fPPS"):format(S.piece,S.piece/S.time), ("%d(%d) %.2fLPM"):format(S.row,S.dig,S.row/S.time*60), diff --git a/parts/scenes/setting_key.lua b/parts/scenes/setting_key.lua index 1f657fda..c38235f1 100644 --- a/parts/scenes/setting_key.lua +++ b/parts/scenes/setting_key.lua @@ -188,7 +188,7 @@ function scene.draw() if selected then gc.setLineWidth(3) - gc.setColor(COLOR[TIME()%.26<.13 and'F'or'Y']) + gc.setColor(TIME()%.26<.13 and COLOR.F or COLOR.Y) gc.rectangle('line', selected>10 and 860 or 240, selected>10 and 60*(selected-10)-50 or selected>0 and 60*selected-50 or 640,