temp

resource/lua/maav0.lua

@@ -4,31 +4,29 @@ if maav0 ~= nil then
     return maav0
 end
 
+---@param ms number
+function M.sleep(ms)end
+
 ---@return boolean
-M.uuid = function()
-end
+function M.uuid() end
 
 ---@param x number
 ---@param y number
 ---@return boolean
-M.click = function(x, y)
-end
+function M.click(x, y) end
 
 ---@param x1 number
 ---@param y1 number
 ---@param x2 number
 ---@param y2 number
 ---@return boolean
-M.swipe = function(x1, y1, x2, y2)
-end
+function M.swipe(x1, y1, x2, y2) end
 
 ---@return boolean
-M.screencap = function()
-end
+function M.screencap() end
 
 ---@param name string
 ---@return number, number, number, number, number
-M.match_task = function(name)
-end
+function M.match_task(name) end
 
 return M

src/MaaCore/Task/Interface/LuaTask.cpp

@@ -26,18 +26,16 @@ bool asst::LuaTask::run()
 
     luaL_openlibs(l);
     lua_add_path(l, {
-                        ResDir.get().string() + "/lua/?.lua",
-                        ResDir.get().string() + "/lua/?/init.lua",
+                        ResDir.get() / "lua" / "?.lua",
+                        ResDir.get() / "lua" / "?" / "init.lua",
                     });
 
     lua_newtable(l);
-    lua_pushvalue(l, -1);      // duplicate it on stack
-    lua_setglobal(l, "maav0"); // this pops one
 
     add_closure(l, [](lua_State* s, LuaTask* p) -> int {
-            p->sleep(luaL_checknumber(s, 1));
-            return 0;
-            });
+        p->sleep(static_cast<unsigned>(std::max(0., luaL_checknumber(s, 1))));
+        return 0;
+    });
     lua_setfield(l, -2, "sleep");
 
     add_closure(l, [](lua_State* s, LuaTask* p) -> int {
@@ -88,7 +86,7 @@ bool asst::LuaTask::run()
     });
     lua_setfield(l, -2, "match_task");
 
-    lua_pop(l, 1); // global maav0
+    lua_setglobal(l, "maav0");
 
     std::string script = R"(
 print(package.path)
@@ -113,3 +111,8 @@ print("done")
     lua_close(l);
     return true;
 }
+
+bool asst::LuaTask::set_params(const json::value&)
+{
+    return true;
+}

src/MaaCore/Task/Interface/LuaTask.h

@@ -10,13 +10,15 @@ namespace asst
     class LuaTask : public InterfaceTask
     {
     public:
-        inline static constexpr std::string_view TaskType = "Lua";
+        inline static constexpr std::string_view TaskType = "Custom";
 
         LuaTask(const AsstCallback& callback, Assistant* inst) : InterfaceTask(callback, inst, TaskType) {}
         ~LuaTask() override = default;
 
         bool run() override;
 
+        bool set_params(const json::value &params) override;
+
     private:
         template <typename Func>
         void add_closure(lua_State* L, Func&&)