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

统一NONE和NULL

Browse Source
This commit is contained in:
MrZ626
2020-11-05 00:30:54 +08:00
parent 228518ad95
commit 2d671114f5
4 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Zframework/bg.lua
View File

@@ -1,4 +1,3 @@
local function NULL(...)end
local BG={ local BG={
list={}, list={},
cur="", cur="",

2
main.lua
View File

@@ -11,7 +11,7 @@
local fs=love.filesystem local fs=love.filesystem
--? --?
NULL=function()end NONE={}function NULL()end
DBP=print--use this if need debugging print DBP=print--use this if need debugging print
SYSTEM=love.system.getOS() SYSTEM=love.system.getOS()
MOBILE=SYSTEM=="Android"or SYSTEM=="iOS" MOBILE=SYSTEM=="Android"or SYSTEM=="iOS"

2
parts/scenes/main.lua
View File

@@ -7,7 +7,7 @@ function sceneInit.main()
BGM.play("blank") BGM.play("blank")
BG.set("space") BG.set("space")
modeEnv={} modeEnv=NONE
--Create demo player --Create demo player
destroyPlayers() destroyPlayers()
GAME.frame=0 GAME.frame=0

11
parts/scenes/savedata.lua
View File

@@ -5,7 +5,6 @@ function keyDown.savedata(key)
LOG.print("keyPress: ["..key.."]") LOG.print("keyPress: ["..key.."]")
end end
local NULL={}
local function encodeCB(T) local function encodeCB(T)
love.system.setClipboardText( love.system.setClipboardText(
love.data.encode( love.data.encode(
@@ -30,7 +29,7 @@ local function parseCB()
s=loadstring(s) s=loadstring(s)
if s then if s then
setfenv(s,NULL) setfenv(s,NONE)
LOG.print(text.importSuccess,COLOR.green) LOG.print(text.importSuccess,COLOR.green)
return s() return s()
end end
@@ -44,10 +43,10 @@ WIDGET.init("savedata",{
WIDGET.newButton({name="exportSetting", x=790,y=150,w=280,h=100,color="lGreen",font=25,code=function()encodeCB(SETTING)end}), WIDGET.newButton({name="exportSetting", x=790,y=150,w=280,h=100,color="lGreen",font=25,code=function()encodeCB(SETTING)end}),
WIDGET.newButton({name="exportVK", x=1090,y=150,w=280,h=100,color="lGreen",font=25,code=function()encodeCB(VK_org)end}), WIDGET.newButton({name="exportVK", x=1090,y=150,w=280,h=100,color="lGreen",font=25,code=function()encodeCB(VK_org)end}),
WIDGET.newButton({name="importUnlock", x=190,y=300,w=280,h=100,color="lBlue",font=25,code=function()addToTable(parseCB()or NULL,RANKS)end}), WIDGET.newButton({name="importUnlock", x=190,y=300,w=280,h=100,color="lBlue",font=25,code=function()addToTable(parseCB()or NONE,RANKS)end}),
WIDGET.newButton({name="importData", x=490,y=300,w=280,h=100,color="lBlue",font=25,code=function()addToTable(parseCB()or NULL,STAT)end}), WIDGET.newButton({name="importData", x=490,y=300,w=280,h=100,color="lBlue",font=25,code=function()addToTable(parseCB()or NONE,STAT)end}),
WIDGET.newButton({name="importSetting", x=790,y=300,w=280,h=100,color="lBlue",font=25,code=function()addToTable(parseCB()or NULL,SETTING)end}), WIDGET.newButton({name="importSetting", x=790,y=300,w=280,h=100,color="lBlue",font=25,code=function()addToTable(parseCB()or NONE,SETTING)end}),
WIDGET.newButton({name="importVK", x=1090,y=300,w=280,h=100,color="lBlue",font=25,code=function()addToTable(parseCB()or NULL,VK_org)end}), WIDGET.newButton({name="importVK", x=1090,y=300,w=280,h=100,color="lBlue",font=25,code=function()addToTable(parseCB()or NONE,VK_org)end}),
WIDGET.newButton({name="reset", x=640,y=460,w=280,h=100,color="lRed",font=40,code=function()sceneTemp.reset=true end,hide=function()return sceneTemp.reset end}), WIDGET.newButton({name="reset", x=640,y=460,w=280,h=100,color="lRed",font=40,code=function()sceneTemp.reset=true end,hide=function()return sceneTemp.reset end}),
WIDGET.newButton({name="resetUnlock", x=340,y=460,w=280,h=100,color="red", WIDGET.newButton({name="resetUnlock", x=340,y=460,w=280,h=100,color="red",