From 8590f4c383792ddd737808f71dc2a472dbc2b75b Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Thu, 14 Oct 2021 20:06:31 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E6=9B=BF=E6=8D=A2=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=E8=8F=9C=E5=8D=95=E9=87=8C=E7=9A=84=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E4=B8=BA=E5=AD=97=E4=BD=93=E5=86=85=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/char.lua | 12 +++---- parts/language/lang_en.lua | 11 ------ parts/language/lang_es.lua | 14 -------- parts/language/lang_fr.lua | 15 --------- parts/language/lang_pt.lua | 11 ------ parts/language/lang_symbol.lua | 15 --------- parts/language/lang_zh.lua | 11 ------ parts/language/lang_zh3.lua | 11 ------ parts/scenes/custom_field.lua | 58 ++++++++++++++++---------------- parts/scenes/custom_mission.lua | 12 +++---- parts/scenes/custom_sequence.lua | 4 +-- parts/scenes/error.lua | 2 +- parts/scenes/main_simple.lua | 2 +- parts/scenes/net_game.lua | 2 +- parts/scenes/replays.lua | 6 ++-- parts/scenes/setting_touch.lua | 8 ++--- 16 files changed, 53 insertions(+), 141 deletions(-) diff --git a/parts/char.lua b/parts/char.lua index e6d5ab5c..5d82b04a 100644 --- a/parts/char.lua +++ b/parts/char.lua @@ -87,7 +87,7 @@ local L={ mrz= 0xF009A, apple= 0xF009B, home= 0xF009C, - thick_cross= 0xF009D, + cross_thick= 0xF009D, num0InSpin= 0xF009E, num1InSpin= 0xF009F, num2InSpin= 0xF00A0, @@ -102,13 +102,13 @@ local L={ won= 0xF00A9, bitcoin= 0xF00AA, onebag= 0xF00AB, - export= 0xF00AC, + export= 0xF00AC, import= 0xF00AD, trash= 0xF00AE, - exportOne= 0xF00AF, - importOne= 0xF00B0, - exportTwo= 0xF00B1, - importTwo= 0xF00B2, + loadOne= 0xF00AF, + saveOne= 0xF00B0, + loadTwo= 0xF00B1, + saveTwo= 0xF00B2, }, key={--F0100~F017F macCmd= 0xF0100, diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index 4fe3614e..a0a3efe2 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -441,10 +441,6 @@ return{ setting_touch={ default="Default", snap="Snap to Grid", - save1="Save 1", - load1="Load 1", - save2="Save 2", - load2="Load 2", size="Size", shape="Shape", }, @@ -520,15 +516,11 @@ return{ subTitle="Field", any="Erase", - space="×", smart="Smart", push="Add Line(K)", del="Del Line(L)", - copy="Copy", - paste="Paste", - clear="Clear", demo="Don't Show ×", newPg="New Page(N)", @@ -540,7 +532,6 @@ return{ title="Custom Game", subTitle="Sequence", sequence="Sequence", - copy="Copy",paste="Paste", }, custom_mission={ title="Custom Game", @@ -553,8 +544,6 @@ return{ Z2="Z2",S2="S2",J2="J2",L2="L2",T2="T2",O2="O2",I2="I2", Z3="Z3",S3="S3",J3="J3",L3="L3",T3="T3",O3="O3",I3="I3", O4="O4",I4="I4", - copy="Copy", - paste="Paste", mission="Force Mission", }, about={ diff --git a/parts/language/lang_es.lua b/parts/language/lang_es.lua index f755a480..847eb451 100644 --- a/parts/language/lang_es.lua +++ b/parts/language/lang_es.lua @@ -406,10 +406,6 @@ return{ setting_touch={ default="Por Defecto", snap="Snap", - save1="Save1", - load1="Load1", - save2="Save2", - load2="Load2", size="Tamaño", shape="Forma", }, @@ -487,13 +483,9 @@ return{ subTitle="Tablero", any="Borrar", - space="×", pushLine="Añadir Línea (K)", delLine="Borrar Línea (L)", - copy="Copiar", - paste="Pegar", - clear="Limpiar", demo="No Mostrar X", newPage="Nueva pág. (N)", @@ -505,17 +497,11 @@ return{ title="Juego Personalizado", subTitle="Secuencia", sequence="Secuencia", - reset="Reiniciar", - rnd="Al azar", - copy="Copiar", - paste="Pegar", }, custom_mission={ title="Juego Personalizado", subTitle="Misiones", - copy="Copiar", - paste="Pegar", mission="Forzar misión", }, about={ diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index 0220d18d..87584c92 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -406,10 +406,6 @@ return{ setting_touch={ default="Par défaut", snap="Snap", - -- save1="Save1", - -- load1="Load1", - -- save2="Save2", - -- load2="Load2", size="Taille", -- shape="Shape", }, @@ -488,15 +484,11 @@ return{ subTitle="Matrice", any="Effacer", - space="×", -- smart="Smart", push="Ajouter ligne (K)", del="Supprimer ligne (L)", - copy="Copier", - paste="Coller", - clear="Nettoyer", demo="Masquer les ×", newPg="Nouvelle Page(N)", @@ -507,19 +499,12 @@ return{ custom_sequence={ title="Mode personnalisée", subTitle="Séquence", - sequence="Séquence", - reset="Réinitialiser", - rnd="Aléatoire", - copy="Copier", - paste="Coller", }, custom_mission={ title="Mode personnalisé", subTitle="Mission", - copy="Copier", - paste="Coller", mission="Dorcer la mission", }, dict={ diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index 2b23f66e..21496802 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -430,10 +430,6 @@ return{ setting_touch={ default="Default", snap="Encaixo", - -- save1="Save1", - -- load1="Load1", - -- save2="Save2", - -- load2="Load2", size="Tamanho", -- shape="Shape", }, @@ -510,15 +506,11 @@ return{ subTitle="Tabuleiro", any="Apagar", - space="×", -- smart="Smart", push="Add Linha(K)", del="Del Linha(L)", - copy="Copiar", - paste="Colar", - clear="Limpar", demo="Não mostrar ×", newPg="Nova Página(N)", @@ -530,7 +522,6 @@ return{ title="Jogo Custom", subTitle="Sequência", sequence="Sequência", - copy="Copiar",paste="Colar", }, custom_mission={ title="Jogo Custom", @@ -543,8 +534,6 @@ return{ Z2="Z2",S2="S2",J2="J2",L2="L2",T2="T2",O2="O2",I2="I2", Z3="Z3",S3="S3",J3="J3",L3="L3",T3="T3",O3="O3",I3="I3", O4="O4",I4="I4", - copy="Copiar", - paste="Colar", mission="Forçar Missão", }, about={ diff --git a/parts/language/lang_symbol.lua b/parts/language/lang_symbol.lua index 0c185298..4c66e453 100644 --- a/parts/language/lang_symbol.lua +++ b/parts/language/lang_symbol.lua @@ -319,10 +319,6 @@ return{ setting_touch={ default="$0", snap="_ _", - save1=">1", - load1="1>", - save2=">2", - load2="2>", size="←→", shape="@?", }, @@ -399,15 +395,11 @@ return{ subTitle="!@#$%^&* [##]", any="_", - space="×", smart="~", push="↑↑↑↑↑(K)", del="==X==(L)", - copy="→__", - paste="__→", - clear="XXX", demo="X ×", newPg="+[_](N)", @@ -418,19 +410,12 @@ return{ custom_sequence={ title="!@#$%^&*", subTitle="Sequence", - sequence="$=", - reset="R", - rnd="R", - copy="→__", - paste="__→", }, custom_mission={ title="!@#$%^&*", subTitle="(!)", - copy="→__", - paste="__→", mission="Force mission", }, about={ diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 4f2dd37a..c0b3a53d 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -441,10 +441,6 @@ return{ setting_touch={ default="默认组合", snap="吸附", - save1="保存1", - load1="读取1", - save2="保存2", - load2="读取2", size="大小", shape="形状", }, @@ -521,15 +517,11 @@ return{ subTitle="场地", any="不定", - space="×", smart="智能", push="增加一行(K)", del="消除行(L)", - copy="复制", - paste="粘贴", - clear="清除", demo="不显示×", newPg="新页面(N)", @@ -541,7 +533,6 @@ return{ title="自定义游戏", subTitle="序列", sequence="序列", - copy="复制",paste="粘贴", }, custom_mission={ title="自定义游戏", @@ -554,8 +545,6 @@ return{ Z2="Z2",S2="S2",J2="J2",L2="L2",T2="T2",O2="O2",I2="I2", Z3="Z3",S3="S3",J3="J3",L3="L3",T3="T3",O3="O3",I3="I3", O4="O4",I4="I4", - copy="复制", - paste="粘贴", mission="强制任务", }, music={ diff --git a/parts/language/lang_zh3.lua b/parts/language/lang_zh3.lua index 3a7f1fe5..3ca81865 100644 --- a/parts/language/lang_zh3.lua +++ b/parts/language/lang_zh3.lua @@ -442,10 +442,6 @@ return{ setting_touch={ default="违约", snap="捕捉到网格", - save1="储蓄1", - load1="负载1", - save2="储蓄2", - load2="负载2", size="尺寸", shape="形状", }, @@ -522,15 +518,11 @@ return{ subTitle="领域", any="擦除", - space="×", smart="聪明的", push="添加行(K)", del="中线(L)", - copy="复制", - paste="粘贴", - clear="清空", demo="不要展示×", newPg="新页(N)", @@ -542,7 +534,6 @@ return{ title="定制游戏", subTitle="序列", sequence="序列", - copy="复制",paste="粘贴", }, custom_mission={ title="定制游戏", @@ -555,8 +546,6 @@ return{ Z2="Z2",S2="S2",J2="J2",L2="L2",T2="T2",O2="氧气",I2="I2", Z3="Z3",S3="S3",J3="J3",L3="L3",T3="T3",O3="臭氧",I3="I3", O4="O4",I4="I4", - copy="复制", - paste="粘贴", mission="使命", }, about={ diff --git a/parts/scenes/custom_field.lua b/parts/scenes/custom_field.lua index babc84f9..71efcc4c 100644 --- a/parts/scenes/custom_field.lua +++ b/parts/scenes/custom_field.lua @@ -458,45 +458,45 @@ scene.widgetList={ WIDGET.newText{name="title", x=1020,y=5,font=70,align='R'}, WIDGET.newText{name="subTitle", x=1030,y=50,font=35,align='L',color='H'}, - WIDGET.newButton{name="b1", x=580, y=130,w=75,fText="",color='R',code=_setPen(1)},--B1 - WIDGET.newButton{name="b2", x=660, y=130,w=75,fText="",color='F',code=_setPen(2)},--B2 - WIDGET.newButton{name="b3", x=740, y=130,w=75,fText="",color='O',code=_setPen(3)},--B3 - WIDGET.newButton{name="b4", x=820, y=130,w=75,fText="",color='Y',code=_setPen(4)},--B4 - WIDGET.newButton{name="b5", x=900, y=130,w=75,fText="",color='L',code=_setPen(5)},--B5 - WIDGET.newButton{name="b6", x=980, y=130,w=75,fText="",color='J',code=_setPen(6)},--B6 - WIDGET.newButton{name="b7", x=1060,y=130,w=75,fText="",color='G',code=_setPen(7)},--B7 - WIDGET.newButton{name="b8", x=1140,y=130,w=75,fText="",color='A',code=_setPen(8)},--B8 + WIDGET.newButton{name="b1", x=580, y=130,w=76,fText="",color='R',code=_setPen(1)},--B1 + WIDGET.newButton{name="b2", x=660, y=130,w=76,fText="",color='F',code=_setPen(2)},--B2 + WIDGET.newButton{name="b3", x=740, y=130,w=76,fText="",color='O',code=_setPen(3)},--B3 + WIDGET.newButton{name="b4", x=820, y=130,w=76,fText="",color='Y',code=_setPen(4)},--B4 + WIDGET.newButton{name="b5", x=900, y=130,w=76,fText="",color='L',code=_setPen(5)},--B5 + WIDGET.newButton{name="b6", x=980, y=130,w=76,fText="",color='J',code=_setPen(6)},--B6 + WIDGET.newButton{name="b7", x=1060,y=130,w=76,fText="",color='G',code=_setPen(7)},--B7 + WIDGET.newButton{name="b8", x=1140,y=130,w=76,fText="",color='A',code=_setPen(8)},--B8 - WIDGET.newButton{name="b9", x=580, y=210,w=75,fText="",color='C',code=_setPen(9)},--B9 - WIDGET.newButton{name="b10", x=660, y=210,w=75,fText="",color='N',code=_setPen(10)},--B10 - WIDGET.newButton{name="b11", x=740, y=210,w=75,fText="",color='S',code=_setPen(11)},--B11 - WIDGET.newButton{name="b12", x=820, y=210,w=75,fText="",color='B',code=_setPen(12)},--B12 - WIDGET.newButton{name="b13", x=900, y=210,w=75,fText="",color='V',code=_setPen(13)},--B13 - WIDGET.newButton{name="b14", x=980, y=210,w=75,fText="",color='P',code=_setPen(14)},--B14 - WIDGET.newButton{name="b15", x=1060,y=210,w=75,fText="",color='M',code=_setPen(15)},--B15 - WIDGET.newButton{name="b16", x=1140,y=210,w=75,fText="",color='W',code=_setPen(16)},--B16 + WIDGET.newButton{name="b9", x=580, y=210,w=76,fText="",color='C',code=_setPen(9)},--B9 + WIDGET.newButton{name="b10", x=660, y=210,w=76,fText="",color='N',code=_setPen(10)},--B10 + WIDGET.newButton{name="b11", x=740, y=210,w=76,fText="",color='S',code=_setPen(11)},--B11 + WIDGET.newButton{name="b12", x=820, y=210,w=76,fText="",color='B',code=_setPen(12)},--B12 + WIDGET.newButton{name="b13", x=900, y=210,w=76,fText="",color='V',code=_setPen(13)},--B13 + WIDGET.newButton{name="b14", x=980, y=210,w=76,fText="",color='P',code=_setPen(14)},--B14 + WIDGET.newButton{name="b15", x=1060,y=210,w=76,fText="",color='M',code=_setPen(15)},--B15 + WIDGET.newButton{name="b16", x=1140,y=210,w=76,fText="",color='W',code=_setPen(16)},--B16 - WIDGET.newButton{name="b17", x=580, y=290,w=75,fText="[ ]",color='dH',code=_setPen(17)},--BONE - WIDGET.newButton{name="b18", x=660, y=290,w=75,fText="N", color='D', code=_setPen(18)},--HIDE - WIDGET.newButton{name="b19", x=740, y=290,w=75,fText="B", color='lY',code=_setPen(19)},--BOMB - WIDGET.newButton{name="b20", x=820, y=290,w=75,fText="_", color='H', code=_setPen(20)},--GB1 - WIDGET.newButton{name="b21", x=900, y=290,w=75,fText="_", color='lH',code=_setPen(21)},--GB2 - WIDGET.newButton{name="b22", x=980, y=290,w=75,fText="_", color='dV',code=_setPen(22)},--GB3 - WIDGET.newButton{name="b23", x=1060,y=290,w=75,fText="_", color='dR',code=_setPen(23)},--GB4 - WIDGET.newButton{name="b24", x=1140,y=290,w=75,fText="_", color='dG',code=_setPen(24)},--GB5 + WIDGET.newButton{name="b17", x=580, y=290,w=76,fText="[ ]",color='dH',code=_setPen(17)},--BONE + WIDGET.newButton{name="b18", x=660, y=290,w=76,fText="N", color='D', code=_setPen(18)},--HIDE + WIDGET.newButton{name="b19", x=740, y=290,w=76,fText="B", color='lY',code=_setPen(19)},--BOMB + WIDGET.newButton{name="b20", x=820, y=290,w=76,fText="_", color='H', code=_setPen(20)},--GB1 + WIDGET.newButton{name="b21", x=900, y=290,w=76,fText="_", color='lH',code=_setPen(21)},--GB2 + WIDGET.newButton{name="b22", x=980, y=290,w=76,fText="_", color='dV',code=_setPen(22)},--GB3 + WIDGET.newButton{name="b23", x=1060,y=290,w=76,fText="_", color='dR',code=_setPen(23)},--GB4 + WIDGET.newButton{name="b24", x=1140,y=290,w=76,fText="_", color='dG',code=_setPen(24)},--GB5 WIDGET.newButton{name="any", x=600, y=400,w=120,color='lH', font=40,code=_setPen(0)}, - WIDGET.newButton{name="space", x=730, y=400,w=120,color='H', font=65,code=_setPen(-1)}, + WIDGET.newButton{name="space", x=730, y=400,w=120,color='H', font=55,code=_setPen(-1),fText=CHAR.icon.cross_thick}, WIDGET.newButton{name="smart", x=860, y=400,w=120,color='lG', font=30,code=_setPen(-2)}, WIDGET.newButton{name="push", x=990, y=400,w=120,h=120,color='lY',font=20,code=pressKey"k"}, WIDGET.newButton{name="del", x=1120,y=400,w=120,h=120,color='lY',font=20,code=pressKey"l"}, - WIDGET.newButton{name="copy", x=730, y=530,w=120,color='lR', font=35,code=pressKey"cC"}, - WIDGET.newButton{name="paste", x=860, y=530,w=120,color='lB', font=35,code=pressKey"cV"}, - WIDGET.newButton{name="clear", x=990, y=530,w=120,color='Z', font=40,code=pressKey"delete"}, + WIDGET.newButton{name="copy", x=730, y=530,w=120,color='lR',font=60,fText=CHAR.icon.export,code=pressKey"cC"}, + WIDGET.newButton{name="paste", x=860, y=530,w=120,color='lB',font=60,fText=CHAR.icon.import,code=pressKey"cV"}, + WIDGET.newButton{name="clear", x=990, y=530,w=120,color='Z', font=90,fText=CHAR.key.clear,code=pressKey"delete"}, WIDGET.newSwitch{name="demo", x=755, y=640,lim=220,disp=function()return demo end,code=function()demo=not demo end}, - WIDGET.newButton{name="newPg", x=100, y=110,w=160,h=110,color='N',font=20,code=pressKey"n"}, + WIDGET.newButton{name="newPg", x=100, y=110,w=160,h=110,color='N', font=20,code=pressKey"n"}, WIDGET.newButton{name="delPg", x=100, y=230,w=160,h=110,color='lR',font=20,code=pressKey"m"}, WIDGET.newButton{name="prevPg", x=100, y=350,w=160,h=110,color='lG',font=20,code=pressKey"pageup",hideF=function()return page==1 end}, WIDGET.newButton{name="nextPg", x=100, y=470,w=160,h=110,color='lG',font=20,code=pressKey"pagedown",hideF=function()return page==#FIELD end}, diff --git a/parts/scenes/custom_mission.lua b/parts/scenes/custom_mission.lua index 746add9c..f65222c7 100644 --- a/parts/scenes/custom_mission.lua +++ b/parts/scenes/custom_mission.lua @@ -232,13 +232,13 @@ scene.widgetList={ WIDGET.newKey{name="O4", x=600,y=640,w=90,font=50,code=pressKey(64)}, WIDGET.newKey{name="I4", x=700,y=640,w=90,font=50,code=pressKey(74)}, - WIDGET.newKey{name="left", x=800, y=440,w=90, color='lG',font=55,code=pressKey"left",fText=CHAR.key.left}, - WIDGET.newKey{name="right", x=900, y=440,w=90, color='lG',font=55,code=pressKey"right",fText=CHAR.key.right}, - WIDGET.newKey{name="ten", x=1000,y=440,w=90, color='lG',font=55,code=pressKey"ten",fText=CHAR.key.macTab}, + WIDGET.newKey{name="left", x=800, y=440,w=90, color='lG',font=55,code=pressKey"left", fText=CHAR.key.left}, + WIDGET.newKey{name="right", x=900, y=440,w=90, color='lG',font=55,code=pressKey"right", fText=CHAR.key.right}, + WIDGET.newKey{name="ten", x=1000,y=440,w=90, color='lG',font=55,code=pressKey"ten", fText=CHAR.key.macTab}, WIDGET.newKey{name="backsp", x=1000,y=540,w=90, color='lY',font=55,code=pressKey"backspace",fText=CHAR.key.backspace_or_delete}, - WIDGET.newKey{name="reset", x=1000,y=640,w=90, color='lY',font=60,code=pressKey"delete",fText=CHAR.key.clear}, - WIDGET.newButton{name="copy", x=1140,y=440,w=170,h=80,color='lR',font=40,code=pressKey"cC",hideF=function()return #MISSION==0 end}, - WIDGET.newButton{name="paste", x=1140,y=540,w=170,h=80,color='lB',font=40,code=pressKey"cV"}, + WIDGET.newKey{name="reset", x=1000,y=640,w=90, color='lY',font=60,code=pressKey"delete", fText=CHAR.key.clear}, + WIDGET.newButton{name="copy", x=1140,y=440,w=170,h=80,color='lR',font=50,code=pressKey"cC", fText=CHAR.icon.export,hideF=function()return #MISSION==0 end}, + WIDGET.newButton{name="paste", x=1140,y=540,w=170,h=80,color='lB',font=50,code=pressKey"cV", fText=CHAR.icon.import}, WIDGET.newSwitch{name="mission",x=1150,y=340,lim=280,disp=CUSval('missionKill'),code=CUSrev('missionKill')}, WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, diff --git a/parts/scenes/custom_sequence.lua b/parts/scenes/custom_sequence.lua index 9ae11e56..5b41a908 100644 --- a/parts/scenes/custom_sequence.lua +++ b/parts/scenes/custom_sequence.lua @@ -234,8 +234,8 @@ scene.widgetList={ WIDGET.newKey{name="O1", x=920,y=640,w=80,color='dH',font=100,code=pressKey(29),fText=CHAR.mino.O1}, - WIDGET.newButton{name="copy", x=1140,y=460,w=170,h=80,color='lR',font=40,code=pressKey"cC",hideF=function()return #BAG==0 end}, - WIDGET.newButton{name="paste",x=1140,y=550,w=170,h=80,color='lB',font=40,code=pressKey"cV"}, + WIDGET.newButton{name="copy", x=1140,y=460,w=170,h=80,color='lR',font=50,fText=CHAR.icon.export,code=pressKey"cC",hideF=function()return #BAG==0 end}, + WIDGET.newButton{name="paste",x=1140,y=550,w=170,h=80,color='lB',font=50,fText=CHAR.icon.import,code=pressKey"cV"}, WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, } diff --git a/parts/scenes/error.lua b/parts/scenes/error.lua index 69045de9..e9c3189b 100644 --- a/parts/scenes/error.lua +++ b/parts/scenes/error.lua @@ -40,7 +40,7 @@ end scene.widgetList={ WIDGET.newKey{name="console",x=940,y=640,w=170,h=80,font=65,fText=CHAR.icon.console,code=goScene'app_console'}, - WIDGET.newKey{name="quit",x=1140,y=640,w=170,h=80,font=40,fText=CHAR.icon.thick_cross,code=backScene}, + WIDGET.newKey{name="quit",x=1140,y=640,w=170,h=80,font=40,fText=CHAR.icon.cross_thick,code=backScene}, } return scene diff --git a/parts/scenes/main_simple.lua b/parts/scenes/main_simple.lua index 7fb8d3c9..6be71135 100644 --- a/parts/scenes/main_simple.lua +++ b/parts/scenes/main_simple.lua @@ -23,7 +23,7 @@ scene.widgetList={ WIDGET.newButton{name="setting", x=1000,y=400,w=120,font=90,fText=CHAR.icon.settings,code=goScene'setting_game'}, WIDGET.newButton{name="lang", x=1000,y=560,w=120,font=90,fText=CHAR.icon.language,code=goScene'lang'}, WIDGET.newButton{name="manual", x=1160,y=400,w=120,fText=TEXTURE.sure,code=goScene'manual'}, - WIDGET.newButton{name="quit", x=1160,y=560,w=120,font=60,fText=CHAR.icon.thick_cross,code=function()VOC.play('bye')SCN.swapTo('quit','slowFade')end}, + WIDGET.newButton{name="quit", x=1160,y=560,w=120,font=60,fText=CHAR.icon.cross_thick,code=function()VOC.play('bye')SCN.swapTo('quit','slowFade')end}, } return scene diff --git a/parts/scenes/net_game.lua b/parts/scenes/net_game.lua index 006f1442..94399206 100644 --- a/parts/scenes/net_game.lua +++ b/parts/scenes/net_game.lua @@ -344,7 +344,7 @@ scene.widgetList={ WIDGET.newKey{name="spectate",x=1060,y=610,w=360,h=90,color='lO',font=35, code=_setSpectate,hideF=_hideF_ingame}, WIDGET.newKey{name="cancel", x=1060,y=560,w=360,h=120,color='lH',font=40,code=_setCancel,hideF=_hideF_ingame2}, WIDGET.newKey{name="chat", x=390,y=45,w=60,fText="···", code=_switchChat}, - WIDGET.newKey{name="quit", x=890,y=45,w=60,font=30,fText=CHAR.icon.thick_cross,code=_quit}, + WIDGET.newKey{name="quit", x=890,y=45,w=60,font=30,fText=CHAR.icon.cross_thick,code=_quit}, } return scene diff --git a/parts/scenes/replays.lua b/parts/scenes/replays.lua index 95624fdd..2feecc97 100644 --- a/parts/scenes/replays.lua +++ b/parts/scenes/replays.lua @@ -158,10 +158,10 @@ end scene.widgetList={ listBox, - WIDGET.newButton{name="export",x=200,y=640,w=70,color='lG',code=pressKey"cC",fText=GC.DO{50,50,{'fRect',8,44,34,4},{'fRect',22,17,6,23},{'fPoly',25,5,10,20,40,20}}}, - WIDGET.newButton{name="import",x=300,y=640,w=70,color='lN',code=pressKey"cV",fText=GC.DO{50,50,{'fRect',8,44,34,4},{'fRect',22,5,6,23},{'fPoly',25,40,10,25,40,25}}}, + WIDGET.newButton{name="export",x=200,y=640,w=70,color='lG',code=pressKey"cC",font=50,fText=CHAR.icon.export}, + WIDGET.newButton{name="import",x=300,y=640,w=70,color='lN',code=pressKey"cV",font=50,fText=CHAR.icon.import}, WIDGET.newButton{name="play", x=700,y=640,w=170,h=80,color='lY',code=pressKey"return",font=65,fText=CHAR.icon.play}, - WIDGET.newButton{name="delete",x=850,y=640,w=80,h=80,color='lR',code=pressKey"delete",font=40,fText=CHAR.icon.thick_cross}, + WIDGET.newButton{name="delete",x=850,y=640,w=80,h=80,color='lR',code=pressKey"delete",font=40,fText=CHAR.icon.cross_thick}, WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene}, } diff --git a/parts/scenes/setting_touch.lua b/parts/scenes/setting_touch.lua index 0cd81e60..16347e6c 100644 --- a/parts/scenes/setting_touch.lua +++ b/parts/scenes/setting_touch.lua @@ -116,10 +116,10 @@ scene.widgetList={ WIDGET.newSelector{name="snap", x=750,y=90,w=200,h=80,color='Y',list={1,10,20,40,60,80},disp=function()return snapUnit end,code=function(i)snapUnit=i end}, WIDGET.newButton{name="option", x=530,y=190,w=200,h=80,font=60,fText=CHAR.icon.menu,code=function()SCN.go('setting_touchSwitch')end}, WIDGET.newButton{name="back", x=750,y=190,w=200,h=80,font=60,fText=CHAR.icon.back,code=backScene}, - WIDGET.newKey{name="save1", x=475,y=290,w=90,h=70,code=_save1}, - WIDGET.newKey{name="load1", x=585,y=290,w=90,h=70,code=_load1}, - WIDGET.newKey{name="save2", x=695,y=290,w=90,h=70,code=_save2}, - WIDGET.newKey{name="load2", x=805,y=290,w=90,h=70,code=_load2}, + WIDGET.newKey{name="save1", x=475,y=290,w=90,h=70,code=_save1,font=45,fText=CHAR.icon.saveOne}, + WIDGET.newKey{name="load1", x=585,y=290,w=90,h=70,code=_load1,font=45,fText=CHAR.icon.loadOne}, + WIDGET.newKey{name="save2", x=695,y=290,w=90,h=70,code=_save2,font=45,fText=CHAR.icon.saveTwo}, + WIDGET.newKey{name="load2", x=805,y=290,w=90,h=70,code=_load2,font=45,fText=CHAR.icon.loadTwo}, WIDGET.newSlider{name="size", x=440,y=370,w=460,unit=19,font=40,show="vkSize", disp=function() return VK_org[selected].r/10-1