主菜单ui再重做，词典入口移至主菜单

2021-03-26 19:45:35 +08:00
parent 0113cfb78e
commit 9d8478a9c0
10 changed files with 228 additions and 181 deletions
--- a/parts/language/lang_en.lua
+++ b/parts/language/lang_en.lua
@@ -218,9 +218,9 @@ return{
 			custom="Custom Game",
 			setting="Settings",
 			stat="Statistics",
-			music="Musics",
-			sound="SE Room",
+			music="Music & SE",
 			help="Help",
+			dict="Little Z",
 			lang="言/A",
 			quit="Exit",
 		},
@@ -495,7 +495,6 @@ return{
 		},
 		help={
 			manual="Manual",
-			dict="Little Z",
 			staff="Staff",
 			his="History",
 			qq="Author's qq",
@@ -519,24 +518,7 @@ return{
 			up="↑",
 			play="Play",
 			down="↓",
-		},
-		login={
-			title="Log In",
-			register="Register",
-			email="E-mail Address",
-			password="Password",
-			login="Log In",
-		},
-		register={
-			title="Register",
-			login="Log In",
-			username="Username",
-			email="Email Address",
-			password="Password",
-			password2="Re-enter Password",
-		},
-		account={
-			title="Account",
+			sound="SFXs",
 		},
 		sound={
 			title="SE Room",
@@ -603,6 +585,26 @@ return{
 			b2b="B2B",
 			b3b="B3B",
 			pc="PC",
+
+			music="BGMs",
+		},
+		login={
+			title="Log In",
+			register="Register",
+			email="E-mail Address",
+			password="Password",
+			login="Log In",
+		},
+		register={
+			title="Register",
+			login="Log In",
+			username="Username",
+			email="Email Address",
+			password="Password",
+			password2="Re-enter Password",
+		},
+		account={
+			title="Account",
 		},
 		app_15p={
 			reset="Shuffle",
@@ -808,6 +810,7 @@ return{
 		"Mix clear coming soon!",
 		"Music of this game is made using Beepbox.",
 		"Music too distracting? You can turn it off.",
+		"No easter eggs in this menu if simplistic style is on",
 		"O-Spin Triple!",
 		"OHHHHHHHHHHHHHH",
 		"Online mode is planned - please be patient.",
@@ -836,6 +839,7 @@ return{
 		"while(false)",
 		"You are Grand Master!",
 		"You can connect keyboard to your phone!",
+		"You can control with keyboard only in this menu",
 		"You can open the save directory from the Stats page.",
 		"You can perform a spin with 28 of the 29 minoes in this game; the exception being O1.",
 		"You can set the spawning orientation for each tetromino.",
--- a/parts/language/lang_fr.lua
+++ b/parts/language/lang_fr.lua
@@ -195,9 +195,9 @@ return{
 			-- custom="Mode perso.",
 			setting="Paramètres",
 			stat="Statistiques",
-			music="Musicologie",
-			sound="Salon SE",
+			-- music="Music & SE",
 			help="Aide",
+			dict="Little Z",
 			lang="言/A",
 			quit="Quitter",
 		},
@@ -475,24 +475,7 @@ return{
 			up="↑",
 			play="Jouer",
 			down="↓",
-		},
-		login={
-			title="Connexion",
-			register="Enregistrement",
-			email="E-mail",
-			password="Mot de passe",
-			login="Connexion",
-		},
-		register={
-			title="Enregistrement",
-			login="Connexion",
-			username="Nom d'utilisateur",
-			email="E-mail",
-			password="Mot de passe",
-			password2="Confirmer le mot de passe",
-		},
-		account={
-			title="Compte",
+			-- sound="SFXs",
 		},
 		sound={
 			title="Salon SE",
@@ -514,6 +497,25 @@ return{
 			_2="Double",
 			_3="Triple",
 			_4="Techrash",
+			-- music="BGMs",
+		},
+		login={
+			title="Connexion",
+			register="Enregistrement",
+			email="E-mail",
+			password="Mot de passe",
+			login="Connexion",
+		},
+		register={
+			title="Enregistrement",
+			login="Connexion",
+			username="Nom d'utilisateur",
+			email="E-mail",
+			password="Mot de passe",
+			password2="Confirmer le mot de passe",
+		},
+		account={
+			title="Compte",
 		},
 		app_15p={
 			reset="Réinitialiser",
@@ -556,7 +558,6 @@ return{
 		},
 		help={
 			manual="Manuel",
-			dict="Little Z",
 			staff="Staff",
 			his="History",
 			qq="QQ du créateur",
--- a/parts/language/lang_pt.lua
+++ b/parts/language/lang_pt.lua
@@ -218,9 +218,9 @@ return{
 			custom="Custom",
 			setting="Config.",
 			stat="Stats",
-			music="Música",
-			sound="SFX",
+			-- music="Music & SE",
 			help="Ajuda",
+			dict="Little Z",
 			lang="言/A",
 			quit="Saída",
 		},
@@ -495,7 +495,6 @@ return{
 		},
 		help={
 			manual="Manual",
-			dict="Little Z",
 			staff="Staff",
 			his="History",
 			qq="Author's qq",
@@ -519,24 +518,7 @@ return{
 			up="↑",
 			play="Jogar",
 			down="↓",
-		},
-		login={
-			title="Log in",
-			register="Registrar",
-			email="Endereço De Email",
-			password="Senha",
-			login="Log in",
-		},
-		register={
-			title="Registrar",
-			login="Registrar",
-			username="Nome De Usuário",
-			email="Endereço De Email",
-			password="Senha",
-			password2="Entre Senha Novamente",
-		},
-		account={
-			title="Conta",
+			-- sound="SFXs",
 		},
 		sound={
 			title="Efeito Sonoros",
@@ -603,6 +585,25 @@ return{
 			b2b="B2B",
 			b3b="B3B",
 			pc="PC",
+			-- music="BGMs",
+		},
+		login={
+			title="Log in",
+			register="Registrar",
+			email="Endereço De Email",
+			password="Senha",
+			login="Log in",
+		},
+		register={
+			title="Registrar",
+			login="Registrar",
+			username="Nome De Usuário",
+			email="Endereço De Email",
+			password="Senha",
+			password2="Entre Senha Novamente",
+		},
+		account={
+			title="Conta",
 		},
 		app_15p={
 			reset="Embaralhar",
--- a/parts/language/lang_sp.lua
+++ b/parts/language/lang_sp.lua
@@ -197,9 +197,9 @@ return{
 			-- custom="Person.",
 			setting="Opciones",
 			stat="Estadísticas",
-			music="Música",
-			sound="Sala de SE",
+			-- music="Music & SE",
 			help="Ayuda",
+			dict="Little Z",
 			lang="言/A",
 			quit="Salir",
 		},
@@ -456,7 +456,6 @@ return{
 		},
 		help={
 			manual="Manual",
-			dict="Little Z",
 			staff="Staff",
 			his="Hist. de Acts.",
 			qq="QQ del Autor",
@@ -480,24 +479,7 @@ return{
 			up="↑",
 			play="Reprod.",
 			down="↓",
-		},
-		login={
-			title="Entrar",
-			register="Registrarse",
-			email="Correo Elec.",
-			password="Contraseña",
-			login="Entrar",
-		},
-		register={
-			title="Registrarse",
-			login="Entrar",
-			username="Nombre de Usuario",
-			email="Correo Elec.",
-			password="Contraseña",
-			password2="Repetir Contr.",
-		},
-		account={
-			title="Cuenta",
+			-- sound="SFXs",
 		},
 		sound={
 			title="Sala de SE",
@@ -518,6 +500,25 @@ return{
 			_2="Doble",
 			_3="Triple",
 			_4="Techrash",
+			-- music="BGMs",
+		},
+		login={
+			title="Entrar",
+			register="Registrarse",
+			email="Correo Elec.",
+			password="Contraseña",
+			login="Entrar",
+		},
+		register={
+			title="Registrarse",
+			login="Entrar",
+			username="Nombre de Usuario",
+			email="Correo Elec.",
+			password="Contraseña",
+			password2="Repetir Contr.",
+		},
+		account={
+			title="Cuenta",
 		},
 		app_15p={
 			reset="Mezclar",
--- a/parts/language/lang_symbol.lua
+++ b/parts/language/lang_symbol.lua
@@ -98,9 +98,9 @@ return{
 			custom="_?!",
 			setting="_?_",
 			stat="=___",
-			music="~~~",
-			sound="=><=",
+			music="~~~ & =><=",
 			help="???",
+			dict="z",
 			lang="言/A",
 			quit="X",
 		},
@@ -339,7 +339,6 @@ return{
 		},
 		help={
 			manual="?",
-			dict="z",
 			staff="Orz",
 			his="_&_",
 			qq="_@_",
@@ -363,24 +362,7 @@ return{
 			up="↑",
 			play="!!!",
 			down="↓",
-		},
-		login={
-			title="Log in",
-			register="Sign up",
-			email="@",
-			password="*",
-			login="Log in",
-		},
-		register={
-			title="Sign up",
-			login="Log in",
-			username="#",
-			email="@",
-			password="*",
-			password2="*",
-		},
-		account={
-			title="@_@",
+			sound="=><=",
 		},
 		sound={
 			title="SE Room",
@@ -447,6 +429,25 @@ return{
 			b2b="^",
 			b3b="^^",
 			pc="#<>#",
+			music="~~~",
+		},
+		login={
+			title="Log in",
+			register="Sign up",
+			email="@",
+			password="*",
+			login="Log in",
+		},
+		register={
+			title="Sign up",
+			login="Log in",
+			username="#",
+			email="@",
+			password="*",
+			password2="*",
+		},
+		account={
+			title="@_@",
 		},
 		app_15p={
 			reset="!@#$%",
--- a/parts/language/lang_yygq.lua
+++ b/parts/language/lang_yygq.lua
@@ -109,7 +109,6 @@ return{
 		},
 		help={
 			manual="聪明人不用看",
-			dict="词典",
 			staff="游戏谁做的",
 			his="黑历史",
 			qq="QQ对线",
--- a/parts/language/lang_zh.lua
+++ b/parts/language/lang_zh.lua
@@ -218,9 +218,9 @@ return{
 			custom="自定义",
 			setting="设置",
 			stat="统计信息",
-			music="音乐室",
-			sound="音效室",
+			music="音乐&音效",
 			help="帮助",
+			dict="小Z词典",
 			lang="言/A",
 			quit="退出",
 		},
@@ -501,41 +501,7 @@ return{
 			up="↑",
 			play="播放",
 			down="↓",
-		},
-		help={
-			manual="说明书",
-			dict="小Z词典",
-			staff="制作人员",
-			his="更新历史",
-			qq="作者QQ",
-		},
-		dict={
-			title="小Z方块词典",
-			link="打开链接",
-			up="↑",
-			down="↓",
-		},
-		stat={
-			path="打开存储目录",
-			save="用户档案管理",
-		},
-		login={
-			title="登录",
-			register="注册",
-			email="邮箱",
-			password="密码",
-			login="登录",
-		},
-		register={
-			title="注册",
-			login="登录",
-			username="用户名",
-			email="邮箱",
-			password="密码",
-			password2="确认密码",
-		},
-		account={
-			title="账户",
+			sound="音效",
 		},
 		sound={
 			title="音效室",
@@ -602,6 +568,41 @@ return{
 			b2b="B2B",
 			b3b="B3B",
 			pc="PC",
+			music="音乐",
+		},
+		help={
+			manual="说明书",
+			staff="制作人员",
+			his="更新历史",
+			qq="作者QQ",
+		},
+		dict={
+			title="小Z方块词典",
+			link="打开链接",
+			up="↑",
+			down="↓",
+		},
+		stat={
+			path="打开存储目录",
+			save="用户档案管理",
+		},
+		login={
+			title="登录",
+			register="注册",
+			email="邮箱",
+			password="密码",
+			login="登录",
+		},
+		register={
+			title="注册",
+			login="登录",
+			username="用户名",
+			email="邮箱",
+			password="密码",
+			password2="确认密码",
+		},
+		account={
+			title="账户",
 		},
 		app_15p={
 			reset="打乱",
@@ -889,6 +890,7 @@ return{
 		"去玩别的方块的时候记得没有Ospin!",
 		"全球应该没人能全S评价(大爆炸不算)",
 		"群友翻译的中文方块百科全书! tetris.huijiwiki.com",
+		"如果打开简洁模式那这个菜单就没有彩蛋了",
 		"三连块只有2种",
 		"三岁通关困难马拉松",
 		"少女祈祷中",
@@ -929,6 +931,7 @@ return{
 		"有三个隐藏模式不能从模式地图进入,到处找找看吧",
 		"有疑问? 先看设置有没有你想要的",
 		"右边那个不是录像,是机器人实时在玩",
+		"这个菜单可以用纯键盘控制",
 		"这里的极简判定不松不严,放心软降,小心hold!",
 		"震惊,我只是一条凑数tip吗",
 		"中国的方块起步晚,所以世界级高手很少…下一个会是你吗?",
--- a/parts/language/lang_zh2.lua
+++ b/parts/language/lang_zh2.lua
@@ -86,9 +86,6 @@ return{
 			infHold="无限暂存",
 			phyHold="物理暂存",
 		},
-		music={
-			bgm="音乐",
-		},
 		sound={
 			clear1="消一",
 			clear2="消二",
--- a/parts/scenes/help.lua
+++ b/parts/scenes/help.lua
@@ -41,10 +41,9 @@ end
 scene.widgetList={
 	WIDGET.newImage{name="pay1",	x=20,	y=20},
 	WIDGET.newImage{name="pay2",	x=1014,	y=20},
-	WIDGET.newButton{name="manual",	x=1140,	y=350,w=220,h=70,font=35,code=goScene"manual"},
-	WIDGET.newButton{name="dict",	x=1140,	y=430,w=220,h=70,font=35,code=goScene"dict"},
-	WIDGET.newButton{name="staff",	x=1140,	y=510,w=220,h=70,font=35,code=goScene"staff"},
-	WIDGET.newButton{name="his",	x=1140,	y=590,w=220,h=70,font=35,code=goScene"history"},
+	WIDGET.newButton{name="manual",	x=1140,	y=400,w=220,h=70,font=35,code=goScene"manual"},
+	WIDGET.newButton{name="staff",	x=1140,	y=490,w=220,h=70,font=35,code=goScene"staff"},
+	WIDGET.newButton{name="his",	x=1140,	y=580,w=220,h=70,font=35,code=goScene"history"},
 	WIDGET.newButton{name="qq",		x=1140,	y=670,w=220,h=70,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},
 }
--- a/parts/scenes/main.lua
+++ b/parts/scenes/main.lua
@@ -2,14 +2,31 @@ local gc=love.graphics

 local scene={}

+local tipLength=540
 local tip=gc.newText(getFont(30),"")
 local scrollX

+local cmdEntryThread=coroutine.create(function()
+	while true do
+		while true do
+			if YIELD()~="c"then break end
+			SFX.play("ren_6")
+			if YIELD()~="m"then break end
+			SFX.play("ren_9")
+			if YIELD()~="d"then break end
+			SFX.play("ren_10")
+			if YIELD()~="k"then break end
+			SFX.play("ren_11")
+			SCN.go("app_cmd")
+		end
+	end
+end)
 function scene.sceneInit()
 	tip:set(text.getTip())
-	scrollX=1000
+	scrollX=tipLength

 	BG.set()
+	coroutine.resume(cmdEntryThread)

 	--Create demo player
 	destroyPlayers()
@@ -20,12 +37,24 @@ function scene.sceneInit()
 	PLAYERS[1]:setPosition(560,50,.95)
 end

+function scene.mouseDown(x,y)
+	if x>=550 and x<=840 and y>=50 and y<=620 then
+		coroutine.resume(cmdEntryThread,
+			x<610 and y>560 and"c"or
+			x>780 and y>560 and"m"or
+			x<610 and y<110 and"d"or
+			x>780 and y<110 and"k"or
+			"x"
+		)
+	end
+end
+scene.touchDown=scene.mouseDown
 function scene.keyDown(key)
-	if key=="q"then
-		loadGame(STAT.lastPlay,true)
-	elseif key=="p"then
+	if key=="1"then
 		SCN.go("mode")
-	elseif key=="m"then
+	elseif key=="q"then
+		loadGame(STAT.lastPlay,true)
+	elseif key=="a"then
 		if not LATEST_VERSION then
 			TEXT.show(text.notFinished,370,380,60,"flicker")
 			SFX.play("finesseError")
@@ -48,18 +77,26 @@ function scene.keyDown(key)
 		else
 			SCN.go("login")
 		end
-	elseif key=="escape"then
-		SCN.back()
+	elseif key=="z"then
+		SCN.go("customGame")
+	elseif key=="-"then
+		SCN.go("setting_game")
+	elseif key=="p"then
+		SCN.go("stat")
+	elseif key=="l"then
+		SCN.go("music")
+	elseif key==","then
+		SCN.go("help")
 	elseif key=="application"then
 		SCN.go("dict")
+	elseif key=="ralt"then
+		SCN.go("lang")
 	elseif key=="f1"then
 		SCN.go("manual")
-	elseif key=="c"then
-		SCN.go("customGame")
-	elseif key=="s"then
-		SCN.go("setting_game")
-	else
-		WIDGET.keyPressed(key)
+	elseif key=="escape"then
+		SCN.back()
+	elseif key=="c"or key=="m"or key=="d"or key=="k"or key=="x"then
+		coroutine.resume(cmdEntryThread,key)
 	end
 end

@@ -68,22 +105,26 @@ function scene.update(dt)
 	PLAYERS[1]:update(dt)
 	scrollX=scrollX-2.6
 	if scrollX<-tip:getWidth()then
-		scrollX=1000
+		scrollX=tipLength
 		tip:set(text.getTip())
 	end
 end

 local function tipStencil()
-	gc.rectangle("fill",0,0,1000,42)
+	gc.rectangle("fill",0,0,tipLength,42)
 end
 function scene.draw()
-	gc.setColor(1,1,1)
+	--Version
+	setFont(30)
+	gc.setColor(.6,.6,.6)
+	gc.printf(SYSTEM,640,30,600,"right")
+	gc.printf(VERSION_NAME,640,70,600,"right")

 	--Title
+	gc.setColor(1,1,1)
 	gc.draw(TEXTURE.title_color,20,20,nil,.43)

 	--Quick play
-	setFont(30)
 	local L=text.modes[STAT.lastPlay]
 	gc.print(L[1],365,300)
 	gc.print(L[2],365,340)
@@ -92,7 +133,7 @@ function scene.draw()
 	gc.push("transform")
 		gc.translate(40,650)
 		gc.setLineWidth(2)
-		gc.rectangle("line",0,0,1000,42)
+		gc.rectangle("line",0,0,tipLength,42)
 		gc.stencil(tipStencil,"replace",1)
 		gc.setStencilTest("equal",1)
 		gc.draw(tip,0+scrollX,0)
@@ -105,19 +146,19 @@ function scene.draw()
 end

 scene.widgetList={
-	WIDGET.newText{name="system",	x=1245,y=40,fText=SYSTEM,		color="white",	font=30,align="R"},
-	WIDGET.newText{name="version",	x=1245,y=80,fText=VERSION_NAME,	color="white",	font=30,align="R"},
-	WIDGET.newButton{name="offline",x=50,y=210,w=600,h=100,			color="lRed",	font=45,align="R",	code=pressKey"p"},
-	WIDGET.newButton{name="qplay",	x=50,y=330,w=600,h=100,			color="lCyan",	font=45,align="R",	code=pressKey"q"},
-	WIDGET.newButton{name="online",	x=50,y=450,w=600,h=100,			color="lBlue",	font=45,align="R",	code=pressKey"m"},
-	WIDGET.newButton{name="custom",	x=50,y=570,w=600,h=100,			color="white",	font=45,align="R",	code=pressKey"c"},
-	WIDGET.newButton{name="setting",x=1230,y=210,w=600,h=100,		color="lYellow",font=40,align="L",	code=pressKey"s"},
-	WIDGET.newButton{name="stat",	x=1230,y=330,w=600,h=100,		color="lOrange",font=40,align="L",	code=goScene"stat"},
-	WIDGET.newButton{name="music",	x=1290,y=450,w=480,h=100,		color="grape",	font=30,align="L",	code=goScene"music"},
-	WIDGET.newButton{name="sound",	x=1290,y=570,w=480,h=100,		color="pink",	font=30,align="L",	code=goScene"sound"},
-	WIDGET.newButton{name="help",	x=950,y=450,w=170,h=100,		color="blue",	font=35,			code=goScene"help"},
-	WIDGET.newButton{name="lang",	x=950,y=570,w=170,h=100,		color="lCyan",	font=40,			code=goScene"lang"},
-	WIDGET.newButton{name="quit",	x=1170,y=670,w=190,h=70,		color="grey",	font=40,			code=function()VOC.play("bye")SCN.swapTo("quit","slowFade")end},
+	WIDGET.newButton{name="offline",x=20,y=210,w=600,h=100,		color="lR",		font=45,align="R",edge=30,	code=pressKey"1"},
+	WIDGET.newButton{name="qplay",	x=50,y=330,w=600,h=100,		color="lM",		font=45,align="R",edge=30,	code=pressKey"q"},
+	WIDGET.newButton{name="online",	x=80,y=450,w=600,h=100,		color="lPurple",font=45,align="R",edge=30,	code=pressKey"a"},
+	WIDGET.newButton{name="custom",	x=110,y=570,w=600,h=100,	color="lSea",	font=45,align="R",edge=30,	code=pressKey"z"},
+
+	WIDGET.newButton{name="setting",x=1170,y=210,w=600,h=100,	color="lOrange",font=40,align="L",edge=30,	code=pressKey"-"},
+	WIDGET.newButton{name="stat",	x=1200,y=330,w=600,h=100,	color="lLame",	font=40,align="L",edge=30,	code=pressKey"p"},
+	WIDGET.newButton{name="music",	x=1230,y=450,w=600,h=100,	color="lGreen",	font=40,align="L",edge=30,	code=pressKey"l"},
+	WIDGET.newButton{name="help",	x=1260,y=570,w=600,h=100,	color="lC",		font=40,align="L",edge=30,	code=pressKey","},
+
+	WIDGET.newButton{name="lang",	x=720,y=670,w=200,h=70,		color="Y",		font=40,					code=goScene"lang"},
+	WIDGET.newButton{name="dict",	x=940,y=670,w=200,h=70,		color="orange",	font=35,					code=goScene"dict"},
+	WIDGET.newButton{name="quit",	x=1160,y=670,w=200,h=70,	color="R",		font=40,					code=function()VOC.play("bye")SCN.swapTo("quit","slowFade")end},
 }

 return scene