为了不再需要控件模块统一添加back按钮文本,返回按钮统一使用图标;含义接近"更多"按钮也改用图标
This commit is contained in:
@@ -29,11 +29,6 @@ function LANG.init(langList,publicText)--Attention, calling this will destory al
|
||||
if type(rawget(L,"getTip"))=='table'then
|
||||
setmetatable(L.getTip,tipMeta)
|
||||
end
|
||||
|
||||
--set global name for all back button
|
||||
for _,v in next,L.WidgetText do
|
||||
v.back=L.back
|
||||
end
|
||||
end
|
||||
|
||||
LANG.init,LANG.setLangList,LANG.setPublicText=nil
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
local C=COLOR
|
||||
return{
|
||||
back="Back",
|
||||
anykey="Press a key!",
|
||||
sureQuit="Press again to exit",
|
||||
newVersion="Thanks for updating! Changelog:",
|
||||
@@ -227,7 +226,6 @@ return{
|
||||
setting="Settings",
|
||||
stat="Statistics",
|
||||
music="Music & SE",
|
||||
about="About",
|
||||
dict="Zictionary",
|
||||
manual="Manual",
|
||||
},
|
||||
@@ -387,7 +385,6 @@ return{
|
||||
setting_touch={
|
||||
default="Default",
|
||||
snap="Snap",
|
||||
option="Options",
|
||||
save1="Save1",
|
||||
load1="Load1",
|
||||
save2="Save2",
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
return{
|
||||
fallback=4,
|
||||
back="Retour",
|
||||
anykey="Appuyez sur n'importe quelle touche",
|
||||
sureQuit="Appuyez à nouveau pour sortir",
|
||||
newVersion="Merci d'avoir mis le jeu à jour ! Les nouvelles fonctionnalités sont listées ci-dessous.",
|
||||
@@ -203,7 +202,6 @@ return{
|
||||
setting="Paramètres",
|
||||
stat="Statistiques",
|
||||
-- music="Music & SE",
|
||||
-- about="About",
|
||||
dict="Zictionary",
|
||||
manual="Manuel",
|
||||
},
|
||||
@@ -357,7 +355,6 @@ return{
|
||||
setting_touch={
|
||||
default="Par défaut",
|
||||
snap="Snap",
|
||||
option="Options",
|
||||
-- save1="Save1",
|
||||
-- load1="Load1",
|
||||
-- save2="Save2",
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
local C=COLOR
|
||||
return{
|
||||
fallback=4,
|
||||
back="Voltar",
|
||||
anykey="Pressione qualquer tecla",
|
||||
sureQuit="Aparte novamente para sair",
|
||||
newVersion="Obrigado por atualizar! Veja as mudanças abaixo.",
|
||||
@@ -226,7 +225,6 @@ return{
|
||||
setting="Config.",
|
||||
stat="Stats",
|
||||
-- music="Music & SE",
|
||||
-- about="About",
|
||||
dict="Zictionary",
|
||||
manual="Manual",
|
||||
},
|
||||
@@ -386,7 +384,6 @@ return{
|
||||
setting_touch={
|
||||
default="Default",
|
||||
snap="Encaixo",
|
||||
option="Opção",
|
||||
-- save1="Save1",
|
||||
-- load1="Load1",
|
||||
-- save2="Save2",
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
return{
|
||||
fallback=4,
|
||||
back="Atrás",
|
||||
anykey="Pulsa cualquier tecla",
|
||||
sureQuit="Pulsa de nuevo para salir",
|
||||
newVersion="¡Gracias por actualizar! Detalles a continuación:",
|
||||
@@ -204,7 +203,6 @@ return{
|
||||
setting="Opciones",
|
||||
stat="Estadísticas",
|
||||
music="Música y SFX",
|
||||
about="Acerca del Juego",
|
||||
dict="Zictionary",
|
||||
manual="Manual",
|
||||
},
|
||||
@@ -360,7 +358,6 @@ return{
|
||||
setting_touch={
|
||||
default="Por Defecto",
|
||||
snap="Snap",
|
||||
option="Opciones",
|
||||
-- save1="Save1",
|
||||
-- load1="Load1",
|
||||
-- save2="Save2",
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
return{
|
||||
fallback=4,
|
||||
back="X",
|
||||
anykey="↓□↓",
|
||||
newVersion="&!!!???↓↓",
|
||||
httpTimeout="e??????x",
|
||||
@@ -103,7 +102,6 @@ return{
|
||||
setting="_?_",
|
||||
stat="=___",
|
||||
music="~~~ & =><=",
|
||||
about="?",
|
||||
dict="z",
|
||||
manual="???",
|
||||
},
|
||||
@@ -235,7 +233,6 @@ return{
|
||||
setting_touch={
|
||||
default="$0",
|
||||
snap="_ _",
|
||||
option="_?",
|
||||
save1=">1",
|
||||
load1="1>",
|
||||
save2=">2",
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
local C=COLOR
|
||||
return{
|
||||
back="返回",
|
||||
anykey="按任意键继续",
|
||||
sureQuit="再按一次退出",
|
||||
newVersion="感谢更新!更新内容如下",
|
||||
@@ -227,7 +226,6 @@ return{
|
||||
setting="设置",
|
||||
stat="统计信息",
|
||||
music="音乐&音效",
|
||||
about="关于",
|
||||
dict="小Z词典",
|
||||
manual="说明书",
|
||||
},
|
||||
@@ -386,7 +384,6 @@ return{
|
||||
setting_touch={
|
||||
default="默认组合",
|
||||
snap="吸附",
|
||||
option="选项",
|
||||
save1="保存1",
|
||||
load1="读取1",
|
||||
save2="保存2",
|
||||
|
||||
@@ -46,7 +46,7 @@ scene.widgetList={
|
||||
WIDGET.newButton{name="staff", x=1140, y=400,w=220,h=80,font=35,code=goScene'staff'},
|
||||
WIDGET.newButton{name="his", x=1140, y=500,w=220,h=80,font=35,code=goScene'history'},
|
||||
WIDGET.newButton{name="qq", x=1140, y=600,w=220,h=80,font=35,code=function()love.system.openURL("tencent://message/?uin=1046101471&Site=&Menu=yes")end,hide=MOBILE},
|
||||
WIDGET.newButton{name="back", x=640, y=600,w=170,h=80,font=35,code=backScene},
|
||||
WIDGET.newButton{name="back", x=640, y=600,w=170,h=80,fText=TEXTURE.back,font=35,code=backScene},
|
||||
}
|
||||
|
||||
return scene
|
||||
@@ -8,7 +8,7 @@ end
|
||||
|
||||
scene.widgetList={
|
||||
WIDGET.newText{name="title",x=80,y=50,font=70,align='L'},
|
||||
WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,font=40,code=backScene},
|
||||
WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,fText=TEXTURE.back,font=40,code=backScene},
|
||||
}
|
||||
|
||||
return scene
|
||||
@@ -321,7 +321,7 @@ scene.widgetList={
|
||||
WIDGET.newSwitch{name="slide", x=240,y=420,w=60, font=40,disp=function()return slide end, code=pressKey"e",hideF=ifGaming},
|
||||
WIDGET.newSwitch{name="pathVis",x=240,y=510,w=60, font=40,disp=function()return pathVis end, code=pressKey"r",hideF=function()return state==1 or not slide end},
|
||||
WIDGET.newSwitch{name="revKB", x=240,y=600,w=60, font=40,disp=function()return revKB end, code=pressKey"t",hideF=ifGaming},
|
||||
WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80, font=40,code=backScene},
|
||||
WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,fText=TEXTURE.back,font=40,code=backScene},
|
||||
}
|
||||
|
||||
return scene
|
||||
@@ -492,7 +492,7 @@ scene.widgetList={
|
||||
WIDGET.newKey{name="record2", x=1100,y=450,w=220,h=50,fText="", color='H',code=pressKey"2",hideF=function()return state==2 end},
|
||||
WIDGET.newKey{name="replay1", x=1245,y=390,w=50,fText="!", color='G',code=pressKey"c1",hideF=function()return state==2 or #repeater.seq[1]==0 end},
|
||||
WIDGET.newKey{name="replay2", x=1245,y=450,w=50,fText="!", color='G',code=pressKey"c2",hideF=function()return state==2 or #repeater.seq[2]==0 end},
|
||||
WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=40,code=backScene},
|
||||
WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,fText=TEXTURE.back,font=40,code=backScene},
|
||||
}
|
||||
|
||||
return scene
|
||||
@@ -119,7 +119,7 @@ scene.widgetList={
|
||||
WIDGET.newSelector{name="level", x=640,y=640,w=200,list={'A_Z','Z_A','Tech1','Tech2','KeyTest1','KeyTest2','Hello','Roll1','Roll2','Roll3','ZZZ','ZXZX','ZMZM','Stair','Stair2','Stair3','BPW'},disp=function()return levelName end,code=function(i)levelName=i;targetString=levels[i]end,hideF=function()return state>0 end},
|
||||
WIDGET.newButton{name="reset", x=160,y=100,w=180,h=100,color='lG',font=40,code=pressKey"space"},
|
||||
WIDGET.newButton{name="keyboard", x=160,y=210,w=180,h=100,code=function()love.keyboard.setTextInput(true,0,select(2,SCR.xOy:transformPoint(0,500)),1,1)end,hide=not MOBILE},
|
||||
WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=40,code=backScene},
|
||||
WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,fText=TEXTURE.back,font=40,code=backScene},
|
||||
}
|
||||
|
||||
return scene
|
||||
@@ -236,7 +236,7 @@ end
|
||||
|
||||
scene.widgetList={
|
||||
WIDGET.newButton{name="reset",x=1140,y=540,w=170,h=80,font=40,color='lG',code=restart},
|
||||
WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,font=40,code=backScene},
|
||||
WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,fText=TEXTURE.back,font=40,code=backScene},
|
||||
}
|
||||
|
||||
return scene
|
||||
@@ -109,7 +109,7 @@ scene.widgetList={
|
||||
WIDGET.newKey{name="/",x=450,y=600,w=90,fText="/",color='lB',font=50,code=pressKey"/"},
|
||||
WIDGET.newKey{name="<",x=550,y=300,w=90,fText="<",color='lR',font=50,code=pressKey"backspace"},
|
||||
WIDGET.newKey{name="=",x=550,y=400,w=90,fText="=",color='lY',font=50,code=pressKey"return"},
|
||||
WIDGET.newKey{name="back",x=1140,y=640,w=170,h=80,font=40,code=backScene},
|
||||
WIDGET.newKey{name="back",x=1140,y=640,w=170,h=80,fText=TEXTURE.back,font=40,code=backScene},
|
||||
}
|
||||
|
||||
return scene
|
||||
@@ -128,7 +128,7 @@ function scene.draw()
|
||||
end
|
||||
|
||||
scene.widgetList={
|
||||
WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,font=40,code=backScene},
|
||||
WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,fText=TEXTURE.back,font=40,code=backScene},
|
||||
}
|
||||
|
||||
return scene
|
||||
@@ -302,7 +302,7 @@ function scene.draw()
|
||||
end
|
||||
|
||||
scene.widgetList={
|
||||
WIDGET.newKey{name="back",x=1140,y=80,w=170,h=80,font=40,code=backScene},
|
||||
WIDGET.newKey{name="back",x=1140,y=80,w=170,h=80,fText=TEXTURE.back,font=40,code=backScene},
|
||||
}
|
||||
|
||||
return scene
|
||||
@@ -233,7 +233,7 @@ function scene.draw()
|
||||
end
|
||||
|
||||
scene.widgetList={
|
||||
WIDGET.newButton{name="back",x=1140,y=60,w=170,h=80,font=40,code=pressKey"escape"},
|
||||
WIDGET.newButton{name="back",x=1140,y=60,w=170,h=80,fText=TEXTURE.back,font=40,code=pressKey"escape"},
|
||||
}
|
||||
|
||||
return scene
|
||||
@@ -279,7 +279,7 @@ scene.widgetList={
|
||||
WIDGET.newButton{name="reset", x=155,y=100,w=180,h=100,color='lG',font=40,code=pressKey"r"},
|
||||
WIDGET.newButton{name="mode", x=155,y=220,w=180,h=100,font=40,code=pressKey"q",hideF=function()return state~=0 end},
|
||||
WIDGET.newSwitch{name="arcade", x=230,y=330,font=40,disp=function()return arcade end,code=pressKey"w",hideF=function()return state~=0 end},
|
||||
WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=40,code=backScene},
|
||||
WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,fText=TEXTURE.back,font=40,code=backScene},
|
||||
}
|
||||
|
||||
return scene
|
||||
@@ -164,7 +164,7 @@ function scene.draw()
|
||||
end
|
||||
|
||||
scene.widgetList={
|
||||
WIDGET.newKey{name="back",x=1140,y=60,w=170,h=80,color='D',font=40,code=pressKey"escape"},
|
||||
WIDGET.newKey{name="back",x=1140,y=60,w=170,h=80,color='D',fText=TEXTURE.back,font=40,code=pressKey"escape"},
|
||||
}
|
||||
|
||||
return scene
|
||||
@@ -172,7 +172,7 @@ end
|
||||
|
||||
scene.widgetList={
|
||||
WIDGET.newKey{name="reset",x=640,y=45,w=150,h=50,font=35,code=pressKey"r"},
|
||||
WIDGET.newKey{name="back",x=640,y=675,w=150,h=50,font=35,code=backScene},
|
||||
WIDGET.newKey{name="back",x=640,y=675,w=150,h=50,fText=TEXTURE.back,font=35,code=backScene},
|
||||
}
|
||||
|
||||
return scene
|
||||
@@ -133,7 +133,7 @@ function scene.draw()
|
||||
end
|
||||
|
||||
scene.widgetList={
|
||||
WIDGET.newKey{name="back",x=640,y=675,w=150,h=50,font=35,code=backScene},
|
||||
WIDGET.newKey{name="back",x=640,y=675,w=150,h=50,fText=TEXTURE.back,font=35,code=backScene},
|
||||
}
|
||||
|
||||
return scene
|
||||
@@ -173,7 +173,7 @@ scene.widgetList={
|
||||
WIDGET.newSwitch{name="blind", x=240,y=330,w=60, font=40,disp=function()return blind end, code=pressKey"q",hideF=function()return state==1 end},
|
||||
WIDGET.newSwitch{name="disappear", x=240,y=420,w=60, font=40,disp=function()return disappear end,code=pressKey"w",hideF=function()return state==1 end},
|
||||
WIDGET.newSwitch{name="tapFX", x=240,y=510,w=60, font=40,disp=function()return tapFX end, code=pressKey"e",hideF=function()return state==1 end},
|
||||
WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=40,code=backScene},
|
||||
WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,fText=TEXTURE.back,font=40,code=backScene},
|
||||
}
|
||||
|
||||
return scene
|
||||
@@ -73,7 +73,7 @@ end
|
||||
|
||||
scene.widgetList={
|
||||
WIDGET.newKey{name="tap",x=640,y=540,w=626,h=260,fText="TAP",color='Z',font=100,code=pressKey"button"},
|
||||
WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,font=40,code=backScene},
|
||||
WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,fText=TEXTURE.back,font=40,code=backScene},
|
||||
}
|
||||
|
||||
return scene
|
||||
@@ -302,7 +302,7 @@ scene.widgetList={
|
||||
WIDGET.newSwitch{name="next", x=240,y=235,font=40,disp=function()return nexts end,code=pressKey"q",hideF=function()return state==1 end},
|
||||
WIDGET.newSwitch{name="blind", x=240,y=305,font=40,disp=function()return blind end,code=pressKey"w",hideF=function()return state==1 end},
|
||||
WIDGET.newSwitch{name="fast", x=240,y=375,font=30,disp=function()return fast end,code=pressKey"e",hideF=function()return state==1 end},
|
||||
WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=40,code=backScene},
|
||||
WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,fText=TEXTURE.back,font=40,code=backScene},
|
||||
}
|
||||
|
||||
return scene
|
||||
@@ -198,7 +198,7 @@ scene.widgetList={
|
||||
WIDGET.newKey{name="sequence", x=450, y=640,w=240,h=80,color='W',font=25,code=pressKey"s"},
|
||||
WIDGET.newKey{name="mission", x=730, y=640,w=240,h=80,color='N',font=25,code=pressKey"m"},
|
||||
|
||||
WIDGET.newButton{name="back", x=1140, y=640, w=170,h=80,font=40,code=pressKey"escape"},
|
||||
WIDGET.newButton{name="back", x=1140, y=640, w=170,h=80,fText=TEXTURE.back,font=40,code=pressKey"escape"},
|
||||
}
|
||||
|
||||
return scene
|
||||
@@ -38,7 +38,7 @@ scene.widgetList={
|
||||
WIDGET.newSwitch{name="deepDrop", x=1160, y=440, font=30,disp=CUSval("deepDrop"), code=CUSrev("deepDrop")},
|
||||
WIDGET.newSwitch{name="bone", x=1160, y=530, disp=CUSval("bone"), code=CUSrev("bone")},
|
||||
|
||||
WIDGET.newButton{name="back", x=1140, y=640, w=170,h=80, font=40,code=backScene},
|
||||
WIDGET.newButton{name="back", x=1140, y=640, w=170,h=80,fText=TEXTURE.back,font=40,code=backScene},
|
||||
}
|
||||
|
||||
return scene
|
||||
@@ -485,7 +485,7 @@ scene.widgetList={
|
||||
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},
|
||||
|
||||
WIDGET.newButton{name="back", x=1140, y=640, w=170,h=80,font=40,code=backScene},
|
||||
WIDGET.newButton{name="back", x=1140, y=640,w=170,h=80,fText=TEXTURE.back,font=40,code=backScene},
|
||||
}
|
||||
|
||||
return scene
|
||||
@@ -236,7 +236,7 @@ scene.widgetList={
|
||||
WIDGET.newButton{name="paste", x=1140, y=540,w=170,h=80, color='lB',font=40,code=pressKey"cV"},
|
||||
WIDGET.newSwitch{name="mission",x=1150, y=350,disp=CUSval("missionKill"),code=CUSrev("missionKill")},
|
||||
|
||||
WIDGET.newButton{name="back", x=1140, y=640, w=170,h=80, font=40,code=backScene},
|
||||
WIDGET.newButton{name="back", x=1140, y=640, w=170,h=80,fText=TEXTURE.back,font=40,code=backScene},
|
||||
}
|
||||
|
||||
return scene
|
||||
@@ -237,7 +237,7 @@ scene.widgetList={
|
||||
|
||||
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="back",x=1140,y=640,w=170,h=80,font=40,code=backScene},
|
||||
WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,fText=TEXTURE.back,font=40,code=backScene},
|
||||
}
|
||||
|
||||
return scene
|
||||
@@ -188,7 +188,7 @@ scene.widgetList={
|
||||
WIDGET.newKey{name="down", x=1130, y=560,w=60,h=90,font=35,code=pressKey"down",hide=not MOBILE},
|
||||
WIDGET.newKey{name="pageup", x=1210, y=460,w=80,h=90,font=35,code=pressKey"pageup",hide=not MOBILE},
|
||||
WIDGET.newKey{name="pagedown", x=1210, y=560,w=80,h=90,font=35,code=pressKey"pagedown",hide=not MOBILE},
|
||||
WIDGET.newButton{name="back", x=1165, y=60,w=170,h=80,font=40,code=backScene},
|
||||
WIDGET.newButton{name="back", x=1165, y=60,w=170,h=80,fText=TEXTURE.back,font=40,code=backScene},
|
||||
}
|
||||
|
||||
return scene
|
||||
@@ -24,7 +24,7 @@ end
|
||||
|
||||
scene.widgetList={
|
||||
WIDGET.newTextBox{name="texts",x=30,y=45,w=1000,h=640,font=20,fix=true},
|
||||
WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,font=40,code=backScene},
|
||||
WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,fText=TEXTURE.back,font=40,code=backScene},
|
||||
}
|
||||
|
||||
return scene
|
||||
@@ -14,7 +14,7 @@ scene.widgetList={
|
||||
WIDGET.newButton{name="sp", x=200, y=250,w=200,h=120,fText="Español", font=35,code=setLang(6)},
|
||||
WIDGET.newButton{name="pt", x=420, y=250,w=200,h=120,fText="Português", font=35,code=setLang(7)},
|
||||
WIDGET.newButton{name="symbol", x=640, y=250,w=200,h=120,fText="?????", font=35,code=setLang(8)},
|
||||
WIDGET.newButton{name="back", x=640, y=600,w=200,h=80,font=35,code=backScene},
|
||||
WIDGET.newButton{name="back", x=640, y=600,w=200,h=80,fText=TEXTURE.back,font=35,code=backScene},
|
||||
}
|
||||
|
||||
return scene
|
||||
@@ -38,7 +38,7 @@ scene.widgetList={
|
||||
passwordBox,
|
||||
WIDGET.newSwitch{name="keepPW", x=900,y=420,disp=function()return savePW end,code=function()savePW=not savePW end},
|
||||
WIDGET.newKey{name="login", x=1140, y=540,w=170,h=80,font=40,code=login},
|
||||
WIDGET.newButton{name="back", x=1140, y=640,w=170,h=80,font=40,code=backScene},
|
||||
WIDGET.newButton{name="back", x=1140, y=640,w=170,h=80,fText=TEXTURE.back,font=40,code=backScene},
|
||||
}
|
||||
|
||||
return scene
|
||||
@@ -182,8 +182,8 @@ scene.widgetList={
|
||||
{"dArc",53,31,40,2.3,3.9},
|
||||
}
|
||||
},
|
||||
WIDGET.newButton{name="about", x=-110,y=670,w=600,h=70, color='lB',font=35,align='R',edge=30,code=pressKey"x"},
|
||||
WIDGET.newButton{name="back", x=1390,y=670,w=600,h=70, color='lR',font=40,align='L',edge=30,code=backScene},
|
||||
WIDGET.newButton{name="about", x=-110,y=670,w=600,h=70, color='lB',fText=TEXTURE.more,font=35,align='R',edge=30,code=pressKey"x"},
|
||||
WIDGET.newButton{name="back", x=1390,y=670,w=600,h=70, color='lR',fText=TEXTURE.back,font=40,align='L',edge=30,code=backScene},
|
||||
}
|
||||
|
||||
return scene
|
||||
@@ -24,7 +24,7 @@ end
|
||||
|
||||
scene.widgetList={
|
||||
WIDGET.newTextBox{name="texts",x=30,y=45,w=1000,h=640,font=15,fix=true},
|
||||
WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,font=40,code=backScene},
|
||||
WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,fText=TEXTURE.back,font=40,code=backScene},
|
||||
}
|
||||
|
||||
return scene
|
||||
@@ -153,7 +153,7 @@ scene.widgetList={
|
||||
WIDGET.newText{name="title", x=80,y=50,font=70,align='L'},
|
||||
WIDGET.newText{name="unranked", x=1200,y=60,color='Y',font=50,align='R',hideF=function()return scoreValid()end},
|
||||
WIDGET.newButton{name="reset", x=1140,y=540,w=170,h=80,font=25,code=pressKey"tab"},
|
||||
WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=40,code=backScene},
|
||||
WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,fText=TEXTURE.back,font=40,code=backScene},
|
||||
}
|
||||
|
||||
return scene
|
||||
@@ -308,7 +308,7 @@ end
|
||||
scene.widgetList={
|
||||
WIDGET.newKey{name="mod", x=140,y=655,w=220,h=80,font=35,code=goScene'mod'},
|
||||
WIDGET.newButton{name="start", x=1040,y=655,w=180,h=80,font=40,code=pressKey"return",hideF=function()return not mapCam.sel end},
|
||||
WIDGET.newButton{name="back", x=1200,y=655,w=120,h=80,font=40,code=backScene},
|
||||
WIDGET.newButton{name="back", x=1200,y=655,w=120,h=80,fText=TEXTURE.back,font=40,code=backScene},
|
||||
}
|
||||
|
||||
return scene
|
||||
@@ -100,7 +100,7 @@ scene.widgetList={
|
||||
WIDGET.newButton{name="play", x=200, y=390,w=120, font=35,code=pressKey"space"},
|
||||
WIDGET.newButton{name="down", x=200, y=530,w=120, font=55,code=pressKey"down",hideF=function()return selected==#bgmList end},
|
||||
WIDGET.newButton{name="sound", x=1140, y=540,w=170,h=80,font=40,code=pressKey"tab"},
|
||||
WIDGET.newButton{name="back", x=1140, y=640,w=170,h=80,font=40,code=backScene},
|
||||
WIDGET.newButton{name="back", x=1140, y=640,w=170,h=80,fText=TEXTURE.back,font=40,code=backScene},
|
||||
}
|
||||
|
||||
return scene
|
||||
@@ -17,7 +17,7 @@ end
|
||||
scene.widgetList={
|
||||
WIDGET.newKey{name="setting",fText=TEXTURE.setting,x=1200,y=160,w=90,h=90,code=goScene'setting_game'},
|
||||
WIDGET.newKey{name="match",x=640,y=500,w=760,h=140,font=60,code=function()LOG.print("Coming soon 开发中,敬请期待")end},
|
||||
WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,font=40,code=backScene},
|
||||
WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,fText=TEXTURE.back,font=40,code=backScene},
|
||||
}
|
||||
|
||||
return scene
|
||||
@@ -36,7 +36,7 @@ scene.widgetList={
|
||||
lastLogoutTime=TIME()
|
||||
end
|
||||
end},
|
||||
WIDGET.newButton{name="back", x=1140, y=640,w=170,h=80,font=40,code=backScene},
|
||||
WIDGET.newButton{name="back", x=1140, y=640,w=170,h=80,fText=TEXTURE.back,font=40,code=backScene},
|
||||
}
|
||||
|
||||
return scene
|
||||
@@ -213,7 +213,7 @@ scene.widgetList={
|
||||
WIDGET.newKey{name="new", x=500,y=620,w=140,h=140,font=20,code=pressKey"n"},
|
||||
WIDGET.newKey{name="new2", x=700,y=620,w=140,h=140,font=20,code=pressKey"m"},
|
||||
WIDGET.newKey{name="join", x=900,y=620,w=140,h=140,font=40,code=pressKey"return",hideF=function()return #NET.roomList==0 or NET.getlock('enterRoom')end},
|
||||
WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=40,code=backScene},
|
||||
WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,fText=TEXTURE.back,font=40,code=backScene},
|
||||
}
|
||||
|
||||
return scene
|
||||
@@ -25,7 +25,7 @@ scene.widgetList={
|
||||
WIDGET.newInputBox{name="password", x=380, y=400,w=626,h=60,secret=true,regex="[ -~]"},
|
||||
WIDGET.newInputBox{name="password2",x=380, y=500,w=626,h=60,secret=true,regex="[ -~]"},
|
||||
WIDGET.newKey{name="register", x=1140, y=540,w=170,h=80,font=40,code=register},
|
||||
WIDGET.newButton{name="back", x=1140, y=640,w=170,h=80,font=40,code=backScene},
|
||||
WIDGET.newButton{name="back", x=1140, y=640,w=170,h=80,fText=TEXTURE.back,font=40,code=backScene},
|
||||
}
|
||||
|
||||
return scene
|
||||
@@ -78,7 +78,7 @@ scene.widgetList={
|
||||
LOG.print(text.dataCorrupted,'warn')
|
||||
end
|
||||
end},
|
||||
WIDGET.newButton{name="back", x=640,y=620,w=200,h=80,font=40,code=backScene},
|
||||
WIDGET.newButton{name="back", x=640,y=620,w=200,h=80,fText=TEXTURE.back,font=40,code=backScene},
|
||||
}
|
||||
|
||||
return scene
|
||||
@@ -96,7 +96,7 @@ scene.widgetList={
|
||||
_.sddas,_.sdarr=0,2
|
||||
_.ihs,_.irs,_.ims=false,false,false
|
||||
end},
|
||||
WIDGET.newButton{name="back", x=1140, y=640,w=170,h=80,font=40,code=backScene},
|
||||
WIDGET.newButton{name="back", x=1140, y=640,w=170,h=80,fText=TEXTURE.back,font=40,code=backScene},
|
||||
}
|
||||
|
||||
return scene
|
||||
@@ -44,7 +44,7 @@ scene.widgetList={
|
||||
end
|
||||
end
|
||||
end},
|
||||
WIDGET.newButton{name="back", x=1140, y=640, w=170,h=80, font=40,code=backScene},
|
||||
WIDGET.newButton{name="back", x=1140, y=640, w=170,h=80,fText=TEXTURE.back,font=40,code=backScene},
|
||||
}
|
||||
|
||||
return scene
|
||||
@@ -139,7 +139,7 @@ scene.widgetList={
|
||||
|
||||
WIDGET.newKey{name="restart",x=160,y=670,w=200,h=60,code=function()setSel(0)end},
|
||||
|
||||
WIDGET.newButton{name="back",x=1140,y=640,w=190,h=80,font=40,code=backScene},
|
||||
WIDGET.newButton{name="back",x=1140,y=640,w=190,h=80,fText=TEXTURE.back,font=40,code=backScene},
|
||||
}
|
||||
|
||||
return scene
|
||||
@@ -100,7 +100,7 @@ scene.widgetList={
|
||||
end
|
||||
SFX.play('hold')
|
||||
end},
|
||||
WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=40,code=backScene},
|
||||
WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,fText=TEXTURE.back,font=40,code=backScene},
|
||||
}
|
||||
|
||||
return scene
|
||||
@@ -69,7 +69,7 @@ scene.widgetList={
|
||||
WIDGET.newSlider{name="voc", x=300, y=610,w=420, change=function()VOC.play('test')end,disp=SETval("voc"),code=SETsto("voc")},
|
||||
WIDGET.newSelector{name="cv", x=1100, y=380,w=200, list={'miya','naki'},disp=function()return cv end,code=function(i)cv=i end},
|
||||
WIDGET.newButton{name="apply", x=1100, y=460,w=180,h=80, code=function()SETTING.cv=cv VOC.loadAll()end,hideF=function()return SETTING.cv==cv end},
|
||||
WIDGET.newButton{name="back", x=1140, y=640,w=170,h=80, font=40,code=backScene},
|
||||
WIDGET.newButton{name="back", x=1140, y=640,w=170,h=80,fText=TEXTURE.back,font=40,code=backScene},
|
||||
}
|
||||
|
||||
return scene
|
||||
@@ -193,8 +193,8 @@ scene.widgetList={
|
||||
selected=false
|
||||
end},
|
||||
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=40,code=function()SCN.go('setting_touchSwitch')end},
|
||||
WIDGET.newButton{name="back", x=750,y=190,w=200,h=80,font=35,code=backScene},
|
||||
WIDGET.newButton{name="option", x=530,y=190,w=200,h=80,fText=TEXTURE.more,font=40,code=function()SCN.go('setting_touchSwitch')end},
|
||||
WIDGET.newButton{name="back", x=750,y=190,w=200,h=80,fText=TEXTURE.back,font=35,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},
|
||||
|
||||
@@ -55,7 +55,7 @@ scene.widgetList={
|
||||
WIDGET.newSlider{name="tchW", x=140, y=860, w=1000, font=35,disp=SETval("VKTchW"),code=function(i)SETTING.VKTchW=i SETTING.VKCurW=math.max(SETTING.VKCurW,i)end,hideF=notTrack},
|
||||
WIDGET.newSlider{name="curW", x=140, y=930, w=1000, font=35,disp=SETval("VKCurW"),code=function(i)SETTING.VKCurW=i SETTING.VKTchW=math.min(SETTING.VKTchW,i)end,hideF=notTrack},
|
||||
|
||||
WIDGET.newButton{name="back", x=1140, y=640, w=170,h=80,font=40,code=backScene},
|
||||
WIDGET.newButton{name="back", x=1140, y=640, w=170,h=80,fText=TEXTURE.back,font=40,code=backScene},
|
||||
}
|
||||
|
||||
return scene
|
||||
@@ -50,7 +50,7 @@ scene.widgetList={
|
||||
SETTING.bg=not SETTING.bg
|
||||
BG.set()
|
||||
end},
|
||||
WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=40,code=backScene},
|
||||
WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,fText=TEXTURE.back,font=40,code=backScene},
|
||||
}
|
||||
|
||||
return scene
|
||||
@@ -105,7 +105,7 @@ scene.widgetList={
|
||||
WIDGET.newSwitch{name="pc", x=515, y=660,font=25,disp=function()return pc end,sound=false,code=pressKey"4"},
|
||||
|
||||
WIDGET.newButton{name="music", x=1140, y=540,w=170,h=80,font=40,code=pressKey"tab"},
|
||||
WIDGET.newButton{name="back", x=1140, y=640,w=170,h=80,font=40,code=backScene},
|
||||
WIDGET.newButton{name="back", x=1140, y=640,w=170,h=80,fText=TEXTURE.back,font=40,code=backScene},
|
||||
}
|
||||
|
||||
return scene
|
||||
@@ -103,7 +103,7 @@ function scene.draw()
|
||||
end
|
||||
|
||||
scene.widgetList={
|
||||
WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,font=40,code=backScene},
|
||||
WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,fText=TEXTURE.back,font=40,code=backScene},
|
||||
}
|
||||
|
||||
return scene
|
||||
@@ -98,7 +98,7 @@ end
|
||||
scene.widgetList={
|
||||
WIDGET.newButton{name="path",x=1000,y=540,w=250,h=80,font=25,code=function()love.system.openURL(SAVEDIR)end,hide=MOBILE},
|
||||
WIDGET.newButton{name="save",x=1000,y=640,w=250,h=80,font=25,code=goScene'savedata'},
|
||||
WIDGET.newButton{name="back",x=640,y=620,w=200,h=80,font=35,code=backScene},
|
||||
WIDGET.newButton{name="back",x=640,y=620,w=200,h=80,fText=TEXTURE.back,font=35,code=backScene},
|
||||
}
|
||||
|
||||
return scene
|
||||
@@ -131,5 +131,22 @@ TEXTURE.question=DOGC{45,80,
|
||||
{'print',"?",0,-30},
|
||||
}
|
||||
|
||||
--More mark
|
||||
TEXTURE.more=DOGC{60,15,
|
||||
{'fCirc',10,7,6},
|
||||
{'fCirc',30,7,6},
|
||||
{'fCirc',50,7,6},
|
||||
}
|
||||
|
||||
--Back mark
|
||||
TEXTURE.back=DOGC{75,55,
|
||||
{'setLW',6},
|
||||
{'line',5,10,55,10},
|
||||
{'line',10,40,55,40},
|
||||
{'dArc',55,25,15,-1.6,1.6},
|
||||
{'setLW',4},
|
||||
{'line',20,50,10,40,20,30},
|
||||
}
|
||||
|
||||
gc.setCanvas()
|
||||
return TEXTURE
|
||||
Reference in New Issue
Block a user