From 4235ce9358bdd72f05fbf8a4d3ef59fc71449fe0 Mon Sep 17 00:00:00 2001
From: Hydrogina <46482682+Hydrogina@users.noreply.github.com>
Date: Wed, 30 Nov 2022 12:59:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=80=9F=E5=8A=A9?=
 =?UTF-8?q?=E6=88=98=E5=88=B7=E4=BF=A1=E7=94=A8=E6=97=A0=E6=B3=95=E8=BF=9B?=
 =?UTF-8?q?=E5=9B=BE=20#2947=20fix:=20=E4=BF=AE=E5=A4=8DOF-1=E6=9C=AA?=
 =?UTF-8?q?=E5=BC=80=E5=90=AF=E6=83=85=E5=86=B5=E4=B8=8B=E4=BF=A1=E7=94=A8?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8D=A1=E4=BD=8F&=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E8=AF=B4=E6=98=8E=E4=B8=8D=E6=98=8E=E7=A1=AE=20#2949?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resource/tasks.json                              |  10 ++++++++++
 resource/template/NotUsePrts.png                 | Bin 0 -> 3444 bytes
 .../Task/Miscellaneous/CreditFightTask.cpp       |   5 +++++
 .../Resources/Localizations/zh-cn.xaml           |   2 +-
 4 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 resource/template/NotUsePrts.png

diff --git a/resource/tasks.json b/resource/tasks.json
index 6a0b26c9a1..504b1aa692 100644
--- a/resource/tasks.json
+++ b/resource/tasks.json
@@ -2760,6 +2760,16 @@
             "StartButton1"
         ]
     },
+    "NotUsePrts": {
+        "action": "ClickSelf",
+        "roi": [
+            1000,
+            550,
+            280,
+            90
+        ],
+        "cache": false
+    },
     "UsePrts-Annihilation": {
         "Doc": "剿灭的“全权委托”按钮",
         "action": "ClickSelf",
diff --git a/resource/template/NotUsePrts.png b/resource/template/NotUsePrts.png
new file mode 100644
index 0000000000000000000000000000000000000000..45c34ae77ef6632ad584aa9809de441188f9286f
GIT binary patch
literal 3444
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
W@s+hKkOsy80000<MNUMnLSTYIo2V!N

literal 0
HcmV?d00001

diff --git a/src/MeoAssistant/Task/Miscellaneous/CreditFightTask.cpp b/src/MeoAssistant/Task/Miscellaneous/CreditFightTask.cpp
index d3864498dd..5aec9959b4 100644
--- a/src/MeoAssistant/Task/Miscellaneous/CreditFightTask.cpp
+++ b/src/MeoAssistant/Task/Miscellaneous/CreditFightTask.cpp
@@ -18,6 +18,7 @@ asst::CreditFightTask::CreditFightTask(const AsstCallback& callback, Assistant*
     auto start_up_task_ptr = std::make_shared<ProcessTask>(m_callback, m_inst, task_chain);
     auto stage_navigation_task_ptr = std::make_shared<StageNavigationTask>(m_callback, m_inst, task_chain);
     auto stop_task_ptr = std::make_shared<ProcessTask>(m_callback, m_inst, task_chain);
+    auto not_use_prts_task_ptr = std::make_shared<ProcessTask>(m_callback, m_inst, task_chain);
     auto copilot_task_ptr = std::make_shared<CopilotTask>(m_callback, m_inst);
 
     // 开始
@@ -34,11 +35,15 @@ asst::CreditFightTask::CreditFightTask(const AsstCallback& callback, Assistant*
     // 关卡导航
     stage_navigation_task_ptr->set_stage_name(copilot_task_ptr->get_stage_name());
 
+    // 不使用代理指挥
+    not_use_prts_task_ptr->set_tasks({ "NotUsePrts", "Stop" });
+
     // 战斗结束后
     stop_task_ptr->set_tasks({ "EndOfActionThenStop", "FightMissionFailedThenStop" });
 
     m_subtasks.emplace_back(start_up_task_ptr);
     m_subtasks.emplace_back(stage_navigation_task_ptr);
+    m_subtasks.emplace_back(not_use_prts_task_ptr);
     m_subtasks.emplace_back(copilot_task_ptr);
     m_subtasks.emplace_back(stop_task_ptr);
 }
diff --git a/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml b/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml
index 50714447c0..f4853f9ae5 100644
--- a/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml
+++ b/src/MeoAsstGui/Resources/Localizations/zh-cn.xaml
@@ -192,7 +192,7 @@
 
     <system:String x:Key="SocialPtShop">信用相关</system:String>
     <system:String x:Key="CreditFight">借助战赚信用</system:String>
-    <system:String x:Key="CreditFightTip">访问好友后借助战打一把OF-1赚30信用，关卡选择为「当前/上次」时请勿勾选</system:String>
+    <system:String x:Key="CreditFightTip">访问好友后借助战打一把OF-1赚30信用，关卡选择为「当前/上次」时请勿勾选，关卡选择为「当前/上次」时请勿勾选，别传「火蓝之心」关卡OF-1未解锁时请勿勾选</system:String>
     <system:String x:Key="HighPriority">优先购买 子串即可 分号分隔</system:String>
     <system:String x:Key="Blacklist">黑名单 子串即可 分号分隔</system:String>
     <system:String x:Key="HighPriorityDefault">招聘许可；龙门币</system:String>