diff --git a/main.lua b/main.lua index 2e6045c2..d47f04b9 100644 --- a/main.lua +++ b/main.lua @@ -366,7 +366,6 @@ LANG.init('zh', { zh=require'parts.language.lang_zh', zh_trad=require'parts.language.lang_zh_trad', - zh_full=require'parts.language.lang_zh_full', en=require'parts.language.lang_en', fr=require'parts.language.lang_fr', es=require'parts.language.lang_es', @@ -550,6 +549,7 @@ do if type(SETTING.bg)~='string'then SETTING.bg='on'end if SETTING.skin[18]==10 then SETTING.skin[18]=4 end if SETTING.reTime>3 or SETTING.reTime<.5 then SETTING.reTime=2 end + if SETTING.locale=='zh_full' then SETTING.locale='zh' end if RANKS.infinite then RANKS.infinite=0 end if RANKS.infinite_dig then RANKS.infinite_dig=0 end if not RANKS.sprint_10l then RANKS.sprint_10l=0 end diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index cde1111d..2f72edbf 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -762,10 +762,10 @@ return{ ['sprint_100l']= {"竞速", "100L", "消除100行"}, ['sprint_400l']= {"竞速", "400L", "消除400行"}, ['sprint_1000l']= {"竞速", "1000L", "消除1000行"}, - ['secret_grade']= {"秘密段位", "", "做一个人字形的队形，按照指南的要求!"}, + ['secret_grade']= {"秘密段位", "", "按照提示完成经典的“大于号”拼图"}, ['sprintPenta']= {"竞速", "五连块", "伤脑筋十八块"}, ['sprintMPH']= {"竞速", "MPH", "纯随机\n无预览\n无暂存"}, - ['sprint123']= {"竞速", "M123", "40L，只有单米诺、多米诺和三米诺。"}, + ['sprint123']= {"竞速", "M123", "40L，但只有1~3连块"}, ['dig_10l']= {"挖掘", "10L", "挖掘10行"}, ['dig_40l']= {"挖掘", "40L", "挖掘40行"}, ['dig_100l']= {"挖掘", "100L", "挖掘100行"}, @@ -790,16 +790,16 @@ return{ ['round_h']= {"回合制", "困难", "下棋模式"}, ['round_l']= {"回合制", "疯狂", "下棋模式"}, ['round_u']= {"回合制", "极限", "下棋模式"}, - ['big_n']= {"大的", "普通", "在一个较小的棋盘上玩!"}, - ['big_h']= {"大的", "困难", "在一个较小的棋盘上玩!"}, + ['big_n']= {"大的", "普通", "模拟10*5场地的玩法(标准尺寸的一半)"}, + ['big_h']= {"大的", "困难", "模拟10*5场地的玩法(标准尺寸的一半)"}, ['master_n']= {"大师", "普通", "20G初心者练习"}, ['master_h']= {"大师", "困难", "上级者20G挑战"}, ['master_m']= {"大师", "大师", "大师20G"}, ['master_final']= {"大师", "终点", "究极20G:无法触及的终点"}, ['master_ph']= {"大师", "虚幻", "虚幻20G:？？？"}, - ['master_g']= {"大师", "分级的", "获得最高的成绩!"}, + ['master_g']= {"大师", "段位考试", "20G段位考试"}, ['master_ex']= {"宗师", "EX", "成为方块大师"}, - ['master_instinct']={"大师", "本能", "隐藏当前块"}, + ['master_instinct']={"大师", "本能", "当前块在出现后一小会后会隐形"}, ['strategy_e']= {"策略堆叠", "简单", "20G堆叠中速决策练习"}, ['strategy_h']= {"策略堆叠", "困难", "20G堆叠快速决策练习"}, ['strategy_u']= {"策略堆叠", "极限", "20G堆叠极速决策练习"}, diff --git a/parts/language/lang_zh_full.lua b/parts/language/lang_zh_full.lua deleted file mode 100644 index a6a856a1..00000000 --- a/parts/language/lang_zh_full.lua +++ /dev/null @@ -1,184 +0,0 @@ -return{ - cmb={nil,"1连击","2连击","3连击","4连击","5连击","6连击","7连击","8连击","9连击","10连击!","11连击!","12连击!","13连击!","14连击!","15连击!","16连击!","17连击!","18连击!","19连击!","巨型连击"}, - spin="型回旋", - clear={"单清","双清","三清","四清","五清","六清","七清","八清","九清","十清","十一清","十二清","十三清","十四清","十五清","十六清","十七清","十八清","十九清","二十清","超二十清"}, - cleared="", - mini="迷你",b2b="满贯",b3b="大满贯", - PC="场地全清",HPC="场地半清", - - great="不错!", - awesome="精彩。", - almost="差一点!", - continue="继续。", - - speedLV="速度等级", - piece="块数",line="行数",atk="攻击",eff="效率", - rpm="收每分",tsd="T2", - grade="段位",techrash="消四", - wave="波数",nextWave="下一波", - combo="连击",maxcmb="最大连击", - pc="全清",ko="淘汰", - - finesse_ap="完美极简", - finesse_fc="全连击", - - cc_fixed="不能同时开启CC和固定序列", - cc_swap="不能同时开启CC和swap的暂存模式", - ai_prebag="不能同时开启电脑玩家和含有非四连块的自定义序列", - ai_mission="不能同时开启电脑玩家和自定义任务", - - modInstruction="选择你要使用的模组!\n不同的模组会用不同的方式改变游戏规则，来开发新玩法挑战自我吧!\n提醒:开启一些模组会让成绩无效 你可以用键盘开关模组，按tab重置", - modInfo={ - next="预览数量:\n强制使用预览的个数", - hold="暂存数量:\n强制使用暂存的个数", - hideNext="隐藏预览:\n隐藏前几个预览", - infHold="无限暂存:\n可以无限制使用暂存", - forceB2B="强制满贯:\n满贯点数条掉到启动线以下就会结束游戏", - }, - pauseStat={ - "时间:", - "按键/旋转/暂存:", - "落块:", - "消行/挖掘:", - "攻击/挖掘攻击:", - "上涨/接收/抵消:", - "消除:", - "回旋:", - "(大)满贯/全(半)清:", - "非极简操作:", - }, - radar={"防","守","攻","送","速","挖"}, - radarData={"防/分","守/分","攻/分","送/分","行/分","挖/分"}, - WidgetText={ - mode={ - mod="模组(F1)", - }, - mod={ - title="模组", - }, - net_newRoom={ - ospin="O旋", - holdMode="暂存模式", - nextCount="预览个数", - holdCount="暂存个数", - infHold="无限暂存", - phyHold="物理暂存", - }, - setting_control={ - das="首次移动延迟",arr="移动重复延迟", - sddas="首次软降延迟",sdarr="软降重复延迟", - ihs="提前暂存", - }, - customGame={ - mod="模组(F1)", - - ospin="O旋", - holdMode="暂存模式", - nextCount="预览个数", - holdCount="暂存个数", - infHold="无限暂存", - phyHold="物理暂存", - }, - }, - modes={ - ['sprint_10l']= {"竞速", "10行", "消除10行"}, - ['sprint_20l']= {"竞速", "20行", "消除20行"}, - ['sprint_40l']= {"竞速", "40行", "消除40行"}, - ['sprint_100l']= {"竞速", "100行", "消除100行"}, - ['sprint_400l']= {"竞速", "400行", "消除400行"}, - ['sprint_1000l']= {"竞速", "1000行", "消除1000行"}, - ['sprintPenta']= {"竞速", "五连块", "伤脑筋十八块"}, - ['sprintMPH']= {"竞速", "纯净", "纯随机\n无预览\n无暂存"}, - ['dig_10l']= {"挖掘", "10L", "挖掘10行"}, - ['dig_40l']= {"挖掘", "40L", "挖掘40行"}, - ['dig_100l']= {"挖掘", "100L", "挖掘100行"}, - ['dig_400l']= {"挖掘", "400L", "挖掘400行"}, - ['drought_n']= {"干旱", "100行", "你I没了"}, - ['drought_l']= {"干旱+", "100行", "后 妈 发 牌"}, - ['marathon_n']= {"马拉松", "普通", "200行加速马拉松"}, - ['marathon_h']= {"马拉松", "困难", "200行高速马拉松"}, - ['solo_e']= {"单挑", "简单", "打败机器人"}, - ['solo_n']= {"单挑", "普通", "打败机器人"}, - ['solo_h']= {"单挑", "困难", "打败机器人"}, - ['solo_l']= {"单挑", "疯狂", "打败机器人"}, - ['solo_u']= {"单挑", "极限", "打败机器人"}, - ['techmino49_e']= {"49人混战", "简单", "49人混战，活到最后"}, - ['techmino49_h']= {"49人混战", "困难", "49人混战，活到最后"}, - ['techmino49_u']= {"49人混战", "极限", "49人混战，活到最后"}, - ['techmino99_e']= {"99人混战", "简单", "99人混战，活到最后"}, - ['techmino99_h']= {"99人混战", "困难", "99人混战，活到最后"}, - ['techmino99_u']= {"99人混战", "极限", "99人混战，活到最后"}, - ['round_e']= {"回合制", "简单", "下棋模式"}, - ['round_n']= {"回合制", "普通", "下棋模式"}, - ['round_h']= {"回合制", "困难", "下棋模式"}, - ['round_l']= {"回合制", "疯狂", "下棋模式"}, - ['round_u']= {"回合制", "极限", "下棋模式"}, - ['master_n']= {"大师", "普通", "20G初心者练习"}, - ['master_h']= {"大师", "困难", "上级者20G挑战"}, - ['master_m']= {"大师", "大师", "大师20G"}, - ['master_final']= {"大师", "终点", "究极20G:无法触及的终点"}, - ['master_ph']= {"大师", "虚幻", "虚幻20G:???"}, - ['master_ex']= {"宗师", "EX", "成为方块大师"}, - ['master_instinct']={"大师", "本能", "隐藏当前块"}, - ['strategy_e']= {"策略堆叠", "简单", "20G堆叠中速决策练习"}, - ['strategy_h']= {"策略堆叠", "困难", "20G堆叠快速决策练习"}, - ['strategy_u']= {"策略堆叠", "极限", "20G堆叠极速决策练习"}, - ['strategy_e_plus']={"策略堆叠", "简单+", "20G堆叠中速决策练习"}, - ['strategy_h_plus']={"策略堆叠", "困难+", "20G堆叠快速决策练习"}, - ['strategy_u_plus']={"策略堆叠", "极限+", "20G堆叠极速决策练习"}, - ['blind_e']= {"隐形", "半隐", "不强大脑"}, - ['blind_n']= {"隐形", "全隐", "挺强大脑"}, - ['blind_h']= {"隐形", "瞬隐", "很强大脑"}, - ['blind_l']= {"隐形", "瞬隐+", "超强大脑"}, - ['blind_u']= {"隐形", "啊这", "你准备好了吗"}, - ['blind_wtf']= {"隐形", "不会吧", "还没准备好"}, - ['classic_e']= {"高速经典", "简单", "高速经典"}, - ['classic_h']= {"高速经典", "困难", "飞速经典"}, - ['classic_u']= {"高速经典", "极限", "极速经典"}, - ['survivor_e']= {"生存", "简单", "你能存活多久?"}, - ['survivor_n']= {"生存", "普通", "你能存活多久?"}, - ['survivor_h']= {"生存", "困难", "你能存活多久?"}, - ['survivor_l']= {"生存", "疯狂", "你能存活多久?"}, - ['survivor_u']= {"生存", "极限", "你能存活多久?"}, - ['attacker_h']= {"进攻", "困难", "进攻练习"}, - ['attacker_u']= {"进攻", "极限", "进攻练习"}, - ['defender_n']= {"防守", "普通", "防守练习"}, - ['defender_l']= {"防守", "疯狂", "防守练习"}, - ['dig_h']= {"挖掘", "困难", "挖掘练习"}, - ['dig_u']= {"挖掘", "极限", "挖掘练习"}, - ['clearRush']= {"清版竞速", "普通", "所有块的回旋入门\n还没做好"}, - ['c4wtrain_n']= {"中四宽练习", "普通", "无 限 连 击"}, - ['c4wtrain_l']= {"中四宽练习", "疯狂", "无 限 连 击"}, - ['pctrain_n']= {"全清训练", "普通", "简易全清题库，熟悉全清定式的组合"}, - ['pctrain_l']= {"全清训练", "疯狂", "困难全清题库，强算力者进"}, - ['pc_n']= {"全清挑战", "普通", "100行内刷全清"}, - ['pc_h']= {"全清挑战", "困难", "100行内刷全清"}, - ['pc_l']= {"全清挑战", "疯狂", "100行内刷全清"}, - ['pc_inf']= {"无尽全清挑战", "", "你能连续做多少全清?"}, - ['tech_n']= {"科研", "普通", "禁止断满贯"}, - ['tech_n_plus']= {"科研", "普通+", "仅允许回旋与全清"}, - ['tech_h']= {"科研", "困难", "禁止断满贯"}, - ['tech_h_plus']= {"科研", "困难+", "仅允许回旋与全清"}, - ['tech_l']= {"科研", "疯狂", "禁止断满贯"}, - ['tech_l_plus']= {"科研", "疯狂+", "仅允许回旋与全清"}, - ['tech_finesse']= {"科研", "极简", "强制最简操作"}, - ['tech_finesse_f']= {"科研", "极简+", "禁止普通消除，强制最简操作"}, - ['tsd_e']= {"T2挑战", "简单", "你能连续做几个T旋双清?"}, - ['tsd_h']= {"T2挑战", "困难", "你能连续做几个T旋双清?"}, - ['tsd_u']= {"T2挑战", "极限", "你能连续做几个T旋双清?"}, - ['backfire_n']= {"自攻自防", "普通", "打出100攻击"}, - ['backfire_h']= {"自攻自防", "困难", "打出100攻击"}, - ['backfire_l']= {"自攻自防", "疯狂", "打出100攻击"}, - ['backfire_u']= {"自攻自防", "极限", "打出100攻击"}, - ['sprintAtk']= {"竞速", "100攻击", "打出100攻击"}, - ['sprintEff']= {"竞速", "效率", "40行内打出更高的攻击"}, - ['zen']= {"禅", "200", "不限时200行"}, - ['ultra']= {"限时打分", "挑战", "在两分钟内尽可能拿到最多的分数"}, - ['infinite']= {"无尽", "", "沙盒"}, - ['infinite_dig']= {"无尽:挖掘", "", "挖呀挖呀挖"}, - ['marathon_inf']= {"马拉松", "无尽", "无尽马拉松"}, - - ['custom_clear']= {"自定义", "普通"}, - ['custom_puzzle']= {"自定义", "拼图"}, - }, -} diff --git a/parts/scenes/lang.lua b/parts/scenes/lang.lua index 871367d8..65fe6527 100644 --- a/parts/scenes/lang.lua +++ b/parts/scenes/lang.lua @@ -1,6 +1,5 @@ local langList={ zh="简体中文", - zh_full="全简体中文", zh_trad="繁體中文", en="English", fr="Français", @@ -61,8 +60,8 @@ scene.widgetList={ WIDGET.newButton{x=637,y=568,w=346,h=100,font=40, fText=langList.zh_grass,color='L',sound='click',code=function()_setLang('zh_grass')end}, WIDGET.newButton{x=1003,y=210,w=346,h=100,font=40,fText=langList.zh, color='C',sound='click',code=function()_setLang('zh')end}, - WIDGET.newButton{x=1003,y=329,w=346,h=100,font=40,fText=langList.zh_full, color='N',sound='click',code=function()_setLang('zh_full')end}, - WIDGET.newButton{x=1003,y=449,w=346,h=100,font=40,fText=langList.zh_trad, color='S',sound='click',code=function()_setLang('zh_trad')end}, + WIDGET.newButton{x=1003,y=329,w=346,h=100,font=40,fText=langList.zh_trad, color='S',sound='click',code=function()_setLang('zh_trad')end}, + -- WIDGET.newButton{x=1003,y=449,w=346,h=100,font=40,fText=langList.zh_trad, color='S',sound='click',code=function()_setLang('zh_trad')end}, WIDGET.newButton{name='back',x=1003,y=568,w=346,h=100,sound='back',font=60,fText=CHAR.icon.back,code=backScene}, }