From 37c5be5dd0c77fa1af68a02b32a5504a47e9df7e Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Thu, 12 Aug 2021 00:46:38 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=9D=E6=AD=A5=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E5=88=B6=E9=80=A0=E7=AB=99=E6=8D=A2=E7=8F=AD=E7=9A=84demo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MeoAssistance/InfrastConfiger.cpp             |  66 +++++++++
 MeoAssistance/MeoAssistance.vcxproj           |  13 +-
 MeoAssistance/MeoAssistance.vcxproj.filters   |  80 ++++++-----
 MeoAssistance/include/Assistance.h            |   3 +
 MeoAssistance/include/AsstCaller.h            |   1 +
 MeoAssistance/include/AsstDef.h               |   1 +
 MeoAssistance/include/Configer.h              |   7 +-
 MeoAssistance/include/InfrastConfiger.h       |  35 +++++
 MeoAssistance/include/OpenRecruitConfiger.h   |  39 ------
 MeoAssistance/include/RecruitConfiger.h       |  39 ++++++
 MeoAssistance/include/Task.h                  |   2 +-
 MeoAssistance/include/WinMacro.h              |   4 +
 MeoAssistance/src/Assistance.cpp              |  15 +-
 MeoAssistance/src/AsstCaller.cpp              |  10 +-
 MeoAssistance/src/Configer.cpp                |   2 +-
 ...ecruitConfiger.cpp => RecruitConfiger.cpp} |  10 +-
 MeoAssistance/src/Task.cpp                    | 128 ++++++++++++++----
 MeoAssistance/src/WinMacro.cpp                |  66 +++++++--
 Tools/TestCaller/TestCaller.vcxproj           |   2 +-
 Tools/TestCaller/main.cpp                     |  24 +++-
 resource/config.json                          | 119 ++--------------
 resource/infrast.json                         |  26 ++++
 resource/{operInfo.json => recruit.json}      |   0
 23 files changed, 450 insertions(+), 242 deletions(-)
 create mode 100644 MeoAssistance/InfrastConfiger.cpp
 create mode 100644 MeoAssistance/include/InfrastConfiger.h
 delete mode 100644 MeoAssistance/include/OpenRecruitConfiger.h
 create mode 100644 MeoAssistance/include/RecruitConfiger.h
 rename MeoAssistance/src/{OpenRecruitConfiger.cpp => RecruitConfiger.cpp} (88%)
 create mode 100644 resource/infrast.json
 rename resource/{operInfo.json => recruit.json} (100%)

diff --git a/MeoAssistance/InfrastConfiger.cpp b/MeoAssistance/InfrastConfiger.cpp
new file mode 100644
index 0000000000..2cffe2172b
--- /dev/null
+++ b/MeoAssistance/InfrastConfiger.cpp
@@ -0,0 +1,66 @@
+#include "InfrastConfiger.h"
+
+#include <fstream>
+#include <sstream>
+
+#include <json.h>
+#include "Logger.hpp"
+
+using namespace asst;
+
+bool InfrastConfiger::load(const std::string& filename)
+{
+	DebugTraceFunction;
+	DebugTrace("Configer::load | ", filename);
+
+	InfrastConfiger temp;
+	if (temp._load(filename)) {
+		*this = std::move(temp);
+		return true;
+	}
+	else {
+		return false;
+	}
+}
+
+bool InfrastConfiger::_load(const std::string& filename)
+{
+	std::ifstream ifs(filename, std::ios::in);
+	if (!ifs.is_open()) {
+		return false;
+	}
+	std::stringstream iss;
+	iss << ifs.rdbuf();
+	ifs.close();
+	std::string content(iss.str());
+
+	auto&& ret = json::parser::parse(content);
+	if (!ret) {
+		DebugTrace("parse error", content);
+		return false;
+	}
+
+	json::value root = ret.value();
+	try {
+		// ����վ
+		for (json::value& comb_info : root["Manufacturing"]["combs"].as_array())
+		{
+			std::vector<std::string> comb_vec;
+			for (json::value& oper_name : comb_info["comb"].as_array())
+			{
+				std::string oper_name_str = oper_name.as_string();
+				m_mfg_opers.emplace(oper_name_str);
+				comb_vec.emplace_back(std::move(oper_name_str));
+			}
+			m_mfg_combs.emplace_back(std::move(comb_vec));
+		}
+		// ó��վ TODO����
+	}
+	catch (json::exception& e) {
+		DebugTraceError("Load config json error!", e.what());
+		return false;
+	}
+	DebugTrace("Load config succeed");
+
+	return true;
+}
\ No newline at end of file
diff --git a/MeoAssistance/MeoAssistance.vcxproj b/MeoAssistance/MeoAssistance.vcxproj
index 630f320157..cd0ef8ffbe 100644
--- a/MeoAssistance/MeoAssistance.vcxproj
+++ b/MeoAssistance/MeoAssistance.vcxproj
@@ -26,25 +26,28 @@
     <ClInclude Include="include\AsstPort.h" />
     <ClInclude Include="include\Configer.h" />
     <ClInclude Include="include\Identify.h" />
+    <ClInclude Include="include\InfrastConfiger.h" />
     <ClInclude Include="include\Logger.hpp" />
-    <ClInclude Include="include\OpenRecruitConfiger.h" />
+    <ClInclude Include="include\RecruitConfiger.h" />
     <ClInclude Include="include\Task.h" />
     <ClInclude Include="include\Updater.h" />
     <ClInclude Include="include\Version.h" />
     <ClInclude Include="include\WinMacro.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="InfrastConfiger.cpp" />
     <ClCompile Include="src\Assistance.cpp" />
     <ClCompile Include="src\AsstCaller.cpp" />
     <ClCompile Include="src\Configer.cpp" />
     <ClCompile Include="src\Identify.cpp" />
-    <ClCompile Include="src\OpenRecruitConfiger.cpp" />
+    <ClCompile Include="src\RecruitConfiger.cpp" />
     <ClCompile Include="src\Task.cpp" />
     <ClCompile Include="src\Updater.cpp" />
     <ClCompile Include="src\WinMacro.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\resource\operInfo.json" />
+    <None Include="..\resource\infrast.json" />
+    <None Include="..\resource\recruit.json" />
     <None Include="..\resource\config.json" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
@@ -155,7 +158,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;CSHARP_API;MEO_DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;MEO_DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <LanguageStandard_C>stdc11</LanguageStandard_C>
@@ -196,7 +199,7 @@ xcopy /e /y /i $(SolutionDir)3rdPart\resource $(TargetDir)resource</Command>
       </FunctionLevelLinking>
       <IntrinsicFunctions>false</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;CSHARP_API;MEO_DLL_EXPORTS;LOG_TRACE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;MEO_DLL_EXPORTS;LOG_TRACE;DEBUG_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <LanguageStandard_C>stdc11</LanguageStandard_C>
diff --git a/MeoAssistance/MeoAssistance.vcxproj.filters b/MeoAssistance/MeoAssistance.vcxproj.filters
index 8c07d230c9..f09ac5310a 100644
--- a/MeoAssistance/MeoAssistance.vcxproj.filters
+++ b/MeoAssistance/MeoAssistance.vcxproj.filters
@@ -13,20 +13,23 @@
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
     </Filter>
