diff --git a/Zframework/languages.lua b/Zframework/languages.lua index 512b3976..d234e900 100644 --- a/Zframework/languages.lua +++ b/Zframework/languages.lua @@ -4,6 +4,7 @@ local langList={ newVersion="检测到更新!", marking="游戏作者:MrZ_26\n任何视频/直播不得出现此水印\n任何转述声明无效", holdR="长按以重新开始", + D="D",C="C",B="B",A="A",S="S", lang="中文", atkModeName={"随机","徽章","击杀","反击"}, @@ -158,15 +159,6 @@ local langList={ support="支持作者", group="官方QQ群(如果没有被暗改的话就是这个):1127702001", WidgetText={ - calculator={ - _1="1",_2="2",_3="3", - _4="4",_5="5",_6="6", - _7="7",_8="8",_9="9", - _0="0",["."]=".",e="e", - ["+"]="+",["-"]="-",["*"]="*",["/"]="/", - ["<"]="<",["="]="=", - play="开始", - }, main={ play="开始", setting="设置", @@ -531,6 +523,7 @@ local langList={ newVersion="检测到更新!", marking="游戏作者:MrZ_26\n任何视频/直播不得出现此水印\n任何转述声明无效", holdR="长按以重新开始", + D="D",C="C",B="B",A="A",S="S", lang="全中文", atkModeName={"随机","徽章","击杀","反击"}, @@ -683,15 +676,6 @@ local langList={ support="支持作者", group="官方QQ群(如果没有被暗改的话就是这个):1127702001", WidgetText={ - calculator={ - _1="1",_2="2",_3="3", - _4="4",_5="5",_6="6", - _7="7",_8="8",_9="9", - _0="0",["."]=".",e="e", - ["+"]="+",["-"]="-",["*"]="*",["/"]="/", - ["<"]="<",["="]="=", - play="开始", - }, main={ play="开始", setting="设置", @@ -1056,6 +1040,7 @@ local langList={ newVersion="Update detected!", marking="Game Author: MrZ_26\nIllegal recording if you can see this\nAny explanation is invalid", holdR="Hold to restart", + D="D",C="C",B="B",A="A",S="S", lang="English", atkModeName={"Random","Badges","K.O.s","Attackers"}, @@ -1198,15 +1183,6 @@ local langList={ support="Support author", group="Official QQ Group (if not hacked): 1127702001", WidgetText={ - calculator={ - _1="1",_2="2",_3="3", - _4="4",_5="5",_6="6", - _7="7",_8="8",_9="9", - _0="0",["."]=".",e="e", - ["+"]="+",["-"]="-",["*"]="*",["/"]="/", - ["<"]="<",["="]="=", - play="Play", - }, main={ play="Play", setting="Settings", @@ -1571,6 +1547,7 @@ local langList={ newVersion="&!!!", marking="Game Author:MrZ_26\nIllegal recording if see this\nAny explanation invalid", holdR="→→→→R", + D="",C=".",B="-",A="+",S="=", lang="?????", atkModeName={"?","( )","!","←→"}, @@ -1713,15 +1690,6 @@ local langList={ support="Support author", group="Official QQ Group(if not hacked):1127702001", WidgetText={ - calculator={ - _1="1",_2="2",_3="3", - _4="4",_5="5",_6="6", - _7="7",_8="8",_9="9", - _0="0",["."]=".",e="e", - ["+"]="+",["-"]="-",["*"]="*",["/"]="/", - ["<"]="<",["="]="=", - play="!!!", - }, main={ play="!!!", setting="_?_", @@ -2080,6 +2048,7 @@ local langList={ newVersion="感谢更新!", marking="游戏作者:MrZ_26\n任何视频/直播不得出现此水印\n任何转述声明无效", holdR="长按重开", + D="菜",C="可",B="行",A="强",S="神", lang="就这", atkModeName={"随机","徽章","击杀","反击"}, @@ -2232,15 +2201,6 @@ local langList={ support="支持作者", group="官方QQ群(如果没有被暗改的话就是这个):1127702001", WidgetText={ - calculator={ - _1="1",_2="2",_3="3", - _4="4",_5="5",_6="6", - _7="7",_8="8",_9="9", - _0="0",["."]=".",e="e", - ["+"]="+",["-"]="-",["*"]="*",["/"]="/", - ["<"]="<",["="]="=", - play="开始", - }, main={ play="开始", setting="设置", @@ -2601,9 +2561,6 @@ local langList={ }, }, } -for k,v in next,langList[1] do - if not langList[2][k]then print(k)end -end local publicText={ block={ "Z","S","J","L","T","O","I", @@ -2612,6 +2569,25 @@ local publicText={ "J5","L5","R","Y","N","H","I5" }, } +local publicWidgetText={ + calculator={ + _1="1",_2="2",_3="3", + _4="4",_5="5",_6="6", + _7="7",_8="8",_9="9", + _0="0",["."]=".",e="e", + ["+"]="+",["-"]="-",["*"]="*",["/"]="/", + ["<"]="<",["="]="=", + play="-->", + }, + setting_lang={ + chi="中文", + chi2="全中文", + eng="English", + str="?????", + yygq="就这?", + }, +} + for key,list in next,publicText do for i=1,#langList do if langList[i][key]then @@ -2624,15 +2600,6 @@ for key,list in next,publicText do end end end -local publicWidgetText={ - setting_lang={ - chi="中文", - chi2="全中文", - eng="English", - str="?????", - yygq="就这?", - }, -} for key,list in next,publicWidgetText do for i=1,#langList do local WT=langList[i].WidgetText @@ -2647,6 +2614,10 @@ for key,list in next,publicWidgetText do end end +--fallback to normal Chinese if no +local langMeta={__index=langList[1]} +for i=2,#langList do setmetatable(langList[i],langMeta)end + local gc=love.graphics local LANG={} local drawableTextLoad={ @@ -2654,6 +2625,7 @@ local drawableTextLoad={ "replaying", "next","hold", "win","finish","gameover","pause", + "D","C","B","A","S", "custom","basic","rule","field","mission", "setting_game","setting_video","setting_sound", diff --git a/parts/list.lua b/parts/list.lua index 622eac34..6a133bfe 100644 --- a/parts/list.lua +++ b/parts/list.lua @@ -199,7 +199,6 @@ drawableText={ mxcmb=T(20,"Max Combo"), pc=T(20,"Perfect Clear"), ko=T(25,"KO"), - D=T(100,"D"),C=T(100,"C"),B=T(100,"B"),A=T(100,"A"),S=T(100,"S"), modeName=T(30),levelName=T(30), @@ -210,6 +209,7 @@ drawableText={ next=T(40),hold=T(40), win=T(120),finish=T(120), gameover=T(100),pause=T(120), + D=T(100),C=T(100),B=T(100),A=T(100),S=T(100), custom=T(80),basic=T(35),rule=T(35),field=T(35),mission=T(35), setting_game=T(80),setting_video=T(80),setting_sound=T(80), diff --git a/parts/scenes.lua b/parts/scenes.lua index 83dc8d64..404ef394 100644 --- a/parts/scenes.lua +++ b/parts/scenes.lua @@ -1466,7 +1466,7 @@ do--custom_seq else if count>1 then gc.setColor(1,1,1) - gc.print("x",x-5,y-15) + gc.print("×",x-5,y-14) gc.print(count,x+10,y-13) x=x+(count<10 and 33 or 45) count=1 @@ -1835,7 +1835,7 @@ do--custom_mission if count>1 then setFont(25) gc.setColor(1,1,1) - gc.print("x",x-10,y-15) + gc.print("×",x-10,y-14) gc.print(count,x+5,y-13) x=x+(count<10 and 33 or 45) count=1