From 6cee129a68a29c3064bd0ced019d2a5376b60ea1 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Tue, 20 Apr 2021 01:35:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E8=8F=9C=E5=8D=95=E8=AF=AD=E8=A8=80?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=94=B9=E7=94=A8=E5=9C=B0=E7=90=83=E5=9B=BE?= =?UTF-8?q?=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/language/lang_en.lua | 1 - parts/language/lang_fr.lua | 1 - parts/language/lang_pt.lua | 1 - parts/language/lang_sp.lua | 1 - parts/language/lang_symbol.lua | 1 - parts/language/lang_zh.lua | 1 - parts/scenes/main.lua | 12 +++++++++++- 7 files changed, 11 insertions(+), 7 deletions(-) diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index 821eacb4..df23a05e 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -219,7 +219,6 @@ return{ music="Music & SE", about="About", dict="Zictionary", - lang="言/A", manual="Manual", quit="Exit", }, diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index 11e5dcd3..d790e7c3 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -196,7 +196,6 @@ return{ -- music="Music & SE", -- about="About", dict="Zictionary", - lang="言/A", manual="Manuel", quit="Quitter", }, diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index 55f7890e..c88e8e87 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -219,7 +219,6 @@ return{ -- music="Music & SE", -- about="About", dict="Zictionary", - lang="言/A", manual="Manual", quit="Saída", }, diff --git a/parts/language/lang_sp.lua b/parts/language/lang_sp.lua index 9914cec9..f8898f61 100644 --- a/parts/language/lang_sp.lua +++ b/parts/language/lang_sp.lua @@ -197,7 +197,6 @@ return{ music="Música y SFX", about="Acerca del Juego", dict="Zictionary", - lang="言/A", manual="Manual", quit="Salir", }, diff --git a/parts/language/lang_symbol.lua b/parts/language/lang_symbol.lua index 5f3e33ba..ba7a7675 100644 --- a/parts/language/lang_symbol.lua +++ b/parts/language/lang_symbol.lua @@ -101,7 +101,6 @@ return{ music="~~~ & =><=", about="?", dict="z", - lang="言/A", manual="???", quit="X", }, diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 3a4df2d5..4465e59d 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -219,7 +219,6 @@ return{ music="音乐&音效", about="关于", dict="小Z词典", - lang="言/A", manual="说明书", quit="退出", }, diff --git a/parts/scenes/main.lua b/parts/scenes/main.lua index a286bf0c..5c0e1447 100644 --- a/parts/scenes/main.lua +++ b/parts/scenes/main.lua @@ -168,6 +168,9 @@ function scene.draw() --Player PLAYERS[1]:draw() + + --Profile + drawSelfProfile() end scene.widgetList={ @@ -182,7 +185,14 @@ scene.widgetList={ WIDGET.newButton{name="manual", x=2480,y=570,w=800,h=100, color="lC", font=40,align="L",edge=30, code=pressKey","}, WIDGET.newButton{name="music", x=160,y=80,w=200,h=90, color="lOrange",font=35, code=pressKey"2"}, - WIDGET.newButton{name="lang", x=1120,y=80,w=200,h=90, color="lY", font=40, code=pressKey"0"}, + WIDGET.newButton{name="lang", x=960,y=80,w=90,h=90, color="lY", font=40, code=pressKey"0",fText=DOGC{64,64, + {"setLW",4}, + {"dCirc",32,32,30}, + {"dLine",2,31,62,31}, + {"dLine",31,2,31,62}, + {"doArc",10,31,40,-.8,.8}, + {"doArc",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="quit", x=1390,y=670,w=600,h=70, color="lR", font=40,align="L",edge=30, code=function()VOC.play("bye")SCN.swapTo("quit","slowFade")end}, }