diff --git a/utils/Macro.lua b/utils/Macro.lua index 39d19fe..b1435bc 100644 --- a/utils/Macro.lua +++ b/utils/Macro.lua @@ -21,7 +21,7 @@ function Macro:new(macroSeries) macroLen = 0, compiledSeries = nil, compiledLen = 0, - pointer = 0 + offset = 0 } setmetatable(obj, Macro) @@ -54,15 +54,15 @@ function Macro:compile() end function Macro:getNext(loop) - if self.pointer >= self.compiledLen then + if self.offset >= self.compiledLen then if not loop then return nil end self:reset() end - self.pointer = self.pointer + 1 - local cmd = self.compiledSeries[self.pointer] + self.offset = self.offset + 1 + local cmd = self.compiledSeries[self.offset] if cmd == nil then -- 理论不应该是nil,此处保险 return nil end @@ -76,7 +76,11 @@ function Macro:getNext(loop) end function Macro:reset() - self.pointer = 0 + self.offset = 0 +end + +function Macro:toEnd() + self.offset = self.compiledLen end function Macro:runNext(func, forceRun)