From 3d0a39dd342c5252a31463af0993cdb841f8b33f Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Sat, 16 Oct 2021 02:59:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=80=E6=9C=89=E8=A6=81=E4=BA=8C=E6=AC=A1?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E7=9A=84=E6=8C=89=E9=92=AE=E9=83=BD=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E5=B7=A6=E4=B8=8A=E8=A7=92=E6=8F=90=E7=A4=BA=E8=80=8C?= =?UTF-8?q?=E4=B8=8D=E6=98=AF=E6=98=BE=E7=A4=BA=E9=97=AE=E5=8F=B7=20?= =?UTF-8?q?=E7=A7=BB=E9=99=A4=E7=A1=AE=E8=AE=A4=E7=94=A8=E9=97=AE=E5=8F=B7?= =?UTF-8?q?=E8=B4=B4=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/language/lang_en.lua | 1 + parts/language/lang_es.lua | 1 + parts/language/lang_fr.lua | 1 + parts/language/lang_pt.lua | 1 + parts/language/lang_zh.lua | 1 + parts/language/lang_zh3.lua | 1 + parts/scenes/customGame.lua | 6 +----- parts/scenes/custom_field.lua | 7 +------ parts/scenes/custom_mission.lua | 7 +------ parts/scenes/custom_sequence.lua | 7 +------ parts/scenes/replays.lua | 9 +-------- parts/texture.lua | 9 --------- 12 files changed, 11 insertions(+), 40 deletions(-) diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index e61a6ed9..a99a1ca6 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -10,6 +10,7 @@ return{ finish="Press any key to start!", }, sureQuit="Press again to quit", + sureReset="Press again to reset", newDay="A new day, a new beginning!", playedLong="You have been playing for a long time. Time to a break!", playedTooMuch="You have been playing for far too long! Techmino is fun, but remember to have some rests!", diff --git a/parts/language/lang_es.lua b/parts/language/lang_es.lua index bc09c337..4dbfc233 100644 --- a/parts/language/lang_es.lua +++ b/parts/language/lang_es.lua @@ -1,6 +1,7 @@ return{ fallback='en', sureQuit="Pulsa de nuevo para salir", + -- sureReset="Press again to reset", newDay="[Anti-adicción] ¡Nuevo día, nuevo comienzo!", playedLong="[Anti-adicción] Estuviste jugando un buen rato hoy. Recuerda descansar de vez en cuando.", playedTooMuch="[Anti-adicción] ¡Has jugado mucho por hoy! No puedes jugar más.", diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index c830e6a9..fa9e27f6 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -1,6 +1,7 @@ return{ fallback='en', sureQuit="Appuyez à nouveau pour sortir", + -- sureReset="Press again to reset", newDay="[Anti-addiction] Nouveau jour, nouveau commencement !", playedLong="[Anti-addiction] Vous avez joué pendant un bon bout de temps aujourd'hui. Faites des pauses.", playedTooMuch="[Anti-addiction] Vous avez joué trop longtemps ! Vous ne pouvez plus jouer.", diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index 0adf0b6b..718de450 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -2,6 +2,7 @@ local C=COLOR return{ fallback='en', sureQuit="Aparte novamente para sair", + -- sureReset="Press again to reset", newDay="[Anti-vício] Novo dia, um começo novo!", playedLong="[Anti-vício] Você andou jogando bastante hoje. Certifique-se de fazer pausas.", playedTooMuch="[Anti-vício] Você esteve jogando demais hoje! Você não pode jogar mais.", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 389b9b41..e8889d3b 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -10,6 +10,7 @@ return{ finish="按任意键继续", }, sureQuit="再按一次退出", + sureReset="再按一次重置", newDay="新的一天,新的开始~", playedLong="已经玩很久了!注意休息!", playedTooMuch="今天玩太久啦!打块好玩但也要适可而止哦~", diff --git a/parts/language/lang_zh3.lua b/parts/language/lang_zh3.lua index 2fbf9c19..66c3f149 100644 --- a/parts/language/lang_zh3.lua +++ b/parts/language/lang_zh3.lua @@ -11,6 +11,7 @@ return{ finish="按任意按钮开始!", }, sureQuit="再次按退出", + sureReset="再次按下可重置", newDay="新的一天,新的开始!", playedLong="你已经玩了很长时间了。一定要好好休息!", playedTooMuch="你玩得太久了!玩方块游戏很有趣,但现在是休息的时候了。", diff --git a/parts/scenes/customGame.lua b/parts/scenes/customGame.lua index d9406799..3994aaf1 100644 --- a/parts/scenes/customGame.lua +++ b/parts/scenes/customGame.lua @@ -92,6 +92,7 @@ function scene.keyDown(key,isRep) BGM.play(CUSTOMENV.bgm) else sure=1 + MES.new('info',text.sureReset) end elseif key=="f1"then SCN.go('mod','swipeD') @@ -176,11 +177,6 @@ function scene.draw() gc.setColor(COLOR.Z) gc.print(CUSTOMENV.sequence,610,250) - --Confirm reset - if sure>0 then - gc.setColor(1,1,1,sure) - 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 790a8d3e..b7b6d602 100644 --- a/parts/scenes/custom_field.lua +++ b/parts/scenes/custom_field.lua @@ -191,6 +191,7 @@ function scene.keyDown(key) SFX.play('finesseError',.7) else sure=1 + MES.new('info',text.sureReset) end elseif key=="j"then demo=not demo @@ -438,12 +439,6 @@ function scene.draw() end gc.translate(-560,-475) - --Confirm reset - if sure>0 then - gc.setColor(1,1,1,sure) - mDraw(TEXTURE.sure,990,530,nil,1.2) - end - --Block name setFont(55) gc.setColor(1,1,1) diff --git a/parts/scenes/custom_mission.lua b/parts/scenes/custom_mission.lua index 98d5eea9..4671b0c1 100644 --- a/parts/scenes/custom_mission.lua +++ b/parts/scenes/custom_mission.lua @@ -69,6 +69,7 @@ function scene.keyDown(key) SFX.play('finesseError',.7) else sure=1 + MES.new('info',text.sureReset) end elseif key=="c"and kb.isDown("lctrl","rctrl")or key=="cC"then if #MISSION>0 then @@ -183,12 +184,6 @@ function scene.draw() --Draw cursor gc.setColor(1,1,.4,.6+.4*sin(TIME()*6.26)) gc.line(cx-5,cy-20,cx-5,cy+20) - - --Confirm reset - if sure>0 then - gc.setColor(1,1,1,sure) - mDraw(TEXTURE.sure,1000,640,nil,.9) - end end scene.widgetList={ diff --git a/parts/scenes/custom_sequence.lua b/parts/scenes/custom_sequence.lua index 1f111f47..bc421566 100644 --- a/parts/scenes/custom_sequence.lua +++ b/parts/scenes/custom_sequence.lua @@ -73,6 +73,7 @@ function scene.keyDown(key) SFX.play('finesseError',.7) else sure=1 + MES.new('info',text.sureReset) end elseif key=="="then local l={1,2,3,4,5,6,7} @@ -179,12 +180,6 @@ function scene.draw() --Draw cursor gc_setColor(.5,1,.5,.6+.4*sin(TIME()*6.26)) gc.line(cx-5,cy-20,cx-5,cy+20) - - --Confirm reset - if sure>0 then - gc_setColor(1,1,1,sure) - mDraw(TEXTURE.sure,1000,460,nil,.8) - end end scene.widgetList={ diff --git a/parts/scenes/replays.lua b/parts/scenes/replays.lua index ff7507ed..95273494 100644 --- a/parts/scenes/replays.lua +++ b/parts/scenes/replays.lua @@ -134,6 +134,7 @@ function scene.keyDown(key) SFX.play('finesseError',.7) else sure=1 + MES.new('info',text.sureReset) end end elseif key=="escape"then @@ -149,14 +150,6 @@ function scene.update(dt) end end -function scene.draw() - --Confirm delete - if sure>0 then - gc_setColor(1,1,1,sure) - mDraw(TEXTURE.sure,930,640,nil,.9) - end -end - scene.widgetList={ listBox, WIDGET.newButton{name="export",x=200,y=640,w=70,color='lG',code=pressKey"cC",font=50,fText=CHAR.icon.export}, diff --git a/parts/texture.lua b/parts/texture.lua index 0421f737..3781e676 100644 --- a/parts/texture.lua +++ b/parts/texture.lua @@ -154,15 +154,6 @@ TEXTURE.dial={ } } -TEXTURE.sure=GC.DO{48,64, - {'fRect',0,0,10,27}, - {'fRect',0,0,48,10}, - {'fRect',38,10,10,15}, - {'fRect',19,25,29,9}, - {'fRect',19,25,9,22}, - {'fRect',18,53,11,11}, -} - TEXTURE.rep={--Replay speed buttons rep0=GC.DO{50,50,{'fRect',11,8,8,34},{'fRect',31,8,8,34}}, repP8=GC.DO{50,50,{'setFT',15},{'mText',"0.125x",25,15}},