From e5c3fd89f3720fd8a8b26e1ce7735f852b8d6597 Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Mon, 6 Dec 2021 21:25:34 +0800
Subject: [PATCH] =?UTF-8?q?fix.=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E6=9C=89=E7=9A=84=E6=B2=A1=E7=9A=84=E5=B0=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resource/tasks.json                           | 23 +++++++++++++++++++
 src/MeoAssistance/Assistance.cpp              |  1 +
 src/MeoAssistance/Assistance.h                |  1 +
 .../AutoRecruitSettingsUserControl.xaml       |  2 +-
 .../UserControl/MallSettingsUserControl.xaml  |  4 ++--
 5 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/resource/tasks.json b/resource/tasks.json
index dc63d15d92..e39c14854c 100644
--- a/resource/tasks.json
+++ b/resource/tasks.json
@@ -879,6 +879,7 @@
             640,
             360
         ],
+        "rearDelay": 1000,
         "next": [
             "CreditStoreOcr",
             "Mall"
@@ -1173,6 +1174,28 @@
             400,
             650,
             160
+        ],
+        "next": [
+            "RecruitLoading",
+            "Stop"
+        ]
+    },
+    "RecruitLoading": {
+        "algorithm": "OcrDetect",
+        "action": "doNothing",
+        "text": [
+            "正在提交",
+            "反馈至神经"
+        ],
+        "roi": [
+            700,
+            600,
+            300,
+            120
+        ],
+        "next": [
+            "RecruitLoading",
+            "Stop"
         ]
     },
     "RecruitConfirm": {
diff --git a/src/MeoAssistance/Assistance.cpp b/src/MeoAssistance/Assistance.cpp
index bc6ad6b212..ed56a65640 100644
--- a/src/MeoAssistance/Assistance.cpp
+++ b/src/MeoAssistance/Assistance.cpp
@@ -248,6 +248,7 @@ bool asst::Assistance::append_recruit(unsigned max_times, const std::vector<int>
     recruit_task_ptr->set_required_level(required_level);
     recruit_task_ptr->set_confirm_level(confirm_level);
     recruit_task_ptr->set_task_chain(TaskChain);
+    recruit_task_ptr->set_retry_times(AutoRecruitTaskRetryTimesDefault);
 
     m_tasks_queue.emplace(recruit_task_ptr);
 
diff --git a/src/MeoAssistance/Assistance.h b/src/MeoAssistance/Assistance.h
index cb40e73db6..01069bca1c 100644
--- a/src/MeoAssistance/Assistance.h
+++ b/src/MeoAssistance/Assistance.h
@@ -76,6 +76,7 @@ namespace asst
 
         static constexpr int ProcessTaskRetryTimesDefault = 20;
         static constexpr int OpenRecruitTaskRetryTimesDefault = 10;
+        static constexpr int AutoRecruitTaskRetryTimesDefault = 5;
 
     private:
         void working_proc();
diff --git a/src/MeoAsstGui/UserControl/AutoRecruitSettingsUserControl.xaml b/src/MeoAsstGui/UserControl/AutoRecruitSettingsUserControl.xaml
index 838fc87c7f..2603b38e99 100644
--- a/src/MeoAsstGui/UserControl/AutoRecruitSettingsUserControl.xaml
+++ b/src/MeoAsstGui/UserControl/AutoRecruitSettingsUserControl.xaml
@@ -15,7 +15,7 @@
         <StackPanel Grid.Column="0" VerticalAlignment="Center" Margin="10">
             <CheckBox IsChecked="{Binding RefreshLevel3}" Content="自动刷新3星Tags" VerticalAlignment="Center" Margin="10" />
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0, 10">
-                <TextBlock Style="{StaticResource TextBlockDefault}"
+                <TextBlock Style="{StaticResource TextBlockDefault}" Block.TextAlignment="Center"
                    Text="每次执行时&#xA;最大招募次数" Margin="5" VerticalAlignment="Center" />
                 <TextBox Text="{Binding RecruitMaxTimes}" Margin="5"
                      Width="50" InputMethod.IsInputMethodEnabled="False" />
diff --git a/src/MeoAsstGui/UserControl/MallSettingsUserControl.xaml b/src/MeoAsstGui/UserControl/MallSettingsUserControl.xaml
index 1bd5b5e96a..10519e1f26 100644
--- a/src/MeoAsstGui/UserControl/MallSettingsUserControl.xaml
+++ b/src/MeoAsstGui/UserControl/MallSettingsUserControl.xaml
@@ -9,7 +9,7 @@
              d:DesignHeight="300" d:DesignWidth="550">
     <Grid>
         <!--IsEnabled="{Binding CreditShoppingCheckBoxIsEnable}"-->
-        <CheckBox IsChecked="{Binding CreditShopping}"
-                  Content=" 信用商店随缘买&#13;（不买碳和家具）" />
+        <CheckBox IsChecked="{Binding CreditShopping}"  Block.TextAlignment="Center"
+                  Content="信用商店随缘买&#13;（不买碳和家具）" />
     </Grid>
 </UserControl>
\ No newline at end of file