SweetSea/Techmino
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

移除加载时可能的强制重启（防止ios出问题）

Browse Source 
几处love退出改为去quit场景（防止ios出问题）
整理代码
框架跟进
This commit is contained in:
MrZ_26
2022-11-06 17:28:54 +08:00
parent d932febe89
commit f70edaac83
66 changed files with 252 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
parts/scenes/about.lua
View File

@@ -4,7 +4,7 @@ local sin=math.sin
local scene={}
function scene.sceneInit()
function scene.enter()
BG.set()
end

2
parts/scenes/account.lua
View File

@@ -2,7 +2,7 @@
local scene={}
function scene.sceneInit()
function scene.enter()
end

2
parts/scenes/app_15p.lua
View File

@@ -14,7 +14,7 @@ local slide,pathVis,revKB
local function ifGaming() return state==1 end
local colorSelector=WIDGET.newSelector{name='color',x=150,y=240,w=200,list={'color1','rainbow','color2','gray','black'},color='lY',disp=function() return color end,code=function(v) if state~=1 then color=v end end,hideF=ifGaming}
function scene.sceneInit()
function scene.enter()
BG.set('rainbow2')
BGM.play('push')
board={{1,2,3,4},{5,6,7,8},{9,10,11,12},{13,14,15,16}}

2
parts/scenes/app_2048.lua
View File

@@ -225,7 +225,7 @@ local function skip()
end
end
function scene.sceneInit()
function scene.enter()
BG.set('cubes')
BGM.play('truth')
board={}

2
parts/scenes/app_AtoZ.lua
View File

@@ -29,7 +29,7 @@ local startTime,time
local state,progress
local frameKeyCount,mistake
function scene.sceneInit()
function scene.enter()
BG.set('bg2')
BGM.play('way')
levelName="A_Z"

2
parts/scenes/app_UTTT.lua
View File

@@ -94,7 +94,7 @@ end
local scene={}
function scene.sceneInit()
function scene.enter()
restart()
BGM.play('truth')
BG.set('rainbow')

2
parts/scenes/app_arithmetic.lua
View File

@@ -153,7 +153,7 @@ end
local scene={}
function scene.sceneInit()
function scene.enter()
reset()
BGM.play('truth')
end

4
parts/scenes/app_calc.lua
View File

@@ -24,12 +24,12 @@ local function _autoReturn()
end
end
function scene.sceneInit()
function scene.enter()
BG.set('none')
BGM.stop()
reg,val,sym=false,"0",false
end
function scene.sceneBack()
function scene.leave()
BGM.play()
end

2
parts/scenes/app_cannon.lua
View File

@@ -6,7 +6,7 @@ local state,timer,score,combo
local x,y,vx,vy,ex,ey
local scene={}
function scene.sceneInit()
function scene.enter()
pow,ang=0,0
state=0
timer=0

30
parts/scenes/app_console.lua
View File

