From 2163d09c08e5029ba56afea7a6491f2877269f95 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Sat, 24 Jul 2021 16:42:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BA=8F=E5=88=97=E5=92=8C?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=B6=85=E9=95=BF=E5=AF=BC=E8=87=B4=E6=B8=B2?= =?UTF-8?q?=E6=9F=93=E5=BC=80=E9=94=80=E5=A4=AA=E5=A4=A7=E5=8D=A1=E6=AD=BB?= =?UTF-8?q?=20close=20#137?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/data.lua | 28 ++++++++++++---------------- parts/scenes/custom_mission.lua | 1 + parts/scenes/custom_sequence.lua | 1 + 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/parts/data.lua b/parts/data.lua index 119110ee..83bc32e6 100644 --- a/parts/data.lua +++ b/parts/data.lua @@ -47,17 +47,17 @@ function DATA.pasteSequence(str) end else if b>=97 and b<=125 then - ins(BAG,reg)if #BAG>2600 then return end + ins(BAG,reg) reg=b-96 elseif b>=34 and b<=96 then for _=1,b-32 do - ins(BAG,reg)if #BAG>2600 then return end + ins(BAG,reg) end reg=false end end end - if reg then ins(BAG,reg)if #BAG>2600 then return end end + if reg then ins(BAG,reg)end return true end @@ -215,9 +215,7 @@ function DATA.pasteMission(str) end end end - if reg then - ins(MISSION,reg) - end + if reg then ins(MISSION,reg)end return true end @@ -230,16 +228,14 @@ function DATA.copyQuestArgs() ENV.sequence return str end -do--function DATA.pasteQuestArgs(str) - function DATA.pasteQuestArgs(str) - if #str<4 then return end - local ENV=CUSTOMENV - ENV.holdCount= str:byte(1)-48 - ENV.ospin= str:byte(2)~=90 - ENV.missionKill= str:byte(3)~=90 - ENV.sequence= str:sub(4) - return true - end +function DATA.pasteQuestArgs(str) + if #str<4 then return end + local ENV=CUSTOMENV + ENV.holdCount= str:byte(1)-48 + ENV.ospin= str:byte(2)~=90 + ENV.missionKill= str:byte(3)~=90 + ENV.sequence= str:sub(4) + return true end --[[ diff --git a/parts/scenes/custom_mission.lua b/parts/scenes/custom_mission.lua index a00fc46b..dbdb4c2f 100644 --- a/parts/scenes/custom_mission.lua +++ b/parts/scenes/custom_mission.lua @@ -153,6 +153,7 @@ function scene.draw() end if x>1140 then x,y=100,y+36 + if y>1260 then break end end if i<=j then setFont(35) diff --git a/parts/scenes/custom_sequence.lua b/parts/scenes/custom_sequence.lua index 9324898c..72022945 100644 --- a/parts/scenes/custom_sequence.lua +++ b/parts/scenes/custom_sequence.lua @@ -157,6 +157,7 @@ function scene.draw() end if x>1060 then x,y=120,y+50 + if y>1260 then break end end if i<=j then local B=miniBlock[L[i]]