整理代码，语言选择界面按钮有颜色了

2021-05-30 17:23:42 +08:00
parent 57f67749dc
commit 2b05efb0ff
47 changed files with 69 additions and 66 deletions
--- a/Zframework/init.lua
+++ b/Zframework/init.lua
@@ -475,13 +475,18 @@ local devColor={
 }
 local WS=WS
 local WSnames={'app','user','play','stream','chat'}
-local WScolor={
-	{1,.6,.6,.7},
-	{1,.8,.4,.7},
-	{1,1,.5,.7},
-	{.5,1,.8,.7},
-	{.6,.9,1,.7},
-}
+local wsBottomImage do
+	local L={78,18,
+		{'clear',1,1,1,0},
+		{'setCL',1,1,1,.3},
+		{'fRect',60,0,18,18},
+	}
+	for i=0,59 do
+		ins(L,{'setCL',1,1,1,i*.005})
+		ins(L,{'fRect',i,0,1,18})
+	end
+	wsBottomImage=DOGC(L)
+end
 local ws_deadImg=DOGC{20,20,
 	{'setFT',20},
 	{'setCL',1,.3,.3},
@@ -636,16 +641,14 @@ function love.run()
 						--Websocket status
 						for i=1,5 do
 							local status=WS.status(WSnames[i])
-							gc_setColor(WScolor[i])
-							gc.rectangle('fill',0,20*i-100,-80,-20)
+							gc_setColor(1,1,1)
+							gc.draw(wsBottomImage,-79,20*i-119)
 							if status=='dead'then
-								gc_setColor(1,1,1)
 								gc_draw(ws_deadImg,-20,20*i-120)
 							elseif status=='connecting'then
 								gc_setColor(1,1,1,.5+.3*sin(time*6.26))
 								gc_draw(ws_connectingImg,-20,20*i-120)
 							elseif status=='running'then
-								gc_setColor(1,1,1)
 								gc_draw(ws_runningImg,-20,20*i-120)
 							end
 							local t1,t2,t3=WS.getTimers(WSnames[i])
--- a/parts/scenes/about.lua
+++ b/parts/scenes/about.lua
@@ -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,fText=TEXTURE.back,font=35,code=backScene},
+	WIDGET.newButton{name="back",	x=640,	y=600,w=170,h=80,fText=TEXTURE.back,code=backScene},
 }

 return scene
--- a/parts/scenes/account.lua
+++ b/parts/scenes/account.lua
@@ -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,fText=TEXTURE.back,font=40,code=backScene},
+	WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,fText=TEXTURE.back,code=backScene},
 }

 return scene
--- a/parts/scenes/app_15p.lua
+++ b/parts/scenes/app_15p.lua
@@ -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,fText=TEXTURE.back,font=40,code=backScene},
+	WIDGET.newButton{name="back",	x=1140,y=640,w=170,h=80,fText=TEXTURE.back,code=backScene},
 }

 return scene
--- a/parts/scenes/app_2048.lua
+++ b/parts/scenes/app_2048.lua
@@ -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,fText=TEXTURE.back,font=40,code=backScene},
+	WIDGET.newButton{name="back",		x=1140,y=640,w=170,h=80,fText=TEXTURE.back,code=backScene},
 }

 return scene
--- a/parts/scenes/app_AtoZ.lua
+++ b/parts/scenes/app_AtoZ.lua
@@ -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,fText=TEXTURE.back,font=40,code=backScene},
+	WIDGET.newButton{name="back",		x=1140,y=640,w=170,h=80,fText=TEXTURE.back,code=backScene},
 }

 return scene
--- a/parts/scenes/app_UTTT.lua
+++ b/parts/scenes/app_UTTT.lua
@@ -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,fText=TEXTURE.back,font=40,code=backScene},
+	WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,fText=TEXTURE.back,code=backScene},
 }

 return scene
--- a/parts/scenes/app_calc.lua
+++ b/parts/scenes/app_calc.lua
@@ -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,fText=TEXTURE.back,font=40,code=backScene},
+	WIDGET.newKey{name="back",x=1140,y=640,w=170,h=80,fText=TEXTURE.back,code=backScene},
 }

 return scene
