大多数菜单的二次确认统一用tryXXX管理

parts/gameFuncs.lua

@@ -15,18 +15,42 @@ local playSFX=SFX.play
 
 
 --System
-do--function tryBackScene()
+do--function tryBack()
-    local sureQuitTime=-1e99
+    local sureTime=-1e99
     function tryBack()
-        if TIME()-sureQuitTime<1 then
+        if TIME()-sureTime<1 then
-            sureQuitTime=-1e99
+            sureTime=-1e99
-            SCN.back()
+            return true
         else
-            sureQuitTime=TIME()
+            sureTime=TIME()
             MES.new('warn',text.sureQuit)
         end
     end
 end
+do--function tryReset()
+    local sureTime=-1e99
+    function tryReset()
+        if TIME()-sureTime<1 then
+            sureTime=-1e99
+            return true
+        else
+            sureTime=TIME()
+            MES.new('warn',text.sureReset)
+        end
+    end
+end
+do--function tryDelete()
+    local sureTime=-1e99
+    function tryDelete()
+        if TIME()-sureTime<1 then
+            sureTime=-1e99
+            return true
+        else
+            sureTime=TIME()
+            MES.new('warn',text.sureDelete)
+        end
+    end
+end
 do--function loadFile(name,args), function saveFile(data,name,args)
     local t=setmetatable({},{__index=function()return"'$1' loading failed: $2"end})
     function loadFile(name,args)

parts/language/lang_en.lua

@@ -12,6 +12,7 @@ return{
     },
     sureQuit="Press again to quit",
     sureReset="Press again to reset",
+    sureDelete="Press again to delete",
     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 take some rests!",

parts/language/lang_es.lua