@@ -711,20 +711,22 @@ local commands={} do
local button=WIDGET.newButton{name='bye',x=640,y=615,w=426,h=100,code=function()
TASK.new(function()
scene.widgetList.bye.hide=true
for _=1,30 do coroutine.yield() end
TEST.yieldN(30)
log{C.R,"Deleting all data in 10..."}SFX.play('ready')SFX.play('clear_1')TEST.yieldN(60)
log{C.R,"Deleting all data in 9..."}SFX.play('ready')SFX.play('clear_1')TEST.yieldN(60)
log{C.R,"Deleting all data in 8..."}SFX.play('ready')SFX.play('clear_1')TEST.yieldN(60)
log{C.R,"Deleting all data in 7..."}SFX.play('ready')SFX.play('clear_2')TEST.yieldN(60)
log{C.R,"Deleting all data in 6..."}SFX.play('ready')SFX.play('clear_2')TEST.yieldN(60)
log{C.R,"Deleting all data in 5..."}SFX.play('ready')SFX.play('clear_3')TEST.yieldN(60)
log{C.R,"Deleting all data in 4..."}SFX.play('ready')SFX.play('clear_3')TEST.yieldN(60)
log{C.R,"Deleting all data in 3..."}SFX.play('ready')SFX.play('clear_4')TEST.yieldN(60)
log{C.R,"Deleting all data in 2..."}SFX.play('ready')SFX.play('clear_4')TEST.yieldN(60)
log{C.R,"Deleting all data in 1..."}SFX.play('ready')SFX.play('clear_5')TEST.yieldN(60)
log{C.R,"Deleting all data in 0..."}SFX.play('start')SFX.play('clear_6')TEST.yieldN(60)
outputBox.hide=true TEST.yieldN(26)
FILE.clear_s('')love.event.quit()
log{C.R,"Deleting all data in 9..."} SFX.play('ready')SFX.play('clear_1')TEST.yieldN(60)
log{C.R,"Deleting all data in 8..."} SFX.play('ready')SFX.play('clear_1')TEST.yieldN(60)
log{C.R,"Deleting all data in 7..."} SFX.play('ready')SFX.play('clear_2')TEST.yieldN(60)
log{C.R,"Deleting all data in 6..."} SFX.play('ready')SFX.play('clear_2')TEST.yieldN(60)
log{C.R,"Deleting all data in 5..."} SFX.play('ready')SFX.play('clear_3')TEST.yieldN(60)
log{C.R,"Deleting all data in 4..."} SFX.play('ready')SFX.play('clear_3')TEST.yieldN(60)
log{C.R,"Deleting all data in 3..."} SFX.play('ready')SFX.play('clear_4')TEST.yieldN(60)
log{C.R,"Deleting all data in 2..."} SFX.play('ready')SFX.play('clear_4')TEST.yieldN(60)
log{C.R,"Deleting all data in 1..."} SFX.play('ready')SFX.play('clear_5')TEST.yieldN(60)
log{C.R,"Deleting all data in 0..."} SFX.play('start')SFX.play('clear_6')TEST.yieldN(60)
outputBox.hide=true
TEST.yieldN(26)
FILE.clear_s('')
love.event.quit()
end)
end}
button:setObject("Techmino is fun. Bye.")
@@ -1014,7 +1016,7 @@ userG.the_key=first_key
function scene.sceneInit()
function scene.enter()
WIDGET.focus(inputBox)
BG.set('none')
end

2
parts/scenes/app_cubefield.lua
View File

@@ -45,7 +45,7 @@ end
local scene={}
function scene.sceneInit()
function scene.enter()
cubesX={} for i=1,40 do cubesX[i]=rnd()*16-8 end
cubesY={} for i=1,40 do cubesY[i]=i/40*9 end
lastCube=1

2
parts/scenes/app_dropper.lua
View File

@@ -33,7 +33,7 @@ local function restart()
end
end
function scene.sceneInit()
function scene.enter()
restart()
state='menu'
BGM.play('hang out')

2
parts/scenes/app_dtw.lua
View File

@@ -197,7 +197,7 @@ end
local scene={}
function scene.sceneInit()
function scene.enter()
reset()
BG.set('fixColor',.26,.26,.26)
BGM.play(bgm)

2
parts/scenes/app_link.lua
View File

@@ -243,7 +243,7 @@ end
local scene={}
function scene.sceneInit()
function scene.enter()
invis=false
newGame()
BGM.play('truth')

2
parts/scenes/app_mahjong.lua
View File

@@ -105,7 +105,7 @@ end
local scene={}
function scene.sceneInit()
function scene.enter()
BG.set('fixColor',.26,.62,.26)
_newGame()
selected=false

2
parts/scenes/app_memorize.lua
View File

@@ -29,7 +29,7 @@ local function _reset()
freshLevel()
end
function scene.sceneInit()
function scene.enter()
state=1
timeUsed=0
level=0

2
parts/scenes/app_piano.lua
View File

@@ -13,7 +13,7 @@ local offset
local scene={}
function scene.sceneInit()
function scene.enter()
inst='lead'
offset=0
end