--- a/parts/scenes/app_cannon.lua
+++ b/parts/scenes/app_cannon.lua
@@ -128,7 +128,7 @@ function scene.draw()
 end

 scene.widgetList={
-	WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,fText=TEXTURE.back,font=40,code=backScene},
+	WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,fText=TEXTURE.back,code=backScene},
 }

 return scene
--- a/parts/scenes/app_cubefield.lua
+++ b/parts/scenes/app_cubefield.lua
@@ -302,7 +302,7 @@ function scene.draw()
 end

 scene.widgetList={
-	WIDGET.newKey{name="back",x=1140,y=80,w=170,h=80,fText=TEXTURE.back,font=40,code=backScene},
+	WIDGET.newKey{name="back",x=1140,y=80,w=170,h=80,fText=TEXTURE.back,code=backScene},
 }

 return scene
--- a/parts/scenes/app_dropper.lua
+++ b/parts/scenes/app_dropper.lua
@@ -233,7 +233,7 @@ function scene.draw()
 end

 scene.widgetList={
-	WIDGET.newButton{name="back",x=1140,y=60,w=170,h=80,fText=TEXTURE.back,font=40,code=pressKey"escape"},
+	WIDGET.newButton{name="back",x=1140,y=60,w=170,h=80,fText=TEXTURE.back,code=pressKey"escape"},
 }

 return scene
--- a/parts/scenes/app_dtw.lua
+++ b/parts/scenes/app_dtw.lua
@@ -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,fText=TEXTURE.back,font=40,code=backScene},
+	WIDGET.newButton{name="back",	x=1140,y=640,w=170,h=80,fText=TEXTURE.back,code=backScene},
 }

 return scene
--- a/parts/scenes/app_polyforge.lua
+++ b/parts/scenes/app_polyforge.lua
@@ -164,7 +164,7 @@ function scene.draw()
 end

 scene.widgetList={
-	WIDGET.newKey{name="back",x=1140,y=60,w=170,h=80,color='D',fText=TEXTURE.back,font=40,code=pressKey"escape"},
+	WIDGET.newKey{name="back",x=1140,y=60,w=170,h=80,color='D',fText=TEXTURE.back,code=pressKey"escape"},
 }

 return scene
--- a/parts/scenes/app_pong.lua
+++ b/parts/scenes/app_pong.lua
@@ -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,fText=TEXTURE.back,font=35,code=backScene},
+	WIDGET.newKey{name="back",x=640,y=675,w=150,h=50,fText=TEXTURE.back,code=backScene},
 }

 return scene
--- a/parts/scenes/app_reflect.lua
+++ b/parts/scenes/app_reflect.lua
@@ -133,7 +133,7 @@ function scene.draw()
 end

 scene.widgetList={
-	WIDGET.newKey{name="back",x=640,y=675,w=150,h=50,fText=TEXTURE.back,font=35,code=backScene},
+	WIDGET.newKey{name="back",x=640,y=675,w=150,h=50,fText=TEXTURE.back,code=backScene},
 }

 return scene
--- a/parts/scenes/app_schulteG.lua
+++ b/parts/scenes/app_schulteG.lua
@@ -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,fText=TEXTURE.back,font=40,code=backScene},
+	WIDGET.newButton{name="back",		x=1140,y=640,w=170,h=80,fText=TEXTURE.back,code=backScene},
 }

 return scene
--- a/parts/scenes/app_tap.lua
+++ b/parts/scenes/app_tap.lua
@@ -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,fText=TEXTURE.back,font=40,code=backScene},
+	WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,fText=TEXTURE.back,code=backScene},
 }

 return scene
--- a/parts/scenes/app_ten.lua
+++ b/parts/scenes/app_ten.lua
@@ -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,fText=TEXTURE.back,font=40,code=backScene},
+	WIDGET.newButton{name="back",	x=1140,y=640,w=170,h=80,fText=TEXTURE.back,code=backScene},
 }

 return scene
