perf: 优化战斗中技能识别，改用深度学习模型 (#3918)

* feat: 战斗中技能使用ort识别 * fix: 修正技能识别的错误 * feat: 当技能识别置信度过低时，保存debug图片 * fix: build error for onnx runtime * fix: build error on linux * perf: onnx path * fix: build error * fix: onnx build error
2026-07-16 01:40:46 +08:00 · 2023-03-08 21:55:57 +08:00
parent bf0e472d11
commit 54732036d8
10 changed files with 248 additions and 168 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,7 +70,27 @@ find_package(OpenCV REQUIRED COMPONENTS core imgproc imgcodecs)
 find_package(ZLIB REQUIRED)
 find_package(MaaDerpLearning REQUIRED)
 find_package(asio REQUIRED)
-target_link_libraries(MaaCore ${OpenCV_LIBS} MaaDerpLearning asio::asio ZLIB::ZLIB header_only_libraries)
+
+find_path(ONNXRuntime_INCLUDE_DIR NAMES onnxruntime/core/session/onnxruntime_c_api.h)
+find_library(ONNXRuntime_LIBRARY NAMES onnxruntime)
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(
+    ONNXRuntime
+    REQUIRED_VARS ONNXRuntime_LIBRARY ONNXRuntime_INCLUDE_DIR
+)
+if(ONNXRuntime_FOUND)
+    set(ONNXRuntime_INCLUDE_DIRS ${ONNXRuntime_INCLUDE_DIR})
+    if(NOT TARGET ONNXRuntime::ONNXRuntime)
+        add_library(ONNXRuntime::ONNXRuntime UNKNOWN IMPORTED)
+        set_target_properties(ONNXRuntime::ONNXRuntime PROPERTIES
+            IMPORTED_LOCATION "${ONNXRuntime_LIBRARY}"
+            INTERFACE_INCLUDE_DIRECTORIES "${ONNXRuntime_INCLUDE_DIR}"
+        )
+    endif()
+endif()
+find_package(ONNXRuntime)
+
+target_link_libraries(MaaCore ${OpenCV_LIBS} MaaDerpLearning asio::asio ZLIB::ZLIB ONNXRuntime::ONNXRuntime header_only_libraries)

 if(WIN32)
    target_link_libraries(MaaCore ws2_32)
--- a/resource/tasks.json
+++ b/resource/tasks.json
@@ -6264,10 +6264,10 @@
    "BattleSkillReady": {
        "cache": false,
        "rectMove": [
-            -20,
-            -125,
-            45,
-            50
+            -28,
+            -140,
+            64,
+            64
        ]
    },
    "BattleSkillReadyOnClick": {
--- a/src/MaaCore/Config/OnnxSession.cpp
+++ b/src/MaaCore/Config/OnnxSession.cpp
@@ -0,0 +1,20 @@
+#include "OnnxSession.h"
+
+#include <array>
+#include <filesystem>
+#include <string_view>
+
+#include "Utils/Logger.hpp"
+
+bool asst::OnnxSession::load(const std::filesystem::path& path)
+{
+    LogTraceFunction;
+    Log.info("load", path);
+
+    std::string name = utils::path_to_utf8_string(path.stem());
+    Ort::Session session(m_env, path.c_str(), m_options);
+
+    m_sessions.insert_or_assign(std::move(name), std::move(session));
+
+    return true;
+}
--- a/src/MaaCore/Config/OnnxSession.h
+++ b/src/MaaCore/Config/OnnxSession.h
@@ -0,0 +1,24 @@
+#pragma once
+
+#include "AbstractResource.h"
+
+#include <unordered_map>
+
+#include <onnxruntime/core/session/onnxruntime_cxx_api.h>
+
+namespace asst
+{
+    class OnnxSession final : public SingletonHolder<OnnxSession>, public AbstractResource
+    {
+    public:
+        virtual ~OnnxSession() override = default;
+        virtual bool load(const std::filesystem::path& path) override;
+
+        Ort::Session& get(const std::string& key) { return m_sessions.at(key); }
+
+    private:
+        Ort::Env m_env;
+        Ort::SessionOptions m_options;
+        std::unordered_map<std::string, Ort::Session> m_sessions;
+    };
+}
--- a/src/MaaCore/Config/ResourceLoader.cpp
+++ b/src/MaaCore/Config/ResourceLoader.cpp
@@ -9,11 +9,12 @@
 #include "Miscellaneous/CopilotConfig.h"
 #include "Miscellaneous/InfrastConfig.h"
 #include "Miscellaneous/ItemConfig.h"
+#include "Miscellaneous/OcrConfig.h"
 #include "Miscellaneous/OcrPack.h"
 #include "Miscellaneous/RecruitConfig.h"
 #include "Miscellaneous/StageDropsConfig.h"
 #include "Miscellaneous/TilePack.h"
-#include "Miscellaneous/OcrConfig.h"
+#include "OnnxSession.h"
 #include "Roguelike/RoguelikeCopilotConfig.h"
 #include "Roguelike/RoguelikeRecruitConfig.h"
 #include "Roguelike/RoguelikeShoppingConfig.h"
@@ -66,6 +67,7 @@ bool asst::ResourceLoader::load(const std::filesystem::path& path)
        LoadResourceAndCheckRet(RoguelikeShoppingConfig, "roguelike"_p / "shopping.json"_p);
        LoadResourceAndCheckRet(BattleDataConfig, "battle_data.json"_p);
        LoadResourceAndCheckRet(OcrConfig, "ocr_config.json"_p);
+        LoadResourceAndCheckRet(OnnxSession, "onnx"_p / "skill_ready_rec.onnx"_p);

        /* load resource with json and template files*/
        LoadResourceWithTemplAndCheckRet(TaskData, "tasks.json"_p, "template"_p);
--- a/src/MaaCore/MaaCore.vcxproj
+++ b/src/MaaCore/MaaCore.vcxproj
@@ -39,6 +39,7 @@
    <ClInclude Include="Config\Miscellaneous\AvatarCacheManager.h" />
    <ClInclude Include="Config\Miscellaneous\OcrConfig.h" />
    <ClInclude Include="Config\Miscellaneous\SSSCopilotConfig.h" />
+    <ClInclude Include="Config\OnnxSession.h" />
    <ClInclude Include="Controller\adb-lite\client.hpp" />
    <ClInclude Include="Controller\adb-lite\protocol.hpp" />
    <ClInclude Include="Controller\Controller.h" />
@@ -173,6 +174,7 @@
    <ClCompile Include="Config\Miscellaneous\AvatarCacheManager.cpp" />
    <ClCompile Include="Config\Miscellaneous\OcrConfig.cpp" />
    <ClCompile Include="Config\Miscellaneous\SSSCopilotConfig.cpp" />
+    <ClCompile Include="Config\OnnxSession.cpp" />
    <ClCompile Include="Controller\adb-lite\client.cpp" />
    <ClCompile Include="Controller\adb-lite\protocol.cpp" />
    <ClCompile Include="Controller\Controller.cpp" />
@@ -381,7 +383,7 @@
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <OptimizeReferences>true</OptimizeReferences>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>MaaDerpLearning.lib;opencv_world4.lib;zlib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>MaaDerpLearning.lib;opencv_world4.lib;zlib.lib;ws2_32.lib;onnxruntime.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
      <Profile>true</Profile>
      <IgnoreSpecificDefaultLibraries>msvcrt.lib</IgnoreSpecificDefaultLibraries>
@@ -428,7 +430,7 @@
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <OptimizeReferences>true</OptimizeReferences>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>MaaDerpLearning.lib;opencv_world4.lib;zlib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>MaaDerpLearning.lib;opencv_world4.lib;zlib.lib;ws2_32.lib;onnxruntime.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
      <Profile>true</Profile>
      <IgnoreSpecificDefaultLibraries>msvcrt.lib</IgnoreSpecificDefaultLibraries>
@@ -478,7 +480,7 @@
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <OptimizeReferences>true</OptimizeReferences>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>MaaDerpLearning.lib;opencv_world4.lib;zlib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>MaaDerpLearning.lib;opencv_world4.lib;zlib.lib;ws2_32.lib;onnxruntime.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
      <Profile>true</Profile>
      <IgnoreSpecificDefaultLibraries>msvcrt.lib</IgnoreSpecificDefaultLibraries>
@@ -528,7 +530,7 @@
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <OptimizeReferences>true</OptimizeReferences>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>MaaDerpLearning.lib;opencv_world4.lib;zlib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>MaaDerpLearning.lib;opencv_world4.lib;zlib.lib;ws2_32.lib;onnxruntime.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
      <Profile>true</Profile>
      <IgnoreSpecificDefaultLibraries>msvcrt.lib</IgnoreSpecificDefaultLibraries>
--- a/src/MaaCore/MaaCore.vcxproj.filters
+++ b/src/MaaCore/MaaCore.vcxproj.filters
@@ -26,15 +26,6 @@
    <Filter Include="源文件\Vision\Roguelike">
      <UniqueIdentifier>{250bc7cb-e99a-42f8-ae3c-66998564fdcf}</UniqueIdentifier>
    </Filter>
-    <Filter Include="源文件\Config">
-      <UniqueIdentifier>{3b2a04b8-fb22-43c3-9444-1b455851d8e2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="源文件\Config\Roguelike">
-      <UniqueIdentifier>{de1acbf1-3e7a-4e91-8a62-e966602c6b25}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="源文件\Config\Miscellaneous">
-      <UniqueIdentifier>{64367a8b-0654-47bb-92cc-d451799457a4}</UniqueIdentifier>
-    </Filter>
    <Filter Include="源文件\Task">
      <UniqueIdentifier>{8499a77f-7bcc-457c-97f1-6e950ab68bf4}</UniqueIdentifier>
    </Filter>
@@ -86,6 +77,15 @@
    <Filter Include="源文件\Controller\adb-lite">
      <UniqueIdentifier>{a61a19a3-e1ba-45f2-9264-acb4102106b9}</UniqueIdentifier>
    </Filter>
+    <Filter Include="源文件\Resource">
+      <UniqueIdentifier>{3b2a04b8-fb22-43c3-9444-1b455851d8e2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="源文件\Resource\Roguelike">
+      <UniqueIdentifier>{de1acbf1-3e7a-4e91-8a62-e966602c6b25}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="源文件\Resource\Miscellaneous">
+      <UniqueIdentifier>{64367a8b-0654-47bb-92cc-d451799457a4}</UniqueIdentifier>
+    </Filter>
  </ItemGroup>
  <ItemGroup>
    <None Include="..\..\resource\config.json">
@@ -196,52 +196,52 @@
      <Filter>源文件\Vision\Roguelike</Filter>
    </ClInclude>
    <ClInclude Include="Config\AbstractConfig.h">
-      <Filter>源文件\Config</Filter>
+      <Filter>源文件\Resource</Filter>
    </ClInclude>
    <ClInclude Include="Config\AbstractConfigWithTempl.h">
-      <Filter>源文件\Config</Filter>
+      <Filter>源文件\Resource</Filter>
    </ClInclude>
    <ClInclude Include="Config\AbstractResource.h">
-      <Filter>源文件\Config</Filter>
+      <Filter>源文件\Resource</Filter>
    </ClInclude>
    <ClInclude Include="Config\ResourceLoader.h">
-      <Filter>源文件\Config</Filter>
+      <Filter>源文件\Resource</Filter>
    </ClInclude>
    <ClInclude Include="Config\TaskData.h">
-      <Filter>源文件\Config</Filter>
+      <Filter>源文件\Resource</Filter>
    </ClInclude>
    <ClInclude Include="Config\TemplResource.h">
-      <Filter>源文件\Config</Filter>
+      <Filter>源文件\Resource</Filter>
    </ClInclude>
    <ClInclude Include="Config\Roguelike\RoguelikeCopilotConfig.h">
-      <Filter>源文件\Config\Roguelike</Filter>
+      <Filter>源文件\Resource\Roguelike</Filter>
    </ClInclude>
    <ClInclude Include="Config\Roguelike\RoguelikeRecruitConfig.h">
-      <Filter>源文件\Config\Roguelike</Filter>
+      <Filter>源文件\Resource\Roguelike</Filter>
    </ClInclude>
    <ClInclude Include="Config\Roguelike\RoguelikeShoppingConfig.h">
-      <Filter>源文件\Config\Roguelike</Filter>
+      <Filter>源文件\Resource\Roguelike</Filter>
    </ClInclude>
    <ClInclude Include="Config\Miscellaneous\BattleDataConfig.h">
-      <Filter>源文件\Config\Miscellaneous</Filter>
+      <Filter>源文件\Resource\Miscellaneous</Filter>
    </ClInclude>
    <ClInclude Include="Config\Miscellaneous\CopilotConfig.h">
-      <Filter>源文件\Config\Miscellaneous</Filter>
+      <Filter>源文件\Resource\Miscellaneous</Filter>
    </ClInclude>
    <ClInclude Include="Config\Miscellaneous\InfrastConfig.h">
-      <Filter>源文件\Config\Miscellaneous</Filter>
+      <Filter>源文件\Resource\Miscellaneous</Filter>
    </ClInclude>
    <ClInclude Include="Config\Miscellaneous\ItemConfig.h">
-      <Filter>源文件\Config\Miscellaneous</Filter>
+      <Filter>源文件\Resource\Miscellaneous</Filter>
    </ClInclude>
    <ClInclude Include="Config\Miscellaneous\RecruitConfig.h">
-      <Filter>源文件\Config\Miscellaneous</Filter>
+      <Filter>源文件\Resource\Miscellaneous</Filter>
    </ClInclude>
    <ClInclude Include="Config\Miscellaneous\StageDropsConfig.h">
-      <Filter>源文件\Config\Miscellaneous</Filter>
+      <Filter>源文件\Resource\Miscellaneous</Filter>
    </ClInclude>
    <ClInclude Include="Config\Miscellaneous\TilePack.h">
-      <Filter>源文件\Config\Miscellaneous</Filter>
+      <Filter>源文件\Resource\Miscellaneous</Filter>
    </ClInclude>
    <ClInclude Include="Task\AbstractTask.h">
      <Filter>源文件\Task</Filter>
@@ -355,10 +355,10 @@
      <Filter>源文件</Filter>
    </ClInclude>
    <ClInclude Include="Config\GeneralConfig.h">
-      <Filter>源文件\Config</Filter>
+      <Filter>源文件\Resource</Filter>
    </ClInclude>
    <ClInclude Include="Config\Miscellaneous\OcrPack.h">
-      <Filter>源文件\Config\Miscellaneous</Filter>
+      <Filter>源文件\Resource\Miscellaneous</Filter>
    </ClInclude>
    <ClInclude Include="Task\Fight\DrGrandetTaskPlugin.h">
      <Filter>源文件\Task\Fight</Filter>
@@ -469,13 +469,13 @@
      <Filter>源文件\Task</Filter>
    </ClInclude>
    <ClInclude Include="Config\Miscellaneous\SSSCopilotConfig.h">
-      <Filter>源文件\Config\Miscellaneous</Filter>
+      <Filter>源文件\Resource\Miscellaneous</Filter>
    </ClInclude>
    <ClInclude Include="Task\Interface\SSSCopilotTask.h">
      <Filter>源文件\Task\Interface</Filter>
    </ClInclude>
    <ClInclude Include="Config\Miscellaneous\AvatarCacheManager.h">
-      <Filter>源文件\Config\Miscellaneous</Filter>
+      <Filter>源文件\Resource\Miscellaneous</Filter>
    </ClInclude>
    <ClInclude Include="Task\SSS\SSSBattleProcessTask.h">
      <Filter>源文件\Task\SSS</Filter>
@@ -523,7 +523,10 @@
      <Filter>源文件\Controller\adb-lite</Filter>
    </ClInclude>
    <ClInclude Include="Config\Miscellaneous\OcrConfig.h">
-      <Filter>源文件\Config\Miscellaneous</Filter>
+      <Filter>源文件\Resource\Miscellaneous</Filter>
+    </ClInclude>
+    <ClInclude Include="Config\OnnxSession.h">
+      <Filter>源文件\Resource</Filter>
    </ClInclude>
  </ItemGroup>
  <ItemGroup>
@@ -591,46 +594,46 @@
      <Filter>源文件\Vision\Roguelike</Filter>
    </ClCompile>
    <ClCompile Include="Config\AbstractConfig.cpp">
-      <Filter>源文件\Config</Filter>
+      <Filter>源文件\Resource</Filter>
    </ClCompile>
    <ClCompile Include="Config\ResourceLoader.cpp">
-      <Filter>源文件\Config</Filter>
+      <Filter>源文件\Resource</Filter>
    </ClCompile>
    <ClCompile Include="Config\TaskData.cpp">
-      <Filter>源文件\Config</Filter>
+      <Filter>源文件\Resource</Filter>
    </ClCompile>
    <ClCompile Include="Config\TemplResource.cpp">
-      <Filter>源文件\Config</Filter>
+      <Filter>源文件\Resource</Filter>
    </ClCompile>
    <ClCompile Include="Config\Roguelike\RoguelikeCopilotConfig.cpp">
-      <Filter>源文件\Config\Roguelike</Filter>
+      <Filter>源文件\Resource\Roguelike</Filter>
    </ClCompile>
    <ClCompile Include="Config\Roguelike\RoguelikeRecruitConfig.cpp">
-      <Filter>源文件\Config\Roguelike</Filter>
+      <Filter>源文件\Resource\Roguelike</Filter>
    </ClCompile>
    <ClCompile Include="Config\Roguelike\RoguelikeShoppingConfig.cpp">
-      <Filter>源文件\Config\Roguelike</Filter>
+      <Filter>源文件\Resource\Roguelike</Filter>
    </ClCompile>
    <ClCompile Include="Config\Miscellaneous\BattleDataConfig.cpp">
-      <Filter>源文件\Config\Miscellaneous</Filter>
+      <Filter>源文件\Resource\Miscellaneous</Filter>
    </ClCompile>
    <ClCompile Include="Config\Miscellaneous\CopilotConfig.cpp">
-      <Filter>源文件\Config\Miscellaneous</Filter>
+      <Filter>源文件\Resource\Miscellaneous</Filter>
    </ClCompile>
    <ClCompile Include="Config\Miscellaneous\InfrastConfig.cpp">
-      <Filter>源文件\Config\Miscellaneous</Filter>
+      <Filter>源文件\Resource\Miscellaneous</Filter>
    </ClCompile>
    <ClCompile Include="Config\Miscellaneous\ItemConfig.cpp">
-      <Filter>源文件\Config\Miscellaneous</Filter>
+      <Filter>源文件\Resource\Miscellaneous</Filter>
    </ClCompile>
    <ClCompile Include="Config\Miscellaneous\RecruitConfig.cpp">
-      <Filter>源文件\Config\Miscellaneous</Filter>
+      <Filter>源文件\Resource\Miscellaneous</Filter>
    </ClCompile>
    <ClCompile Include="Config\Miscellaneous\StageDropsConfig.cpp">
-      <Filter>源文件\Config\Miscellaneous</Filter>
+      <Filter>源文件\Resource\Miscellaneous</Filter>
    </ClCompile>
    <ClCompile Include="Config\Miscellaneous\TilePack.cpp">
-      <Filter>源文件\Config\Miscellaneous</Filter>
+      <Filter>源文件\Resource\Miscellaneous</Filter>
    </ClCompile>
    <ClCompile Include="Task\AbstractTask.cpp">
      <Filter>源文件\Task</Filter>
@@ -696,10 +699,10 @@
      <Filter>源文件</Filter>
    </ClCompile>
    <ClCompile Include="Config\GeneralConfig.cpp">
-      <Filter>源文件\Config</Filter>
+      <Filter>源文件\Resource</Filter>
    </ClCompile>
    <ClCompile Include="Config\Miscellaneous\OcrPack.cpp">
-      <Filter>源文件\Config\Miscellaneous</Filter>
+      <Filter>源文件\Resource\Miscellaneous</Filter>
    </ClCompile>
    <ClCompile Include="Task\Fight\DrGrandetTaskPlugin.cpp">
      <Filter>源文件\Task\Fight</Filter>
@@ -813,13 +816,13 @@
      <Filter>源文件\Task</Filter>
    </ClCompile>
    <ClCompile Include="Config\Miscellaneous\SSSCopilotConfig.cpp">
-      <Filter>源文件\Config\Miscellaneous</Filter>
+      <Filter>源文件\Resource\Miscellaneous</Filter>
    </ClCompile>
    <ClCompile Include="Task\Interface\SSSCopilotTask.cpp">
      <Filter>源文件\Task\Interface</Filter>
    </ClCompile>
    <ClCompile Include="Config\Miscellaneous\AvatarCacheManager.cpp">
-      <Filter>源文件\Config\Miscellaneous</Filter>
+      <Filter>源文件\Resource\Miscellaneous</Filter>
    </ClCompile>
    <ClCompile Include="Task\SSS\SSSBattleProcessTask.cpp">
      <Filter>源文件\Task\SSS</Filter>
@@ -861,7 +864,10 @@
      <Filter>源文件\Controller\adb-lite</Filter>
    </ClCompile>
    <ClCompile Include="Config\Miscellaneous\OcrConfig.cpp">
-      <Filter>源文件\Config\Miscellaneous</Filter>
+      <Filter>源文件\Resource\Miscellaneous</Filter>
+    </ClCompile>
+    <ClCompile Include="Config\OnnxSession.cpp">
+      <Filter>源文件\Resource</Filter>
    </ClCompile>
  </ItemGroup>
 </Project>
--- a/src/MaaCore/Task/Reclamation/ReclamationBattlePlugin.cpp
+++ b/src/MaaCore/Task/Reclamation/ReclamationBattlePlugin.cpp
@@ -2,8 +2,8 @@

 #include "Utils/NoWarningCV.h"

-#include "Controller/Controller.h"
 #include "Config/TaskData.h"
+#include "Controller/Controller.h"
 #include "ReclamationControlTask.h"
 #include "Status.h"
 #include "Task/ProcessTask.h"
@@ -123,52 +123,54 @@ bool asst::ReclamationBattlePlugin::communicate_with(const std::string& npcName)
 bool asst::ReclamationBattlePlugin::communicate_with_aux(
    const std::string& npcName, std::function<bool(const MatchRect&, const MatchRect&)> orderComp)
 {
-    auto image = ctrler()->get_image();
-    BattleSkillReadyImageAnalyzer skillReadyAnalyzer(image);
-    if (!skillReadyAnalyzer.analyze()) {
-        Log.info(__FUNCTION__, " | ", "no ready skills");
-        return false;
-    }
-    std::vector<MatchRect> skill_results = skillReadyAnalyzer.get_result();
-
-    std::sort(skill_results.begin(), skill_results.end(), orderComp);
-    for (const auto& [score, rect] : skill_results) {
-        Rect center(rect.x + rect.width / 2,
-                    rect.y + rect.height / 2 + Task.get("Reclamation@SkillReadyRoleOffset")->special_params.front(), 5,
-                    5);
-
-        const auto use_oper_task_ptr = Task.get("BattleUseOper");
-        ctrler()->click(center);
-        sleep(use_oper_task_ptr->pre_delay);
-
-        image = ctrler()->get_image();
-        OcrImageAnalyzer npcNameAnalyzer(image);
-        npcNameAnalyzer.set_task_info("Reclamation@Liaison");
-        npcNameAnalyzer.set_required({});
-        if (!npcNameAnalyzer.analyze()) {
-            // 地图发生了移动
-            Log.info(__FUNCTION__, " | ", "map moved ");
-            break;
-        }
-        if (npcNameAnalyzer.get_result().front() != npcName) {
-            // npc名称不正确
-            Log.info(__FUNCTION__, " | ", "npc name not match ", npcNameAnalyzer.get_result().front());
-            cancel_oper_selection();
-            continue;
-        }
-
-        ProcessTask skill_task(this_task(), { "Reclamation@BattleSkillReadyOnClick" });
-        skill_task.set_task_delay(0);
-
-        bool ret = skill_task.set_retry_times(5).run();
-        if (!ret) {
-            cancel_oper_selection();
-            Log.info(__FUNCTION__, " | ", "fail to click skill of npc");
-            return false;
-        }
-
-        return true;
-    }
+    std::ignore = npcName;
+    std::ignore = orderComp;
+    //    auto image = ctrler()->get_image();
+    //    BattleSkillReadyImageAnalyzer skillReadyAnalyzer(image);
+    //    if (!skillReadyAnalyzer.analyze()) {
+    //        Log.info(__FUNCTION__, " | ", "no ready skills");
+    //        return false;
+    //    }
+    //    std::vector<MatchRect> skill_results = skillReadyAnalyzer.get_result();
+    //
+    //    std::sort(skill_results.begin(), skill_results.end(), orderComp);
+    //    for (const auto& [score, rect] : skill_results) {
+    //        Rect center(rect.x + rect.width / 2,
+    //                    rect.y + rect.height / 2 +
+    //                    Task.get("Reclamation@SkillReadyRoleOffset")->special_params.front(), 5, 5);
+    //
+    //        const auto use_oper_task_ptr = Task.get("BattleUseOper");
+    //        ctrler()->click(center);
+    //        sleep(use_oper_task_ptr->pre_delay);
+    //
+    //        image = ctrler()->get_image();
+    //        OcrImageAnalyzer npcNameAnalyzer(image);
+    //        npcNameAnalyzer.set_task_info("Reclamation@Liaison");
+    //        npcNameAnalyzer.set_required({});
+    //        if (!npcNameAnalyzer.analyze()) {
+    //            // 地图发生了移动
+    //            Log.info(__FUNCTION__, " | ", "map moved ");
+    //            break;
+    //        }
+    //        if (npcNameAnalyzer.get_result().front() != npcName) {
+    //            // npc名称不正确
+    //            Log.info(__FUNCTION__, " | ", "npc name not match ", npcNameAnalyzer.get_result().front());
+    //            cancel_oper_selection();
+    //            continue;
+    //        }
+    //
+    //        ProcessTask skill_task(this_task(), { "Reclamation@BattleSkillReadyOnClick" });
+    //        skill_task.set_task_delay(0);
+    //
+    //        bool ret = skill_task.set_retry_times(5).run();
+    //        if (!ret) {
+    //            cancel_oper_selection();
+    //            Log.info(__FUNCTION__, " | ", "fail to click skill of npc");
+    //            return false;
+    //        }
+    //
+    //        return true;
+    //    }

    return false;
 }
--- a/src/MaaCore/Vision/Miscellaneous/BattleSkillReadyImageAnalyzer.cpp
+++ b/src/MaaCore/Vision/Miscellaneous/BattleSkillReadyImageAnalyzer.cpp
@@ -3,76 +3,84 @@
 #include "Utils/NoWarningCV.h"

 #include <algorithm>
-#include <functional>
-#include <vector>
+#include <array>
+#include <cmath>

+#include <onnxruntime/core/session/onnxruntime_cxx_api.h>
+
+#include "Config/OnnxSession.h"
 #include "Config/TaskData.h"
-#include "Config/TemplResource.h"
 #include "Utils/Logger.hpp"

+template <typename T>
+static void softmax(T& input)
+{
+    float rowmax = *std::max_element(input.begin(), input.end());
+    std::vector<float> y(input.size());
+    float sum = 0.0f;
+    for (size_t i = 0; i != input.size(); ++i) {
+        sum += y[i] = std::exp(input[i] - rowmax);
+    }
+    for (size_t i = 0; i != input.size(); ++i) {
+        input[i] = y[i] / sum;
+    }
+}
+
 bool asst::BattleSkillReadyImageAnalyzer::analyze()
 {
-    auto task_ptr = Task.get<MatchTaskInfo>("BattleSkillReady");
-    const cv::Mat& templ = TemplResource::get_instance().get_templ(task_ptr->templ_name);
+    LogTraceFunction;

-    auto key_color = [](cv::InputArray src, cv::OutputArray dst, const cv::Scalar& color,
-                        const cv::Scalar& tolerance = {}) {
-        cv::inRange(src, color - tolerance, color + tolerance, dst);
-    };
-    auto preprocess = [&](cv::Mat& img) {
-        cv::Mat mask_y2;
-        key_color(img, mask_y2, { 40, 94, 103 }, { 10, 10, 10 }); // BGR
-        img.setTo(cv::Scalar { 2, 216, 255 }, mask_y2);           // BGR
-        cv::Mat mask_y1;
-        key_color(img, mask_y1, { 2, 216, 255 }, { 20, 20, 20 });
-        cv::dilate(mask_y1, mask_y1, cv::getStructuringElement(cv::MORPH_RECT, { 4, 4 }));
-        cv::bitwise_not(mask_y1, mask_y1);
-        img.setTo(cv::Scalar { 0, 0, 0 }, mask_y1);
-    };
+    cv::Mat image = m_image(make_rect<cv::Rect>(m_roi));
+    cv::cvtColor(image, image, cv::COLOR_BGR2RGB);

-    cv::Mat tmp = templ.clone();
-    cv::Mat img = m_image(make_rect<cv::Rect>(m_roi)).clone();
-
-    cv::Mat template_mask;
-    key_color(tmp, template_mask, { 0, 255, 0 }, { 0, 0, 0 });
-    cv::bitwise_not(template_mask, template_mask);
-
-    preprocess(img);
-    preprocess(tmp);
-
-    cv::Mat match;
-    cv::matchTemplate(img, tmp, match, cv::TM_SQDIFF, template_mask);
-    match /= template_mask.cols * template_mask.rows;
-    cv::sqrt(match, match);
-
-    // 修改自MultiMatchImageAnalyzer
-    const double templ_thres = 130.;
-    int mini_distance = (std::min)(templ.cols, templ.rows) / 2;
-    for (int i = 0; i != match.rows; ++i) {
-        for (int j = 0; j != match.cols; ++j) {
-            auto value = match.at<float>(i, j);
-            if (value < templ_thres) {
-                Rect rect(j + m_roi.x, i + m_roi.y, templ.cols, templ.rows);
-                bool need_push = true;
-                for (auto& iter : ranges::reverse_view(m_result)) {
-                    if (std::abs(j + m_roi.x - iter.rect.x) < mini_distance &&
-                        std::abs(i + m_roi.y - iter.rect.y) < mini_distance) {
-                        if (iter.score > value) {
-                            iter.rect = rect;
-                            iter.score = value;
-                        }
-                        need_push = false;
-                        break;
-                    }
-                }
-                if (need_push) {
-                    m_result.emplace_back(value, rect);
-                }
+    size_t input_size = 1ULL * image.cols * image.rows * image.channels();
+    std::vector<float> input(input_size);
+    std::vector<float> output;
+    size_t count = 0;
+    for (int k = 0; k < image.channels(); k++) {
+        for (int i = 0; i < image.rows; i++) {
+            for (int j = 0; j < image.cols; j++) {
+                float value = static_cast<float>(image.at<cv::Vec3b>(i, j)[k]);
+                value /= 255;
+                value -= 0.5f; // mean
+                value /= 0.5f; // std
+                input[count++] = value;
            }
        }
    }

-    return !m_result.empty();
+    auto memory_info = Ort::MemoryInfo::CreateCpu(OrtDeviceAllocator, OrtMemTypeCPU);
+    constexpr int64_t batch_size = 1;
+    std::array<int64_t, 4> input_shape { batch_size, image.channels(), image.cols, image.rows };
+
+    Ort::Value input_tensor =
+        Ort::Value::CreateTensor<float>(memory_info, input.data(), input_size, input_shape.data(), input_shape.size());
+
+    constexpr size_t classification_size = 2;
+    std::array<float, classification_size> results;
+    std::array<int64_t, 2> output_shape { batch_size, classification_size };
+    Ort::Value output_tensor = Ort::Value::CreateTensor<float>(memory_info, results.data(), results.size(),
+                                                               output_shape.data(), output_shape.size());
+
+    auto& session = OnnxSession::get_instance().get("skill_ready_rec");
+    // 这俩是hardcode在模型里的
+    constexpr const char* input_names[] = { "input" };   // session.GetInputName()
+    constexpr const char* output_names[] = { "output" }; // session.GetOutputName()
+
+    Ort::RunOptions run_options;
+    session.Run(run_options, input_names, &input_tensor, 1, output_names, &output_tensor, 1);
+
+    softmax(results);
+
+    Log.info("after softmax, 0: ", results[0], ", 1: ", results[1]);
+
+    auto max_iter = std::max_element(results.begin(), results.end());
+    if (*max_iter < 0.7) {
+        Log.warn("Skill ready recognition confidence too low: ", *max_iter, ", roi:", m_roi);
+        save_img(utils::path("debug") / utils::path("skill_ready_rec"));
+    }
+
+    return results[1] > results[0];
 }

 void asst::BattleSkillReadyImageAnalyzer::set_base_point(const Point& pt)
--- a/src/MaaCore/Vision/Miscellaneous/BattleSkillReadyImageAnalyzer.h
+++ b/src/MaaCore/Vision/Miscellaneous/BattleSkillReadyImageAnalyzer.h
@@ -11,11 +11,7 @@ namespace asst
        virtual ~BattleSkillReadyImageAnalyzer() override = default;

        virtual bool analyze() override;
-        const std::vector<MatchRect>& get_result() const noexcept { return m_result; }

        void set_base_point(const Point& pt);
-
-    private:
-        std::vector<MatchRect> m_result;
    };
 }