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

整理代码，部分全局变量声明移入Zframework中

Browse Source
This commit is contained in:
MrZ626
2021-04-28 13:51:56 +08:00
parent 28576c2c9a
commit fcae6c61e4
6 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Zframework/init.lua
View File

@@ -1,3 +1,8 @@
NONE={}function NULL()end
EDITING=""
LOADED=false
ERRDATA={}
SCR= require"Zframework.screen" SCR= require"Zframework.screen"
COLOR= require"Zframework.color" COLOR= require"Zframework.color"
SCN= require"Zframework.scene" SCN= require"Zframework.scene"
@@ -128,7 +133,7 @@ function love.mousemoved(x,y,dx,dy,touch)
if SCN.swapping then return end if SCN.swapping then return end
dx,dy=dx/SCR.k,dy/SCR.k dx,dy=dx/SCR.k,dy/SCR.k
if SCN.mouseMove then SCN.mouseMove(mx,my,dx,dy)end if SCN.mouseMove then SCN.mouseMove(mx,my,dx,dy)end
if ms.isDown(1) then if ms.isDown(1)then
WIDGET.drag(mx,my,dx,dy) WIDGET.drag(mx,my,dx,dy)
else else
WIDGET.cursorMove(mx,my) WIDGET.cursorMove(mx,my)

2
Zframework/sysFX.lua
View File

@@ -114,7 +114,7 @@ end
local SYSFX={} local SYSFX={}
function SYSFX.update(dt) function SYSFX.update(dt)
for i=#fx,1,-1 do for i=#fx,1,-1 do
if fx[i]:update(dt) then if fx[i]:update(dt)then
rem(fx,i) rem(fx,i)
end end
end end

4
main.lua
View File

@@ -15,7 +15,6 @@
--Declaration --Declaration
goto REM love=require"love"::REM::--Just tell IDE to load love-api, no actual usage goto REM love=require"love"::REM::--Just tell IDE to load love-api, no actual usage
local fs=love.filesystem local fs=love.filesystem
NONE={}function NULL()end
DBP=print--Use this in temporary code, easy to find and remove DBP=print--Use this in temporary code, easy to find and remove
TIME=love.timer.getTime TIME=love.timer.getTime
YIELD=coroutine.yield YIELD=coroutine.yield
@@ -24,10 +23,7 @@ MOBILE=SYSTEM=="Android"or SYSTEM=="iOS"
SAVEDIR=fs.getSaveDirectory() SAVEDIR=fs.getSaveDirectory()
--Global Vars & Settings --Global Vars & Settings
LOADED=false
DAILYLAUNCH=false DAILYLAUNCH=false
EDITING=""
ERRDATA={}
--System setting --System setting
math.randomseed(os.time()*626) math.randomseed(os.time()*626)

2
parts/player/getSeqGen.lua
View File

@@ -2,7 +2,7 @@ local ins,rem=table.insert,table.remove
local yield=YIELD local yield=YIELD
local seqGens={ local seqGens={
none=function() while true do yield()end end, none=function()while true do yield()end end,
bag=function(P,seq0) bag=function(P,seq0)
local len=#seq0 local len=#seq0
local bag={} local bag={}

2
parts/player/update.lua
View File

@@ -398,7 +398,7 @@ function update.remote_alive(P,dt)
frmDelta<20 and 1 or frmDelta<20 and 1 or
frmDelta<45 and rnd(2)or frmDelta<45 and rnd(2)or
frmDelta<90 and 2 or frmDelta<90 and 2 or
frmDelta<180 and rnd(2,3) or frmDelta<180 and rnd(2,3)or
3 3
do do
local eventTime=P.stream[P.streamProgress] local eventTime=P.stream[P.streamProgress]

2
parts/scenes/setting_game.lua
View File

@@ -33,7 +33,7 @@ scene.widgetList={
WIDGET.newSwitch{name="dataSaving", x=750, y=550, font=20,disp=SETval("dataSaving"), code=SETrev("dataSaving")}, WIDGET.newSwitch{name="dataSaving", x=750, y=550, font=20,disp=SETval("dataSaving"), code=SETrev("dataSaving")},
WIDGET.newSwitch{name="autoPause", x=1060, y=310, font=20,disp=SETval("autoPause"), code=SETrev("autoPause")}, WIDGET.newSwitch{name="autoPause", x=1060, y=310, font=20,disp=SETval("autoPause"), code=SETrev("autoPause")},
WIDGET.newSwitch{name="swap", x=1060, y=370, font=20,disp=SETval("swap"), code=SETrev("swap")}, WIDGET.newSwitch{name="swap", x=1060, y=370, font=20,disp=SETval("swap"), code=SETrev("swap")},
WIDGET.newSwitch{name="fine", x=1060, y=430, font=20,disp=SETval("fine"), code=function()SETTING.fine=not SETTING.fine if SETTING.fine then SFX.play("finesseError",.6) end end}, WIDGET.newSwitch{name="fine", x=1060, y=430, font=20,disp=SETval("fine"), code=function()SETTING.fine=not SETTING.fine if SETTING.fine then SFX.play("finesseError",.6)end end},
WIDGET.newSwitch{name="appLock", x=1060, y=490, font=20,disp=SETval("appLock"), code=SETrev("appLock")}, WIDGET.newSwitch{name="appLock", x=1060, y=490, font=20,disp=SETval("appLock"), code=SETrev("appLock")},
WIDGET.newSwitch{name="simpMode", x=1060, y=550, font=25,disp=SETval("simpMode"), WIDGET.newSwitch{name="simpMode", x=1060, y=550, font=25,disp=SETval("simpMode"),
code=function() code=function()