From 2d671114f5daa6d7bd26c1f46e2ebef56bd510cb Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Thu, 5 Nov 2020 00:30:54 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80NONE=E5=92=8CNULL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Zframework/bg.lua | 1 - main.lua | 2 +- parts/scenes/main.lua | 2 +- parts/scenes/savedata.lua | 11 +++++------ 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Zframework/bg.lua b/Zframework/bg.lua index 9cb63d5d..9fe65a06 100644 --- a/Zframework/bg.lua +++ b/Zframework/bg.lua @@ -1,4 +1,3 @@ -local function NULL(...)end local BG={ list={}, cur="", diff --git a/main.lua b/main.lua index f43ac6aa..51e2c33b 100644 --- a/main.lua +++ b/main.lua @@ -11,7 +11,7 @@ local fs=love.filesystem --? -NULL=function()end +NONE={}function NULL()end DBP=print--use this if need debugging print SYSTEM=love.system.getOS() MOBILE=SYSTEM=="Android"or SYSTEM=="iOS" diff --git a/parts/scenes/main.lua b/parts/scenes/main.lua index 9f452785..2c429b8f 100644 --- a/parts/scenes/main.lua +++ b/parts/scenes/main.lua @@ -7,7 +7,7 @@ function sceneInit.main() BGM.play("blank") BG.set("space") - modeEnv={} + modeEnv=NONE --Create demo player destroyPlayers() GAME.frame=0 diff --git a/parts/scenes/savedata.lua b/parts/scenes/savedata.lua index 641ea856..d56edc72 100644 --- a/parts/scenes/savedata.lua +++ b/parts/scenes/savedata.lua @@ -5,7 +5,6 @@ function keyDown.savedata(key) LOG.print("keyPress: ["..key.."]") end -local NULL={} local function encodeCB(T) love.system.setClipboardText( love.data.encode( @@ -30,7 +29,7 @@ local function parseCB() s=loadstring(s) if s then - setfenv(s,NULL) + setfenv(s,NONE) LOG.print(text.importSuccess,COLOR.green) return s() 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="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="importData", x=490,y=300,w=280,h=100,color="lBlue",font=25,code=function()addToTable(parseCB()or NULL,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="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="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 NONE,STAT)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 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="resetUnlock", x=340,y=460,w=280,h=100,color="red",