+    <Filter Include="头文件\configer">
+      <UniqueIdentifier>{07a812fe-6b28-4be0-b6d4-33554824d3c5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="源文件\configer">
+      <UniqueIdentifier>{74bd94e1-4973-412a-a17a-d8457de387af}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="头文件\type">
+      <UniqueIdentifier>{87c9dee5-847b-41e6-818e-387a6385ea8b}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="include\Configer.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
     <ClInclude Include="include\Identify.h">
       <Filter>头文件</Filter>
     </ClInclude>
     <ClInclude Include="include\WinMacro.h">
       <Filter>头文件</Filter>
     </ClInclude>
-    <ClInclude Include="include\AsstDef.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
     <ClInclude Include="include\Assistance.h">
       <Filter>头文件</Filter>
     </ClInclude>
@@ -36,32 +39,35 @@
     <ClInclude Include="include\Updater.h">
       <Filter>头文件</Filter>
     </ClInclude>
-    <ClInclude Include="include\Logger.hpp">
-      <Filter>头文件</Filter>
-    </ClInclude>
-    <ClInclude Include="include\AsstAux.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-    <ClInclude Include="include\AsstPort.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-    <ClInclude Include="include\OpenRecruitConfiger.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-    <ClInclude Include="include\Version.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
     <ClInclude Include="include\Task.h">
       <Filter>头文件</Filter>
     </ClInclude>
+    <ClInclude Include="include\InfrastConfiger.h">
+      <Filter>头文件\configer</Filter>
+    </ClInclude>
+    <ClInclude Include="include\RecruitConfiger.h">
+      <Filter>头文件\configer</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Configer.h">
+      <Filter>头文件\configer</Filter>
+    </ClInclude>
+    <ClInclude Include="include\AsstDef.h">
+      <Filter>头文件\type</Filter>
+    </ClInclude>
+    <ClInclude Include="include\AsstAux.h">
+      <Filter>头文件\type</Filter>
+    </ClInclude>
+    <ClInclude Include="include\AsstPort.h">
+      <Filter>头文件\type</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Version.h">
+      <Filter>头文件\type</Filter>
+    </ClInclude>
+    <ClInclude Include="include\Logger.hpp">
+      <Filter>头文件\type</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="src\Configer.cpp">
-      <Filter>源文件</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Identify.cpp">
-      <Filter>源文件</Filter>
-    </ClCompile>
     <ClCompile Include="src\WinMacro.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
@@ -74,18 +80,30 @@
     <ClCompile Include="src\Updater.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
-    <ClCompile Include="src\OpenRecruitConfiger.cpp">
-      <Filter>源文件</Filter>
-    </ClCompile>
     <ClCompile Include="src\Task.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
+    <ClCompile Include="InfrastConfiger.cpp">
+      <Filter>源文件\configer</Filter>
+    </ClCompile>
+    <ClCompile Include="src\Identify.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="src\RecruitConfiger.cpp">
+      <Filter>源文件\configer</Filter>
+    </ClCompile>
+    <ClCompile Include="src\Configer.cpp">
+      <Filter>源文件\configer</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\resource\config.json">
       <Filter>资源文件</Filter>
     </None>
-    <None Include="..\resource\operInfo.json">
+    <None Include="..\resource\recruit.json">
+      <Filter>资源文件</Filter>
+    </None>
+    <None Include="..\resource\infrast.json">
       <Filter>资源文件</Filter>
     </None>
   </ItemGroup>
diff --git a/MeoAssistance/include/Assistance.h b/MeoAssistance/include/Assistance.h
index 7dcdfcaa4a..e6cf6f1680 100644
--- a/MeoAssistance/include/Assistance.h
+++ b/MeoAssistance/include/Assistance.h
@@ -43,6 +43,9 @@ namespace asst {
 
 		bool set_param(const std::string& type, const std::string& param, const std::string& value);
 
+		// ����������������
+		bool swipe(const Point& p1, const Point& p2);
+
 		static constexpr int ProcessTaskRetryTimesDefault = 20;
 		static constexpr int OpenRecruitTaskRetyrTimesDefault = 5;
 
diff --git a/MeoAssistance/include/AsstCaller.h b/MeoAssistance/include/AsstCaller.h
index 5b057d3248..d063218e65 100644
--- a/MeoAssistance/include/AsstCaller.h
+++ b/MeoAssistance/include/AsstCaller.h
@@ -22,6 +22,7 @@ extern "C" {
 
 	MEOAPI_PORT bool CheckVersionUpdate(char* tag_buffer, int tag_bufsize, char* html_url_buffer, int html_bufsize, char* body_buffer, int body_bufsize);
 
+	MEOAPI_PORT bool AsstTestSwipe(asst::Assistance* p_asst, int x1, int y1, int x2, int y2);
 #ifdef __cplusplus
 }
 #endif
\ No newline at end of file
diff --git a/MeoAssistance/include/AsstDef.h b/MeoAssistance/include/AsstDef.h
index e5ce23a76f..e0d1e190d0 100644
--- a/MeoAssistance/include/AsstDef.h
+++ b/MeoAssistance/include/AsstDef.h
@@ -103,6 +103,7 @@ namespace asst {
 		std::string path;
 		std::string connect;
 		std::string click;
+		std::string swipe;
 		std::string display;
 		std::string display_regex;
 		int display_width = 0;
diff --git a/MeoAssistance/include/Configer.h b/MeoAssistance/include/Configer.h
index 2705c135ba..bf4e006cef 100644
--- a/MeoAssistance/include/Configer.h
+++ b/MeoAssistance/include/Configer.h
@@ -2,7 +2,6 @@
 
 #include <string>
 #include <unordered_map>
-#include <optional>
 #include <memory>
 
 #include "AsstDef.h"
@@ -22,9 +21,6 @@ namespace asst {
 
 		bool set_param(const std::string& type, const std::string& param, const std::string& value);
 
-		Configer& operator=(const Configer& rhs) = default;
-		Configer& operator=(Configer&& rhs) noexcept = default;
-
 		constexpr static int DefaultWindowWidth = 1280;
 		constexpr static int DefaultWindowHeight = 720;
 		constexpr static double Defaulttempl_threshold = 0.9;
@@ -42,6 +38,9 @@ namespace asst {
 		Configer(const Configer& rhs) = default;
 		Configer(Configer&& rhs) noexcept = default;
 
+		Configer& operator=(const Configer& rhs) = default;
+		Configer& operator=(Configer && rhs) noexcept = default;
+
 		bool _load(const std::string& filename);
 	};
 }
diff --git a/MeoAssistance/include/InfrastConfiger.h b/MeoAssistance/include/InfrastConfiger.h
new file mode 100644
index 0000000000..b9c0e62582
--- /dev/null
+++ b/MeoAssistance/include/InfrastConfiger.h
@@ -0,0 +1,35 @@
+#pragma once
+
+#include <string>
+#include <unordered_map>
+#include <unordered_set>
+
+#include "AsstDef.h"
+
+namespace asst {
+	class InfrastConfiger
+	{
+	public:
+		~InfrastConfiger() = default;
+
+		static InfrastConfiger& get_instance() {
+			static InfrastConfiger unique_instance;
+			return unique_instance;
+		}
+
+		bool load(const std::string& filename);
+
+		std::vector<std::vector<std::string>> m_mfg_combs;	// ����վ���
+		std::unordered_set<std::string> m_mfg_opers;		// ����վ���и�Ա
+
+	private:
+		InfrastConfiger() = default;
+		InfrastConfiger(const InfrastConfiger& rhs) = default;
+		InfrastConfiger(InfrastConfiger&& rhs) noexcept = default;
+
+		InfrastConfiger& operator=(const InfrastConfiger& rhs) = default;
+		InfrastConfiger& operator=(InfrastConfiger && rhs) noexcept = default;
+
+		bool _load(const std::string& filename);
+	};
+}
diff --git a/MeoAssistance/include/OpenRecruitConfiger.h b/MeoAssistance/include/OpenRecruitConfiger.h
deleted file mode 100644
index aea6f1e779..0000000000
--- a/MeoAssistance/include/OpenRecruitConfiger.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#pragma once
-
-#include <string>
-#include <vector>
-#include <unordered_set>
-
-#include "AsstDef.h"
-
-namespace asst {
-	class OpenRecruitConfiger
-	{
-	public:
-		~OpenRecruitConfiger() = default;
-
-		static OpenRecruitConfiger& get_instance() {
-			static OpenRecruitConfiger unique_instance;
-			return unique_instance;
-		}
-
-		bool load(const std::string& filename);
-
-		OpenRecruitConfiger& operator=(const OpenRecruitConfiger& rhs) = default;
-		OpenRecruitConfiger& operator=(OpenRecruitConfiger&& rhs) noexcept = default;
-
-		std::unordered_set<std::string> m_all_tags;
-		std::unordered_set<std::string> m_all_types;
-
-		std::vector<OperInfo> m_all_opers;
-
-		constexpr static int CorrectNumberOfTags = 5;
-
-	private:
-		OpenRecruitConfiger() = default;
-		OpenRecruitConfiger(const OpenRecruitConfiger& rhs) = default;
-		OpenRecruitConfiger(OpenRecruitConfiger&& rhs) noexcept = default;
-
-		bool _load(const std::string& filename);
-	};
-}
\ No newline at end of file
diff --git a/MeoAssistance/include/RecruitConfiger.h b/MeoAssistance/include/RecruitConfiger.h
new file mode 100644
index 0000000000..c5ac2f3d6a
--- /dev/null
+++ b/MeoAssistance/include/RecruitConfiger.h
@@ -0,0 +1,39 @@
+#pragma once
+
+#include <string>
+#include <vector>
+#include <unordered_set>
+
+#include "AsstDef.h"
+
+namespace asst {
+	class RecruitConfiger
+	{
+	public:
+		~RecruitConfiger() = default;
+
+		static RecruitConfiger& get_instance() {
+			static RecruitConfiger unique_instance;
+			return unique_instance;
+		}
+
+		bool load(const std::string& filename);
+
+		std::unordered_set<std::string> m_all_tags;
+		std::unordered_set<std::string> m_all_types;
+
+		std::vector<OperInfo> m_all_opers;
+
+		constexpr static int CorrectNumberOfTags = 5;
+
+	private:
+		RecruitConfiger() = default;
+		RecruitConfiger(const RecruitConfiger& rhs) = default;
+		RecruitConfiger(RecruitConfiger&& rhs) noexcept = default;
+
+		RecruitConfiger& operator=(const RecruitConfiger& rhs) = default;
+		RecruitConfiger& operator=(RecruitConfiger && rhs) noexcept = default;
+
+		bool _load(const std::string& filename);
+	};
+}
\ No newline at end of file
diff --git a/MeoAssistance/include/Task.h b/MeoAssistance/include/Task.h
index a25cfac7d1..efb37f8207 100644
--- a/MeoAssistance/include/Task.h
+++ b/MeoAssistance/include/Task.h
@@ -25,7 +25,7 @@ namespace asst {
 	class WinMacro;
 	class Identify;
 	class Configer;
-	class OpenRecruitConfiger;
+	class RecruitConfiger;
 
 	enum TaskType {
 		TaskTypeInvalid = 0,
diff --git a/MeoAssistance/include/WinMacro.h b/MeoAssistance/include/WinMacro.h
index 34c2a654a4..1170a99a5d 100644
--- a/MeoAssistance/include/WinMacro.h
+++ b/MeoAssistance/include/WinMacro.h
@@ -25,6 +25,8 @@ namespace asst {
 		bool hideWindow();
 		bool click(const Point& p);
 		bool click(const Rect& rect);
+		bool swipe(const Point& p1, const Point& p2);
+		bool swipe(const Rect& r1, const Rect& r2);
 		void setControlScale(double scale);
 		cv::Mat getImage(const Rect& rect);
 		Rect getWindowRect();
@@ -35,12 +37,14 @@ namespace asst {
 	private:
 		bool findHandle();
 		std::optional<std::string> callCmd(const std::string& cmd, bool use_pipe = true);
+		Point randPointInRect(const Rect& rect);
 
 		const EmulatorInfo m_emulator_info;
 		const HandleType m_handle_type;
 		HWND m_handle = NULL;
 		bool m_is_adb = false;
 		std::string m_click_cmd;	// adb����������adb�ľ���ò������
+		std::string m_swipe_cmd;	// adb�����������adb�ľ���ò������
 		std::minstd_rand m_rand_engine;
 		int m_width = 0;
 		int m_height = 0;
diff --git a/MeoAssistance/src/Assistance.cpp b/MeoAssistance/src/Assistance.cpp
index 9588d2d0fe..916b61b022 100644
--- a/MeoAssistance/src/Assistance.cpp
+++ b/MeoAssistance/src/Assistance.cpp
@@ -6,7 +6,8 @@
 #include "Logger.hpp"
 #include "AsstAux.h"
 #include "Task.h"
-#include "OpenRecruitConfiger.h"
+#include "RecruitConfiger.h"
+#include "InfrastConfiger.h"
 
 #include <json.h>
 #include <opencv2/opencv.hpp>
@@ -33,7 +34,12 @@ Assistance::Assistance(AsstCallback callback, void* callback_arg)
 		callback_error();
 		return;
 	}
-	ret = OpenRecruitConfiger::get_instance().load(GetResourceDir() + "operInfo.json");
+	ret = RecruitConfiger::get_instance().load(GetResourceDir() + "recruit.json");
+	if (!ret) {
+		callback_error();
+		return;
+	}
+	ret = InfrastConfiger::get_instance().load(GetResourceDir() + "infrast.json");
 	if (!ret) {
 		callback_error();
 		return;
@@ -234,6 +240,11 @@ bool Assistance::set_param(const std::string& type, const std::string& param, co
 	return Configer::get_instance().set_param(type, param, value);
 }
 
+bool asst::Assistance::swipe(const Point& p1, const Point& p2)
+{
+	return m_control_ptr->swipe(p1, p2);
+}
+
 void Assistance::working_proc(Assistance* p_this)
 {
 	DebugTraceFunction;
diff --git a/MeoAssistance/src/AsstCaller.cpp b/MeoAssistance/src/AsstCaller.cpp
index 03254d893f..eda8d53193 100644
--- a/MeoAssistance/src/AsstCaller.cpp
+++ b/MeoAssistance/src/AsstCaller.cpp
@@ -139,4 +139,12 @@ bool CheckVersionUpdate(char* tag_buffer, int tag_bufsize, char* html_url_buffer
 	strcpy_s(html_url_buffer, html_bufsize, info.html_url.c_str());
 	strcpy_s(body_buffer, body_bufsize, info.body.c_str());
 	return true;
-}
\ No newline at end of file
+}
+
+bool AsstTestSwipe(asst::Assistance* p_asst, int x1, int y1, int x2, int y2)
+{
+	if (p_asst == NULL) {
+		return false;
+	}
+	return p_asst->swipe({ x1, y1 }, { x2, y2 });
+}
diff --git a/MeoAssistance/src/Configer.cpp b/MeoAssistance/src/Configer.cpp
index b72408d410..42b0b862b8 100644
--- a/MeoAssistance/src/Configer.cpp
+++ b/MeoAssistance/src/Configer.cpp
@@ -250,10 +250,10 @@ bool asst::Configer::_load(const std::string& filename)
 			}
 			if (emulator_json.exist("adb")) {
 				emulator_info.is_adb = true;
-				std::cout << emulator_json.to_string() << std::endl;
 				emulator_info.adb.path = emulator_json["adb"]["path"].as_string();
 				emulator_info.adb.connect = emulator_json["adb"]["connect"].as_string();
 				emulator_info.adb.click = emulator_json["adb"]["click"].as_string();
+				emulator_info.adb.swipe = emulator_json["adb"]["swipe"].as_string();
 				emulator_info.adb.display = emulator_json["adb"]["display"].as_string();
 				emulator_info.adb.display_regex = emulator_json["adb"]["displayRegex"].as_string();
 			}
diff --git a/MeoAssistance/src/OpenRecruitConfiger.cpp b/MeoAssistance/src/RecruitConfiger.cpp
similarity index 88%
rename from MeoAssistance/src/OpenRecruitConfiger.cpp
rename to MeoAssistance/src/RecruitConfiger.cpp
index e2c2681cf8..1e84a69d25 100644
--- a/MeoAssistance/src/OpenRecruitConfiger.cpp
+++ b/MeoAssistance/src/RecruitConfiger.cpp
@@ -1,4 +1,4 @@
-#include "OpenRecruitConfiger.h"
+#include "RecruitConfiger.h"
 
 #include <fstream>
 #include <sstream>
@@ -9,12 +9,12 @@
 
 using namespace asst;
 
-bool OpenRecruitConfiger::load(const std::string& filename)
+bool RecruitConfiger::load(const std::string& filename)
 {
 	DebugTraceFunction;
-	DebugTrace("OpenRecruitConfiger::load | ", filename);
+	DebugTrace("RecruitConfiger::load | ", filename);
 
-	OpenRecruitConfiger temp;
+	RecruitConfiger temp;
 	if (temp._load(filename)) {
 		// ����Ա�ȼ��Ÿ���
 		std::sort(temp.m_all_opers.begin(), temp.m_all_opers.end(), [](
@@ -31,7 +31,7 @@ bool OpenRecruitConfiger::load(const std::string& filename)
 	}
 }
 
-bool asst::OpenRecruitConfiger::_load(const std::string& filename)
+bool asst::RecruitConfiger::_load(const std::string& filename)
 {
 	std::ifstream ifs(filename, std::ios::in);
 	if (!ifs.is_open()) {
diff --git a/MeoAssistance/src/Task.cpp b/MeoAssistance/src/Task.cpp
index b1def43eb3..cd92de8f0b 100644
--- a/MeoAssistance/src/Task.cpp
+++ b/MeoAssistance/src/Task.cpp
@@ -3,7 +3,8 @@
 #include "WinMacro.h"
 #include "Identify.h"
 #include "Configer.h"
-#include "OpenRecruitConfiger.h"
+#include "RecruitConfiger.h"
+#include "InfrastConfiger.h"
 #include <json.h>
 #include "AsstAux.h"
 
@@ -13,6 +14,7 @@
 #include <cmath>
 #include <mutex>
 #include <filesystem>
+#include <future>
 
 using namespace asst;
 
@@ -428,7 +430,7 @@ bool OpenRecruitTask::run()
 
 	/* Filter out all tags from all text */
 	std::vector<TextArea> all_tags = text_match(
-		all_text_area, OpenRecruitConfiger::get_instance().m_all_tags, Configer::get_instance().m_recruit_ocr_replace);
+		all_text_area, RecruitConfiger::get_instance().m_all_tags, Configer::get_instance().m_recruit_ocr_replace);
 
 	std::unordered_set<std::string> all_tags_name;
 	std::vector<json::value> all_tags_json_vector;
@@ -441,7 +443,7 @@ bool OpenRecruitTask::run()
 	m_callback(AsstMsg::RecruitTagsDetected, all_tags_json, m_callback_arg);
 
 	/* ����tags��������������������ʶ��©�ˣ� */
-	if (all_tags.size() != OpenRecruitConfiger::CorrectNumberOfTags) {
+	if (all_tags.size() != RecruitConfiger::CorrectNumberOfTags) {
 		all_tags_json["type"] = "OpenRecruit";
 		m_callback(AsstMsg::OcrResultError, all_tags_json, m_callback_arg);
 		return false;
@@ -488,7 +490,7 @@ bool OpenRecruitTask::run()
 	// ���� key: { "�ѻ�"��"Ⱥ��" }��value: OperCombs.opers{ "����", "��ѩ", "�ձ�" }
 	std::map<std::vector<std::string>, OperCombs> result_map;
 	for (const std::vector<std::string>& comb : all_combs) {
-		for (const OperInfo& cur_oper : OpenRecruitConfiger::get_instance().m_all_opers) {
+		for (const OperInfo& cur_oper : RecruitConfiger::get_instance().m_all_opers) {
 			int matched_count = 0;
 			for (const std::string& tag : comb) {
 				if (cur_oper.tags.find(tag) != cur_oper.tags.cend()) {
@@ -659,39 +661,105 @@ bool TestOcrTask::run()
 	};
 	m_callback(AsstMsg::TaskStart, task_start_json, m_callback_arg);
 
-	/* Find all text */
-	std::vector<TextArea> all_text_area = ocr_detect();
+	auto swipe_foo = [&](bool reverse = false) -> bool {
+		const Point p1(600, 300);
+		const Point p2(500, 300);
+		bool ret = false;
+		if (!reverse) {
+			m_control_ptr->swipe(p1, p2);
+		}
+		else {
+			m_control_ptr->swipe(p2, p1);
+		}
+		sleep(3000);
+		return ret;
+	};
 
-	std::vector<json::value> all_text_json_vector;
-	for (const TextArea& text_area : all_text_area) {
-		all_text_json_vector.emplace_back(Utf8ToGbk(text_area.text));
+	// ʶ�𵽵ĸ�Ա��
+	std::unordered_set<std::string> all_opers;
+
+	// һ��ʶ��һ�߻���������������վ��Ա����ץ����
+	for (int i = 0; i != 10; ++i) {
+		const cv::Mat& image = get_format_image();
+		// �첽���л�������
+		std::future<bool> swipe_future = std::async(std::launch::async, swipe_foo);
+
+		std::vector<TextArea> all_text_area = ocr_detect(image);
+		/* ���˳���������վ�еĸ�Ա�� */
+		std::vector<TextArea> cur_opers = text_search(
+			all_text_area,
+			InfrastConfiger::get_instance().m_mfg_opers,
+			Configer::get_instance().m_infrast_ocr_replace);
+
+		for (TextArea& text_area : cur_opers) {
+			all_opers.emplace(std::move(text_area.text));
+		}
+		swipe_future.get();
 	}
-	json::value all_text_json;
-	all_text_json["text"] = json::array(all_text_json_vector);
-	m_callback(AsstMsg::TextDetected, all_text_json, m_callback_arg);
 
-	/* Filter out all text from all text */
-	std::vector<TextArea> all_text = text_search(
-		all_text_area, m_text_vec, Configer::get_instance().m_infrast_ocr_replace);
-	std::vector<json::value> all_tags_json_vector;
-	for (const TextArea& text_area : all_text) {
-		all_tags_json_vector.emplace_back(Utf8ToGbk(text_area.text));
+	std::cout << "ʶ������վ��Ա:" << std::endl;
+	for (const std::string& oper : all_opers) {
+		std::cout << Utf8ToGbk(oper) << std::endl;
 	}
-	json::value all_tags_json;
-	all_tags_json["tags"] = json::array(all_tags_json_vector);
-	m_callback(AsstMsg::RecruitTagsDetected, all_tags_json, m_callback_arg);
 
-	// ���ʶ�𵽵����֣�ֱ�ӻص��ӳ�ȥ�����������
-	if (m_need_click) {
-		for (const TextArea& text_area : all_text) {
-			json::value task_json;
-			task_json["type"] = "ClickTask";
-			task_json["rect"] = json::array({ text_area.rect.x, text_area.rect.y, text_area.rect.width, text_area.rect.height });
-			task_json["retry_times"] = m_retry_times;
-			task_json["task_chain"] = m_task_chain;
-			m_callback(AsstMsg::AppendTask, task_json, m_callback_arg);
+	// �����ļ��еĸ�Ա��ϣ���ץ�����ĸ�Ա���ȶԣ��������еĸ�Ա���У��Ǿ���������
+	// Todo ʱ�临�Ӷ�����ˣ���Ҫ�Ż���
+	std::vector<std::string> optimal_comb;
+	for (auto&& oper_vec : InfrastConfiger::get_instance().m_mfg_combs) {
+		int count = 0;
+		for (std::string& oper : oper_vec) {
+			if (all_opers.find(oper) != all_opers.cend()) {
+				++count;
+			}
+			else {
+				break;
+			}
+		}
+		if (count == oper_vec.size()) {
+			optimal_comb = oper_vec;
+			break;
 		}
 	}
 
+	std::cout << "�������:" << std::endl;
+	for (const std::string& oper : optimal_comb) {
+		std::cout << Utf8ToGbk(oper) << std::endl;
+	}
+
+	// һ�߻���һ�ߵ�����Ž��еĸ�Ա
+	for (int i = 0; i != 20; ++i) {
+		const cv::Mat& image = get_format_image();
+		std::vector<TextArea> all_text_area = ocr_detect(image);
+		/* ���˳���������վ�еĸ�Ա�� */
+		std::vector<TextArea> cur_opers = text_search(
+			all_text_area,
+			optimal_comb,
+			Configer::get_instance().m_infrast_ocr_replace);
+
+		for (TextArea& text_area : cur_opers) {
+			m_control_ptr->click(text_area.rect);
+			// ����˾Ͳ����ٵ��ˣ�ֱ�Ӵ����Ž�vector����ɾ��
+			optimal_comb.erase(std::find(optimal_comb.begin(), optimal_comb.end(), text_area.text));
+		}
+		if (optimal_comb.empty()) {
+			break;
+		}
+		// ��Ϊ�����͵����ì�ܵģ�����û���첽��
+		swipe_foo(true);
+	}
+
+
+	//// ���ʶ�𵽵����֣�ֱ�ӻص��ӳ�ȥ�����������
+	//if (m_need_click) {
+	//	for (const TextArea& text_area : all_text) {
+	//		json::value task_json;
+	//		task_json["type"] = "ClickTask";
+	//		task_json["rect"] = json::array({ text_area.rect.x, text_area.rect.y, text_area.rect.width, text_area.rect.height });
+	//		task_json["retry_times"] = m_retry_times;
+	//		task_json["task_chain"] = m_task_chain;
+	//		m_callback(AsstMsg::AppendTask, task_json, m_callback_arg);
+	//	}
+	//}
+
 	return true;
 }
\ No newline at end of file
diff --git a/MeoAssistance/src/WinMacro.cpp b/MeoAssistance/src/WinMacro.cpp
index 1170b7a9ec..0d207c9670 100644
--- a/MeoAssistance/src/WinMacro.cpp
+++ b/MeoAssistance/src/WinMacro.cpp
@@ -114,6 +114,7 @@ bool WinMacro::findHandle()
 		}
 
 		m_click_cmd = adb_dir + m_emulator_info.adb.click;
+		m_swipe_cmd = adb_dir + m_emulator_info.adb.swipe;
 	}
 	DebugTrace("Handle:", m_handle, "Name:", m_emulator_info.name, "Type:", m_handle_type);
 
@@ -190,6 +191,29 @@ std::optional<std::string> asst::WinMacro::callCmd(const std::string& cmd, bool
 	return pipe_str;
 }
 
+Point asst::WinMacro::randPointInRect(const Rect& rect)
+{
+	int x = 0, y = 0;
+	if (rect.width == 0) {
+		x = rect.x;
+	}
+	else {
+		int x_rand = std::poisson_distribution<int>(rect.width / 2)(m_rand_engine);
+
+		x = x_rand + rect.x;
+	}
+
+	if (rect.height == 0) {
+		y = rect.y;
+	}
+	else {
+		int y_rand = std::poisson_distribution<int>(rect.height / 2)(m_rand_engine);
+		y = y_rand + rect.y;
+	}
+
+	return Point(x, y);
+}
+
 bool WinMacro::resizeWindow(int width, int height)
 {
 	if (m_handle_type != HandleType::Window || !::IsWindow(m_handle)) {
@@ -289,25 +313,41 @@ bool WinMacro::click(const Rect& rect)
 		return false;
 	}
 
-	int x = 0, y = 0;
-	if (rect.width == 0) {
-		x = rect.x;
-	}
-	else {
-		int x_rand = std::poisson_distribution<int>(rect.width / 2)(m_rand_engine);
+	return click(randPointInRect(rect));
+}
 
-		x = x_rand + rect.x;
+bool asst::WinMacro::swipe(const Point& p1, const Point& p2)
+{
+	if (m_handle_type != HandleType::Control || !::IsWindow(m_handle)) {
+		return false;
 	}
 
-	if (rect.height == 0) {
-		y = rect.y;
+	int x1 = p1.x * m_control_scale;
+	int y1 = p1.y * m_control_scale;
+	int x2 = p2.x * m_control_scale;
+	int y2 = p2.y * m_control_scale;
+	DebugTrace("Swipe, raw:", p1.x, p1.y, p2.x, p2.y, "corr:", x1, y1, x2, y2);
+
+	if (m_is_adb) {
+		std::string cur_cmd = StringReplaceAll(m_swipe_cmd, "[x1]", std::to_string(x1));
+		cur_cmd = StringReplaceAll(cur_cmd, "[y1]", std::to_string(y1));
+		cur_cmd = StringReplaceAll(cur_cmd, "[x2]", std::to_string(x2));
+		cur_cmd = StringReplaceAll(cur_cmd, "[y2]", std::to_string(y2));
+		return callCmd(cur_cmd, false).has_value();
+		return true;
 	}
-	else {
-		int y_rand = std::poisson_distribution<int>(rect.height / 2)(m_rand_engine);
-		y = y_rand + rect.y;
+	else {	// TODO
+		return false;
+	}
+}
+
+bool asst::WinMacro::swipe(const Rect& r1, const Rect& r2)
+{
+	if (m_handle_type != HandleType::Control || !::IsWindow(m_handle)) {
+		return false;
 	}
 
-	return click({ x, y });
+	return swipe(randPointInRect(r1), randPointInRect(r2));
 }
 
 void asst::WinMacro::setControlScale(double scale)
diff --git a/Tools/TestCaller/TestCaller.vcxproj b/Tools/TestCaller/TestCaller.vcxproj
index 566b730ac7..6cccbb9d40 100644
--- a/Tools/TestCaller/TestCaller.vcxproj
+++ b/Tools/TestCaller/TestCaller.vcxproj
@@ -123,7 +123,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(SolutionDir)meojson\include;$(SolutionDir)MeoAssistance\include;$(IncludePath)</IncludePath>
+    <IncludePath>$(SolutionDir)MeoAssistance\include;$(IncludePath)</IncludePath>
     <LibraryPath>$(TargetDir);$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/Tools/TestCaller/main.cpp b/Tools/TestCaller/main.cpp
index 02b3269bdb..50b2671585 100644
--- a/Tools/TestCaller/main.cpp
+++ b/Tools/TestCaller/main.cpp
@@ -1,9 +1,13 @@
 #include "AsstCaller.h"
 #include <stdio.h>
 
+using namespace asst;
+
+void test_dorm(Assistance* ptr);
+void test_swipe(Assistance* ptr);
+
 int main(int argc, char** argv)
 {
-	using namespace asst;
 
 	Assistance* ptr = AsstCreate();
 	auto ret = AsstCatchEmulator(ptr);
@@ -15,11 +19,13 @@ int main(int argc, char** argv)
 		}
 		return -1;
 	}
-	const char* text_array[] = { "ע����" };
 
 	char ch = 0;
 	while (ch != 'q') {
-		AsstTestOcr(ptr, text_array, sizeof(text_array) / sizeof(char*), true);
+
+		test_dorm(ptr);
+		//test_swipe(ptr);
+
 		ch = getchar();
 	}
 
@@ -29,4 +35,16 @@ int main(int argc, char** argv)
 	}
 
 	return 0;
+}
+
+void test_swipe(Assistance* ptr)
+{
+	AsstTestSwipe(ptr, 1000, 300, 500, 300);
+}
+
+void test_dorm(Assistance* ptr)
+{
+	const char* text_array[] = { "ע����" };
+
+	AsstTestOcr(ptr, text_array, sizeof(text_array) / sizeof(char*), true);
 }
\ No newline at end of file
diff --git a/resource/config.json b/resource/config.json
index df462fcebb..061642c391 100644
--- a/resource/config.json
+++ b/resource/config.json
@@ -30,6 +30,8 @@
         [ "都任", "输出" ]
     ],
     "infrastOcrReplace": [
+        [ "森蛐", "森蚺" ],
+        [ "森蛾", "森蚺" ]
     ],
     "handle_Doc": "下面的和模拟器窗口捕获逻辑有关，不需要修改",
     "handle": {
@@ -60,115 +62,19 @@
                     "window": "BlueStacks Android PluginAndroid"
                 }
             ],
+            "adb": {
+                "path": "[EmulatorPath]HD-Adb.exe",
+                "connect": " connect 127.0.0.1:5555",
+                "click": " -s 127.0.0.1:5555 shell input tap [x] [y]",
+                "swipe": " -s 127.0.0.1:5555 shell input swipe [x1] [y1] [x2] [y2]",
+                "display": " -s 127.0.0.1:5555 shell dumpsys window displays | grep init= | awk ' { print $3 } '",
+                "displayRegex": "cur=%dx%d"
+            },
             "xOffset": 11,
             "yOffset": 46,
             "rightOffset": 11,
             "bottomOffset": 10
         },
-        "Nox": {
-            "window": [
-                {
-                    "class": "Qt5QWindowIcon",
-                    "window": "夜神模拟器"
-                }
-            ],
-            "view": [
-                {
-                    "class": "Qt5QWindowIcon",
-                    "window": "夜神模拟器"
-                }
-            ],
-            "control": [
-                {
-                    "class": "Qt5QWindowIcon",
-                    "window": "夜神模拟器"
-                }
-            ],
-            "xOffset": 2,
-            "yOffset": 39,
-            "rightOffset": 39,
-            "bottomOffset": 9
-        },
-        "LDPlayer": {
-            "window": [
-                {
-                    "class": "LDPlayerMainFrame",
-                    "window": "雷电模拟器"
-                }
-            ],
-            "view": [
-                {
-                    "class": "LDPlayerMainFrame",
-                    "window": "雷电模拟器"
-                }
-            ],
-            "control": [
-                {
-                    "class": "LDPlayerMainFrame",
-                    "window": "雷电模拟器"
-                },
-                {
-                    "class": "RenderWindow",
-                    "window": "TheRender"
-                }
-            ],
-            "xOffset": 0,
-            "yOffset": 35
-        },
-        "XYAZ": {
-            "window": [
-                {
-                    "class": "Qt5QWindowIcon",
-                    "window": "逍遥模拟器"
-                }
-            ],
-            "view": [
-                {
-                    "class": "Qt5QWindowIcon",
-                    "window": "逍遥模拟器"
-                }
-            ],
-            "control": [
-                {
-                    "class": "Qt5QWindowIcon",
-                    "window": "逍遥模拟器"
-                },
-                {
-                    "class": "Qt5QWindowIcon",
-                    "window": "MainWindowWindow"
-                }
-            ],
-            "xOffset": 1,
-            "yOffset": 48,
-            "rightOffset": 1,
-            "bottomOffset": 1
-        },
-        "Tencent": {
-            "window": [
-                {
-                    "class": "TXGuiFoundation",
-                    "window": "腾讯手游助手"
-                }
-            ],
-            "view": [
-                {
-                    "class": "TXGuiFoundation",
-                    "window": "腾讯手游助手"
-                }
-            ],
-            "control": [
-                {
-                    "class": "TXGuiFoundation",
-                    "window": "腾讯手游助手"
-                },
-                {
-                    "class": "AEngineRenderWindowClass",
-                    "window": "AEngineRenderWindow"
-                }
-            ],
-            "xOffset": 1,
-            "yOffset": 42
-        },
         "MuMuEmulator": {
             "window": [
                 {
@@ -191,8 +97,9 @@
             "adb": {
                 "path": "[EmulatorPath]..\\\\vmonitor\\\\bin\\\\adb_server.exe",
                 "connect": " connect 127.0.0.1:7555",
-                "click": " shell input tap [x] [y]",
-                "display": " shell dumpsys window displays | grep init= | awk ' { print $3 } '",
+                "click": " -s 127.0.0.1:7555 shell input tap [x] [y]",
+                "swipe": " -s 127.0.0.1:7555 shell input swipe [x1] [y1] [x2] [y2]",
+                "display": " -s 127.0.0.1:7555 shell dumpsys window displays | grep init= | awk ' { print $3 } '",
                 "displayRegex": "cur=%dx%d"
             },
             "xOffset": 0,
diff --git a/resource/infrast.json b/resource/infrast.json
new file mode 100644
index 0000000000..10d51ddb42
--- /dev/null
+++ b/resource/infrast.json
@@ -0,0 +1,26 @@
+{
+    "Manufacturing": {
+        "Doc": "制造站",
+        "combs": [
+            {
+                "comb": [
+                    "刻俄柏",
+                    "稀音",
+                    "红云"
+                ],
+                "efficiency": 105
+            },
+            {
+                "comb": [
+                    "温蒂",
+                    "异客",
+                    "森蚺"
+                ],
+                "efficiency": 90
+            }
+        ]
+    },
+    "Trade": {
+        "Doc": "贸易站"
+    }
+}
diff --git a/resource/operInfo.json b/resource/recruit.json
similarity index 100%
rename from resource/operInfo.json
rename to resource/recruit.json

From ea10f36692a405b5791685bf7c1760fdd2c4a68e Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Thu, 12 Aug 2021 23:31:40 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B9=B2=E5=91=98?=
 =?UTF-8?q?=E8=AF=86=E5=88=AB=E7=9A=84=E7=BB=93=E6=9D=9F=E6=A0=87=E8=AE=B0?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=9B=E4=BC=98=E5=8C=96=E7=BA=BF=E7=A8=8B?=
 =?UTF-8?q?=E9=80=80=E5=87=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MeoAssistance/InfrastConfiger.cpp       |  2 +
 MeoAssistance/include/InfrastConfiger.h |  1 +
 MeoAssistance/include/Task.h            |  2 +-
 MeoAssistance/src/Task.cpp              | 87 ++++++++++++++++---------
 resource/infrast.json                   | 10 ++-
 5 files changed, 71 insertions(+), 31 deletions(-)

diff --git a/MeoAssistance/InfrastConfiger.cpp b/MeoAssistance/InfrastConfiger.cpp
index 2cffe2172b..6bbe771675 100644
--- a/MeoAssistance/InfrastConfiger.cpp
+++ b/MeoAssistance/InfrastConfiger.cpp
@@ -54,6 +54,8 @@ bool InfrastConfiger::_load(const std::string& filename)
 			}
 			m_mfg_combs.emplace_back(std::move(comb_vec));
 		}
+		m_mfg_end = root["Manufacturing"]["end"].as_string();
+
 		// ó��վ TODO����
 	}
 	catch (json::exception& e) {
diff --git a/MeoAssistance/include/InfrastConfiger.h b/MeoAssistance/include/InfrastConfiger.h
index b9c0e62582..6bce7c01a5 100644
--- a/MeoAssistance/include/InfrastConfiger.h
+++ b/MeoAssistance/include/InfrastConfiger.h
@@ -21,6 +21,7 @@ namespace asst {
 
 		std::vector<std::vector<std::string>> m_mfg_combs;	// ����վ���
 		std::unordered_set<std::string> m_mfg_opers;		// ����վ���и�Ա
+		std::string m_mfg_end;								// ʶ������ʣ�����Ϊ��Ա����������һ���������������Ǹ���Ա������
 
 	private:
 		InfrastConfiger() = default;
diff --git a/MeoAssistance/include/Task.h b/MeoAssistance/include/Task.h
index efb37f8207..1f6a482d89 100644
--- a/MeoAssistance/include/Task.h
+++ b/MeoAssistance/include/Task.h
@@ -121,7 +121,7 @@ namespace asst {
 	protected:
 		virtual cv::Mat get_format_image();
 		virtual bool set_control_scale(int cur_width, int cur_height);
-		virtual void sleep(unsigned millisecond);
+		virtual bool sleep(unsigned millisecond);
 		virtual bool print_window(const std::string& dir);
 
 		std::shared_ptr<WinMacro> m_window_ptr = nullptr;
diff --git a/MeoAssistance/src/Task.cpp b/MeoAssistance/src/Task.cpp
index cd92de8f0b..85695a199a 100644
--- a/MeoAssistance/src/Task.cpp
+++ b/MeoAssistance/src/Task.cpp
@@ -82,10 +82,10 @@ bool AbstractTask::set_control_scale(int cur_width, int cur_height)
 	return true;
 }
 
-void AbstractTask::sleep(unsigned millisecond)
+bool AbstractTask::sleep(unsigned millisecond)
 {
 	if (millisecond == 0) {
-		return;
+		return true;
 	}
 	auto start = std::chrono::system_clock::now();
 	unsigned duration = 0;
@@ -101,6 +101,8 @@ void AbstractTask::sleep(unsigned millisecond)
 		std::this_thread::yield();
 	}
 	m_callback(AsstMsg::EndOfSleep, callback_json, m_callback_arg);
+
+	return (m_exit_flag == NULL || *m_exit_flag == false);
 }
 
 bool AbstractTask::print_window(const std::string& dir)
@@ -182,7 +184,10 @@ bool ProcessTask::run()
 	}
 
 	// ǰ�ù̶���ʱ
-	sleep(task_info_ptr->pre_delay);
+	if (!sleep(task_info_ptr->pre_delay))
+	{
+		return false;
+	}
 
 	bool need_stop = false;
 	switch (task_info_ptr->type) {
@@ -200,7 +205,10 @@ bool ProcessTask::run()
 		break;
 	case ProcessTaskType::PrintWindow:
 	{
-		sleep(Configer::get_instance().m_options.print_window_delay);
+		if (!sleep(Configer::get_instance().m_options.print_window_delay))
+		{
+			return false;
+		}
 		static const std::string dirname = GetCurrentDir() + "screenshot\\";
 		print_window(dirname);
 	}
@@ -226,7 +234,9 @@ bool ProcessTask::run()
 	m_callback(AsstMsg::TaskCompleted, callback_json, m_callback_arg);
 
 	// ���ù̶���ʱ
-	sleep(task_info_ptr->rear_delay);
+	if (!sleep(task_info_ptr->rear_delay)) {
+		return false;
+	}
 
 	json::value next_json = callback_json;
 	next_json["task_chain"] = m_task_chain;
@@ -369,7 +379,9 @@ void ProcessTask::exec_click_task(const Rect& matched_rect)
 			Configer::get_instance().m_options.control_delay_upper);
 
 		unsigned rand_delay = rand_uni(rand_engine);
-		sleep(rand_delay);
+		if (!sleep(rand_delay)) {
+			return;
+		}
 	}
 
 	m_control_ptr->click(matched_rect);
@@ -663,67 +675,79 @@ bool TestOcrTask::run()
 
 	auto swipe_foo = [&](bool reverse = false) -> bool {
 		const Point p1(600, 300);
-		const Point p2(500, 300);
+		const Point p2(450, 300);
 		bool ret = false;
 		if (!reverse) {
-			m_control_ptr->swipe(p1, p2);
+			ret = m_control_ptr->swipe(p1, p2);
 		}
 		else {
-			m_control_ptr->swipe(p2, p1);
+			ret = m_control_ptr->swipe(p2, p1);
 		}
-		sleep(3000);
+		ret &= sleep(3000);
 		return ret;
 	};
 
 	// ʶ�𵽵ĸ�Ա��
-	std::unordered_set<std::string> all_opers;
+	std::unordered_set<std::string> all_names;
 
 	// һ��ʶ��һ�߻���������������վ��Ա����ץ����
-	for (int i = 0; i != 10; ++i) {
+	for (int i = 0; i != 20; ++i) {
 		const cv::Mat& image = get_format_image();
 		// �첽���л�������
 		std::future<bool> swipe_future = std::async(std::launch::async, swipe_foo);
 
 		std::vector<TextArea> all_text_area = ocr_detect(image);
 		/* ���˳���������վ�еĸ�Ա�� */
-		std::vector<TextArea> cur_opers = text_search(
+		std::vector<TextArea> cur_names = text_search(
 			all_text_area,
 			InfrastConfiger::get_instance().m_mfg_opers,
 			Configer::get_instance().m_infrast_ocr_replace);
 
-		for (TextArea& text_area : cur_opers) {
-			all_opers.emplace(std::move(text_area.text));
+		for (TextArea& text_area : cur_names) {
+			all_names.emplace(std::move(text_area.text));
+		}
+		bool break_flag = false;
+		// ʶ���˽�����ǣ���ֱ���˳�ѭ��
+		if (all_names.find(InfrastConfiger::get_instance().m_mfg_end) != all_names.cend()) {
+			break_flag = true;
+		}
+		// �����ȴ���������
+		if (!swipe_future.get()) {
+			return false;
+		}
+
+		if (break_flag) {
+			break;
 		}
-		swipe_future.get();
 	}
 
 	std::cout << "ʶ������վ��Ա:" << std::endl;
-	for (const std::string& oper : all_opers) {
-		std::cout << Utf8ToGbk(oper) << std::endl;
+	for (const std::string& name : all_names) {
+		std::cout << Utf8ToGbk(name) << std::endl;
 	}
 
 	// �����ļ��еĸ�Ա��ϣ���ץ�����ĸ�Ա���ȶԣ��������еĸ�Ա���У��Ǿ���������
 	// Todo ʱ�临�Ӷ�����ˣ���Ҫ�Ż���
 	std::vector<std::string> optimal_comb;
-	for (auto&& oper_vec : InfrastConfiger::get_instance().m_mfg_combs) {
+	for (auto&& name_vec : InfrastConfiger::get_instance().m_mfg_combs) {
 		int count = 0;
-		for (std::string& oper : oper_vec) {
-			if (all_opers.find(oper) != all_opers.cend()) {
+		for (std::string& name : name_vec) {
+			if (all_names.find(name) != all_names.cend()) {
 				++count;
 			}
 			else {
 				break;
 			}
 		}
-		if (count == oper_vec.size()) {
-			optimal_comb = oper_vec;
+		if (count == name_vec.size()) {
+			optimal_comb = name_vec;
 			break;
 		}
 	}
 
 	std::cout << "�������:" << std::endl;
-	for (const std::string& oper : optimal_comb) {
-		std::cout << Utf8ToGbk(oper) << std::endl;
+	for (const std::string& name : optimal_comb) {
+		std::cout << Utf8ToGbk(name) << std::endl;
 	}
 
 	// һ�߻���һ�ߵ�����Ž��еĸ�Ա
@@ -731,21 +755,26 @@ bool TestOcrTask::run()
 		const cv::Mat& image = get_format_image();
 		std::vector<TextArea> all_text_area = ocr_detect(image);
 		/* ���˳���������վ�еĸ�Ա�� */
-		std::vector<TextArea> cur_opers = text_search(
+		std::vector<TextArea> cur_names = text_search(
 			all_text_area,
 			optimal_comb,
 			Configer::get_instance().m_infrast_ocr_replace);
 
-		for (TextArea& text_area : cur_opers) {
+		for (TextArea& text_area : cur_names) {
 			m_control_ptr->click(text_area.rect);
 			// ����˾Ͳ����ٵ��ˣ�ֱ�Ӵ����Ž�vector����ɾ��
-			optimal_comb.erase(std::find(optimal_comb.begin(), optimal_comb.end(), text_area.text));
+			auto iter = std::find(optimal_comb.begin(), optimal_comb.end(), text_area.text);
+			if (iter != optimal_comb.end()) {
+				optimal_comb.erase(iter);
+			}
 		}
 		if (optimal_comb.empty()) {
 			break;
 		}
 		// ��Ϊ�����͵����ì�ܵģ�����û���첽��
-		swipe_foo(true);
+		if (!swipe_foo(true)) {
+			return false;
+		}
 	}
 
 
diff --git a/resource/infrast.json b/resource/infrast.json
index 10d51ddb42..ea163cea95 100644
--- a/resource/infrast.json
+++ b/resource/infrast.json
@@ -17,8 +17,16 @@
                     "森蚺"
                 ],
                 "efficiency": 90
+            },
+            {
+                "comb": [
+                    "黑角"
+                ],
+                "efficiency": 10
             }
-        ]
+        ],
+        "end": "黑角",
+        "end_Doc": "识别到这个词，就认为干员遍历结束，一般用排序里最后的那个干员（？）"
     },
     "Trade": {
         "Doc": "贸易站"

From 3d71101d159a927c50c92eca021b669d5b3877a5 Mon Sep 17 00:00:00 2001
From: MistEO <mistereo@hotmail.com>
Date: Sat, 14 Aug 2021 01:04:01 +0800
Subject: [PATCH 3/3] stash

---
 MeoAssistance/include/Assistance.h |   5 +-
 MeoAssistance/include/AsstCaller.h |   1 +
 MeoAssistance/include/Task.h       |  51 +++++++++-
 MeoAssistance/src/Assistance.cpp   |  21 +++++
 MeoAssistance/src/AsstCaller.cpp   |   9 ++
 MeoAssistance/src/Task.cpp         | 144 ++++++++++++++++++++++++++++-
 Tools/TestCaller/main.cpp          |   8 +-
 resource/config.json               |   3 +-
 resource/infrast.json              |   4 +-
 9 files changed, 238 insertions(+), 8 deletions(-)

diff --git a/MeoAssistance/include/Assistance.h b/MeoAssistance/include/Assistance.h
index e6cf6f1680..a736f0e3d0 100644
--- a/MeoAssistance/include/Assistance.h
+++ b/MeoAssistance/include/Assistance.h
@@ -29,11 +29,14 @@ namespace asst {
 
 		// ��ʼˢ����
 		void start_sanity();
-		// ��ʼ���ʻ���
+		// ��ʼ���ʺ��ѻ���
 		void start_visit();
 
 		// ��ʼ������ļ����
 		void start_open_recruit(const std::vector<int>& required_level, bool set_time = true);
+		// ��ʼ������������
+		void start_infrast();
+
 		// ��ʼƥ�����񣬵�����
 		void start_match_task(const std::string& task, int retry_times = ProcessTaskRetryTimesDefault, bool block = true);
 		// ��ʼOCR���ԣ�������
diff --git a/MeoAssistance/include/AsstCaller.h b/MeoAssistance/include/AsstCaller.h
index d063218e65..cd8dde0fa8 100644
--- a/MeoAssistance/include/AsstCaller.h
+++ b/MeoAssistance/include/AsstCaller.h
@@ -18,6 +18,7 @@ extern "C" {
 	MEOAPI_PORT void AsstStop(asst::Assistance* p_asst);
 	MEOAPI_PORT bool AsstSetParam(asst::Assistance* p_asst, const char* type, const char* param, const char* value);
 	MEOAPI_PORT bool AsstRunOpenRecruit(asst::Assistance* p_asst, const int required_level[], bool set_time);
+	MEOAPI_PORT bool AsstStartInfrast(asst::Assistance* p_asst);
 	MEOAPI_PORT bool AsstTestOcr(asst::Assistance* p_asst, const char** text_array, int array_size, bool need_click);
 
 	MEOAPI_PORT bool CheckVersionUpdate(char* tag_buffer, int tag_bufsize, char* html_url_buffer, int html_bufsize, char* body_buffer, int body_bufsize);
diff --git a/MeoAssistance/include/Task.h b/MeoAssistance/include/Task.h
index 1f6a482d89..1d00123a15 100644
--- a/MeoAssistance/include/Task.h
+++ b/MeoAssistance/include/Task.h
@@ -59,8 +59,25 @@ namespace asst {
 		RecruitTagsDetected,
 		OcrResultError,
 		RecruitSpecialTag,
-		RecruitResult
+		RecruitResult,
+		/* Infrast Msg*/
+		InfrastOpers,		// ʶ�𵽻�����Աs
+		InfrastComb			// ��ǰ���õ����Ÿ�Ա���
 	};
+
+	// ��ʩ����
+	enum class FacilityType {
+		Invalid,
+		Manufacturing,		// ����վ
+		Trade,				// ó��վ
+		PowerStation,		// ����վ
+		ControlInterface,	// ��������
+		ReceptionRoom,		// �����
+		Dormitory,			// ����
+		Office				// �칫��
+		// ѵ���Һͼӹ�վ�ò��ϣ�������
+	};
+
 	static std::ostream& operator<<(std::ostream& os, const AsstMsg& type)
 	{
 		static const std::unordered_map<AsstMsg, std::string> _type_name = {
@@ -85,7 +102,10 @@ namespace asst {
 			{AsstMsg::OcrResultError, "OcrResultError"},
 			{AsstMsg::RecruitSpecialTag, "RecruitSpecialTag"},
 			{AsstMsg::RecruitResult, "RecruitResult"},
-			{AsstMsg::AppendTask, "AppendTask"}
+			{AsstMsg::AppendTask, "AppendTask"},
+			{AsstMsg::InfrastOpers, "InfrastOpers"},
+			{AsstMsg::InfrastComb, "InfrastComb"}
+
 		};
 		return os << _type_name.at(type);
 	}
@@ -236,6 +256,33 @@ namespace asst {
 		bool m_set_time = false;
 	};
 
+	// ������פ����
+	class InfrastStationTask : public OcrAbstractTask 
+	{
+	public:
+		InfrastStationTask(AsstCallback callback, void* callback_arg);
+		virtual ~InfrastStationTask() = default;
+
+		virtual bool run() override;
+		void set_swipe_param(int delay, const Rect& begin_rect, const Rect& end_rect, int max_times = 20)
+		{
+			m_swipe_delay = delay;
+			m_swipe_begin = begin_rect;
+			m_swipe_end = end_rect;
+			m_swipe_max_times = max_times;
+		}
+		void set_facility(FacilityType facility)
+		{
+			m_facility = facility;
+		}
+	private:
+		FacilityType m_facility = FacilityType::Invalid;
+		int m_swipe_delay = 0;
+		Rect m_swipe_begin;
+		Rect m_swipe_end;
+		int m_swipe_max_times = 0;
+	};
+
 	// for debug
 	class TestOcrTask : public OcrAbstractTask
 	{
diff --git a/MeoAssistance/src/Assistance.cpp b/MeoAssistance/src/Assistance.cpp
index 916b61b022..06bc0170fb 100644
--- a/MeoAssistance/src/Assistance.cpp
+++ b/MeoAssistance/src/Assistance.cpp
@@ -214,6 +214,27 @@ void Assistance::start_open_recruit(const std::vector<int>& required_level, bool
 	m_condvar.notify_one();
 }
 
+void asst::Assistance::start_infrast()
+{
+	DebugTraceFunction;
+	if (!m_thread_idle || !m_inited)
+	{
+		return;
+	}
+
+	std::unique_lock<std::mutex> lock(m_mutex);
+
+	auto task_ptr = std::make_shared<InfrastStationTask>(task_callback, (void*)this);
+	// TODO �������д�������ļ���
+	task_ptr->set_swipe_param(2000, Rect(600, 300, 0, 0), Rect(450, 300, 0, 0), 20);
+	task_ptr->set_facility(FacilityType::Manufacturing);
+	task_ptr->set_task_chain("Infrast");
+	m_tasks_queue.emplace(task_ptr);
+
+	m_thread_idle = false;
+	m_condvar.notify_one();
+}
+
 void Assistance::stop(bool block)
 {
 	DebugTraceFunction;
diff --git a/MeoAssistance/src/AsstCaller.cpp b/MeoAssistance/src/AsstCaller.cpp
index eda8d53193..e65172c73e 100644
--- a/MeoAssistance/src/AsstCaller.cpp
+++ b/MeoAssistance/src/AsstCaller.cpp
@@ -111,6 +111,15 @@ bool AsstRunOpenRecruit(asst::Assistance* p_asst, const int required_level[], bo
 	return true;
 }
 
+bool AsstStartInfrast(asst::Assistance* p_asst)
+{
+	if (p_asst == NULL) {
+		return false;
+	}
+	p_asst->start_infrast();
+	return true;
+}
+
 bool AsstTestOcr(asst::Assistance* p_asst, const char** text_array, int array_size, bool need_click)
 {
 	if (p_asst == NULL || text_array == nullptr) {
diff --git a/MeoAssistance/src/Task.cpp b/MeoAssistance/src/Task.cpp
index 85695a199a..31719e27fb 100644
--- a/MeoAssistance/src/Task.cpp
+++ b/MeoAssistance/src/Task.cpp
@@ -791,4 +791,146 @@ bool TestOcrTask::run()
 	//}
 
 	return true;
-}
\ No newline at end of file
+}
+
+asst::InfrastStationTask::InfrastStationTask(AsstCallback callback, void* callback_arg)
+	: OcrAbstractTask(callback, callback_arg)
+{
+}
+
+bool asst::InfrastStationTask::run()
+{
+	if (m_view_ptr == NULL
+		|| m_identify_ptr == NULL)
+	{
+		m_callback(AsstMsg::PtrIsNull, json::value(), m_callback_arg);
+		return false;
+	}
+	
+	std::vector<std::vector<std::string>> all_oper_combs;	// ���еĸ�Ա���
+	std::unordered_set<std::string> all_oper_name;			// ���и�Ա��
+	std::string oper_end_flag;								// ��Ա��������ǣ�ʶ�����string����Ϊʶ�������
+
+	switch (m_facility) {
+	case FacilityType::Manufacturing:
+		all_oper_combs = InfrastConfiger::get_instance().m_mfg_combs;
+		all_oper_name = InfrastConfiger::get_instance().m_mfg_opers;
+		oper_end_flag = InfrastConfiger::get_instance().m_mfg_end;
+		break;
+		// TODO ó��վ������ɶ�ģ��п�����
+	default:
+		break;
+	}
+
+	json::value task_start_json = json::object{
+		{ "task_type",  "InfrastStationTask" },
+		{ "task_chain", m_task_chain},
+	};
+	m_callback(AsstMsg::TaskStart, task_start_json, m_callback_arg);
+
+	auto swipe_foo = [&](bool reverse = false) -> bool {
+		bool ret = false;
+		if (!reverse) {
+			ret = m_control_ptr->swipe(m_swipe_begin, m_swipe_end);
+		}
+		else {
+			ret = m_control_ptr->swipe(m_swipe_end, m_swipe_begin);
+		}
+		ret &= sleep(m_swipe_delay);
+		return ret;
+	};
+
+	// ʶ�𵽵ĸ�Ա��
+	std::unordered_set<std::string> detected_names;
+
+	// һ��ʶ��һ�߻���������������վ��Ա����ץ����
+	for (int i = 0; i != m_swipe_max_times; ++i) {
+		const cv::Mat& image = get_format_image();
+		// �첽���л�������
+		std::future<bool> swipe_future = std::async(std::launch::async, swipe_foo);
+
+		std::vector<TextArea> all_text_area = ocr_detect(image);
+		/* ���˳���������վ�еĸ�Ա�� */
+		std::vector<TextArea> cur_names = text_search(
+			all_text_area,
+			all_oper_name,
+			Configer::get_instance().m_infrast_ocr_replace);
+
+		for (TextArea& text_area : cur_names) {
+			detected_names.emplace(std::move(text_area.text));
+		}
+		bool break_flag = false;
+		// ʶ���˽�����ǣ���ֱ���˳�ѭ��
+		if (detected_names.find(oper_end_flag) != detected_names.cend()) {
+			break_flag = true;
+		}
+		// �����ȴ���������
+		if (!swipe_future.get()) {
+			return false;
+		}
+
+		if (break_flag) {
+			break;
+		}
+	}
+
+	json::value opers_json;
+	std::vector<json::value> all_names_vector;
+	for (const std::string& name : detected_names) {
+		all_names_vector.emplace_back(Utf8ToGbk(name));
+	}
+	opers_json["names"] = json::array(all_names_vector);
+
+	m_callback(AsstMsg::InfrastOpers, opers_json, m_callback_arg);
+
+	// �����ļ��еĸ�Ա��ϣ���ץ�����ĸ�Ա���ȶԣ��������еĸ�Ա���У��Ǿ���������
+	// Todo ʱ�临�Ӷ�����ˣ���Ҫ�Ż���
+	std::vector<std::string> optimal_comb;
+	for (auto&& name_vec :all_oper_combs) {
+		int count = 0;
+		for (std::string& name : name_vec) {
+			if (detected_names.find(name) != detected_names.cend()) {
+				++count;
+			}
+			else {
+				break;
+			}
+		}
+		if (count == name_vec.size()) {
+			optimal_comb = name_vec;
+			break;
+		}
+	}
+
+	opers_json["comb"] = json::array(optimal_comb);
+	m_callback(AsstMsg::InfrastComb, opers_json, m_callback_arg);
+
+
+	// һ�߻���һ�ߵ�����Ž��еĸ�Ա
+	for (int i = 0; i != m_swipe_max_times; ++i) {
+		const cv::Mat& image = get_format_image();
+		std::vector<TextArea> all_text_area = ocr_detect(image);
+		/* ���˳���������վ�еĸ�Ա�� */
+		std::vector<TextArea> cur_names = text_search(
+			all_text_area,
+			optimal_comb,
+			Configer::get_instance().m_infrast_ocr_replace);
+
+		for (TextArea& text_area : cur_names) {
+			m_control_ptr->click(text_area.rect);
+			// ����˾Ͳ����ٵ��ˣ�ֱ�Ӵ����Ž�vector����ɾ��
+			auto iter = std::find(optimal_comb.begin(), optimal_comb.end(), text_area.text);
+			if (iter != optimal_comb.end()) {
+				optimal_comb.erase(iter);
+			}
+		}
+		if (optimal_comb.empty()) {
+			break;
+		}
+		// ��Ϊ�����͵����ì�ܵģ�����û���첽��
+		if (!swipe_foo(true)) {
+			return false;
+		}
+	}
+	return true;
+}
diff --git a/Tools/TestCaller/main.cpp b/Tools/TestCaller/main.cpp
index 50b2671585..be2b24999d 100644
--- a/Tools/TestCaller/main.cpp
+++ b/Tools/TestCaller/main.cpp
@@ -5,6 +5,7 @@ using namespace asst;
 
 void test_dorm(Assistance* ptr);
 void test_swipe(Assistance* ptr);
+void test_infrast(Assistance* ptr);
 
 int main(int argc, char** argv)
 {
@@ -23,7 +24,7 @@ int main(int argc, char** argv)
 	char ch = 0;
 	while (ch != 'q') {
 
-		test_dorm(ptr);
+		test_infrast(ptr);
 		//test_swipe(ptr);
 
 		ch = getchar();
@@ -47,4 +48,9 @@ void test_dorm(Assistance* ptr)
 	const char* text_array[] = { "ע����" };
 
 	AsstTestOcr(ptr, text_array, sizeof(text_array) / sizeof(char*), true);
+}
+
+void test_infrast(Assistance* ptr)
+{
+	AsstStartInfrast(ptr);
 }
\ No newline at end of file
diff --git a/resource/config.json b/resource/config.json
index 061642c391..97aa6d04cb 100644
--- a/resource/config.json
+++ b/resource/config.json
@@ -31,7 +31,8 @@
     ],
     "infrastOcrReplace": [
         [ "森蛐", "森蚺" ],
-        [ "森蛾", "森蚺" ]
+        [ "森蛾", "森蚺" ],
+        [ "森躺", "森蚺" ]
     ],
     "handle_Doc": "下面的和模拟器窗口捕获逻辑有关，不需要修改",
     "handle": {
diff --git a/resource/infrast.json b/resource/infrast.json
index ea163cea95..88837267c5 100644
--- a/resource/infrast.json
+++ b/resource/infrast.json
@@ -20,12 +20,12 @@
             },
             {
                 "comb": [
-                    "黑角"
+                    "月见夜"
                 ],
                 "efficiency": 10
             }
         ],
-        "end": "黑角",
+        "end": "月见夜",
         "end_Doc": "识别到这个词，就认为干员遍历结束，一般用排序里最后的那个干员（？）"
     },
     "Trade": {