2
parts/scenes/app_polyforge.lua
View File

@@ -27,7 +27,7 @@ end
local scene={}
function scene.sceneInit()
function scene.enter()
state=0
ang,pos=0,-tau/4
timer=50

2
parts/scenes/app_pong.lua
View File

@@ -14,7 +14,7 @@ local ry=0-- Rotation Y
local p1,p2-- Player data
function scene.sceneInit()
function scene.enter()
BG.set('none')
BGM.play('way')
state=0

2
parts/scenes/app_reflect.lua
View File

@@ -15,7 +15,7 @@ local function reset()
s1,s2=0,0
end
function scene.sceneInit()
function scene.enter()
reset()
BG.set('none')
end

2
parts/scenes/app_schulteG.lua
View File

@@ -11,7 +11,7 @@ local startTime,time
local state,progress
local tapFX,mistake
function scene.sceneInit()
function scene.enter()
BG.set('space')
BGM.play('way')
board={}

2
parts/scenes/app_stopwatch.lua
View File

@@ -23,7 +23,7 @@ end
local scene={}
function scene.sceneInit()
function scene.enter()
state=0
time1=STRING.time(0)
time2=STRING.time(0)

2
parts/scenes/app_tap.lua
View File

@@ -8,7 +8,7 @@ local scene={}
local lastKey,keyTime
local speed,maxSpeed=0,260
function scene.sceneInit()
function scene.enter()
lastKey=nil
speed=0
keyTime={} for i=1,40 do keyTime[i]=-1e99 end

2
parts/scenes/app_ten.lua
View File

@@ -54,7 +54,7 @@ local function reset()
fallingTimer=false
failPos=false
end
function scene.sceneInit()
function scene.enter()
BG.set('rainbow2')
BGM.play('truth')
preview={}

2
parts/scenes/app_triple.lua
View File

@@ -264,7 +264,7 @@ end
local scene={}
function scene.sceneInit()
function scene.enter()
player:reset()
BGM.play('truth')
end

4
parts/scenes/customGame.lua
View File