--- a/parts/scenes/customGame.lua
+++ b/parts/scenes/customGame.lua
@@ -212,7 +212,7 @@ scene.widgetList={
 	WIDGET.newButton{name="paste",	x=1070,	y=380,w=310,h=70,color='lB',font=25,code=pressKey"cV"},
 	WIDGET.newButton{name="clear",	x=1070,	y=460,w=310,h=70,color='lY',font=35,code=pressKey"return"},
 	WIDGET.newButton{name="puzzle",	x=1070,	y=540,w=310,h=70,color='lM',font=35,code=pressKey"return2",hideF=function()return not initField end},
-	WIDGET.newButton{name="back",	x=1140,	y=640,w=170,h=80,fText=TEXTURE.back,font=40,code=pressKey"escape"},
+	WIDGET.newButton{name="back",	x=1140,	y=640,w=170,h=80,fText=TEXTURE.back,code=pressKey"escape"},

 	--Special rules
 	WIDGET.newSwitch{name="ospin",		x=830,	y=750,disp=CUSval("ospin"),		code=CUSrev("ospin")},
--- a/parts/scenes/custom_field.lua
+++ b/parts/scenes/custom_field.lua
@@ -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,fText=TEXTURE.back,font=40,code=backScene},
+	WIDGET.newButton{name="back",	x=1140,	y=640,w=170,h=80,fText=TEXTURE.back,code=backScene},
 }

 return scene
--- a/parts/scenes/custom_mission.lua
+++ b/parts/scenes/custom_mission.lua
@@ -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,fText=TEXTURE.back,font=40,code=backScene},
+	WIDGET.newButton{name="back",	x=1140,	y=640,	w=170,h=80,fText=TEXTURE.back,code=backScene},
 }

 return scene
--- a/parts/scenes/custom_sequence.lua
+++ b/parts/scenes/custom_sequence.lua
@@ -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,fText=TEXTURE.back,font=40,code=backScene},
+	WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,fText=TEXTURE.back,code=backScene},
 }

 return scene
--- a/parts/scenes/dict.lua
+++ b/parts/scenes/dict.lua
@@ -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,fText=TEXTURE.back,font=40,code=backScene},
+	WIDGET.newButton{name="back",	x=1165,	y=60,w=170,h=80,fText=TEXTURE.back,code=backScene},
 }

 return scene
--- a/parts/scenes/history.lua
+++ b/parts/scenes/history.lua
@@ -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,fText=TEXTURE.back,font=40,code=backScene},
+	WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,fText=TEXTURE.back,code=backScene},
 }

 return scene
--- a/parts/scenes/lang.lua
+++ b/parts/scenes/lang.lua
@@ -6,15 +6,15 @@ end

 local function setLang(n)return function()SETTING.lang=n LANG.set(n)end end
 scene.widgetList={
-	WIDGET.newButton{name="zh",		x=200,	y=100,w=200,h=120,fText="中文",			font=35,code=setLang(1)},
-	WIDGET.newButton{name="zh2",	x=420,	y=100,w=200,h=120,fText="全中文",		font=35,code=setLang(2)},
-	WIDGET.newButton{name="yygq",	x=640,	y=100,w=200,h=120,fText="就这?",		font=35,code=setLang(3)},
-	WIDGET.newButton{name="en",		x=860,	y=100,w=200,h=120,fText="English",		font=35,code=setLang(4)},
-	WIDGET.newButton{name="fr",		x=1080,	y=100,w=200,h=120,fText="Français",		font=35,code=setLang(5)},
-	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,fText=TEXTURE.back,font=35,code=backScene},
+	WIDGET.newButton{name="zh",		x=200,	y=100,w=200,h=120,fText="中文",			color='R',font=35,code=setLang(1)},
+	WIDGET.newButton{name="zh2",	x=420,	y=100,w=200,h=120,fText="全中文",		color='dR',font=35,code=setLang(2)},
+	WIDGET.newButton{name="yygq",	x=640,	y=100,w=200,h=120,fText="就这?",		color='D',font=35,code=setLang(3)},
+	WIDGET.newButton{name="en",		x=860,	y=100,w=200,h=120,fText="English",		color='N',font=35,code=setLang(4)},
+	WIDGET.newButton{name="fr",		x=1080,	y=100,w=200,h=120,fText="Français",		color='lW',font=35,code=setLang(5)},
+	WIDGET.newButton{name="sp",		x=200,	y=250,w=200,h=120,fText="Español",		color='O',font=35,code=setLang(6)},
+	WIDGET.newButton{name="pt",		x=420,	y=250,w=200,h=120,fText="Português",	color='Y',font=35,code=setLang(7)},
+	WIDGET.newKey{name="symbol",	x=640,	y=250,w=200,h=120,fText="?????",		color='dH',font=35,code=setLang(8)},
+	WIDGET.newButton{name="back",	x=1140,	y=640,w=170,h=80,fText=TEXTURE.back,code=backScene},
 }

 return scene
