From 0ca408e942aa53b109ae56166b6d490421cd758f Mon Sep 17 00:00:00 2001
From: status102 <102887808+status102@users.noreply.github.com>
Date: Thu, 25 Jan 2024 16:41:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9B=B4=E6=AD=A3=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resource/tasks.json                                 |  10 +++++-----
 .../{AdverseDifficulty.png => RaidDifficulty.png}   | Bin
 src/MaaCore/Task/Interface/CopilotTask.cpp          |   8 ++++----
 src/MaaCore/Task/Interface/CopilotTask.h            |   2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)
 rename resource/template/{AdverseDifficulty.png => RaidDifficulty.png} (100%)

diff --git a/resource/tasks.json b/resource/tasks.json
index b50c001ada..bac61336c2 100644
--- a/resource/tasks.json
+++ b/resource/tasks.json
@@ -707,8 +707,8 @@
             50
         ]
     },
-    "ChangeToAdverseDifficulty": {
-        "template": "AdverseDifficulty.png",
+    "ChangeToRaidDifficulty": {
+        "template": "RaidDifficulty.png",
         "action": "ClickSelf",
         "roi": [
             625,
@@ -718,12 +718,12 @@
         ],
         "maxTimes": 3,
         "next": [
-            "AdverseConfirm",
+            "RaidConfirm",
             "#self"
         ]
     },
-    "AdverseConfirm": {
-        "baseTask": "ChangeToAdverseDifficulty",
+    "RaidConfirm": {
+        "baseTask": "ChangeToRaidDifficulty",
         "action": "DoNothing",
         "template": "NormalDifficulty.png",
         "next": []
diff --git a/resource/template/AdverseDifficulty.png b/resource/template/RaidDifficulty.png
similarity index 100%
rename from resource/template/AdverseDifficulty.png
rename to resource/template/RaidDifficulty.png
diff --git a/src/MaaCore/Task/Interface/CopilotTask.cpp b/src/MaaCore/Task/Interface/CopilotTask.cpp
index f9a4f0b021..676d1de0e2 100644
--- a/src/MaaCore/Task/Interface/CopilotTask.cpp
+++ b/src/MaaCore/Task/Interface/CopilotTask.cpp
@@ -17,7 +17,7 @@ asst::CopilotTask::CopilotTask(const AsstCallback& callback, Assistant* inst)
       m_task_file_reload_task_ptr(std::make_shared<TaskFileReloadTask>(callback, inst, TaskType)),
       m_navigate_task_ptr(std::make_shared<ProcessTask>(callback, inst, TaskType)),
       m_not_use_prts_task_ptr(std::make_shared<ProcessTask>(callback, inst, TaskType)),
-      m_adverse_select_task_ptr(std::make_shared<ProcessTask>(callback, inst, TaskType)),
+      m_change_difficulty_task_ptr(std::make_shared<ProcessTask>(callback, inst, TaskType)),
       m_formation_task_ptr(std::make_shared<BattleFormationTask>(callback, inst, TaskType)),
       m_battle_task_ptr(std::make_shared<BattleProcessTask>(callback, inst, TaskType)),
       m_stop_task_ptr(std::make_shared<ProcessTask>(callback, inst, TaskType))
@@ -31,8 +31,8 @@ asst::CopilotTask::CopilotTask(const AsstCallback& callback, Assistant* inst)
     m_subtasks.emplace_back(m_not_use_prts_task_ptr);
 
     // 选择突袭模式
-    m_adverse_select_task_ptr->set_tasks({ "ChangeToAdverseDifficulty", "AdverseConfirm" });
-    m_subtasks.emplace_back(m_adverse_select_task_ptr);
+    m_change_difficulty_task_ptr->set_tasks({ "RaidConfirm", "ChangeToRaidDifficulty" });
+    m_subtasks.emplace_back(m_change_difficulty_task_ptr);
 
     auto start_1_tp = std::make_shared<ProcessTask>(callback, inst, TaskType);
     start_1_tp->set_tasks({ "BattleStartPre" }).set_retry_times(0).set_ignore_error(true);
@@ -119,7 +119,7 @@ bool asst::CopilotTask::set_params(const json::value& params)
     }
 
     m_navigate_task_ptr->set_enable(need_navigate);
-    m_adverse_select_task_ptr->set_enable(need_navigate && is_adverse);
+    m_change_difficulty_task_ptr->set_enable(need_navigate && is_adverse);
     m_not_use_prts_task_ptr->set_enable(need_navigate); // 不使用代理指挥
     m_medicine_task_ptr->set_enable(use_sanity_potion);
 
diff --git a/src/MaaCore/Task/Interface/CopilotTask.h b/src/MaaCore/Task/Interface/CopilotTask.h
index d1615a934d..204671286a 100644
--- a/src/MaaCore/Task/Interface/CopilotTask.h
+++ b/src/MaaCore/Task/Interface/CopilotTask.h
@@ -27,7 +27,7 @@ namespace asst
         std::shared_ptr<ProcessTask> m_navigate_task_ptr = nullptr;
         std::shared_ptr<ProcessTask> m_not_use_prts_task_ptr = nullptr;
         std::shared_ptr<ProcessTask> m_medicine_task_ptr= nullptr;
-        std::shared_ptr<ProcessTask> m_adverse_select_task_ptr = nullptr;
+        std::shared_ptr<ProcessTask> m_change_difficulty_task_ptr = nullptr;
         std::shared_ptr<BattleFormationTask> m_formation_task_ptr = nullptr;
         std::shared_ptr<BattleProcessTask> m_battle_task_ptr = nullptr;
         std::shared_ptr<ProcessTask> m_stop_task_ptr = nullptr;