diff --git a/MeoAssistance/AbstractTask.cpp b/MeoAssistance/AbstractTask.cpp
index 59415bd74e..2ca7c13cdf 100644
--- a/MeoAssistance/AbstractTask.cpp
+++ b/MeoAssistance/AbstractTask.cpp
@@ -97,6 +97,9 @@ bool AbstractTask::set_control_scale(int cur_width, int cur_height)
 
 bool AbstractTask::sleep(unsigned millisecond)
 {
+	if (need_exit()) {
+		return false;
+	}
 	if (millisecond == 0) {
 		return true;
 	}
@@ -107,15 +110,14 @@ bool AbstractTask::sleep(unsigned millisecond)
 	callback_json["time"] = millisecond;
 	m_callback(AsstMsg::ReadyToSleep, callback_json, m_callback_arg);
 
-	while ((m_exit_flag == NULL || *m_exit_flag == false)
-		&& duration < millisecond) {
+	while (!need_exit() && duration < millisecond) {
 		duration = std::chrono::duration_cast<std::chrono::milliseconds>(
 			std::chrono::system_clock::now() - start).count();
 		std::this_thread::yield();
 	}
 	m_callback(AsstMsg::EndOfSleep, callback_json, m_callback_arg);
 
-	return (m_exit_flag == NULL || *m_exit_flag == false);
+	return !need_exit();
 }
 
 bool AbstractTask::print_window(const std::string& dir)
@@ -142,4 +144,9 @@ bool AbstractTask::print_window(const std::string& dir)
 	m_callback(AsstMsg::PrintWindow, callback_json, m_callback_arg);
 
 	return ret;
-}
\ No newline at end of file
+}
+
+bool asst::AbstractTask::need_exit() const noexcept
+{
+	return m_exit_flag != NULL && *m_exit_flag == true;
+}
diff --git a/MeoAssistance/AbstractTask.h b/MeoAssistance/AbstractTask.h
index e33ee30e5d..2cb7a1079a 100644
--- a/MeoAssistance/AbstractTask.h
+++ b/MeoAssistance/AbstractTask.h
@@ -60,6 +60,7 @@ namespace asst {
 		virtual bool set_control_scale(int cur_width, int cur_height);
 		virtual bool sleep(unsigned millisecond);
 		virtual bool print_window(const std::string& dir);
+		virtual bool need_exit() const noexcept;
 
 		std::shared_ptr<WinMacro> m_window_ptr = nullptr;
 		std::shared_ptr<WinMacro> m_view_ptr = nullptr;
diff --git a/MeoAssistance/Assistance.cpp b/MeoAssistance/Assistance.cpp
index 5b24f293d0..d081e666ab 100644
--- a/MeoAssistance/Assistance.cpp
+++ b/MeoAssistance/Assistance.cpp
@@ -23,8 +23,9 @@ Assistance::Assistance(AsstCallback callback, void* callback_arg)
 	DebugTraceFunction;
 
 	// 检查返回值，若为false则回调错误
-	auto callback_error = [&]() {
+	auto callback_error = [&](const std::string& filename = std::string()) {
 		json::value callback_json;
+		callback_json["filename"] = filename;
 		callback_json["what"] = "Resource";
 		m_callback(AsstMsg::InitFaild, callback_json, m_callback_arg);
 	};
@@ -71,14 +72,14 @@ Assistance::Assistance(AsstCallback callback, void* callback_arg)
 	for (const auto& [key, name] : InfrastConfiger::get_instance().m_oper_name_feat) {
 		ret = m_identify_ptr->add_text_image(name, GetResourceDir() + "operators\\" + Utf8ToGbk(name) + ".png");
 		if (!ret) {
-			callback_error();
+			callback_error(Utf8ToGbk(name));
 			return;
 		}
 	}
 	for (const auto& name : InfrastConfiger::get_instance().m_oper_name_feat_whatever) {
 		ret = m_identify_ptr->add_text_image(name, GetResourceDir() + "operators\\" + Utf8ToGbk(name) + ".png");
 		if (!ret) {
-			callback_error();
+			callback_error(Utf8ToGbk(name));
 			return;
 		}
 	}
@@ -255,7 +256,7 @@ bool asst::Assistance::start_to_identify_opers()
 
 	auto task_ptr = std::make_shared<IdentifyOperTask>(task_callback, (void*)this);
 	// TODO 这个参数写到配置文件里，TODO 滑动位置要根据分辨率缩放
-	task_ptr->set_swipe_param(Rect(2400, 800, 0, 0), Rect(400, 800, 0, 0), 2100);
+	task_ptr->set_swipe_param(Rect(800, 600, 0, 0), Rect(600, 600, 0, 0), 200);
 	task_ptr->set_task_chain("IdentifyOpers");
 	m_tasks_queue.emplace(task_ptr);
 
diff --git a/MeoAssistance/AsstDef.h b/MeoAssistance/AsstDef.h
index b0205b0772..5b18ab8ba6 100644
--- a/MeoAssistance/AsstDef.h
+++ b/MeoAssistance/AsstDef.h
@@ -82,7 +82,7 @@ namespace asst {
 	struct TextArea {
 		TextArea() = default;
 		TextArea(const TextArea&) = default;
-		TextArea(TextArea&&) = default;
+		TextArea(TextArea&&) noexcept = default;
 		template<typename ...RectArgs>
 		TextArea(std::string text, RectArgs &&... rect_args)
 			: text(std::move(text)),
@@ -91,6 +91,9 @@ namespace asst {
 				"Parameter can't be used to construct a asst::Rect");
 		}
 		operator std::string() const { return text; }
+		TextArea& operator=(const TextArea&) = default;
+		TextArea& operator=(TextArea&&) noexcept = default;
+
 		std::string text;
 		Rect rect;
 	};
diff --git a/MeoAssistance/Identify.cpp b/MeoAssistance/Identify.cpp
index 5229e6f1d6..af063c81e1 100644
--- a/MeoAssistance/Identify.cpp
+++ b/MeoAssistance/Identify.cpp
@@ -84,7 +84,7 @@ std::pair<std::vector<cv::KeyPoint>, cv::Mat> asst::Identify::surf_detect(const
 	cv::Mat mat_gray;
 	cv::cvtColor(mat, mat_gray, cv::COLOR_RGB2GRAY);
 
-	constexpr int min_hessian = 4000;
+	constexpr int min_hessian = 400;
 	// SURF特征点检测
 	cv::Ptr<SURF> detector = SURF::create(min_hessian);
 	std::vector<KeyPoint> keypoints;
@@ -103,12 +103,16 @@ std::optional<asst::Rect> asst::Identify::feature_match(
 #endif
 )
 {
+	if (query_mat_vector.empty() || train_mat_vector.empty()) {
+		DebugTraceError("feature_match | image empty");
+		return std::nullopt;
+	}
 	std::vector<cv::DMatch> matches;
 	static FlannBasedMatcher matcher;
 	matcher.match(query_mat_vector, train_mat_vector, matches);
 
 #ifdef LOG_TRACE
-	std::cout << matches.size() << " / " << query_keypoints.size() << std::endl;
+	//std::cout << matches.size() << " / " << query_keypoints.size() << std::endl;
 	cv::Mat allmatch_mat;
 	cv::drawMatches(query_mat, query_keypoints, train_mat, train_keypoints, matches, allmatch_mat);
 #endif
@@ -210,7 +214,7 @@ std::optional<asst::Rect> asst::Identify::feature_match(
 
 #endif
 
-	constexpr static const double MatchSizeRatioThreshold = 0.075;
+	constexpr static const double MatchSizeRatioThreshold = 0.05;
 	if (good_points.size() >= query_keypoints.size() * MatchSizeRatioThreshold) {
 		Rect dst;
 		int left = 0, right = 0, top = 0, bottom = 0;
@@ -301,7 +305,7 @@ std::tuple<AlgorithmType, double, asst::Rect> Identify::find_image(const Mat& cu
 
 std::optional<TextArea> asst::Identify::feature_match(const cv::Mat& mat, const std::string& key)
 {
-	DebugTraceFunction;
+	//DebugTraceFunction;
 
 	if (m_feature_map.find(key) == m_feature_map.cend()) {
 		return std::nullopt;
diff --git a/MeoAssistance/IdentifyOperTask.cpp b/MeoAssistance/IdentifyOperTask.cpp
index ee39425165..eaa282fa2c 100644
--- a/MeoAssistance/IdentifyOperTask.cpp
+++ b/MeoAssistance/IdentifyOperTask.cpp
@@ -3,6 +3,7 @@
 #include <functional>
 #include <thread>
 #include <future>
+#include <algorithm>
 #include <unordered_map>
 #include <unordered_set>
 
@@ -40,50 +41,27 @@ bool asst::IdentifyOperTask::run()
 	std::unordered_map<std::string, std::string> feature_cond = InfrastConfiger::get_instance().m_oper_name_feat;
 	std::unordered_set<std::string> feature_whatever = InfrastConfiger::get_instance().m_oper_name_feat_whatever;
 	std::unordered_set<OperInfrastInfo> detected_opers;
-	//auto swipe_foo = std::bind(&IdentifyOperTask::swipe, *this);
 
 	// 一边识别一边滑动，把所有干员名字抓出来
+	// 异步进行滑动操作
+	m_keep_swipe = true;
+	std::future<bool> swipe_future = std::async(
+		std::launch::async, &IdentifyOperTask::keep_swipe, this, false);
 	while (true) {
 		const cv::Mat& image = OcrAbstractTask::get_format_image(true);
-		// 异步进行滑动操作
-		std::future<bool> swipe_future = std::async(std::launch::async, &IdentifyOperTask::swipe, this, false);
 
 		auto cur_name_textarea = detect_opers(image, feature_cond, feature_whatever);
 
 		int oper_numer = detected_opers.size();
 		for (const TextArea& textarea : cur_name_textarea)
 		{
-			cv::Rect elite_rect;
-			// 因为有的名字长有的名字短，但是右对齐的，所以跟着右边走
-			// TODO，这些长宽的参数要跟着分辨率缩放，最好放到配置文件里
-			elite_rect.x = textarea.rect.x + textarea.rect.width - 250;
-			elite_rect.y = textarea.rect.y - 200;
-			if (elite_rect.x < 0 || elite_rect.y < 0) {
+			int elite = detect_elite(image, textarea.rect);
+			if (elite == -1) {
 				continue;
 			}
-			elite_rect.width = 100;
-			elite_rect.height = 150;
-			cv::Mat elite_mat = image(elite_rect);
-
-			// for debug
-			static cv::Mat elite1 = cv::imread(GetResourceDir() + "operators\\Elite1.png");
-			static cv::Mat elite2 = cv::imread(GetResourceDir() + "operators\\Elite2.png");
-			auto&& [score1, point1] = OcrAbstractTask::m_identify_ptr->match_template(elite_mat, elite1);
-			auto&& [score2, point2] = OcrAbstractTask::m_identify_ptr->match_template(elite_mat, elite2);
-#ifdef LOG_TRACE
-			std::cout << "elite1:" << score1 << ", elite2:" << score2 << std::endl;
-#endif
 			OperInfrastInfo info;
+			info.elite = elite;
 			info.name = textarea.text;
-			if (score1 > score2 && score1 > 0.7) {
-				info.elite = 1;
-			}
-			else if (score2 > score1 && score2 > 0.7) {
-				info.elite = 2;
-			}
-			else {
-				info.elite = 0;
-			}
 			detected_opers.emplace(std::move(info));
 		}
 
@@ -99,29 +77,85 @@ bool asst::IdentifyOperTask::run()
 		opers_json["all"] = json::array(opers_json_vec);
 		m_callback(AsstMsg::InfrastOpers, opers_json, m_callback_arg);
 
-		// 阻塞等待滑动结束
-		if (!swipe_future.get()) {
-			return false;
-		}
 		// 说明本次识别一个新的都没识别到，应该是滑动到最后了，直接结束循环
 		if (oper_numer == detected_opers.size()) {
 			break;
 		}
+		if (need_exit()) {
+			return false;
+		}
 	}
+	// 等待滑动结束
+	m_keep_swipe = false;
+	swipe_future.wait();
 
 	return true;
 }
 
 std::vector<TextArea> asst::IdentifyOperTask::detect_opers(const cv::Mat& image, std::unordered_map<std::string, std::string>& feature_cond, std::unordered_set<std::string>& feature_whatever)
 {
-	std::vector<TextArea> all_text_area = ocr_detect(image);
-	/* 过滤出所有制造站中的干员名 */
-	std::vector<TextArea> cur_name_textarea = text_search(
-		all_text_area,
+	// 裁剪出来干员名的一个长条形图片，没必要把整张图片送去识别
+	// TODO，这个参数要根据分辨率调整
+	constexpr static int cropped_height = 100;
+	constexpr static int cropped_upper_y = 665;
+	cv::Mat upper_part_name_image = image(cv::Rect(0, cropped_upper_y, image.cols, cropped_height));
+
+	std::vector<TextArea> upper_text_area = ocr_detect(upper_part_name_image);	// 所有文字
+	// 因为图片是裁剪过的，所以对应原图的坐标要加上裁剪的参数
+	for (TextArea& textarea : upper_text_area) {
+		textarea.rect.y += cropped_upper_y;
+	}
+	// 过滤出所有的干员名
+	std::vector<TextArea> upper_part_names = text_match(
+		upper_text_area,
 		InfrastConfiger::get_instance().m_all_opers_name,
 		Configer::get_instance().m_infrast_ocr_replace);
 
-	// 用特征检测再筛选一遍OCR识别漏了的
+	// 下半部分的干员
+	// TODO，这个y参数要根据分辨率调整
+	constexpr static int cropped_lower_y = 1300;
+	cv::Mat lower_part_name_image = image(cv::Rect(0, cropped_lower_y, image.cols, cropped_height));
+	std::vector<TextArea> lower_text_area = ocr_detect(lower_part_name_image);	// 所有文字
+	// 因为图片是裁剪过的，所以对应原图的坐标要加上裁剪的参数
+	for (TextArea& textarea : lower_text_area) {
+		textarea.rect.y += cropped_lower_y;
+	}
+	// 过滤出所有的干员名
+	std::vector<TextArea> lower_part_names = text_match(
+		lower_text_area,
+		InfrastConfiger::get_instance().m_all_opers_name,
+		Configer::get_instance().m_infrast_ocr_replace);
+
+	// 上下两部分识别结果合并
+	std::vector<TextArea> all_text_area = std::move(upper_text_area);
+	all_text_area.insert(all_text_area.end(),
+		std::make_move_iterator(lower_text_area.begin()),
+		std::make_move_iterator(lower_text_area.end()));
+	std::vector<TextArea> all_opers_textarea = std::move(upper_part_names);
+	all_opers_textarea.insert(all_opers_textarea.end(),
+		std::make_move_iterator(lower_part_names.begin()),
+		std::make_move_iterator(lower_part_names.end()));
+
+	// 如果ocr结果中已经有某个干员了，就没必要再尝试对他特征检测了，直接删了
+	for (const TextArea& textarea : all_opers_textarea) {
+		auto cond_iter = std::find_if(feature_cond.begin(), feature_cond.end(),
+			[&textarea](const auto& pair) -> bool {
+				return textarea.text == pair.second;
+			});
+		if (cond_iter != feature_cond.end()) {
+			feature_cond.erase(cond_iter);
+		}
+
+		auto whatever_iter = std::find_if(feature_whatever.begin(), feature_whatever.end(),
+			[&textarea](const std::string& str) -> bool {
+				return textarea.text == str;
+			});
+		if (whatever_iter != feature_whatever.end()) {
+			feature_whatever.erase(whatever_iter);
+		}
+	}
+
+	// 用特征检测再筛选一遍OCR识别漏了的——有关键字的
 	for (const TextArea& textarea : all_text_area) {
 		for (auto iter = feature_cond.begin(); iter != feature_cond.end(); ++iter) {
 			auto& [key, value] = *iter;
@@ -142,34 +176,93 @@ std::vector<TextArea> asst::IdentifyOperTask::detect_opers(const cv::Mat& image,
 				// key是关键字而已，真正要识别的是value
 				auto&& ret = OcrAbstractTask::m_identify_ptr->feature_match(image(cv_rect), value);
 				if (ret) {
-					cur_name_textarea.emplace_back(value, textarea.rect);
+					// 匹配上了下次就不用再匹配这个了，直接删了
+					all_opers_textarea.emplace_back(value, textarea.rect);
 					iter = feature_cond.erase(iter);
 					--iter;
+					// 也从whatever里面删了
+					auto whatever_iter = std::find_if(feature_whatever.begin(), feature_whatever.end(),
+						[&textarea](const std::string& str) -> bool {
+							return textarea.text == str;
+						});
+					if (whatever_iter != feature_whatever.end()) {
+						feature_whatever.erase(whatever_iter);
+					}
 				}
 			}
 		}
 	}
+
+	// 用特征检测再筛选一遍OCR识别漏了的——无论如何都进行识别的
 	for (auto iter = feature_whatever.begin(); iter != feature_whatever.end(); ++iter) {
-		auto&& ret = OcrAbstractTask::m_identify_ptr->feature_match(image, *iter);
-		if (ret) {
-			cur_name_textarea.emplace_back(std::move(ret.value()));
+		// 上半部分长条形的图片
+		auto&& upper_ret = OcrAbstractTask::m_identify_ptr->feature_match(upper_part_name_image, *iter);
+		if (upper_ret) {
+			// 因为图片是裁剪过的，所以对应原图的坐标要加上裁剪的参数
+			TextArea temp = std::move(upper_ret.value());
+			temp.rect.y += cropped_upper_y;
+			all_opers_textarea.emplace_back(std::move(temp));
 			iter = feature_whatever.erase(iter);
 			--iter;
+			continue;
+		}
+		// 下半部分长条形的图片
+		auto&& lower_ret = OcrAbstractTask::m_identify_ptr->feature_match(lower_part_name_image, *iter);
+		if (lower_ret) {
+			// 因为图片是裁剪过的，所以对应原图的坐标要加上裁剪的参数
+			TextArea temp = std::move(lower_ret.value());
+			temp.rect.y += cropped_lower_y;
+			all_opers_textarea.emplace_back(std::move(temp));
+			iter = feature_whatever.erase(iter);
+			--iter;
+			continue;
 		}
 	}
 
-	return cur_name_textarea;
+	return all_opers_textarea;
 }
 
-bool IdentifyOperTask::swipe(bool reverse)
+int asst::IdentifyOperTask::detect_elite(const cv::Mat& image, const asst::Rect name_rect)
 {
-	bool ret = false;
-	if (!reverse) {
-		ret = m_control_ptr->swipe(m_swipe_begin, m_swipe_end, m_swipe_duration);
+	cv::Rect elite_rect;
+	// 因为有的名字长有的名字短，但是右对齐的，所以跟着右边走
+	// TODO，这些长宽的参数要跟着分辨率缩放，最好放到配置文件里
+	elite_rect.x = name_rect.x + name_rect.width - 250;
+	elite_rect.y = name_rect.y - 200;
+	if (elite_rect.x < 0 || elite_rect.y < 0) {
+		return -1;
+	}
+	elite_rect.width = 100;
+	elite_rect.height = 150;
+	cv::Mat elite_mat = image(elite_rect);
+
+	// for debug
+	static cv::Mat elite1 = cv::imread(GetResourceDir() + "operators\\Elite1.png");
+	static cv::Mat elite2 = cv::imread(GetResourceDir() + "operators\\Elite2.png");
+	auto&& [score1, point1] = OcrAbstractTask::m_identify_ptr->match_template(elite_mat, elite1);
+	auto&& [score2, point2] = OcrAbstractTask::m_identify_ptr->match_template(elite_mat, elite2);
+	if (score1 > score2 && score1 > 0.7) {
+		return 1;
+	}
+	else if (score2 > score1 && score2 > 0.7) {
+		return 2;
 	}
 	else {
-		ret = m_control_ptr->swipe(m_swipe_end, m_swipe_begin, m_swipe_duration);
+		return 0;
+	}
+}
+
+bool IdentifyOperTask::keep_swipe(bool reverse)
+{
+	bool ret = false;
+	while (m_keep_swipe && !ret) {
+		if (!reverse) {
+			ret &= m_control_ptr->swipe(m_swipe_begin, m_swipe_end, m_swipe_duration);
+		}
+		else {
+			ret &= m_control_ptr->swipe(m_swipe_end, m_swipe_begin, m_swipe_duration);
+		}
+		ret &= sleep(SwipeExtraDelay);
 	}
-	ret &= sleep(m_swipe_duration + SwipeExtraDelay);
 	return ret;
 }
\ No newline at end of file
diff --git a/MeoAssistance/IdentifyOperTask.h b/MeoAssistance/IdentifyOperTask.h
index 987688559d..46d956e20c 100644
--- a/MeoAssistance/IdentifyOperTask.h
+++ b/MeoAssistance/IdentifyOperTask.h
@@ -20,16 +20,18 @@ namespace asst {
 			m_filename = filename;
 		}
 	protected:
-		constexpr static int SwipeExtraDelay = 100;
+		constexpr static int SwipeExtraDelay = 0;
 
-		virtual bool swipe(bool reverse = false);
+		virtual bool keep_swipe(bool reverse = false);
 		std::vector<TextArea> detect_opers(const cv::Mat& image,
 			std::unordered_map<std::string, std::string>& feature_cond,
 			std::unordered_set<std::string>& feature_whatever);
+		int detect_elite(const cv::Mat& image, const asst::Rect name_rect);
 
 		Rect m_swipe_begin;
 		Rect m_swipe_end;
 		int m_swipe_duration = 0;
+		bool m_keep_swipe = false;
 		std::string m_filename;
 	};
 }
diff --git a/MeoAssistance/SwipeTask.cpp b/MeoAssistance/SwipeTask.cpp
index 734e57fc3b..3ff82e039f 100644
--- a/MeoAssistance/SwipeTask.cpp
+++ b/MeoAssistance/SwipeTask.cpp
@@ -24,6 +24,6 @@ bool asst::SwipeTask::swipe()
 	else {
 		ret = m_control_ptr->swipe(m_swipe_end, m_swipe_begin, m_swipe_duration);
 	}
-	ret &= sleep(m_swipe_duration + SwipeExtraDelay);
+	ret &= sleep(SwipeExtraDelay);
 	return ret;
 }
diff --git a/MeoAssistance/SwipeTask.h b/MeoAssistance/SwipeTask.h
index 97ce0ce282..111aa3f426 100644
--- a/MeoAssistance/SwipeTask.h
+++ b/MeoAssistance/SwipeTask.h
@@ -20,7 +20,7 @@ namespace asst {
 			m_reverse = reverse;
 		}
 	protected:
-		constexpr static int SwipeExtraDelay = 100;
+		constexpr static int SwipeExtraDelay = 0;
 
 		virtual bool swipe();
 
diff --git a/resource/config.json b/resource/config.json
index 26f0be5573..749dcf7fcd 100644
--- a/resource/config.json
+++ b/resource/config.json
@@ -31,7 +31,15 @@
     ],
     "infrastOcrReplace": [
         [ "铔囧眳绠�", "铔囧睜绠�" ],
-        [ "鐐庣儰", "鐐庣啍" ]
+        [ "鐐庣儰", "鐐庣啍" ],
+        [ "鐐庣儳", "鐐庣啍" ],
+        [ "鑾辨�濆搱鐗�", "鑾辨仼鍝堢壒" ],
+        [ "娣辫兘", "娣遍潧" ],
+        [ "鍙背", "鍙ょ背" ],
+        [ "绮瑰叞", "姊撳叞" ],
+        [ "鑹句笣鑿滃皵", "鑹句笣榛涘皵" ],
+        [ "鑹句笣鑾卞皵", "鑹句笣榛涘皵" ],
+        [ "鈥濆贰鏋楄��", "宸℃灄鑰�" ]
     ],
     "handle_Doc": "涓嬮潰鐨勫拰妯℃嫙鍣ㄧ獥鍙ｆ崟鑾烽�昏緫鏈夊叧锛屼笉闇�瑕佷慨鏀�",
     "handle": {
diff --git a/resource/infrast.json b/resource/infrast.json
index 865f229d0c..5f8a216517 100644
--- a/resource/infrast.json
+++ b/resource/infrast.json
@@ -50,11 +50,22 @@
     "featureKey_Doc": "鐗瑰緛妫�娴嬬殑鍏抽敭瀛楋紝濡傛灉OCR璇嗗埆鍒颁簡宸﹁竟鐨勫唴瀹癸紝浣嗘槸鍗存病鏈夊彸杈圭殑鍐呭锛屽垯杩涜鐗瑰緛妫�娴嬭繘涓�姝ョ‘璁�",
     "featureKey": [
         [ "妫�", "妫毢" ],
-        [ "鐧介潰", "鐧介潰楦�" ]
+        [ "鐧介潰", "鐧介潰楦�" ],
+        [ "鐏�", "鐏扮儸" ],
+        [ "鏃�", "鏃╅湶" ],
+        [ "鐭�", "鐕х煶" ],
+        [ "娣�", "娣遍潧" ],
+        [ "褰�", "鍌�褰�" ],
+        [ "宄�", "宓敞" ],
+        [ "鍒╁畨", "鍗℃秴鍒╁畨" ],
+        [ "鏄�", "闄ㄦ槦" ],
+        [ "鍐�", "鍑涘啲" ],
+        [ "鐙�", "鐙潕" ]
     ],
     "featureWhatever_Doc": "杩欓噷闈㈢殑鏃犺濡備綍閮借繘琛岀壒寰佹娴�",
-    "featureWhatever": [ "鐮�" ],
+    "featureWhatever": [ "鐮�", "鐓�", "灞�", "榛�", "W", "澶�", "绾�", "鑺�", "姊�", "瀹�", "瀛�", "鍚�" ],
     "allNames": [
+        "妗冮噾濞�",
         "椋熼搧鍏�",
         "鏂姜鑰�",
         "鐧介洩",
@@ -101,6 +112,7 @@
         "鐐庣啍",
         "鏈堣澶�",
         "瀹夋磥鑾夊",
+        "澶滆幒",
         "宓敞",
         "椋庣瑳",
         "璧媺鏍�",
@@ -189,7 +201,7 @@
         "鏆撮洦",
         "钖勭豢",
         "甯冩礇鍗�",
-        "璧や笢",
+        "璧ゅ啲",
         "鏂礀",
         "鑺欏叞鍗�",
         "鏍兼媺灏�",
@@ -198,7 +210,7 @@
         "鎯婅洶",
         "鍙",
         "鑻﹁壘",
-        "鑾卞洜鍝堢壒",
+        "鑾辨仼鍝堢壒",
         "铚滆湣",
         "鏅綏鏃烘柉",
         "缁壇",
@@ -217,7 +229,7 @@
         "澶滈瓟",
         "鏈堢",
         "閾搁搧",
-        "鑹句笣鎴村皵",
+        "鑹句笣榛涘皵",
         "娉㈢櫥鍙�",
         "鍦扮伒",
         "鏉滃",
diff --git a/resource/operators/Castle-3.png b/resource/operators/Castle-3.png
deleted file mode 100644
index 3c82833237..0000000000
Binary files a/resource/operators/Castle-3.png and /dev/null differ
diff --git a/resource/operators/W.png b/resource/operators/W.png
new file mode 100644
index 0000000000..ea705073f3
Binary files /dev/null and b/resource/operators/W.png differ
diff --git a/resource/operators/鍌�褰�.png b/resource/operators/鍌�褰�.png
new file mode 100644
index 0000000000..bfaf950bad
Binary files /dev/null and b/resource/operators/鍌�褰�.png differ
diff --git a/resource/operators/鍏嬫礇涓�.png b/resource/operators/鍏嬫礇涓�.png
deleted file mode 100644
index 00b7e36871..0000000000
Binary files a/resource/operators/鍏嬫礇涓�.png and /dev/null differ
diff --git a/resource/operators/鍑涘啲.png b/resource/operators/鍑涘啲.png
new file mode 100644
index 0000000000..b77853994f
Binary files /dev/null and b/resource/operators/鍑涘啲.png differ
diff --git a/resource/operators/鍒讳縿鏌�.png b/resource/operators/鍒讳縿鏌�.png
deleted file mode 100644
index 25540143b9..0000000000
Binary files a/resource/operators/鍒讳縿鏌�.png and /dev/null differ
diff --git a/resource/operators/鍗℃秴鍒╁畨.png b/resource/operators/鍗℃秴鍒╁畨.png
new file mode 100644
index 0000000000..b6005df18a
Binary files /dev/null and b/resource/operators/鍗℃秴鍒╁畨.png differ
diff --git a/resource/operators/鍗＄紘.png b/resource/operators/鍗＄紘.png
deleted file mode 100644
index f0277bad07..0000000000
Binary files a/resource/operators/鍗＄紘.png and /dev/null differ
diff --git a/resource/operators/鍗¤揪.png b/resource/operators/鍗¤揪.png
deleted file mode 100644
index 92085ee80a..0000000000
Binary files a/resource/operators/鍗¤揪.png and /dev/null differ
diff --git a/resource/operators/鍙ょ背.png b/resource/operators/鍙ょ背.png
new file mode 100644
index 0000000000..fb7f4fc4db
Binary files /dev/null and b/resource/operators/鍙ょ背.png differ
diff --git a/resource/operators/鍙查兘鍗庡痉.png b/resource/operators/鍙查兘鍗庡痉.png
deleted file mode 100644
index 5ab52075ed..0000000000
Binary files a/resource/operators/鍙查兘鍗庡痉.png and /dev/null differ
diff --git a/resource/operators/鍚�.png b/resource/operators/鍚�.png
new file mode 100644
index 0000000000..1cf45f623f
Binary files /dev/null and b/resource/operators/鍚�.png differ
diff --git a/resource/operators/澶�.png b/resource/operators/澶�.png
new file mode 100644
index 0000000000..954311f62d
Binary files /dev/null and b/resource/operators/澶�.png differ
diff --git a/resource/operators/澶滅儫.png b/resource/operators/澶滅儫.png
deleted file mode 100644
index ccf093ddf7..0000000000
Binary files a/resource/operators/澶滅儫.png and /dev/null differ
diff --git a/resource/operators/瀛�.png b/resource/operators/瀛�.png
new file mode 100644
index 0000000000..6f7cea1365
Binary files /dev/null and b/resource/operators/瀛�.png differ
diff --git a/resource/operators/瀹�.png b/resource/operators/瀹�.png
new file mode 100644
index 0000000000..85421cf18e
Binary files /dev/null and b/resource/operators/瀹�.png differ
diff --git a/resource/operators/灞�.png b/resource/operators/灞�.png
new file mode 100644
index 0000000000..cee80f6ee5
Binary files /dev/null and b/resource/operators/灞�.png differ
diff --git a/resource/operators/宓敞.png b/resource/operators/宓敞.png
new file mode 100644
index 0000000000..b8858e9cd7
Binary files /dev/null and b/resource/operators/宓敞.png differ
diff --git a/resource/operators/甯曟媺鏂�.png b/resource/operators/甯曟媺鏂�.png
deleted file mode 100644
index 545655a2f5..0000000000
Binary files a/resource/operators/甯曟媺鏂�.png and /dev/null differ
diff --git a/resource/operators/寮傚.png b/resource/operators/寮傚.png
deleted file mode 100644
index 0d239db008..0000000000
Binary files a/resource/operators/寮傚.png and /dev/null differ
diff --git a/resource/operators/鏂戠偣.png b/resource/operators/鏂戠偣.png
deleted file mode 100644
index 9a80a83cd1..0000000000
Binary files a/resource/operators/鏂戠偣.png and /dev/null differ
diff --git a/resource/operators/鏂姜鑰�.png b/resource/operators/鏂姜鑰�.png
deleted file mode 100644
index c3f1a42f37..0000000000
Binary files a/resource/operators/鏂姜鑰�.png and /dev/null differ
diff --git a/resource/operators/鏃╅湶.png b/resource/operators/鏃╅湶.png
new file mode 100644
index 0000000000..97c52a982d
Binary files /dev/null and b/resource/operators/鏃╅湶.png differ
diff --git a/resource/operators/鏈堣澶�.png b/resource/operators/鏈堣澶�.png
deleted file mode 100644
index 176dd672ad..0000000000
Binary files a/resource/operators/鏈堣澶�.png and /dev/null differ
diff --git a/resource/operators/鏉拌タ鍗�.png b/resource/operators/鏉拌タ鍗�.png
deleted file mode 100644
index e543ead6b0..0000000000
Binary files a/resource/operators/鏉拌タ鍗�.png and /dev/null differ
diff --git a/resource/operators/姊�.png b/resource/operators/姊�.png
new file mode 100644
index 0000000000..1f14735db1
Binary files /dev/null and b/resource/operators/姊�.png differ
diff --git a/resource/operators/姊呭皵.png b/resource/operators/姊呭皵.png
deleted file mode 100644
index ee6b1e8568..0000000000
Binary files a/resource/operators/姊呭皵.png and /dev/null differ
diff --git a/resource/operators/姊撳叞.png b/resource/operators/姊撳叞.png
new file mode 100644
index 0000000000..1366acb172
Binary files /dev/null and b/resource/operators/姊撳叞.png differ
diff --git a/resource/operators/妲愮惀.png b/resource/operators/妲愮惀.png
deleted file mode 100644
index 7c6cf730b9..0000000000
Binary files a/resource/operators/妲愮惀.png and /dev/null differ
diff --git a/resource/operators/姘存湀.png b/resource/operators/姘存湀.png
deleted file mode 100644
index 4ac3ea6d56..0000000000
Binary files a/resource/operators/姘存湀.png and /dev/null differ
diff --git a/resource/operators/娉℃櫘鍗�.png b/resource/operators/娉℃櫘鍗�.png
deleted file mode 100644
index 87286568aa..0000000000
Binary files a/resource/operators/娉℃櫘鍗�.png and /dev/null differ
diff --git a/resource/operators/娉℃场.png b/resource/operators/娉℃场.png
deleted file mode 100644
index ccdbca8468..0000000000
Binary files a/resource/operators/娉℃场.png and /dev/null differ
diff --git a/resource/operators/娴佹槦.png b/resource/operators/娴佹槦.png
deleted file mode 100644
index d76d1c672a..0000000000
Binary files a/resource/operators/娴佹槦.png and /dev/null differ
diff --git a/resource/operators/娣遍潧.png b/resource/operators/娣遍潧.png
new file mode 100644
index 0000000000..56eaffec0e
Binary files /dev/null and b/resource/operators/娣遍潧.png differ
diff --git a/resource/operators/娣遍潧png.png b/resource/operators/娣遍潧png.png
new file mode 100644
index 0000000000..56eaffec0e
Binary files /dev/null and b/resource/operators/娣遍潧png.png differ
diff --git a/resource/operators/娓呮祦.png b/resource/operators/娓呮祦.png
deleted file mode 100644
index 1b3dcf4bce..0000000000
Binary files a/resource/operators/娓呮祦.png and /dev/null differ
diff --git a/resource/operators/娓╄拏.png b/resource/operators/娓╄拏.png
deleted file mode 100644
index 696aa9a057..0000000000
Binary files a/resource/operators/娓╄拏.png and /dev/null differ
diff --git a/resource/operators/鐏.png b/resource/operators/鐏.png
deleted file mode 100644
index e8faa87b04..0000000000
Binary files a/resource/operators/鐏.png and /dev/null differ
diff --git a/resource/operators/鐏扮儸.png b/resource/operators/鐏扮儸.png
new file mode 100644
index 0000000000..bea5ee8c70
Binary files /dev/null and b/resource/operators/鐏扮儸.png differ
diff --git a/resource/operators/鐐庣啍.png b/resource/operators/鐐庣啍.png
deleted file mode 100644
index 612d1e13e6..0000000000
Binary files a/resource/operators/鐐庣啍.png and /dev/null differ
diff --git a/resource/operators/鐓�.png b/resource/operators/鐓�.png
new file mode 100644
index 0000000000..36f82f8694
Binary files /dev/null and b/resource/operators/鐓�.png differ
diff --git a/resource/operators/鐕х煶.png b/resource/operators/鐕х煶.png
new file mode 100644
index 0000000000..a0e1c31c7c
Binary files /dev/null and b/resource/operators/鐕х煶.png differ
diff --git a/resource/operators/鐙潕.png b/resource/operators/鐙潕.png
new file mode 100644
index 0000000000..ad573ecd18
Binary files /dev/null and b/resource/operators/鐙潕.png differ
diff --git a/resource/operators/鐧介洩.png b/resource/operators/鐧介洩.png
deleted file mode 100644
index 0dfa24645a..0000000000
Binary files a/resource/operators/鐧介洩.png and /dev/null differ
diff --git a/resource/operators/鐭虫.png b/resource/operators/鐭虫.png
deleted file mode 100644
index 768aa752a5..0000000000
Binary files a/resource/operators/鐭虫.png and /dev/null differ
diff --git a/resource/operators/绋�闊�.png b/resource/operators/绋�闊�.png
deleted file mode 100644
index f5bdfef9d7..0000000000
Binary files a/resource/operators/绋�闊�.png and /dev/null differ
diff --git a/resource/operators/绫虫牸椴�.png b/resource/operators/绫虫牸椴�.png
deleted file mode 100644
index 22b3c92520..0000000000
Binary files a/resource/operators/绫虫牸椴�.png and /dev/null differ
diff --git a/resource/operators/绾�.png b/resource/operators/绾�.png
new file mode 100644
index 0000000000..5b37f24813
Binary files /dev/null and b/resource/operators/绾�.png differ
diff --git a/resource/operators/绾簯.png b/resource/operators/绾簯.png
deleted file mode 100644
index 2d580fcc3a..0000000000
Binary files a/resource/operators/绾簯.png and /dev/null differ
diff --git a/resource/operators/绾㈣眴.png b/resource/operators/绾㈣眴.png
deleted file mode 100644
index 2b4b0ea766..0000000000
Binary files a/resource/operators/绾㈣眴.png and /dev/null differ
diff --git a/resource/operators/鑹鹃泤娉曟媺.png b/resource/operators/鑹鹃泤娉曟媺.png
deleted file mode 100644
index 68baeb4bd2..0000000000
Binary files a/resource/operators/鑹鹃泤娉曟媺.png and /dev/null differ
diff --git a/resource/operators/铔囧睜绠�.png b/resource/operators/铔囧睜绠�.png
deleted file mode 100644
index 945137aeb4..0000000000
Binary files a/resource/operators/铔囧睜绠�.png and /dev/null differ
diff --git a/resource/operators/璋冮甯�.png b/resource/operators/璋冮甯�.png
deleted file mode 100644
index 5e65182056..0000000000
Binary files a/resource/operators/璋冮甯�.png and /dev/null differ
diff --git a/resource/operators/璞嗚嫍.png b/resource/operators/璞嗚嫍.png
deleted file mode 100644
index 86ab8dbd8f..0000000000
Binary files a/resource/operators/璞嗚嫍.png and /dev/null differ
diff --git a/resource/operators/璐濆.png b/resource/operators/璐濆.png
deleted file mode 100644
index d4c9b8cb74..0000000000
Binary files a/resource/operators/璐濆.png and /dev/null differ
diff --git a/resource/operators/璧粯.png b/resource/operators/璧粯.png
deleted file mode 100644
index 86e2a4530b..0000000000
Binary files a/resource/operators/璧粯.png and /dev/null differ
diff --git a/resource/operators/杩疯凯棣�.png b/resource/operators/杩疯凯棣�.png
deleted file mode 100644
index 22ccf759cf..0000000000
Binary files a/resource/operators/杩疯凯棣�.png and /dev/null differ
diff --git a/resource/operators/闄ㄦ槦.png b/resource/operators/闄ㄦ槦.png
new file mode 100644
index 0000000000..003fdd3aab
Binary files /dev/null and b/resource/operators/闄ㄦ槦.png differ
diff --git a/resource/operators/闇滃彾.png b/resource/operators/闇滃彾.png
deleted file mode 100644
index f2deae2a61..0000000000
Binary files a/resource/operators/闇滃彾.png and /dev/null differ
diff --git a/resource/operators/椋熼搧鍏�.png b/resource/operators/椋熼搧鍏�.png
deleted file mode 100644
index ada0787c6c..0000000000
Binary files a/resource/operators/椋熼搧鍏�.png and /dev/null differ
diff --git a/resource/operators/棣欒崏.png b/resource/operators/棣欒崏.png
deleted file mode 100644
index b6eaac9ce4..0000000000
Binary files a/resource/operators/棣欒崏.png and /dev/null differ
diff --git a/resource/operators/榛�.png b/resource/operators/榛�.png
new file mode 100644
index 0000000000..6e94175f80
Binary files /dev/null and b/resource/operators/榛�.png differ
diff --git a/resource/operators/榛戣.png b/resource/operators/榛戣.png
deleted file mode 100644
index 3e8d198b07..0000000000
Binary files a/resource/operators/榛戣.png and /dev/null differ