--- a/parts/scenes/login.lua
+++ b/parts/scenes/login.lua
@@ -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,fText=TEXTURE.back,font=40,code=backScene},
+	WIDGET.newButton{name="back",		x=1140,	y=640,w=170,h=80,fText=TEXTURE.back,code=backScene},
 }

 return scene
--- a/parts/scenes/main.lua
+++ b/parts/scenes/main.lua
@@ -190,7 +190,7 @@ scene.widgetList={
 		{'fRect',22,20,6,20},
 	}
 	},
-	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},
+	WIDGET.newButton{name="back",	x=1390,y=670,w=600,h=70,	color='lR',fText=TEXTURE.back,align='L',edge=30,code=backScene},
 }

 return scene
--- a/parts/scenes/manual.lua
+++ b/parts/scenes/manual.lua
@@ -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,fText=TEXTURE.back,font=40,code=backScene},
+	WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,fText=TEXTURE.back,code=backScene},
 }

 return scene
--- a/parts/scenes/mod.lua
+++ b/parts/scenes/mod.lua
@@ -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,fText=TEXTURE.back,font=40,code=backScene},
+	WIDGET.newButton{name="back",	x=1140,y=640,w=170,h=80,fText=TEXTURE.back,code=backScene},
 }

 return scene
--- a/parts/scenes/mode.lua
+++ b/parts/scenes/mode.lua
@@ -318,7 +318,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,fText=TEXTURE.back,font=40,code=backScene},
+	WIDGET.newButton{name="back",	x=1200,y=655,w=120,h=80,fText=TEXTURE.back,code=backScene},
 }

 return scene
--- a/parts/scenes/music.lua
+++ b/parts/scenes/music.lua
@@ -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,fText=TEXTURE.back,font=40,code=backScene},
+	WIDGET.newButton{name="back",	x=1140,	y=640,w=170,h=80,fText=TEXTURE.back,code=backScene},
 }

 return scene
--- a/parts/scenes/net_league.lua
+++ b/parts/scenes/net_league.lua
@@ -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,fText=TEXTURE.back,font=40,code=backScene},
+	WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,fText=TEXTURE.back,code=backScene},
 }

 return scene
--- a/parts/scenes/net_menu.lua
+++ b/parts/scenes/net_menu.lua
@@ -36,7 +36,7 @@ scene.widgetList={
 				lastLogoutTime=TIME()
 			end
 		end},
-	WIDGET.newButton{name="back",	x=1140,	y=640,w=170,h=80,fText=TEXTURE.back,font=40,code=backScene},
+	WIDGET.newButton{name="back",	x=1140,	y=640,w=170,h=80,fText=TEXTURE.back,code=backScene},
 }

 return scene
--- a/parts/scenes/net_rooms.lua
+++ b/parts/scenes/net_rooms.lua
@@ -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,fText=TEXTURE.back,font=40,code=backScene},
+	WIDGET.newButton{name="back",	x=1140,y=640,w=170,h=80,fText=TEXTURE.back,code=backScene},
 }

 return scene
--- a/parts/scenes/register.lua
+++ b/parts/scenes/register.lua
@@ -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,fText=TEXTURE.back,font=40,code=backScene},
+	WIDGET.newButton{name="back",		x=1140,	y=640,w=170,h=80,fText=TEXTURE.back,code=backScene},
 }

 return scene
--- a/parts/scenes/savedata.lua
+++ b/parts/scenes/savedata.lua
@@ -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,fText=TEXTURE.back,font=40,code=backScene},
+	WIDGET.newButton{name="back",			x=640,y=620,w=200,h=80,fText=TEXTURE.back,code=backScene},
 }

 return scene
