From c25d40c67dbfeffb996bc1c02b148a56231732e1 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Sun, 28 Nov 2021 01:44:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=AF=E5=8A=A8=E5=8A=A0=E8=BD=BD=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=96=87=E4=BB=B6=E6=97=B6=E5=85=81=E8=AE=B8=E4=B8=8D?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=EF=BC=8C=E4=B8=8D=E4=BC=9A=E6=8F=90=E9=86=92?= =?UTF-8?q?=20close=20#495?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.lua | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/main.lua b/main.lua index ce5d44f9..49cb0817 100644 --- a/main.lua +++ b/main.lua @@ -212,15 +212,15 @@ end Z.setOnQuit(destroyPlayers) --Load settings and statistics -TABLE.cover (loadFile('conf/user')or{},USER) -TABLE.cover (loadFile('conf/unlock')or{},RANKS) -TABLE.update(loadFile('conf/settings')or{},SETTING) -TABLE.coverR(loadFile('conf/data')or{},STAT) -TABLE.cover (loadFile('conf/key')or{},KEY_MAP) -TABLE.cover (loadFile('conf/virtualkey')or{},VK_ORG) +TABLE.cover (loadFile('conf/user','-canSkip')or{},USER) +TABLE.cover (loadFile('conf/unlock','-canSkip')or{},RANKS) +TABLE.update(loadFile('conf/settings','-canSkip')or{},SETTING) +TABLE.coverR(loadFile('conf/data','-canSkip')or{},STAT) +TABLE.cover (loadFile('conf/key','-canSkip')or{},KEY_MAP) +TABLE.cover (loadFile('conf/virtualkey','-json -canSkip')or{},VK_ORG) --Initialize fields, sequence, missions, gameEnv for cutsom game -local fieldData=loadFile('conf/customBoards','-string') +local fieldData=loadFile('conf/customBoards','-string -canSkip') if fieldData then fieldData=STRING.split(fieldData,"!") for i=1,#fieldData do @@ -229,15 +229,15 @@ if fieldData then else FIELD[1]=DATA.newBoard() end -local sequenceData=loadFile('conf/customSequence','-string') +local sequenceData=loadFile('conf/customSequence','-string -canSkip') if sequenceData then DATA.pasteSequence(sequenceData) end -local missionData=loadFile('conf/customMissions','-string') +local missionData=loadFile('conf/customMissions','-string -canSkip') if missionData then DATA.pasteMission(missionData) end -local customData=loadFile('conf/customEnv') +local customData=loadFile('conf/customEnv','-canSkip') if customData and customData['version']==VERSION.code then TABLE.complete(customData,CUSTOMENV) end