diff --git a/Zframework/init.lua b/Zframework/init.lua index ea1958c0..9971c68b 100644 --- a/Zframework/init.lua +++ b/Zframework/init.lua @@ -186,12 +186,12 @@ function keyDown.calculator(k) TEXT.show("\68\69\86\58\85\78\76\79\67\75\65\76\76",640,360,60,"stretch",.6) SFX.play("clear_2") elseif S.val==137926261379 then - SCN.goto("debug") + SCN.go("debug") end end elseif k=="space"then if S.pass then - SCN.goto("load") + SCN.go("load") end end end @@ -216,7 +216,7 @@ function mouseDown.intro(x,y,k) VOC.play("bye") SCN.back() else - SCN.goto("main") + SCN.go("main") end end function touchDown.intro(id,x,y) @@ -339,7 +339,7 @@ function keyDown.mode(key) end elseif mapCam.sel=="custom_clear" or mapCam.sel=="custom_puzzle" then if key=="e"then - SCN.goto("custom") + SCN.go("custom") end end end @@ -396,7 +396,7 @@ function keyDown.custom(key) BGM.play(customRange.bgm[customSel[sel]]) end elseif key=="q"then - SCN.goto("sequence") + SCN.go("sequence") elseif key=="e"then SCN.swapTo("draw","swipe") elseif #key==1 then @@ -685,7 +685,7 @@ function keyDown.pause(key) elseif key=="escape"then resumeGame() elseif key=="s"then - SCN.goto("setting_sound") + SCN.go("setting_sound") elseif key=="r"then TASK.clear("play") resetGameData() @@ -1162,7 +1162,7 @@ function love.run() --Draw scene swapping animation if SCN.swapping then - _=SCN.swap + _=SCN.stat _.draw(_.time) end diff --git a/Zframework/scene.lua b/Zframework/scene.lua index f238f4b5..a812bc45 100644 --- a/Zframework/scene.lua +++ b/Zframework/scene.lua @@ -329,7 +329,7 @@ end local SCN={ cur="load",--Current scene swapping=false,--If Swapping - swap={ + stat={ tar=nil, --Swapping target style=nil, --Swapping style mid=nil, --Loading point @@ -340,7 +340,7 @@ local SCN={ }--Scene datas, returned function SCN.swapUpdate() - local S=SCN.swap + local S=SCN.stat S.time=S.time-1 if S.time==S.mid then SCN.init(S.tar,SCN.cur) @@ -395,7 +395,7 @@ local swap={ end}, }--Scene swapping animations function SCN.swapTo(tar,style)--Parallel scene swapping, cannot back - local S=SCN.swap + local S=SCN.stat if not SCN.swapping and tar~=SCN.cur then SCN.swapping=true if not style then style="fade"end @@ -407,7 +407,7 @@ function SCN.swapTo(tar,style)--Parallel scene swapping, cannot back S.draw=swap[3] end end -function SCN.goto(tar,style)--Normal scene swapping, can back +function SCN.go(tar,style)--Normal scene swapping, can back SCN.push()SCN.swapTo(tar,style) end function SCN.back() diff --git a/Zframework/timer.lua b/Zframework/timer.lua index c5d0d333..1e80f5e1 100644 --- a/Zframework/timer.lua +++ b/Zframework/timer.lua @@ -131,7 +131,7 @@ function Tmr.mode(dt) cam.x1=cam.x1*.85+x*.15 cam.y1=cam.y1*.85+y*.15 cam.k1=cam.k1*.85+k*.15 - local _=SCN.swap.tar + local _=SCN.stat.tar cam.zoomMethod=_=="play"and 1 or _=="mode"and 2 if cam.zoomMethod==1 then if cam.sel then diff --git a/Zframework/widgetList.lua b/Zframework/widgetList.lua index e68478f4..f0a3bac1 100644 --- a/Zframework/widgetList.lua +++ b/Zframework/widgetList.lua @@ -118,18 +118,18 @@ local Widgets={ newButton({name="play", x=800,y=600,w=180,h=90, color="lGreen", font=40,code=pressKey("space"),hide=function()return not sceneTemp.pass end}), }, main={ - newButton({name="play", x=150,y=280,w=200,h=160,color="lRed", font=55,code=function()SCN.goto("mode")end}), - newButton({name="setting", x=370,y=280,w=200,h=160,color="lBlue", font=45,code=function()SCN.goto("setting_game")end}), - newButton({name="music", x=590,y=280,w=200,h=160,color="lPurple",font=32,code=function()SCN.goto("music")end}), - newButton({name="help", x=150,y=460,w=200,h=160,color="lYellow",font=50,code=function()SCN.goto("help")end}), - newButton({name="stat", x=370,y=460,w=200,h=160,color="lCyan", font=43,code=function()SCN.goto("stat")end}), + newButton({name="play", x=150,y=280,w=200,h=160,color="lRed", font=55,code=function()SCN.go("mode")end}), + newButton({name="setting", x=370,y=280,w=200,h=160,color="lBlue", font=45,code=function()SCN.go("setting_game")end}), + newButton({name="music", x=590,y=280,w=200,h=160,color="lPurple",font=32,code=function()SCN.go("music")end}), + newButton({name="help", x=150,y=460,w=200,h=160,color="lYellow",font=50,code=function()SCN.go("help")end}), + newButton({name="stat", x=370,y=460,w=200,h=160,color="lCyan", font=43,code=function()SCN.go("stat")end}), newButton({name="qplay", x=590,y=460,w=200,h=160,color="lOrange",font=43,code=function()SCN.push()loadGame(stat.lastPlay,true)end}), - newButton({name="lang", x=150,y=610,w=160,h=100,color="lGreen", font=45,code=function()SCN.goto("setting_lang")end}), + newButton({name="lang", x=150,y=610,w=160,h=100,color="lGreen", font=45,code=function()SCN.go("setting_lang")end}), newButton({name="quit", x=590,y=610,w=160,h=100,color="lGrey", font=45,code=function()VOC.play("bye")SCN.swapTo("quit","slowFade")end}), }, mode={ newButton({name="setting", x=1100,y=540,w=240,h=90,color="lGreen", font=40,code=function() - SCN.goto("custom") + SCN.go("custom") end, hide=function() return mapCam.sel~="custom_clear" and mapCam.sel~="custom_puzzle" @@ -238,13 +238,13 @@ local Widgets={ setting_game={ newButton({name="graphic", x=200, y=80, w=240,h=80, color="lCyan", font=35,code=function()SCN.swapTo("setting_video","swipe")end}), newButton({name="sound", x=1080, y=80, w=240,h=80, color="lCyan", font=35,code=function()SCN.swapTo("setting_sound","swipe")end}), - newButton({name="ctrl", x=290, y=220, w=320,h=80, color="lYellow",font=35,code=function()SCN.goto("setting_control")end}), - newButton({name="key", x=640, y=220, w=320,h=80, color="lGreen", font=35,code=function()SCN.goto("setting_key")end}), - newButton({name="touch", x=990, y=220, w=320,h=80, color="lBlue", font=35,code=function()SCN.goto("setting_touch")end}), + newButton({name="ctrl", x=290, y=220, w=320,h=80, color="lYellow",font=35,code=function()SCN.go("setting_control")end}), + newButton({name="key", x=640, y=220, w=320,h=80, color="lGreen", font=35,code=function()SCN.go("setting_key")end}), + newButton({name="touch", x=990, y=220, w=320,h=80, color="lBlue", font=35,code=function()SCN.go("setting_touch")end}), newSlider({name="reTime", x=350, y=340, w=300,unit=10, font=30,disp=SETval("reTime"), code=SETsto("reTime")}), newSlider({name="maxNext", x=350, y=440, w=300,unit=6, font=30,disp=SETval("maxNext"), code=SETsto("maxNext")}), newButton({name="layout", x=460, y=540, w=140,h=70,color="white", font=35,code=function() - SCN.goto("setting_skin") + SCN.go("setting_skin") end}), newSwitch({name="autoPause",x=1080, y=320, font=20,disp=SETval("autoPause"), code=SETrev("autoPause")}), newSwitch({name="swap", x=1080, y=380, font=20,disp=SETval("swap"), code=SETrev("swap")}), @@ -390,7 +390,7 @@ local Widgets={ end}), newButton({name="option", x=520,y=180,w=170,h=80,color="white",font=40, code=function() - SCN.goto("setting_touchSwitch") + SCN.go("setting_touchSwitch") end}), newButton({name="back", x=760,y=180,w=170,h=80,color="white",font=40,code=BACK}), newSlider({name="size", x=450,y=265,w=460,unit=14,font=40, @@ -436,7 +436,7 @@ local Widgets={ newSwitch({name="icon", x=850, y=300, font=40,disp=SETval("VKIcon"),code=SETrev("VKIcon")}), newButton({name="tkset", x=1120, y=420, w=240,h=80,color="white",font=32, code=function() - SCN.goto("setting_trackSetting") + SCN.go("setting_trackSetting") end, hide=function() return not setting.VKTrack @@ -459,8 +459,8 @@ local Widgets={ newButton({name="back", x=640, y=600,w=200,h=80,color="white",font=40,code=BACK}), }, help={ - newButton({name="staff", x=980, y=500,w=150,h=80,color="white",font=32,code=function()SCN.goto("staff")end}), - newButton({name="his", x=1160, y=500,w=150,h=80,color="white",font=32,code=function()SCN.goto("history")end}), + newButton({name="staff", x=980, y=500,w=150,h=80,color="white",font=32,code=function()SCN.go("staff")end}), + newButton({name="his", x=1160, y=500,w=150,h=80,color="white",font=32,code=function()SCN.go("history")end}), newButton({name="qq", x=1070, y=600,w=200,h=80,color="white",font=32,code=function()love.system.openURL("tencent://message/?uin=1046101471&Site=&Menu=yes")end,hide=mobileHide}), newButton({name="back", x=640, y=600,w=200,h=80,color="white",font=40,code=BACK}), },