@@ -24,12 +24,12 @@ local sList={
local scene={}
function scene.sceneInit()
function scene.enter()
destroyPlayers()
BG.set(CUSTOMENV.bg)
BGM.play(CUSTOMENV.bgm)
end
function scene.sceneBack()
function scene.leave()
saveFile(CUSTOMENV,'conf/customEnv')
BGM.play()
end

4
parts/scenes/custom_field.lua
View File

@@ -117,14 +117,14 @@ local function _pDraw()
while #F>0 and isEmpty(F[#F]) do rem(F) end
end
function scene.sceneInit()
function scene.enter()
curPen=false
penMode=0
penX,penY=1,1
demo=false
page=1
end
function scene.sceneBack()
function scene.leave()
saveFile(DATA.copyBoards(),'conf/customBoards')
end

4
parts/scenes/custom_mission.lua
View File

@@ -9,11 +9,11 @@ local scene={}
local input-- Input buffer
local cur-- Cursor position
function scene.sceneInit()
function scene.enter()
input=""
cur=#MISSION
end
function scene.sceneBack()
function scene.leave()
saveFile(DATA.copyMission(),'conf/customMissions')
end

4
parts/scenes/custom_sequence.lua
View File

@@ -9,10 +9,10 @@ local scene={}
local cur-- Cursor position
function scene.sceneInit()
function scene.enter()
cur=#BAG
end
function scene.sceneBack()
function scene.leave()
saveFile(DATA.copySequence(),'conf/customSequence')
end

2
parts/scenes/depause.lua
View File

@@ -4,7 +4,7 @@ local scene={}
local timer
function scene.sceneInit()
function scene.enter()
timer=1
scene.widgetList.pause.x=
SETTING.menuPos=='right' and 1195 or

2
parts/scenes/dict.lua
View File

@@ -75,7 +75,7 @@ local function _search()
lastSearch=input
end
function scene.sceneInit()
function scene.enter()
dict=require("parts.language.dict_"..(SETTING.locale:find'zh' and 'zh' or SETTING.locale:find'ja' and 'ja' or 'en'))
_scanDict(dict)

4
parts/scenes/error.lua
View File

@@ -4,7 +4,7 @@ local errorShot,errorInfo
local scene={}
function scene.sceneInit()
function scene.enter()
BGcolor=math.random()>.026 and {.3,.5,.9} or {.62,.3,.926}
sysAndScn=SYSTEM.."-"..VERSION.string.." scene:"..Z.getErr('#').scene
errorText=LOADED and text.errorMsg or "An error has occurred while the game was loading.\nAn error log has been created so you can send it to the author."
@@ -34,7 +34,7 @@ end
scene.widgetList={
WIDGET.newKey{name='console',x=940,y=640,w=170,h=80,font=65,fText=CHAR.icon.console,code=goScene'app_console'},
WIDGET.newKey{name='quit',x=1140,y=640,w=170,h=80,font=40,fText=CHAR.icon.cross_thick,code=love.event.quit},
WIDGET.newKey{name='quit',x=1140,y=640,w=170,h=80,font=40,fText=CHAR.icon.cross_thick,code=goScene('quit','none')},
}
return scene

2
parts/scenes/game.lua
View File

@@ -133,7 +133,7 @@ local function _checkGameKeyDown(key)
return true-- No key pressed
end
function scene.sceneInit()
function scene.enter()
if GAME.init then
resetGameData()
GAME.init=false

2
parts/scenes/history.lua
View File

@@ -1,6 +1,6 @@
local scene={}
function scene.sceneInit()
function scene.enter()
BG.set('cubes')
scene.widgetList.texts:setTexts(require"parts.updateLog":split("\n"))
end

2
parts/scenes/lang.lua
View File

@@ -20,7 +20,7 @@ local curLang=1
local scene={}
function scene.sceneBack()
function scene.leave()
saveSettings()
end

2
parts/scenes/legals.lua
View File

@@ -1,5 +1,5 @@
local scene={}
function scene.sceneInit()
function scene.enter()
BG.set('cubes')
local fileData=love.filesystem.read("legals.md")
if fileData then

8
parts/scenes/load.lua
View File

@@ -110,15 +110,15 @@ local loadingThread=coroutine.wrap(function()
return 'finish'
end)
function scene.sceneInit()
function scene.enter()
studioLogo=GC.newText(getFont(90),"26F Studio")
progress=0
maxProgress=10
t1,t2=0,0-- Timer
animeType={} for i=1,#SVG_TITLE_FILL do animeType[i]=math.random(#titleTransform) end-- Random animation type
end
function scene.sceneBack()
love.event.quit()
function scene.leave()
SCN.go('quit','none')
end
function scene.mouseDown()
@@ -134,7 +134,7 @@ end
scene.touchDown=scene.mouseDown
function scene.keyDown(key)
if key=='escape' then
love.event.quit()
SCN.go('quit','none')
else
scene.mouseDown()
end

2
parts/scenes/login_mail.lua
View File

@@ -29,7 +29,7 @@ local function _paste()
MES.new('warn',text.wrongCode)
end
function scene.sceneInit()
function scene.enter()
scene.widgetList.email:setText(USER.email or "")
scene.widgetList.code:clear()
end

2
parts/scenes/login_pw.lua
View File

@@ -15,7 +15,7 @@ end
local scene={}
function scene.sceneInit()
function scene.enter()
showEmail=false
emailBox.secret=true
emailBox:setText(USER.email)

2
parts/scenes/main.lua
View File

@@ -18,7 +18,7 @@ local enterConsole=coroutine.wrap(function()
Snd('bell',.6,'A4',.7,'A5',1,'A6')SFX.play('ren_mega')SCN.go('app_console')coroutine.yield()
end
end)
function scene.sceneInit()
function scene.enter()
if THEME.cur=='halloween' then
TASK.new(function()
TEST.yieldT(.26)

2
parts/scenes/main_simple.lua
View File

@@ -2,7 +2,7 @@ local scene={}
local tip=GC.newText(getFont(30),"")
function scene.sceneInit()
function scene.enter()
tip:set(text.getTip())
BG.set()
end

2
parts/scenes/manual.lua
View File

@@ -1,6 +1,6 @@
local scene={}
function scene.sceneInit()
function scene.enter()
BG.set('cubes')
local fileData=FILE.load('parts/language/manual_'..(SETTING.locale:find'zh' and 'zh' or SETTING.locale:find'ja' and 'ja' or 'en')..'.txt','-string')
if fileData then

2
parts/scenes/mod.lua
View File

@@ -38,7 +38,7 @@ local function _toggleMod(M,back)
scene.widgetList.unranked.hide=scoreValid()
end
function scene.sceneInit()
function scene.enter()
selected=false
scene.widgetList.unranked.hide=scoreValid()
BG.set('tunnel')

2
parts/scenes/mode.lua
View File

@@ -24,7 +24,7 @@ local touchDist
local scene={}
function scene.sceneInit()
function scene.enter()
BG.set()
mapCam.zoomK=SCN.prev=='main' and 5 or 1
visibleModes={}-- 1=unlocked, 2=locked but visible

2
parts/scenes/music.lua
View File

@@ -23,7 +23,7 @@ local selected-- Music selected
local bgmList=BGM.getList()
if #bgmList==0 then bgmList={"[NO BGM]"} end
function scene.sceneInit()
function scene.enter()
playing=BGM.getPlaying()[1]
selected=TABLE.find(bgmList,playing) or 1
end

4
parts/scenes/net_game.lua
View File

@@ -59,7 +59,7 @@ end
local scene={}
function scene.sceneInit()
function scene.enter()
noTouch=not SETTING.VKSwitch
playing=false
lastUpstreamTime=0
@@ -73,7 +73,7 @@ function scene.sceneInit()
GAME.prevBG=false
end
end
function scene.sceneBack()
function scene.leave()
TASK.unlock('netPlaying')
end

2
parts/scenes/net_league.lua
View File

@@ -2,7 +2,7 @@ local gc=love.graphics
local scene={}
function scene.sceneInit()
function scene.enter()
BG.set('league')
BGM.play('exploration')
end

4
parts/scenes/net_menu.lua
View File

@@ -1,9 +1,9 @@
local scene={}
function scene.sceneInit()
function scene.enter()
BG.set()
end
function scene.sceneBack()
function scene.leave()
NET.ws_close()
TASK.removeTask_code(NET.ws_update)
end

4
parts/scenes/net_newRoom.lua
View File

@@ -50,11 +50,11 @@ local function _createRoom()
end
end
function scene.sceneInit()
function scene.enter()
sure=0
destroyPlayers()
end
function scene.sceneBack()
function scene.leave()
BGM.play()
end

2
parts/scenes/net_rooms.lua
View File

@@ -71,7 +71,7 @@ local function _fetchRoom()
end
local scene={}
function scene.sceneInit()
function scene.enter()
BG.set()
_fetchRoom()
end

4
parts/scenes/pause.lua
View File

@@ -17,7 +17,7 @@ local rank-- Current rank
local trophy-- Current trophy
local trophyColor-- Current trophy color
function scene.sceneInit()
function scene.enter()
page=0
if SCN.prev:find("setting") then
TEXT.show(text.needRestart,640,410,50,'fly',.6)
@@ -116,7 +116,7 @@ function scene.sceneInit()
GAME.prevBG=false
end
end
function scene.sceneBack()
function scene.leave()
trySave()
end

16
parts/scenes/quit.lua
View File

@@ -1,19 +1,19 @@
local scene={}
function scene.sceneInit()
if SYSTEM~="iOS" then
function scene.enter()
if SYSTEM=="iOS" then
MES.update(1e99)
Z.setPowerInfo(false)
Z.setClickFX(false)
VERSION.string=""
MES.new('error',"Please swipe up or press Home button to quit Techmino on iOS",1e99)
else
if math.random()>.0000626 then
love.timer.sleep(.26)
love.event.quit()
else
error("So lucky! 0.00626% to get this!! You can quit the game now.")
end
else
MES.update(1e99)
Z.setPowerInfo(false)
Z.setClickFX(false)
VERSION.string=""
MES.new('error',"Please swipe up or press Home button to quit Techmino on iOS",1e99)
end
end

2
parts/scenes/replays.lua
View File

@@ -68,7 +68,7 @@ local function _updateButtonVisibility()
scene.widgetList[i].hide=hide
end
end
function scene.sceneInit()
function scene.enter()
BG.set()
listBox:setList(REPLAY)
_updateButtonVisibility()

2
parts/scenes/setting_control.lua
View File

@@ -5,7 +5,7 @@ local scene={}
local das,arr
local pos,dir,wait
function scene.sceneInit()
function scene.enter()
das,arr=SETTING.das,SETTING.arr
pos,dir,wait=0,1,30
BG.set('bg1')

4
parts/scenes/setting_game.lua
View File

@@ -2,10 +2,10 @@ local gc=love.graphics
local scene={}
function scene.sceneInit()
function scene.enter()
BG.set()
end
function scene.sceneBack()
function scene.leave()
saveSettings()
end

4
parts/scenes/setting_key.lua
View File

@@ -98,12 +98,12 @@ local function _freshKeyList()
end
end
function scene.sceneInit()
function scene.enter()
selected=false
_freshKeyList()
BG.set('none')
end
function scene.sceneBack()
function scene.leave()
saveFile(KEY_MAP,'conf/key')
end

2
parts/scenes/setting_skin.lua
View File

@@ -11,7 +11,7 @@ local playEgg=WIDGET.newButton{name='playEgg', x=1140,y=540,w=140,h=65,color='l
local scene={}
function scene.sceneInit()
function scene.enter()
selEggMode=false
scene.widgetList.playEgg.hide=true
BG.set()

4
parts/scenes/setting_sound.lua
View File

@@ -8,7 +8,7 @@ local last1,last2-- Last touch/sound time
local sfxPack=SETTING.sfxPack
local vocPack=SETTING.vocPack
function scene.sceneInit()
function scene.enter()
last1,last2=0,0
sfxPack=SETTING.sfxPack
vocPack=SETTING.vocPack
@@ -16,7 +16,7 @@ function scene.sceneInit()
scene.widgetList.vocPack:reset()
BG.set()
end
function scene.sceneBack()
function scene.leave()
saveSettings()
end

4
parts/scenes/setting_touch.lua
View File

@@ -31,12 +31,12 @@ local function _load2()
end
end
function scene.sceneInit()
function scene.enter()
BG.set('rainbow')
defaultSetSelect=1
selected=false
end
function scene.sceneBack()
function scene.leave()
saveFile(VK_ORG,'conf/virtualkey')
end

2
parts/scenes/setting_touchSwitch.lua
View File

@@ -1,6 +1,6 @@
local scene={}
function scene.sceneInit()
function scene.enter()
BG.set('matrix')
end

2
parts/scenes/setting_video.lua
View File

@@ -2,7 +2,7 @@ local gc=love.graphics
local scene={}
function scene.sceneBack()
function scene.leave()
saveSettings()
end

2
parts/scenes/staff.lua
View File

@@ -10,7 +10,7 @@ local patron=require"parts.patron"
local names
local counter
function scene.sceneInit()
function scene.enter()
time=0
v=22.6
BG.set()

2
parts/scenes/stat.lua
View File

@@ -3,7 +3,7 @@ local scene={}
local form-- Form of clear & spins
local item-- Detail datas
function scene.sceneInit()
function scene.enter()
BG.set()
local S=STAT
local X1,X2,Y1,Y2={0,0,0,0},{0,0,0,0},{},{}

2
parts/scenes/test.lua
View File

@@ -9,7 +9,7 @@ local function _push(mes)
timer=1
end
function scene.sceneInit()
function scene.enter()
backCounter=5
list={}
timer=0