From ab82271fd067e12ed7a86ba6a6bed77f034a1058 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Mon, 2 Nov 2020 01:25:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=9A=E8=AF=AD=E8=A8=80?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=9A=84=E5=B0=8Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LANG/lang_en.lua | 4 ++-- LANG/lang_fr.lua | 2 +- LANG/lang_sp.lua | 2 +- LANG/lang_yygq.lua | 4 ++-- LANG/lang_zh.lua | 6 +++--- LANG/lang_zh2.lua | 2 +- Zframework/languages.lua | 2 +- parts/scenes/dict.lua | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/LANG/lang_en.lua b/LANG/lang_en.lua index 7082464d..b498c8ec 100644 --- a/LANG/lang_en.lua +++ b/LANG/lang_en.lua @@ -535,7 +535,7 @@ return{ reset3="Reset all", }, }, - modes={ + modes={fullCopy=true, ["sprint_10"]= {"Sprint", "10L", "Clear 10 lines!"}, ["sprint_20"]= {"Sprint", "20L", "Clear 20 lines!"}, ["sprint_40"]= {"Sprint", "40L", "Clear 40 lines!"}, @@ -621,7 +621,7 @@ return{ ["sprintPenta"]= {"Sprint", "PENTOMINO", "Clear 40 lines with 18 pentominoes."}, ["sprintMPH"]= {"Sprint", "MPH", "Memoriyless\nPreviewless\nHoldless"}, }, - getTip={noMerge=true, + getTip={fullCopy=true, 'Free block game with Battle Royale mode!', 'Have you noticed what "rotating" does do to the block?', ":pog:", diff --git a/LANG/lang_fr.lua b/LANG/lang_fr.lua index cb5fc684..3cfe6a4b 100644 --- a/LANG/lang_fr.lua +++ b/LANG/lang_fr.lua @@ -539,7 +539,7 @@ return{ reset3="Tout réinitialiser", }, }, - modes={ + modes={fullCopy=true, ["sprint_10"]= {"Sprint", "10L", "Nettoyez 10 lignes !"}, ["sprint_20"]= {"Sprint", "20L", "Nettoyez 20 lignes !"}, ["sprint_40"]= {"Sprint", "40L", "Nettoyez 40 lignes !"}, diff --git a/LANG/lang_sp.lua b/LANG/lang_sp.lua index 0a943cc0..5cde8370 100644 --- a/LANG/lang_sp.lua +++ b/LANG/lang_sp.lua @@ -538,7 +538,7 @@ return{ reset3="Reiniciar todo", }, }, - modes={ + modes={fullCopy=true, ["sprint_10"]= {"Sprint", "10L", "¡Limpia 10 líneas!"}, ["sprint_20"]= {"Sprint", "20L", "¡Limpia 20 líneas!"}, ["sprint_40"]= {"Sprint", "40L", "¡Limpia 40 líneas!"}, diff --git a/LANG/lang_yygq.lua b/LANG/lang_yygq.lua index 205cb74a..f12bbbb1 100644 --- a/LANG/lang_yygq.lua +++ b/LANG/lang_yygq.lua @@ -436,7 +436,7 @@ return{ tapFX="动画", }, }, - modes={ + modes={fullCopy=true, ["sprint_10"]= {"竞速", "10L", "消10行"}, ["sprint_20"]= {"竞速", "20L", "消20行"}, ["sprint_40"]= {"竞速", "40L", "消40行"}, @@ -522,7 +522,7 @@ return{ ["sprintPenta"]= {"竞速", "五连块", "离谱"}, ["sprintMPH"]= {"竞速", "纯净", "听说你反应很快?"}, }, - getTip={noMerge=true, + getTip={fullCopy=true, "100apm?你倒是不用开局定式连续打几把", "10连pc不是随手?", "20G很难?是个人都能玩吧。", diff --git a/LANG/lang_zh.lua b/LANG/lang_zh.lua index 47db52cc..09e119a9 100644 --- a/LANG/lang_zh.lua +++ b/LANG/lang_zh.lua @@ -118,7 +118,7 @@ return{ "全/半清:", "多余操作/极简率:", }, - help={ + help={fullCopy=true, "既然你能玩到这个游戏,应该也不需要什么帮助吧?", "这只是一个普通的方块游戏,请勿称此游戏为某某某方块", "从TO/C2/KOS/TGM3/JS等方块获得过灵感", @@ -537,7 +537,7 @@ return{ reset3="清空所有数据", }, }, - modes={ + modes={fullCopy=true, ["sprint_10"]= {"竞速", "10L", "消除10行"}, ["sprint_20"]= {"竞速", "20L", "消除20行"}, ["sprint_40"]= {"竞速", "40L", "消除40行"}, @@ -623,7 +623,7 @@ return{ ["sprintPenta"]= {"竞速", "五连块", "伤脑筋十八块"}, ["sprintMPH"]= {"竞速", "MPH", "纯随机\n无预览\n无暂存"}, }, - getTip={noMerge=true, + getTip={fullCopy=true, '注意到"旋转"到底对方块做了些什么吗?', "(RUR'U')R'FR2U'R'U'(RUR'F')", "↑↑↓↓←→←→BA", diff --git a/LANG/lang_zh2.lua b/LANG/lang_zh2.lua index c937db5d..da705f1f 100644 --- a/LANG/lang_zh2.lua +++ b/LANG/lang_zh2.lua @@ -111,7 +111,7 @@ return{ pong="弹球", }, }, - modes={ + modes={fullCopy=true, ["sprint_10"]= {"竞速", "10行", "消除10行"}, ["sprint_20"]= {"竞速", "20行", "消除20行"}, ["sprint_40"]= {"竞速", "40行", "消除40行"}, diff --git a/Zframework/languages.lua b/Zframework/languages.lua index e7fe0ccf..e8e7d3ae 100644 --- a/Zframework/languages.lua +++ b/Zframework/languages.lua @@ -43,7 +43,7 @@ local publicWidgetText={ } local function langFallback(T0,T) for k,v in next,T0 do - if type(v)=="table"and not v.noMerge then--noMerge=true : copy pointer instead of content + if type(v)=="table"and not v.fullCopy then--fullCopy=true : copy pointer instead of content if not T[k]then T[k]={}end if type(T[k])=="table"and not v[1]then langFallback(v,T[k])end elseif not T[k]then diff --git a/parts/scenes/dict.lua b/parts/scenes/dict.lua index e2d35dfb..cd0a9682 100644 --- a/parts/scenes/dict.lua +++ b/parts/scenes/dict.lua @@ -8,7 +8,7 @@ local ins,rem=table.insert,table.remove local find,sub=string.find,string.sub function sceneInit.dict() - local location=(SETTING.lang==3 or SETTING.lang==4)and"en"or"zh" + local location=({"zh","zh","en","en","en","en","zh"})[SETTING.lang] sceneTemp={ dict=require("LANG/dict_"..location),