--- a/parts/scenes/setting_control.lua
+++ b/parts/scenes/setting_control.lua
@@ -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,fText=TEXTURE.back,font=40,code=backScene},
+	WIDGET.newButton{name="back",	x=1140,	y=640,w=170,h=80,fText=TEXTURE.back,code=backScene},
 }

 return scene
--- a/parts/scenes/setting_game.lua
+++ b/parts/scenes/setting_game.lua
@@ -44,7 +44,7 @@ scene.widgetList={
 				end
 			end
 		end},
-	WIDGET.newButton{name="back",		x=1140,	y=640,	w=170,h=80,fText=TEXTURE.back,font=40,code=backScene},
+	WIDGET.newButton{name="back",		x=1140,	y=640,	w=170,h=80,fText=TEXTURE.back,code=backScene},
 }

 return scene
--- a/parts/scenes/setting_key.lua
+++ b/parts/scenes/setting_key.lua
@@ -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,fText=TEXTURE.back,font=40,code=backScene},
+	WIDGET.newButton{name="back",x=1140,y=640,w=190,h=80,fText=TEXTURE.back,code=backScene},
 }

 return scene
--- a/parts/scenes/setting_skin.lua
+++ b/parts/scenes/setting_skin.lua
@@ -100,7 +100,7 @@ scene.widgetList={
 			end
 			SFX.play('hold')
 		end},
-	WIDGET.newButton{name="back",	x=1140,y=640,w=170,h=80,fText=TEXTURE.back,font=40,code=backScene},
+	WIDGET.newButton{name="back",	x=1140,y=640,w=170,h=80,fText=TEXTURE.back,code=backScene},
 }

 return scene
--- a/parts/scenes/setting_sound.lua
+++ b/parts/scenes/setting_sound.lua
@@ -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,fText=TEXTURE.back,font=40,code=backScene},
+	WIDGET.newButton{name="back",	x=1140,	y=640,w=170,h=80,fText=TEXTURE.back,code=backScene},
 }

 return scene
--- a/parts/scenes/setting_touch.lua
+++ b/parts/scenes/setting_touch.lua
@@ -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,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.newButton{name="option",	x=530,y=190,w=200,h=80,fText=TEXTURE.more,code=function()SCN.go('setting_touchSwitch')end},
+	WIDGET.newButton{name="back",	x=750,y=190,w=200,h=80,fText=TEXTURE.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},
--- a/parts/scenes/setting_touchSwitch.lua
+++ b/parts/scenes/setting_touchSwitch.lua
@@ -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,fText=TEXTURE.back,font=40,code=backScene},
+	WIDGET.newButton{name="back",	x=1140,	y=640,	w=170,h=80,fText=TEXTURE.back,code=backScene},
 }

 return scene
--- a/parts/scenes/setting_video.lua
+++ b/parts/scenes/setting_video.lua
@@ -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,fText=TEXTURE.back,font=40,code=backScene},
+	WIDGET.newButton{name="back",		x=1140,y=640,w=170,h=80,fText=TEXTURE.back,code=backScene},
 }

 return scene
--- a/parts/scenes/sound.lua
+++ b/parts/scenes/sound.lua
@@ -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,fText=TEXTURE.back,font=40,code=backScene},
+	WIDGET.newButton{name="back",	x=1140,	y=640,w=170,h=80,fText=TEXTURE.back,code=backScene},
 }

 return scene
--- a/parts/scenes/staff.lua
+++ b/parts/scenes/staff.lua
@@ -102,7 +102,7 @@ function scene.draw()
 end

 scene.widgetList={
-	WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,fText=TEXTURE.back,font=40,code=backScene},
+	WIDGET.newButton{name="back",x=1140,y=640,w=170,h=80,fText=TEXTURE.back,code=backScene},
 }

 return scene
--- a/parts/scenes/stat.lua
+++ b/parts/scenes/stat.lua
@@ -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,fText=TEXTURE.back,font=35,code=backScene},
+	WIDGET.newButton{name="back",x=640,y=620,w=200,h=80,fText=TEXTURE.back,code=backScene},
 }

 return scene