From bcc1b25023cb488797d079a214c0806535d5ec7f Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Sat, 26 Jun 2021 02:24:12 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=BB=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=92=8C=E5=AF=B9=E5=BA=94=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=EF=BC=88=E7=A7=BB=E9=99=A4=E8=BF=94=E5=9B=9E=EF=BC=8C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=BD=95=E5=83=8F=E5=9B=9E=E6=94=BE=EF=BC=89=EF=BC=88?= =?UTF-8?q?=E5=9B=9E=E6=94=BE=E6=9A=82=E6=9C=AA=E5=AE=9E=E7=8E=B0=EF=BC=8C?= =?UTF-8?q?=E5=8F=AA=E6=98=AF=E6=B7=BB=E5=8A=A0=E5=85=A5=E5=8F=A3=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/language/lang_en.lua | 3 +-- parts/language/lang_es.lua | 3 +-- parts/language/lang_fr.lua | 3 +-- parts/language/lang_pt.lua | 3 +-- parts/language/lang_symbol.lua | 3 +-- parts/language/lang_zh.lua | 3 +-- parts/scenes/customGame.lua | 2 +- parts/scenes/custom_field.lua | 2 +- parts/scenes/custom_mission.lua | 2 +- parts/scenes/custom_sequence.lua | 2 +- parts/scenes/main.lua | 6 +++--- parts/scenes/main_simple.lua | 2 +- parts/scenes/stat.lua | 1 - parts/texture.lua | 11 +++++++++-- 14 files changed, 23 insertions(+), 23 deletions(-) diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index b21bdd2a..600fb45e 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -210,7 +210,7 @@ return{ stat="Statistics", music="Music & SE", dict="Zictionary", - manual="Manual", + replays="Replays", }, main_simple={ sprint="Sprint", @@ -546,7 +546,6 @@ return{ stat={ path="Open Data Folder", save="Data Management", - replays="Saved Replays", }, music={ title="Music Room", diff --git a/parts/language/lang_es.lua b/parts/language/lang_es.lua index 65df9294..9f54b65a 100644 --- a/parts/language/lang_es.lua +++ b/parts/language/lang_es.lua @@ -185,7 +185,7 @@ return{ stat="Estadísticas", music="Música y SFX", dict="Zictionary", - manual="Manual", + -- replays="Replays", }, main_simple={ sprint="Sprint", @@ -501,7 +501,6 @@ return{ stat={ path="Abrir carpeta del juego", save="Manejo de Datos", - -- replays="Saved Replays", }, music={ title="Sala de Música", diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index fdb958d8..edd18d2a 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -185,7 +185,7 @@ return{ stat="Statistiques", -- music="Music & SE", dict="Zictionary", - manual="Manuel", + -- replays="Replays", }, mode={ mod="Mods (F1)", @@ -500,7 +500,6 @@ return{ stat={ path="Ouvrir dossier des données", save="Gestion des données", - -- replays="Saved Replays", }, music={ title="Salon musical", diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index 7e7162eb..8666b84b 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -209,7 +209,7 @@ return{ stat="Stats", -- music="Music & SE", dict="Zictionary", - manual="Manual", + -- replays="Replays", }, main_simple={ sprint="Sprint", @@ -543,7 +543,6 @@ return{ stat={ path="Abrir Pasta De Data", save="Gestão De Dados", - -- replays="Saved Replays", }, music={ title="Sala De Música", diff --git a/parts/language/lang_symbol.lua b/parts/language/lang_symbol.lua index eab8c43f..ac5006c3 100644 --- a/parts/language/lang_symbol.lua +++ b/parts/language/lang_symbol.lua @@ -102,7 +102,7 @@ return{ stat="=___", music="~~~ & =><=", dict="z", - manual="???", + replays="=~~~", }, mode={ mod="?!?!?!(F1)", @@ -357,7 +357,6 @@ return{ stat={ path="%$%", save="%0123%", - replays="%0101%", }, music={ title="(~~~~)", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index f047300f..c2c8d6d9 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -210,7 +210,7 @@ return{ stat="统计信息", music="音乐&音效", dict="小Z词典", - manual="说明书", + replays="录像回放", }, main_simple={ sprint="40行", @@ -623,7 +623,6 @@ return{ stat={ path="打开存储目录", save="用户档案管理", - replays="录像菜单", }, login={ title="登录", diff --git a/parts/scenes/customGame.lua b/parts/scenes/customGame.lua index 99417709..4ccd3209 100644 --- a/parts/scenes/customGame.lua +++ b/parts/scenes/customGame.lua @@ -177,7 +177,7 @@ function scene.draw() --Confirm reset if sure>0 then gc.setColor(1,1,1,sure*.02) - gc.draw(TEXTURE.question,920,50) + gc.draw(TEXTURE.sure,920,50) end gc.translate(0, WIDGET.scrollPos) end diff --git a/parts/scenes/custom_field.lua b/parts/scenes/custom_field.lua index 66b86df1..85412ff6 100644 --- a/parts/scenes/custom_field.lua +++ b/parts/scenes/custom_field.lua @@ -425,7 +425,7 @@ function scene.draw() --Confirm reset if sure>0 then gc.setColor(1,1,1,sure*.02) - gc.draw(TEXTURE.question,1070,490) + gc.draw(TEXTURE.sure,1070,490) end --Block name diff --git a/parts/scenes/custom_mission.lua b/parts/scenes/custom_mission.lua index 3a0b08b6..a00fc46b 100644 --- a/parts/scenes/custom_mission.lua +++ b/parts/scenes/custom_mission.lua @@ -181,7 +181,7 @@ function scene.draw() --Confirm reset if sure>0 then gc.setColor(1,1,1,sure*.02) - gc.draw(TEXTURE.question,980,600) + gc.draw(TEXTURE.sure,980,600) end end diff --git a/parts/scenes/custom_sequence.lua b/parts/scenes/custom_sequence.lua index e8e0883f..f9150272 100644 --- a/parts/scenes/custom_sequence.lua +++ b/parts/scenes/custom_sequence.lua @@ -183,7 +183,7 @@ function scene.draw() --Confirm reset if sure>0 then gc.setColor(1,1,1,sure*.02) - gc.draw(TEXTURE.question,1050,430,nil,.6) + gc.draw(TEXTURE.sure,1050,430,nil,.6) end end diff --git a/parts/scenes/main.lua b/parts/scenes/main.lua index f6e33db8..bfa42a42 100644 --- a/parts/scenes/main.lua +++ b/parts/scenes/main.lua @@ -94,7 +94,7 @@ function scene.keyDown(key,isRep) end elseif key==","then if testButton(8)then - SCN.go('manual') + SCN.go('replays') end elseif key=="2"then if testButton(9)then @@ -182,12 +182,12 @@ scene.widgetList={ WIDGET.newButton{name="setting",x=2480,y=210,w=800,h=100, color='lO',font=40,align='L',edge=30,code=pressKey"-"}, WIDGET.newButton{name="stat", x=2480,y=330,w=800,h=100, color='lL',font=40,align='L',edge=30,code=pressKey"p"}, WIDGET.newButton{name="dict", x=2480,y=450,w=800,h=100, color='lG',font=40,align='L',edge=30,code=pressKey"l"}, - 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="replays",x=2480,y=570,w=800,h=100, color='lC',font=40,align='L',edge=30,code=pressKey","}, WIDGET.newButton{name="music", x=130,y=80,w=200,h=90, color='lO',font=35,code=pressKey"2"}, WIDGET.newButton{name="lang", x=300,y=80,w=90,h=90, color='lN',font=40,code=pressKey"3",fText=TEXTURE.language}, WIDGET.newButton{name="about", x=-110,y=670,w=600,h=70, color='lB',font=35,align='R',edge=30,code=pressKey"x",fText=TEXTURE.info}, - WIDGET.newButton{name="back", x=1390,y=670,w=600,h=70, color='lR',fText=TEXTURE.back,align='L',edge=30,code=backScene}, + WIDGET.newButton{name="manual", x=1390,y=670,w=600,h=70, color='lR',fText=TEXTURE.question,align='L',edge=30,code=goScene'manual'}, } return scene \ No newline at end of file diff --git a/parts/scenes/main_simple.lua b/parts/scenes/main_simple.lua index ad45226e..48e71246 100644 --- a/parts/scenes/main_simple.lua +++ b/parts/scenes/main_simple.lua @@ -22,7 +22,7 @@ scene.widgetList={ WIDGET.newButton{name="marathon",x=640,y=480,w=260,font=50,code=function()loadGame('marathon_n',true)end}, WIDGET.newButton{name="setting",x=1000,y=400,w=120,fText=TEXTURE.setting,font=50,code=goScene'setting_game'}, WIDGET.newButton{name="lang", x=1000,y=560,w=120,fText=TEXTURE.language,font=40,code=goScene'lang'}, - WIDGET.newButton{name="manual", x=1160,y=400,w=120,fText=TEXTURE.question,font=80,code=goScene'manual'}, + WIDGET.newButton{name="manual", x=1160,y=400,w=120,fText=TEXTURE.sure,font=80,code=goScene'manual'}, WIDGET.newButton{name="quit", x=1160,y=560,w=120,fText=TEXTURE.quit,font=70,code=function()VOC.play('bye')SCN.swapTo('quit','slowFade')end}, } diff --git a/parts/scenes/stat.lua b/parts/scenes/stat.lua index 166ee4a4..a2ebe4c3 100644 --- a/parts/scenes/stat.lua +++ b/parts/scenes/stat.lua @@ -102,7 +102,6 @@ end scene.widgetList={ WIDGET.newButton{name="path", x=800,y=540,w=250,h=80,font=25,code=function()love.system.openURL(SAVEDIR)end,hide=MOBILE}, WIDGET.newButton{name="save", x=800,y=640,w=250,h=80,font=25,code=goScene'savedata'}, - WIDGET.newButton{name="replays",x=1100,y=540,w=250,h=80,font=25,code=goScene'replays'}, WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,fText=TEXTURE.back,code=backScene}, } diff --git a/parts/texture.lua b/parts/texture.lua index 146a2003..461f7874 100644 --- a/parts/texture.lua +++ b/parts/texture.lua @@ -111,8 +111,8 @@ for i=1,8 do gc.translate(-12*i,i==1 and -8 or -14) end ---Question mark -TEXTURE.question=DOGC{48,64, +--Sure mark +TEXTURE.sure=DOGC{48,64, {'fRect',0,0,10,27}, {'fRect',0,0,48,10}, {'fRect',38,10,10,15}, @@ -154,6 +154,13 @@ TEXTURE.info=DOGC{50,50, {'fRect',22,20,6,20}, } +--Question mark +TEXTURE.question=DOGC{50,50, + {'setLW',5}, + {'dCirc',25,25,22}, + {'print',"?",16,-6}, +} + --More mark TEXTURE.more=DOGC{60,15, {'fCirc',10,7,6},