diff --git a/MeoAssistance/include/AsstDef.h b/MeoAssistance/include/AsstDef.h index 19968279ea..6b285e01ec 100644 --- a/MeoAssistance/include/AsstDef.h +++ b/MeoAssistance/include/AsstDef.h @@ -11,7 +11,7 @@ namespace asst { - const static std::string Version = "release.beta.01"; + const static std::string Version = "release.beta.01.2"; /************ Type ************/ diff --git a/MeoAssistance/src/Assistance.cpp b/MeoAssistance/src/Assistance.cpp index a4b3bba571..1c08bc574a 100644 --- a/MeoAssistance/src/Assistance.cpp +++ b/MeoAssistance/src/Assistance.cpp @@ -116,6 +116,7 @@ void Assistance::stop(bool block) bool Assistance::setParam(const std::string& type, const std::string& param, const std::string& value) { DebugTraceFunction; + DebugTrace("SetParam |", type, param, value); return Configer::setParam(type, param, value); } diff --git a/MeoAsstGui/MainWindow.xaml.cs b/MeoAsstGui/MainWindow.xaml.cs index f858970036..291053e4e0 100644 --- a/MeoAsstGui/MainWindow.xaml.cs +++ b/MeoAsstGui/MainWindow.xaml.cs @@ -89,7 +89,7 @@ namespace MeoAsstGui private void textBox_useStone_TextChanged(object sender, TextChangedEventArgs e) { - if (checkBox_useMedicine.IsChecked == true) + if (checkBox_useStone.IsChecked == true) { String text = textBox_useStone.Text != String.Empty ? textBox_useStone.Text : "0"; AsstSetParam(p_asst, "task.maxTimes", "StoneConfirm", text); @@ -98,13 +98,16 @@ namespace MeoAsstGui private void checkBox_useStone_Checked(object sender, RoutedEventArgs e) { - if (checkBox_useMedicine.IsChecked == true) + if (checkBox_useStone.IsChecked == true) { AsstSetParam(p_asst, "task.type", "UseStone", "doNothing"); + String text = textBox_useStone.Text != String.Empty ? textBox_useStone.Text : "0"; + AsstSetParam(p_asst, "task.maxTimes", "StoneConfirm", text); } else { AsstSetParam(p_asst, "task.type", "UseStone", "stop"); + AsstSetParam(p_asst, "task.maxTimes", "StoneConfirm", "0"); } }