@@ -2,6 +2,7 @@ return{
     fallback='en',
     sureQuit="Pulsa de nuevo para salir",
     -- sureReset="Press again to reset",
+    -- sureDelete="Press again to delete",
     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.",

parts/language/lang_fr.lua

@@ -2,6 +2,7 @@ return{
     fallback='en',
     sureQuit="Appuyez à nouveau pour sortir",
     -- sureReset="Press again to reset",
+    -- sureDelete="Press again to delete",
     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.",

parts/language/lang_pt.lua

@@ -3,6 +3,7 @@ return{
     fallback='en',
     sureQuit="Aparte novamente para sair",
     -- sureReset="Press again to reset",
+    -- sureDelete="Press again to delete",
     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.",

parts/language/lang_symbol.lua

@@ -14,6 +14,7 @@ return{
 
     sureQuit="X?",
     sureReset="R?",
+    sureDelete="D?",
     newDay="→→!→→",
     playedLong="→→→→!, XX□XX!",
     playedTooMuch="→→→→→→→→→→→!, XX□XX!!!!!!!",

parts/language/lang_zh.lua

@@ -12,6 +12,7 @@ return{
     },
     sureQuit="再按一次退出",
     sureReset="再按一次重置",
+    sureDelete="再按一次删除",
     newDay="新的一天，新的开始~",
     playedLong="已经玩很久了！注意休息！",
     playedTooMuch="今天玩太久啦！打块好玩但也要适可而止哦~",

parts/language/lang_zh_grass.lua

@@ -12,6 +12,7 @@ return{
     },
     sureQuit="再次按退出",
     sureReset="再次按下可重置",
+    sureDelete="再次按可删除",
     newDay="新的一天，新的开始！",
     playedLong="你已经玩了很长时间了。一定要好好休息！",
     playedTooMuch="你玩得太久了！玩方块游戏很有趣，但现在是休息的时候了。",

parts/language/lang_zh_trad.lua

@@ -12,6 +12,7 @@ return{
     },
     sureQuit="再按一次退出",
     sureReset="再按一次重設",
+    sureDelete="再按一次删除",
     newDay="新的一天，新的開始~",
     playedLong="你玩太久了！注意休息！",
     playedTooMuch="今天玩得太久啦！Techmino好玩但也要注意休息哦~",

parts/scenes/customGame.lua

@@ -24,9 +24,7 @@ local sList={
 
 local scene={}
 
-local sure
 function scene.sceneInit()
-    sure=0
     destroyPlayers()
     BG.set(CUSTOMENV.bg)
     BGM.play(CUSTOMENV.bgm)
@@ -80,7 +78,7 @@ function scene.keyDown(key,isRep)
     elseif key=='m'then
         SCN.go('custom_mission','swipeD')
     elseif key=='delete'then
-        if sure>.3 then
+        if tryReset()then
             TABLE.cut(FIELD)TABLE.cut(BAG)TABLE.cut(MISSION)
             FIELD[1]=DATA.newBoard()
             TABLE.clear(CUSTOMENV)
@@ -90,13 +88,9 @@ function scene.keyDown(key,isRep)
             saveFile(DATA.copyBoards(),'conf/customBoards')
             saveFile(DATA.copySequence(),'conf/customSequence')
             saveFile(CUSTOMENV,'conf/customEnv')
-            sure=0
             SFX.play('finesseError',.7)
             BG.set(CUSTOMENV.bg)
             BGM.play(CUSTOMENV.bgm)
-        else
-            sure=1
-            MES.new('info',text.sureReset)
         end
     elseif key=='f1'then
         SCN.go('mod','swipeD')
@@ -129,10 +123,6 @@ function scene.keyDown(key,isRep)
     end
 end
 
-function scene.update(dt)
-    if sure>0 then sure=sure-dt end
-end
-
 function scene.draw()
     gc.translate(0,-WIDGET.scrollPos)
     setFont(30)

parts/scenes/custom_field.lua

@@ -7,7 +7,6 @@ local ins,rem=table.insert,table.remove
 local FIELD=FIELD
 local scene={}
 
-local sure
 local curPen
 local pens={-2,0,-1,[false]=false}--Color (air/smart)
 local penMode
@@ -119,7 +118,6 @@ local function _pDraw()
 end
 
 function scene.sceneInit()
-    sure=0
     curPen=false
     penMode=0
     penX,penY=1,1
@@ -182,13 +180,9 @@ function scene.keyDown(key)
             _pTouch(penX,penY)
         end
     elseif key=='delete'then
-        if sure>.3 then
+        if tryReset()then
             FIELD[page]=DATA.newBoard()
-            sure=0
             SFX.play('finesseError',.7)
-        else
-            sure=1
-            MES.new('info',text.sureReset)
         end
     elseif key=='j'then
         demo=not demo
@@ -265,12 +259,6 @@ function scene.keyUp(key)
     end
 end
 
-function scene.update(dt)
-    if sure>0 then
-        sure=sure-dt
-    end
-end
-
 function scene.draw()
     gc.translate(200,60)
 

parts/scenes/custom_mission.lua

@@ -8,12 +8,10 @@ local scene={}
 
 local input--Input buffer
 local cur--Cursor position
-local sure
 
 function scene.sceneInit()
     input=""
     cur=#MISSION
-    sure=0
 end
 function scene.sceneBack()
     saveFile(DATA.copyMission(),'conf/customMissions')
@@ -62,14 +60,10 @@ function scene.keyDown(key)
             end
         end
     elseif key=='delete'then
-        if sure>.3 then
+        if tryReset()then
             TABLE.cut(MISSION)
             cur=0
-            sure=0
             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
@@ -117,12 +111,6 @@ function scene.keyDown(key)
     end
 end
 
-function scene.update(dt)
-    if sure>0 then
-        sure=sure-dt
-    end
-end
-
 function scene.draw()
     --Draw frame
     gc.setLineWidth(2)

parts/scenes/custom_sequence.lua

@@ -9,11 +9,9 @@ local gc_setColor,gc_print=gc.setColor,gc.print
 local scene={}
 
 local cur--Cursor position
-local sure
 
 function scene.sceneInit()
     cur=#BAG
-    sure=0
 end
 function scene.sceneBack()
     saveFile(DATA.copySequence(),'conf/customSequence')
@@ -66,14 +64,10 @@ function scene.keyDown(key)
             cur=cur-1
         end
     elseif key=='delete'then
-        if sure>.3 then
+        if tryReset()then
             TABLE.cut(BAG)
             cur=0
-            sure=0
             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}
@@ -119,12 +113,6 @@ function scene.keyDown(key)
     end
 end
 
-function scene.update(dt)
-    if sure>0 then
-        sure=sure-dt
-    end
-end
-
 local blockCharWidth={}for i=1,#BLOCK_CHARS do blockCharWidth[i]=gc.newText(FONT.get(60),BLOCK_CHARS[i]):getWidth()end
 function scene.draw()
     --Draw frame

parts/scenes/replays.lua

@@ -39,8 +39,6 @@ end}
 
 local scene={}
 
-local sure
-
 local function _playRep(fileName)
     local rep=DATA.parseReplay(fileName,true)
     if not rep.available then
@@ -72,7 +70,6 @@ end
 
 function scene.sceneInit()
     BG.set()
-    sure=0
     listBox:setList(REPLAY)
     local hide=listBox:getLen()==0
     for i=3,5 do
@@ -121,8 +118,7 @@ function scene.keyDown(key)
     elseif key=='delete'then
         local rep=listBox:getSel()
         if rep then
-            if sure>.3 then
+            if tryDelete()then
-                sure=0
                 listBox:remove()
                 love.filesystem.remove(rep.fileName)
                 for i=1,#REPLAY do
@@ -132,9 +128,6 @@ function scene.keyDown(key)
                     end
                 end
                 SFX.play('finesseError',.7)
-            else
-                sure=1
-                MES.new('info',text.sureReset)
             end
         end
     else
@@ -142,12 +135,6 @@ function scene.keyDown(key)
     end
 end
 
-function scene.update(dt)
-    if sure>0 then
-        sure=sure-dt
-    end
-end
-
 scene.widgetList={
     listBox,
     WIDGET.newButton{name='export',x=180,y=640,w=140,h=80,color='lG',code=pressKey'cC',font=50,fText=CHAR.icon.export},