From cd17cced22cef9b2673a636dba07b723301a8a65 Mon Sep 17 00:00:00 2001 From: zzyyyl Date: Fri, 26 Sep 2025 15:33:15 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=8D=E5=85=81=E8=AE=B8=E8=99=9A?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=BD=9C=E4=B8=BA=20`@`=20=E8=BF=90=E7=AE=97?= =?UTF-8?q?=E7=9A=84=E5=B7=A6=E5=85=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaCore/Config/TaskData.cpp | 1 - src/MaaCore/Config/TaskData/TaskDataSymbol.cpp | 9 ++------- src/MaaCore/Config/TaskData/TaskDataSymbol.h | 1 - 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/MaaCore/Config/TaskData.cpp b/src/MaaCore/Config/TaskData.cpp index a986bf4aa7..8ba73670f9 100644 --- a/src/MaaCore/Config/TaskData.cpp +++ b/src/MaaCore/Config/TaskData.cpp @@ -863,7 +863,6 @@ asst::ResultOrError asst::TaskData::compile_ra return TaskDataSymbol::append_prefix( symbol, prefix, - self_name, get_raw, [&](const TaskList& raw_or_empty) -> TaskDataSymbol::SymbolsOrError { if (auto opt = compile_raw_tasklist(raw_or_empty, self_name, get_raw, allow_duplicate)) { diff --git a/src/MaaCore/Config/TaskData/TaskDataSymbol.cpp b/src/MaaCore/Config/TaskData/TaskDataSymbol.cpp index 0cd402f983..ef5e54315f 100644 --- a/src/MaaCore/Config/TaskData/TaskDataSymbol.cpp +++ b/src/MaaCore/Config/TaskData/TaskDataSymbol.cpp @@ -3,20 +3,15 @@ asst::TaskDataSymbol::SymbolsOrError asst::TaskDataSymbol::append_prefix( const TaskDataSymbol& symbol, const TaskDataSymbol& prefix, - std::string_view self_name, std::function get_raw, std::function compile_tasklist) { - // 注意:A@#self 是 A 而不是 A@self_name, #self@A 是 self_name@A 而不是 A std::string_view prefix_name; - if (prefix == SharpSelf) { - prefix_name = self_name; - } - else if (prefix.is_name()) { + if (prefix.is_name()) { prefix_name = prefix.name(); } else [[unlikely]] { - return { std::nullopt, "prefix " + prefix.name() + " is not name or self" }; + return { std::nullopt, "prefix " + prefix.name() + " is not name" }; } if (prefix_name.empty()) { return std::vector { symbol }; diff --git a/src/MaaCore/Config/TaskData/TaskDataSymbol.h b/src/MaaCore/Config/TaskData/TaskDataSymbol.h index 0e9c8e0cec..16c53f60c0 100644 --- a/src/MaaCore/Config/TaskData/TaskDataSymbol.h +++ b/src/MaaCore/Config/TaskData/TaskDataSymbol.h @@ -136,7 +136,6 @@ public: static SymbolsOrError append_prefix( const TaskDataSymbol& symbol, const TaskDataSymbol& prefix, - std::string_view self_name, std::function get_raw, std::function compile_tasklist);