From 7d43aea92212ca271a2c9f126b77d2cfaaa7dd23 Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Mon, 19 Jul 2021 21:22:10 +0800
Subject: [PATCH] add set max times function

---
 MeoAssistance/src/Assistance.cpp |  2 ++
 MeoAsstGui/MainWindow.xaml       |  8 +++++---
 MeoAsstGui/MainWindow.xaml.cs    | 20 ++++++++++++++++++++
 README.md                        |  2 +-
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/MeoAssistance/src/Assistance.cpp b/MeoAssistance/src/Assistance.cpp
index c9ddc80c1f..5b36e88e19 100644
--- a/MeoAssistance/src/Assistance.cpp
+++ b/MeoAssistance/src/Assistance.cpp
@@ -82,6 +82,8 @@ void Assistance::start(const std::string& task)
 	}
 
 	std::unique_lock<std::mutex> lock(m_mutex);
+
+	Configer::clearExecTimes();
 	m_pIder->clear_cache();
 	m_next_tasks.clear();
 	m_next_tasks.emplace_back(task);
diff --git a/MeoAsstGui/MainWindow.xaml b/MeoAsstGui/MainWindow.xaml
index 86b6497585..2268524b29 100644
--- a/MeoAsstGui/MainWindow.xaml
+++ b/MeoAsstGui/MainWindow.xaml
@@ -11,11 +11,13 @@
         <CheckBox x:Name="checkBox_useStone" Content="吃石头" HorizontalAlignment="Left" Margin="50,150,0,0" VerticalAlignment="Top" Checked="checkBox_useStone_Checked" Unchecked="checkBox_useStone_Checked"/>
         <TextBox x:Name="textBox_useStone" HorizontalAlignment="Left" Height="23" Margin="112,148,0,0" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="47" TextChanged="textBox_useStone_TextChanged" InputMethod.IsInputMethodEnabled="False"/>
         <Label x:Name="label_stoneNumber" Content="颗" HorizontalAlignment="Left" Margin="164,144,0,0" VerticalAlignment="Top" RenderTransformOrigin="-5.771,-6.291"/>
-        <Button x:Name="button_startSanity" Content="开始刷理智" HorizontalAlignment="Left" Margin="50,200,0,0" VerticalAlignment="Top" Width="120" Height="50" Click="button_Click_startSanity"/>
-        <Button x:Name="button_stop" Content="停止" HorizontalAlignment="Left" Margin="50,280,0,0" VerticalAlignment="Top" Width="300" Height="50" Click="button_Click_stop"/>
+        <Button x:Name="button_startSanity" Content="开始刷理智" HorizontalAlignment="Left" Margin="50,270,0,0" VerticalAlignment="Top" Width="120" Height="50" Click="button_Click_startSanity"/>
+        <Button x:Name="button_stop" Content="停止" HorizontalAlignment="Left" Margin="50,350,0,0" VerticalAlignment="Top" Width="300" Height="50" Click="button_Click_stop"/>
         <Label x:Name="catch_status" Content="" HorizontalAlignment="Left" Margin="50,30,0,0" VerticalAlignment="Top"/>
-        <Button x:Name="button_visit" Content="访问基建" HorizontalAlignment="Left" Margin="230,200,0,0" VerticalAlignment="Top" Width="120" Height="50" Click="button_Click_visit"/>
+        <Button x:Name="button_visit" Content="访问基建" HorizontalAlignment="Left" Margin="230,270,0,0" VerticalAlignment="Top" Width="120" Height="50" Click="button_Click_visit"/>
         <Label x:Name="exec_times" Content="" HorizontalAlignment="Left" Margin="230,30,0,0" VerticalAlignment="Top"/>
         <Label x:Name="stone_times" Content="" HorizontalAlignment="Left" Margin="230,144,0,0" VerticalAlignment="Top" RenderTransformOrigin="-0.702,0.403"/>
+        <CheckBox x:Name="checkBox_maxTimes" Content="指定次数" HorizontalAlignment="Left" Margin="50,200,0,0" VerticalAlignment="Top" Checked="checkBox_maxTimes_Checked" Unchecked="checkBox_maxTimes_Checked"/>
+        <TextBox x:Name="textBox_maxTimes" HorizontalAlignment="Left" Height="23" Margin="124,198,0,0" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="47" TextChanged="textBox_maxTimes_TextChanged" InputMethod.IsInputMethodEnabled="False"/>
     </Grid>
 </Window>
diff --git a/MeoAsstGui/MainWindow.xaml.cs b/MeoAsstGui/MainWindow.xaml.cs
index ed5ac0e4d9..3141bb78da 100644
--- a/MeoAsstGui/MainWindow.xaml.cs
+++ b/MeoAsstGui/MainWindow.xaml.cs
@@ -114,5 +114,25 @@ namespace MeoAsstGui
                 stone_times.Content = "已碎石 " + buff_stone + " 个";
             }
         }
+
+        private void checkBox_maxTimes_Checked(object sender, RoutedEventArgs e)
+        {
+            if (checkBox_maxTimes.IsChecked == true)
+            {
+                AsstSetParam(p_asst, "task.maxTimes", "StartButton1", textBox_maxTimes.Text);
+            }
+            else
+            {
+                AsstSetParam(p_asst, "task.maxTimes", "StartButton1", int.MaxValue.ToString());
+            }
+        }
+
+        private void textBox_maxTimes_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            if (checkBox_maxTimes.IsChecked == true)
+            {
+                AsstSetParam(p_asst, "task.maxTimes", "StartButton1", textBox_maxTimes.Text);
+            }
+        }
     }
 }
diff --git a/README.md b/README.md
index 136daf0eef..c9eaec490c 100644
--- a/README.md
+++ b/README.md
@@ -91,7 +91,7 @@ MuMu是个奇葩，它的所有的窗口句柄均不响应SendMessage鼠标消
         - [x] 代理失败的情况
         - [x] 支持等级提升
         - [x] 支持自动勾选代理指挥
-        - [ ] 支持刷指定次数
+        - [x] 支持刷指定次数
         - [x] 自动吃石头（根据设置，指定数量）
         - [ ] 支持凌晨4点更新数据
         - [ ] 结束界面自动截图，可用于上传企鹅物流