diff --git a/include/AsstCaller.h b/include/AsstCaller.h
index 4ecc59743a..51216a1f3e 100644
--- a/include/AsstCaller.h
+++ b/include/AsstCaller.h
@@ -19,9 +19,9 @@ extern "C" {
     bool MEOAPI AsstStartSanity(void* p_asst);
     bool MEOAPI AsstStartVisit(void* p_asst, bool with_shopping);
     bool MEOAPI AsstStartProcessTask(void* p_asst, const char* task);
-    bool MEOAPI AsstStartOpenRecruit(void* p_asst, const int required_level[], int required_len, bool set_time);
-    bool MEOAPI AsstStartIndertifyOpers(void* p_asst);
-    bool MEOAPI AsstStartInfrast(void* p_asst);
+    bool MEOAPI AsstStartRecruiting(void* p_asst, const int required_level[], int required_len, bool set_time);
+    //bool MEOAPI AsstStartIndertifyOpers(void* p_asst);
+    //bool MEOAPI AsstStartInfrast(void* p_asst);
     bool MEOAPI AsstStartDebugTask(void* p_asst);
 
     void MEOAPI AsstStop(void* p_asst);
diff --git a/resource/config.json b/resource/config.json
index 145a440a0a..911ceaf2d8 100644
--- a/resource/config.json
+++ b/resource/config.json
@@ -21,10 +21,6 @@
         "ocrThreadNumber": 4,
         "ocrThreadNumber_Doc": "文字识别库OcrLite的线程数量，理论上开的高点识别会快点，但是会更卡。默认4"
     },
-    "infrastOptions": {
-        "dormThreshold": 0.3,
-        "dormThreshold_Doc": "宿舍心情百分比阈值，心情百分比小于该值的干员会被放进宿舍。取值范围(0, 1.0)，默认0.3"
-    },
     "emulator_Doc": "下面的和模拟器窗口捕获逻辑有关，不需要修改",
     "emulator": {
         "BlueStacks": {
@@ -150,74 +146,5 @@
                 "screencap": "[Adb] exec-out screencap -p"
             }
         }
-    },
-    "ocrReplace_Doc": "下面为常见的文字识别错误纠正，不需要修改",
-    "recruitOcrReplace": [
-        [
-            "沮击",
-            "狙击"
-        ],
-        [
-            "犯击",
-            "狙击"
-        ],
-        [
-            "泪击",
-            "狙击"
-        ],
-        [
-            "都出",
-            "输出"
-        ],
-        [
-            "都乐",
-            "输出"
-        ],
-        [
-            "抓出",
-            "输出"
-        ],
-        [
-            "都任",
-            "输出"
-        ],
-        [
-            "新于",
-            "新手"
-        ],
-        [
-            "防拍",
-            "防护"
-        ]
-    ],
-    "infrastOcrReplace": [
-        [
-            "蛇居箱",
-            "蛇屠箱"
-        ],
-        [
-            "叫米",
-            "古米"
-        ],
-        [
-            "节草",
-            "苇草"
-        ],
-        [
-            "粹兰",
-            "梓兰"
-        ],
-        [
-            "艾丝菜尔",
-            "艾丝黛尔"
-        ],
-        [
-            "艾丝莱尔",
-            "艾丝黛尔"
-        ],
-        [
-            "，斑点",
-            "斑点"
-        ]
-    ]
+    }
 }
\ No newline at end of file
diff --git a/resource/infrast.json b/resource/infrast.json
deleted file mode 100644
index e423d1b324..0000000000
--- a/resource/infrast.json
+++ /dev/null
@@ -1,1043 +0,0 @@
-{
-    "infrast": [
-        {
-            "facility": "DogFood",
-            "Doc": "制造站-狗粮",
-            "combs": [
-                {
-                    "opers": [
-                        {
-                            "name": "刻俄柏",
-                            "elite": 2
-                        },
-                        {
-                            "name": "稀音",
-                            "elite": 2
-                        },
-                        {
-                            "name": "红云",
-                            "elite": 1
-                        }
-                    ],
-                    "efficiency": 105
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "贝娜",
-                            "elite": 0
-                        },
-                        {
-                            "name": "泡泡",
-                            "elite": 1
-                        },
-                        {
-                            "name": "火神",
-                            "elite": 2
-                        }
-                    ],
-                    "efficiency": 93
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "温蒂",
-                            "elite": 2
-                        },
-                        {
-                            "name": "异客",
-                            "elite": 2
-                        },
-                        {
-                            "name": "森蚺",
-                            "elite": 2
-                        }
-                    ],
-                    "efficiency": 90
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "槐琥",
-                            "elite": 2
-                        }
-                    ],
-                    "efficiency": 40
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "食铁兽",
-                            "elite": 2
-                        }
-                    ],
-                    "efficiency": 35
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "断罪者",
-                            "elite": 2
-                        }
-                    ],
-                    "efficiency": 35
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "白雪",
-                            "elite": 1
-                        }
-                    ],
-                    "efficiency": 30
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "霜叶",
-                            "elite": 1
-                        }
-                    ],
-                    "efficiency": 30
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "红豆",
-                            "elite": 0
-                        }
-                    ],
-                    "efficiency": 30
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "Castle-3",
-                            "elite": 0
-                        }
-                    ],
-                    "efficiency": 30
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "梅尔",
-                            "elite": 2
-                        }
-                    ],
-                    "efficiency": 30
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "帕拉斯",
-                            "elite": 2
-                        }
-                    ],
-                    "efficiency": 25
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "水月",
-                            "elite": 2
-                        }
-                    ],
-                    "efficiency": 25
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "白面鸮",
-                            "elite": 2
-                        }
-                    ],
-                    "efficiency": 25
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "赫默",
-                            "elite": 2
-                        }
-                    ],
-                    "efficiency": 25
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "杰西卡",
-                            "elite": 0
-                        }
-                    ],
-                    "efficiency": 25
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "史都华德",
-                            "elite": 1
-                        }
-                    ],
-                    "efficiency": 25
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "香草",
-                            "elite": 0
-                        }
-                    ],
-                    "efficiency": 25
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "调香师",
-                            "elite": 1
-                        }
-                    ],
-                    "efficiency": 25
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "石棉",
-                            "elite": 0
-                        }
-                    ],
-                    "efficiency": 25
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "泡普卡",
-                            "elite": 0
-                        }
-                    ],
-                    "efficiency": 25
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "芬",
-                            "elite": 0
-                        }
-                    ],
-                    "efficiency": 23
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "克洛斯",
-                            "elite": 0
-                        }
-                    ],
-                    "efficiency": 20
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "豆苗",
-                            "elite": 0
-                        }
-                    ],
-                    "efficiency": 15
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "流星",
-                            "elite": 0
-                        }
-                    ],
-                    "efficiency": 15
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "夜刀",
-                            "elite": 0
-                        }
-                    ],
-                    "efficiency": 15
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "蛇屠箱",
-                            "elite": 0
-                        }
-                    ],
-                    "efficiency": 10
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "黑角",
-                            "elite": 0
-                        }
-                    ],
-                    "efficiency": 10
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "卡缇",
-                            "elite": 0
-                        }
-                    ],
-                    "efficiency": 10
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "米格鲁",
-                            "elite": 0
-                        }
-                    ],
-                    "efficiency": 10
-                }
-            ],
-            "endFlag": [
-                "安洁莉娜",
-                "嵯峨",
-                "风笛",
-                "赫拉格",
-                "棘刺",
-                "假日威龙陈",
-                "卡涅利安",
-                "傀影",
-                "铃兰",
-                "塞雷娅",
-                "闪灵",
-                "史尔特尔",
-                "斯卡蒂",
-                "夜莺",
-                "推进之王",
-                "星熊",
-                "银灰",
-                "浊心斯卡蒂",
-                "歌蕾蒂娅",
-                "莫斯提马",
-                "早露",
-                "瑕光",
-                "阿米娅"
-            ],
-            "endFlag_Doc": "识别到这里面的名字，就不继续往后识别了，一般用列表里的最后一个人名"
-        },
-        {
-            "facility": "PureGold",
-            "Doc": "制造站-赤金",
-            "combs": [
-                {
-                    "opers": [
-                        {
-                            "name": "贝娜",
-                            "elite": 0
-                        },
-                        {
-                            "name": "泡泡",
-                            "elite": 1
-                        },
-                        {
-                            "name": "火神",
-                            "elite": 2
-                        }
-                    ],
-                    "efficiency": 93
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "温蒂",
-                            "elite": 2
-                        },
-                        {
-                            "name": "异客",
-                            "elite": 2
-                        },
-                        {
-                            "name": "森蚺",
-                            "elite": 2
-                        }
-                    ],
-                    "efficiency": 90
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "砾",
-                            "elite": 2
-                        }
-                    ],
-                    "efficiency": 35
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "斑点",
-                            "elite": 0
-                        }
-                    ],
-                    "efficiency": 30
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "夜烟",
-                            "elite": 0
-                        }
-                    ],
-                    "efficiency": 30
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "槐琥",
-                            "elite": 2
-                        }
-                    ],
-                    "efficiency": 40
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "梅尔",
-                            "elite": 2
-                        }
-                    ],
-                    "efficiency": 30
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "水月",
-                            "elite": 2
-                        }
-                    ],
-                    "efficiency": 25
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "白面鸮",
-                            "elite": 2
-                        }
-                    ],
-                    "efficiency": 25
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "赫默",
-                            "elite": 2
-                        }
-                    ],
-                    "efficiency": 25
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "杰西卡",
-                            "elite": 0
-                        }
-                    ],
-                    "efficiency": 25
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "史都华德",
-                            "elite": 1
-                        }
-                    ],
-                    "efficiency": 25
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "香草",
-                            "elite": 0
-                        }
-                    ],
-                    "efficiency": 25
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "调香师",
-                            "elite": 1
-                        }
-                    ],
-                    "efficiency": 25
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "石棉",
-                            "elite": 0
-                        }
-                    ],
-                    "efficiency": 25
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "泡普卡",
-                            "elite": 0
-                        }
-                    ],
-                    "efficiency": 25
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "芬",
-                            "elite": 0
-                        }
-                    ],
-                    "efficiency": 23
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "克洛斯",
-                            "elite": 0
-                        }
-                    ],
-                    "efficiency": 20
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "豆苗",
-                            "elite": 0
-                        }
-                    ],
-                    "efficiency": 15
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "流星",
-                            "elite": 0
-                        }
-                    ],
-                    "efficiency": 15
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "夜刀",
-                            "elite": 0
-                        }
-                    ],
-                    "efficiency": 15
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "蛇屠箱",
-                            "elite": 0
-                        }
-                    ],
-                    "efficiency": 10
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "黑角",
-                            "elite": 0
-                        }
-                    ],
-                    "efficiency": 10
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "卡缇",
-                            "elite": 0
-                        }
-                    ],
-                    "efficiency": 10
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "米格鲁",
-                            "elite": 0
-                        }
-                    ],
-                    "efficiency": 10
-                }
-            ],
-            "endFlag": [
-                "安洁莉娜",
-                "嵯峨",
-                "风笛",
-                "赫拉格",
-                "棘刺",
-                "假日威龙陈",
-                "卡涅利安",
-                "傀影",
-                "铃兰",
-                "塞雷娅",
-                "闪灵",
-                "史尔特尔",
-                "斯卡蒂",
-                "夜莺",
-                "推进之王",
-                "星熊",
-                "银灰",
-                "浊心斯卡蒂",
-                "歌蕾蒂娅",
-                "莫斯提马",
-                "早露",
-                "瑕光",
-                "阿米娅"
-            ],
-            "endFlag_Doc": "识别到这里面的名字，就不继续往后识别了，一般用列表里的最后一个人名"
-        },
-        {
-            "facility": "TradeMoney",
-            "Doc": "贸易站-龙门币",
-            "combs": [
-                {
-                    "opers": [
-                        {
-                            "name": "巫恋",
-                            "elite": 2
-                        },
-                        {
-                            "name": "龙舌兰",
-                            "elite": 2
-                        },
-                        {
-                            "name": "卡夫卡",
-                            "elite": 2
-                        }
-                    ],
-                    "efficiency": 150,
-                    "Doc": "这三个有效率加成，不知道怎么算的，反正很高，先按150写"
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "巫恋",
-                            "elite": 2
-                        },
-                        {
-                            "name": "龙舌兰",
-                            "elite": 2
-                        },
-                        {
-                            "name": "柏喙",
-                            "elite": 2
-                        }
-                    ],
-                    "efficiency": 150,
-                    "Doc": "这三个有效率加成，不知道怎么算的，反正很高，先按150写"
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "能天使",
-                            "elite": 2
-                        },
-                        {
-                            "name": "拉普兰德",
-                            "elite": 2
-                        },
-                        {
-                            "name": "德克萨斯",
-                            "elite": 2
-                        }
-                    ],
-                    "efficiency": 100
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "空弦",
-                            "elite": 2
-                        }
-                    ],
-                    "efficiency": 40
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "能天使",
-                            "elite": 2
-                        }
-                    ],
-                    "efficiency": 35
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "雪雉",
-                            "elite": 2
-                        }
-                    ],
-                    "efficiency": 35
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "古米",
-                            "elite": 0
-                        }
-                    ],
-                    "efficiency": 30
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "空爆",
-                            "elite": 0
-                        }
-                    ],
-                    "efficiency": 30
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "月见夜",
-                            "elite": 0
-                        }
-                    ],
-                    "efficiency": 30
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "空",
-                            "elite": 2
-                        }
-                    ],
-                    "efficiency": 30
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "安比尔",
-                            "elite": 1
-                        }
-                    ],
-                    "efficiency": 30
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "缠丸",
-                            "elite": 1
-                        }
-                    ],
-                    "efficiency": 30
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "芬",
-                            "elite": 1
-                        }
-                    ],
-                    "efficiency": 30
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "芬",
-                            "elite": 1
-                        }
-                    ],
-                    "efficiency": 30
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "慕斯",
-                            "elite": 0
-                        }
-                    ],
-                    "efficiency": 30
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "夜刀",
-                            "elite": 0
-                        }
-                    ],
-                    "efficiency": 30
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "夜烟",
-                            "elite": 1
-                        }
-                    ],
-                    "efficiency": 30
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "玫兰莎",
-                            "elite": 0
-                        }
-                    ],
-                    "efficiency": 25
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "梓兰",
-                            "elite": 0
-                        }
-                    ],
-                    "efficiency": 25
-                },
-                {
-                    "opers": [
-                        {
-                            "name": "远山",
-                            "elite": 0
-                        }
-                    ],
-                    "efficiency": 25
-                }
-            ],
-            "endFlag": [
-                "安洁莉娜",
-                "嵯峨",
-                "风笛",
-                "赫拉格",
-                "棘刺",
-                "假日威龙陈",
-                "卡涅利安",
-                "傀影",
-                "铃兰",
-                "塞雷娅",
-                "闪灵",
-                "史尔特尔",
-                "斯卡蒂",
-                "夜莺",
-                "推进之王",
-                "星熊",
-                "浊心斯卡蒂",
-                "歌蕾蒂娅",
-                "莫斯提马",
-                "早露",
-                "瑕光",
-                "阿米娅"
-            ],
-            "endFlag_Doc": "识别到这里面的名字，就不继续往后识别了，一般用列表里的最后一个人名"
-        }
-    ],
-    "allNames": [
-        "桃金娘",
-        "食铁兽",
-        "断罪者",
-        "白雪",
-        "Castle-3",
-        "霜叶",
-        "红豆",
-        "帕拉斯",
-        "砾",
-        "夜烟",
-        "斑点",
-        "清流",
-        "迷迭香",
-        "槐琥",
-        "梅尔",
-        "赫默",
-        "白面鸮",
-        "水月",
-        "调香师",
-        "杰西卡",
-        "史都华德",
-        "香草",
-        "石棉",
-        "泡普卡",
-        "芬",
-        "克洛丝",
-        "豆苗",
-        "流星",
-        "夜刀",
-        "温蒂",
-        "森蚺",
-        "异客",
-        "蛇屠箱",
-        "黑角",
-        "卡缇",
-        "米格鲁",
-        "火神",
-        "贝娜",
-        "卡达",
-        "稀音",
-        "泡泡",
-        "刻俄柏",
-        "红云",
-        "艾雅法拉",
-        "炎熔",
-        "月见夜",
-        "安洁莉娜",
-        "夜莺",
-        "嵯峨",
-        "风笛",
-        "赫拉格",
-        "黑",
-        "煌",
-        "棘刺",
-        "卡涅利安",
-        "傀影",
-        "铃兰",
-        "泥岩",
-        "塞雷娅",
-        "山",
-        "史尔特尔",
-        "闪灵",
-        "斯卡蒂",
-        "推进之王",
-        "星熊",
-        "银灰",
-        "浊心斯卡蒂",
-        "W",
-        "歌蕾蒂娅",
-        "假日威龙陈",
-        "空弦",
-        "麦哲伦",
-        "莫斯提马",
-        "年",
-        "早露",
-        "阿",
-        "夕",
-        "瑕光",
-        "阿米娅",
-        "幽灵鲨",
-        "白金",
-        "柏喙",
-        "鞭刃",
-        "华法琳",
-        "极境",
-        "贾维",
-        "空",
-        "临光",
-        "狮蝎",
-        "星极",
-        "陨星",
-        "真理",
-        "初雪",
-        "格劳克斯",
-        "凛冬",
-        "送葬人",
-        "苇草",
-        "爱丽丝",
-        "蓝毒",
-        "天火",
-        "锡兰",
-        "罗宾",
-        "特米米",
-        "图耶",
-        "雪雉",
-        "炎狱炎熔",
-        "羽毛笔",
-        "嘉维尔",
-        "末药",
-        "安比尔",
-        "暗索",
-        "缠丸",
-        "古米",
-        "坚雷",
-        "孑",
-        "刻刀",
-        "猎蜂",
-        "梅",
-        "苏苏洛",
-        "讯使",
-        "宴",
-        "远山",
-        "玫兰莎",
-        "空爆",
-        "安德切尔",
-        "安赛尔",
-        "芙蓉",
-        "翎羽",
-        "梓兰",
-        "安哲拉",
-        "奥斯塔",
-        "拜松",
-        "暴行",
-        "暴雨",
-        "薄绿",
-        "布洛卡",
-        "赤冬",
-        "断崖",
-        "芙兰卡",
-        "格拉尼",
-        "吽",
-        "灰喉",
-        "惊蛰",
-        "可颂",
-        "苦艾",
-        "莱恩哈特",
-        "蜜蜡",
-        "普罗旺斯",
-        "绮良",
-        "熔泉",
-        "慑砂",
-        "诗怀雅",
-        "守林人",
-        "四月",
-        "燧石",
-        "微风",
-        "乌有",
-        "絮雨",
-        "崖心",
-        "亚叶",
-        "炎客",
-        "夜魔",
-        "月禾",
-        "铸铁",
-        "艾丝黛尔",
-        "波登可",
-        "地灵",
-        "杜宾",
-        "芳汀",
-        "角峰",
-        "杰克",
-        "慕斯",
-        "清道夫",
-        "深靛",
-        "深海色",
-        "松果",
-        "酸糖",
-        "12F",
-        "杜林",
-        "巡林者",
-        "Lancet-2",
-        "闪击",
-        "战车",
-        "红",
-        "卡夫卡",
-        "龙舌兰",
-        "巫恋",
-        "阿消",
-        "雷蛇",
-        "伊桑",
-        "陈",
-        "灰烬",
-        "凯尔希",
-        "霜华",
-        "拉普兰德",
-        "格雷伊",
-        "能天使",
-        "德克萨斯",
-        "因陀罗",
-        "伊芙利特",
-        "THRM-EX"
-    ]
-}
\ No newline at end of file
diff --git a/resource/tasks.json b/resource/tasks.json
index a61a059ad3..f2c53f4bec 100644
--- a/resource/tasks.json
+++ b/resource/tasks.json
@@ -20,7 +20,6 @@
         ]
     },
     "UsePrts": {
-        "template": "UsePrts.png",
         "templThreshold": 0.8,
         "action": "clickSelf",
         "next": [
@@ -28,8 +27,16 @@
         ]
     },
     "StartButton1": {
-        "template": "StartButton1.png",
-        "templThreshold": 0.75,
+        "algorithm": "OcrDetect",
+        "text": [
+            "开始行动"
+        ],
+        "roi": [
+            800,
+            400,
+            480,
+            320
+        ],
         "action": "clickSelf",
         "next": [
             "StartButton2",
@@ -38,7 +45,6 @@
         ]
     },
     "StartButton2": {
-        "template": "StartButton2.png",
         "action": "clickSelf",
         "rearDelay": 20000,
         "templThreshold": 0.95,
@@ -54,7 +60,7 @@
             "剩余可放置角色",
             "接管作战"
         ],
-        "identifyArea": [
+        "roi": [
             0,
             530,
             1279,
@@ -84,7 +90,7 @@
         "ClickCorner_Doc": "点击屏幕右边，不会点到掉落物品，且不会关掉关卡选择的一块区域",
         "algorithm": "justreturn",
         "action": "clickRect",
-        "specificArea": [
+        "specificRect": [
             1000,
             1,
             270,
@@ -92,7 +98,6 @@
         ],
         "next": [
             "EndOfAction",
-            "Loading",
             "StartButton1",
             "StartButton2",
             "UseMedicine",
@@ -117,14 +122,13 @@
         "algorithm": "justreturn",
         "action": "clickRect",
         "rearDelay": 2000,
-        "specificArea": [
+        "specificRect": [
             1000,
             1,
             270,
             340
         ],
         "next": [
-            "Loading",
             "StartButton1",
             "StartButton2",
             "UseMedicine",
@@ -132,23 +136,13 @@
             "EndOfAction"
         ]
     },
-    "Loading": {
-        "template": "Loading.png",
-        "templThreshold": 0.8,
-        "action": "doNothing",
-        "next": [
-            "StartButton1"
-        ]
-    },
     "UseMedicine": {
-        "template": "UseMedicine.png",
         "action": "doNothing",
         "next": [
             "MedicineConfirm"
         ]
     },
     "MedicineConfirm": {
-        "template": "MedicineConfirm.png",
         "action": "clickSelf",
         "maxTimes": 0,
         "reduceOtherTimes": [
@@ -159,7 +153,6 @@
         ]
     },
     "UseStone": {
-        "template": "UseStone.png",
         "action": "doNothing",
         "next": [
             "StoneConfirm"
@@ -177,7 +170,6 @@
         ]
     },
     "PrtsErrorConfirm": {
-        "template": "PrtsErrorConfirm.png",
         "templThreshold": 0.8,
         "cache": false,
         "action": "doNothing",
@@ -187,13 +179,11 @@
         ]
     },
     "AbandonAction": {
-        "template": "AbandonAction.png",
         "action": "clickSelf",
         "cache": false,
         "reduceOtherTimes": [
             "StartButton1",
-            "StartButton2",
-            "Loading"
+            "StartButton2"
         ],
         "next": [
             "EndOfAction",
@@ -213,13 +203,11 @@
         ]
     },
     "OfflineConfirm": {
-        "template": "OfflineConfirm.png",
         "action": "clickSelf",
         "cache": false,
         "reduceOtherTimes": [
             "StartButton1",
-            "StartButton2",
-            "Loading"
+            "StartButton2"
         ],
         "next": [
             "CloseAnno",
@@ -228,7 +216,6 @@
         ]
     },
     "StartToWakeUp": {
-        "template": "StartToWakeUp.png",
         "action": "clickSelf",
         "cache": false,
         "next": [
@@ -239,7 +226,6 @@
         ]
     },
     "CloseAnno": {
-        "template": "CloseAnno.png",
         "action": "clickSelf",
         "cache": false,
         "next": [
@@ -249,7 +235,6 @@
         ]
     },
     "Terminal": {
-        "template": "Terminal.png",
         "cache": false,
         "action": "clickSelf",
         "next": [
@@ -265,7 +250,7 @@
             "今日配给"
         ],
         "action": "clickRect",
-        "specificArea": [
+        "specificRect": [
             1000,
             1,
             270,
@@ -312,7 +297,6 @@
         ]
     },
     "Friends": {
-        "template": "Friends.png",
         "templThreshold": 0.85,
         "action": "clickSelf",
         "next": [
@@ -321,7 +305,6 @@
         ]
     },
     "FriendsList": {
-        "template": "FriendsList.png",
         "action": "clickSelf",
         "next": [
             "StartToVisit",
@@ -329,14 +312,12 @@
         ]
     },
     "NoFriends": {
-        "template": "NoFriends.png",
         "action": "doNothing",
         "next": [
             "ReturnToMall"
         ]
     },
     "StartToVisit": {
-        "template": "StartToVisit.png",
         "templThreshold": 0.8,
         "action": "clickSelf",
         "rearDelay": 3000,
@@ -347,11 +328,10 @@
         ]
     },
     "VisitNext": {
-        "template": "VisitNext.png",
         "action": "clickSelf",
         "cache": false,
         "rearDelay": 2000,
-        "identifyArea": [
+        "roi": [
             1080,
             570,
             195,
@@ -374,7 +354,7 @@
         ],
         "action": "clickSelf",
         "rearDelay": 2000,
-        "identifyArea": [
+        "roi": [
             1080,
             570,
             195,
@@ -411,7 +391,6 @@
         ]
     },
     "Mall": {
-        "template": "Mall.png",
         "action": "clickSelf",
         "next": [
             "CreditStore",
@@ -419,7 +398,6 @@
         ]
     },
     "CreditStore": {
-        "template": "CreditStore.png",
         "templThreshold": 0.85,
         "rearDelay": 1000,
         "action": "clickSelf",
@@ -433,7 +411,7 @@
         "text": [
             "信用交易所"
         ],
-        "identifyArea": [
+        "roi": [
             1000,
             0,
             280,
@@ -447,7 +425,6 @@
         ]
     },
     "CollectCredit": {
-        "template": "CollectCredit.png",
         "action": "clickSelf",
         "rearDelay": 2000,
         "next": [
@@ -457,7 +434,7 @@
     "CloseCollectCredit": {
         "algorithm": "justReturn",
         "action": "clickRect",
-        "specificArea": [
+        "specificRect": [
             1000,
             1,
             270,
@@ -474,7 +451,7 @@
             "已达上限"
         ],
         "action": "doNothing",
-        "identifyArea": [
+        "roi": [
             900,
             50,
             375,
@@ -485,9 +462,8 @@
         ]
     },
     "VisitNextBlack": {
-        "template": "VisitNextBlack.png",
         "action": "doNothing",
-        "identifyArea": [
+        "roi": [
             1080,
             570,
             195,
@@ -497,6 +473,30 @@
             "ReturnToMall"
         ]
     },
+    "CreditShop-CreditPoint": {
+        "template": "CreditPoint.png"
+    },
+    "CreditShop-SoldOut": {
+        "template": "SoldOut.png"
+    },
+    "CreditShop-BuyIt": {
+        "template": "BuyIt.png",
+        "preDelay": 1000,
+        "rareDelay": 1000
+    },
+    "CreditShop-NoMoney": {
+        "algorithm": "OcrDetect",
+        "text": [
+            "信用不足",
+            "无法购买"
+        ],
+        "roi": [
+            940,
+            60,
+            339,
+            110
+        ]
+    },
     "Stop": {
         "algorithm": "justreturn",
         "action": "stop",
@@ -505,22 +505,60 @@
     "RecruitTime": {
         "template": "RecruitTimeReduce.png",
         "templThreshold": 0.89,
-        "action": "clickRect",
-        "specificArea": [
-            391,
-            279,
+        "action": "clickSelf",
+        "resultMove": [
+            7,
+            94,
             129,
             44
-        ],
-        "next": [
-            "Stop"
         ]
     },
-    "Listless": {
-        "template": "Listless.png",
-        "action": "clickSelf",
-        "next": [
-            "Stop"
+    "RecruitTags": {
+        "algorithm": "OcrDetect",
+        "text": [],
+        "roi": [
+            200,
+            200,
+            800,
+            500
+        ],
+        "ocrReplace": [
+            [
+                "沮击",
+                "狙击"
+            ],
+            [
+                "犯击",
+                "狙击"
+            ],
+            [
+                "泪击",
+                "狙击"
+            ],
+            [
+                "都出",
+                "输出"
+            ],
+            [
+                "都乐",
+                "输出"
+            ],
+            [
+                "抓出",
+                "输出"
+            ],
+            [
+                "都任",
+                "输出"
+            ],
+            [
+                "新于",
+                "新手"
+            ],
+            [
+                "防拍",
+                "防护"
+            ]
         ]
     },
     "OperatorBegin": {
@@ -532,7 +570,6 @@
         ]
     },
     "EnterOperator": {
-        "template": "EnterOperator.png",
         "rareDelay": 1000,
         "templThreshold": 0.7,
         "action": "clickSelf",
@@ -575,7 +612,6 @@
         ]
     },
     "EnterInfrast": {
-        "template": "EnterInfrast.png",
         "templThreshold": 0.85,
         "histThreshold": 0.85,
         "rareDelay": 3000,
@@ -601,7 +637,6 @@
         ]
     },
     "Trade": {
-        "template": "Trade.png",
         "templThreshold": 0.8,
         "cache": false,
         "action": "clickSelf",
@@ -611,7 +646,6 @@
         ]
     },
     "TradeMini": {
-        "template": "TradeMini.png",
         "templThreshold": 0.8,
         "cache": false,
         "action": "clickSelf",
@@ -621,7 +655,6 @@
         ]
     },
     "Manufacturing": {
-        "template": "Manufacturing.png",
         "templThreshold": 0.8,
         "cache": false,
         "action": "clickSelf",
@@ -631,7 +664,6 @@
         ]
     },
     "ManufacturingMini": {
-        "template": "ManufacturingMini.png",
         "templThreshold": 0.8,
         "cache": false,
         "action": "clickSelf",
@@ -644,7 +676,7 @@
         "Doc": "制造站点进去之后，左下角那个“中级作战记录 制造中”",
         "algorithm": "justreturn",
         "action": "clickRect",
-        "specificArea": [
+        "specificRect": [
             1,
             535,
             525,
@@ -658,7 +690,7 @@
         "Doc": "设施列表里第一个（第一个制造站或者贸易站）",
         "algorithm": "justreturn",
         "action": "clickRect",
-        "specificArea": [
+        "specificRect": [
             1,
             183,
             220,
@@ -669,7 +701,6 @@
         ]
     },
     "InfrastNotification": {
-        "template": "InfrastNotification.png",
         "templThreshold": 0.8,
         "action": "clickSelf",
         "next": [
@@ -686,7 +717,7 @@
         ],
         "rearDelay": 1000,
         "action": "clickSelf",
-        "identifyArea": [
+        "roi": [
             0,
             600,
             800,
@@ -702,7 +733,7 @@
         "Doc": "干员疲劳、线索收集 是不能一键收获的，所以要先退出一键收获的界面，这里点击的是控制中枢左侧那一片空白的区域",
         "algorithm": "justreturn",
         "action": "clickRect",
-        "specificArea": [
+        "specificRect": [
             250,
             100,
             380,
@@ -713,7 +744,6 @@
         ]
     },
     "UavAssist-MFG": {
-        "template": "UavAssist-MFG.png",
         "action": "clickSelf",
         "cache": false,
         "maxTimes": 1,
@@ -724,7 +754,6 @@
         ]
     },
     "UavAssist-Trade": {
-        "template": "UavAssist-Trade.png",
         "action": "clickSelf",
         "cache": false,
         "next": [
@@ -733,14 +762,12 @@
         ]
     },
     "UavMax": {
-        "template": "UavMax.png",
         "action": "clickSelf",
         "next": [
             "UavConfirm"
         ]
     },
     "UavConfirm": {
-        "template": "UavConfirm.png",
         "action": "clickSelf",
         "rearDelay": 2000,
         "next": [
@@ -750,7 +777,6 @@
         ]
     },
     "DeliverableOrder": {
-        "template": "DeliverableOrder.png",
         "cache": false,
         "action": "clickSelf",
         "next": [
diff --git a/resource/template/special/02.png b/resource/template/02.png
similarity index 100%
rename from resource/template/special/02.png
rename to resource/template/02.png
diff --git a/resource/template/special/03.png b/resource/template/03.png
similarity index 100%
rename from resource/template/special/03.png
rename to resource/template/03.png
diff --git a/resource/template/special/04.png b/resource/template/04.png
similarity index 100%
rename from resource/template/special/04.png
rename to resource/template/04.png
diff --git a/resource/template/special/05.png b/resource/template/05.png
similarity index 100%
rename from resource/template/special/05.png
rename to resource/template/05.png
diff --git a/resource/template/special/AddOperator-Trade.png b/resource/template/AddOperator-Trade.png
similarity index 100%
rename from resource/template/special/AddOperator-Trade.png
rename to resource/template/AddOperator-Trade.png
diff --git a/resource/template/special/BuyIt.png b/resource/template/BuyIt.png
similarity index 100%
rename from resource/template/special/BuyIt.png
rename to resource/template/BuyIt.png
diff --git a/resource/template/special/ContactSuspended.png b/resource/template/ContactSuspended.png
similarity index 100%
rename from resource/template/special/ContactSuspended.png
rename to resource/template/ContactSuspended.png
diff --git a/resource/template/special/CreditPoint.png b/resource/template/CreditPoint.png
similarity index 100%
rename from resource/template/special/CreditPoint.png
rename to resource/template/CreditPoint.png
diff --git a/resource/template/special/DogFood.png b/resource/template/DogFood.png
similarity index 100%
rename from resource/template/special/DogFood.png
rename to resource/template/DogFood.png
diff --git a/resource/template/special/Dorm.png b/resource/template/Dorm.png
similarity index 100%
rename from resource/template/special/Dorm.png
rename to resource/template/Dorm.png
diff --git a/resource/template/special/DormConfirm.png b/resource/template/DormConfirm.png
similarity index 100%
rename from resource/template/special/DormConfirm.png
rename to resource/template/DormConfirm.png
diff --git a/resource/template/special/DormMini.png b/resource/template/DormMini.png
similarity index 100%
rename from resource/template/special/DormMini.png
rename to resource/template/DormMini.png
diff --git a/resource/template/special/Elite1.png b/resource/template/Elite1.png
similarity index 100%
rename from resource/template/special/Elite1.png
rename to resource/template/Elite1.png
diff --git a/resource/template/special/Elite2.png b/resource/template/Elite2.png
similarity index 100%
rename from resource/template/special/Elite2.png
rename to resource/template/Elite2.png
diff --git a/resource/template/special/GoIn.png b/resource/template/GoIn.png
similarity index 100%
rename from resource/template/special/GoIn.png
rename to resource/template/GoIn.png
diff --git a/resource/template/Listless.png b/resource/template/Listless.png
index 61ee7aff8b..014335c901 100644
Binary files a/resource/template/Listless.png and b/resource/template/Listless.png differ
diff --git a/resource/template/special/Office.png b/resource/template/Office.png
similarity index 100%
rename from resource/template/special/Office.png
rename to resource/template/Office.png
diff --git a/resource/template/special/OfficeMini.png b/resource/template/OfficeMini.png
similarity index 100%
rename from resource/template/special/OfficeMini.png
rename to resource/template/OfficeMini.png
diff --git a/resource/template/special/OnShift.png b/resource/template/OnShift.png
similarity index 100%
rename from resource/template/special/OnShift.png
rename to resource/template/OnShift.png
diff --git a/resource/template/Power.png b/resource/template/Power.png
index fa1db56ce7..c04f3d78e1 100644
Binary files a/resource/template/Power.png and b/resource/template/Power.png differ
diff --git a/resource/template/special/PowerMini.png b/resource/template/PowerMini.png
similarity index 100%
rename from resource/template/special/PowerMini.png
rename to resource/template/PowerMini.png
diff --git a/resource/template/special/PureGold.png b/resource/template/PureGold.png
similarity index 100%
rename from resource/template/special/PureGold.png
rename to resource/template/PureGold.png
diff --git a/resource/template/special/Resting.png b/resource/template/Resting.png
similarity index 100%
rename from resource/template/special/Resting.png
rename to resource/template/Resting.png
diff --git a/resource/template/special/SmileyAtRest.png b/resource/template/SmileyAtRest.png
similarity index 100%
rename from resource/template/special/SmileyAtRest.png
rename to resource/template/SmileyAtRest.png
diff --git a/resource/template/special/SmileyAtWork.png b/resource/template/SmileyAtWork.png
similarity index 100%
rename from resource/template/special/SmileyAtWork.png
rename to resource/template/SmileyAtWork.png
diff --git a/resource/template/special/SoldOut.png b/resource/template/SoldOut.png
similarity index 100%
rename from resource/template/special/SoldOut.png
rename to resource/template/SoldOut.png
diff --git a/resource/template/special/StationInfoSelected.png b/resource/template/StationInfoSelected.png
similarity index 100%
rename from resource/template/special/StationInfoSelected.png
rename to resource/template/StationInfoSelected.png
diff --git a/resource/template/special/TradeMoney.png b/resource/template/TradeMoney.png
similarity index 100%
rename from resource/template/special/TradeMoney.png
rename to resource/template/TradeMoney.png
diff --git a/resource/template/special/UnlockClues.png b/resource/template/UnlockClues.png
similarity index 100%
rename from resource/template/special/UnlockClues.png
rename to resource/template/UnlockClues.png
diff --git a/resource/template/special/AddOperator.png b/resource/template/special/AddOperator.png
deleted file mode 100644
index bebe549b84..0000000000
Binary files a/resource/template/special/AddOperator.png and /dev/null differ
diff --git a/resource/template/special/ClearSelection.png b/resource/template/special/ClearSelection.png
deleted file mode 100644
index 52220b1a9f..0000000000
Binary files a/resource/template/special/ClearSelection.png and /dev/null differ
diff --git a/resource/template/special/Listless.png b/resource/template/special/Listless.png
deleted file mode 100644
index 014335c901..0000000000
Binary files a/resource/template/special/Listless.png and /dev/null differ
diff --git a/resource/template/special/Power.png b/resource/template/special/Power.png
deleted file mode 100644
index c04f3d78e1..0000000000
Binary files a/resource/template/special/Power.png and /dev/null differ
diff --git a/src/MeoAssistance/AbstractConfiger.cpp b/src/MeoAssistance/AbstractConfiger.cpp
index 9dc8be4d2b..e288ecd568 100644
--- a/src/MeoAssistance/AbstractConfiger.cpp
+++ b/src/MeoAssistance/AbstractConfiger.cpp
@@ -1,20 +1,15 @@
 #include "AbstractConfiger.h"
 
-#include <memory>
 #include <sstream>
 #include <fstream>
 
 #include <json.h>
 
-#include "Logger.hpp"
-
 bool asst::AbstractConfiger::load(const std::string& filename)
 {
-    DebugTraceFunction;
-    DebugTrace("Configer::load | ", filename);
-
     std::ifstream ifs(filename, std::ios::in);
     if (!ifs.is_open()) {
+        m_last_error = filename + " can't be opened";
         return false;
     }
     std::stringstream iss;
@@ -24,7 +19,7 @@ bool asst::AbstractConfiger::load(const std::string& filename)
 
     auto&& ret = json::parser::parse(content);
     if (!ret) {
-        DebugTrace("parse error", content);
+        m_last_error = "json pasing error " + content;
         return false;
     }
 
@@ -34,10 +29,8 @@ bool asst::AbstractConfiger::load(const std::string& filename)
         parse(root);
     }
     catch (json::exception& e) {
-        DebugTraceError("Load config json error!", e.what());
+        m_last_error = std::string("json field error ") + e.what();
         return false;
     }
-
-    DebugTrace("Load config succeed");
     return true;
 }
\ No newline at end of file
diff --git a/src/MeoAssistance/AbstractConfiger.h b/src/MeoAssistance/AbstractConfiger.h
index 9df0f2e8ce..ef8903b241 100644
--- a/src/MeoAssistance/AbstractConfiger.h
+++ b/src/MeoAssistance/AbstractConfiger.h
@@ -1,30 +1,20 @@
 #pragma once
 
-#include <string>
-#include <unordered_map>
-#include <memory>
+#include "AbstractResource.h"
 
-#include "AsstDef.h"
+#include <string>
 
 namespace json {
     class value;
 }
 
 namespace asst {
-    class AbstractConfiger
+    class AbstractConfiger : public AbstractResource
     {
     public:
         virtual ~AbstractConfiger() = default;
-        virtual bool load(const std::string& filename);
-
+        virtual bool load(const std::string& filename) override;
     protected:
-        AbstractConfiger() = default;
-        AbstractConfiger(const AbstractConfiger& rhs) = default;
-        AbstractConfiger(AbstractConfiger&& rhs) noexcept = default;
-
-        AbstractConfiger& operator=(const AbstractConfiger& rhs) = default;
-        AbstractConfiger& operator=(AbstractConfiger&& rhs) noexcept = default;
-
         virtual bool parse(const json::value& json) = 0;
     };
 }
diff --git a/src/MeoAssistance/AbstractImageAnalyzer.cpp b/src/MeoAssistance/AbstractImageAnalyzer.cpp
new file mode 100644
index 0000000000..53fa2c523b
--- /dev/null
+++ b/src/MeoAssistance/AbstractImageAnalyzer.cpp
@@ -0,0 +1,24 @@
+#include "AbstractImageAnalyzer.h"
+
+asst::AbstractImageAnalyzer::AbstractImageAnalyzer(const cv::Mat& image, const Rect& roi)
+    : m_image(image),
+    m_roi(empty_rect_to_full(roi, image))
+{
+    ;
+}
+
+void asst::AbstractImageAnalyzer::set_image(const cv::Mat& image, const Rect& roi)
+{
+    m_image = image;
+    m_roi = empty_rect_to_full(roi, image);
+}
+
+void asst::AbstractImageAnalyzer::set_roi(const Rect& roi) noexcept
+{
+    m_roi = empty_rect_to_full(roi, m_image);
+}
+
+asst::Rect asst::AbstractImageAnalyzer::empty_rect_to_full(const Rect& rect, const cv::Mat& image) noexcept
+{
+    return rect.empty() ? Rect(0, 0, image.cols, image.rows) : rect;
+}
\ No newline at end of file
diff --git a/src/MeoAssistance/AbstractImageAnalyzer.h b/src/MeoAssistance/AbstractImageAnalyzer.h
new file mode 100644
index 0000000000..e8c5e25544
--- /dev/null
+++ b/src/MeoAssistance/AbstractImageAnalyzer.h
@@ -0,0 +1,30 @@
+#pragma once
+
+#include <opencv2/opencv.hpp>
+
+#include "AsstDef.h"
+
+namespace asst {
+    class AbstractImageAnalyzer
+    {
+    public:
+        AbstractImageAnalyzer() = default;
+        AbstractImageAnalyzer(const cv::Mat& image, const Rect& roi = Rect());
+        AbstractImageAnalyzer(const AbstractImageAnalyzer&) = delete;
+        AbstractImageAnalyzer(AbstractImageAnalyzer&&) = delete;
+        virtual ~AbstractImageAnalyzer() = default;
+
+        virtual void set_image(const cv::Mat& image, const Rect& roi = Rect());
+        virtual void set_roi(const Rect& roi) noexcept;
+        virtual bool analyze() = 0;
+
+        AbstractImageAnalyzer& operator=(const AbstractImageAnalyzer&) = delete;
+        AbstractImageAnalyzer& operator=(AbstractImageAnalyzer&&) = delete;
+
+    protected:
+        static Rect empty_rect_to_full(const Rect& rect, const cv::Mat& image) noexcept;
+
+        cv::Mat m_image;
+        Rect m_roi;
+    };
+}
\ No newline at end of file
diff --git a/src/MeoAssistance/AbstractResource.cpp b/src/MeoAssistance/AbstractResource.cpp
new file mode 100644
index 0000000000..e9b6196692
--- /dev/null
+++ b/src/MeoAssistance/AbstractResource.cpp
@@ -0,0 +1 @@
+#include "AbstractResource.h"
\ No newline at end of file
diff --git a/src/MeoAssistance/AbstractResource.h b/src/MeoAssistance/AbstractResource.h
new file mode 100644
index 0000000000..04e67bf3a0
--- /dev/null
+++ b/src/MeoAssistance/AbstractResource.h
@@ -0,0 +1,27 @@
+#pragma once
+
+#include <string>
+
+namespace asst {
+    class AbstractResource
+    {
+    public:
+        AbstractResource() = default;
+        AbstractResource(const AbstractResource& rhs) = delete;
+        AbstractResource(AbstractResource&& rhs) noexcept = delete;
+
+        virtual ~AbstractResource() = default;
+
+        virtual bool load(const std::string& filename) = 0;
+        virtual const std::string& get_last_error() const noexcept
+        {
+            return m_last_error;
+        }
+
+        AbstractResource& operator=(const AbstractResource& rhs) = delete;
+        AbstractResource& operator=(AbstractResource&& rhs) noexcept = delete;
+
+    protected:
+        std::string m_last_error;
+    };
+}
diff --git a/src/MeoAssistance/AbstractTask.cpp b/src/MeoAssistance/AbstractTask.cpp
index 22a28c8400..7feeb1f23c 100644
--- a/src/MeoAssistance/AbstractTask.cpp
+++ b/src/MeoAssistance/AbstractTask.cpp
@@ -6,9 +6,7 @@
 
 #include <opencv2/opencv.hpp>
 
-#include "WinMacro.h"
-#include "Identify.h"
-#include "Configer.h"
+#include "Controller.h"
 #include "AsstAux.h"
 #include "Logger.hpp"
 
@@ -21,14 +19,6 @@ AbstractTask::AbstractTask(AsstCallback callback, void* callback_arg)
     ;
 }
 
-void AbstractTask::set_ptr(
-    std::shared_ptr<WinMacro> controller_ptr,
-    std::shared_ptr<Identify> identify_ptr)
-{
-    m_controller_ptr = controller_ptr;
-    m_identify_ptr = identify_ptr;
-}
-
 void AbstractTask::set_exit_flag(bool* exit_flag)
 {
     m_exit_flag = exit_flag;
@@ -81,20 +71,10 @@ bool asst::AbstractTask::need_exit() const noexcept
     return m_exit_flag != NULL && *m_exit_flag == true;
 }
 
-bool asst::AbstractTask::is_ptr_inited() const noexcept
-{
-    if (m_controller_ptr == NULL
-        || m_identify_ptr == NULL)
-    {
-        return false;
-    }
-    return true;
-}
-
 bool asst::AbstractTask::click_return_button()
 {
-    DebugTraceFunction;
+    LogTraceFunction;
 
     const static Rect ConfirmButtonRect(20, 20, 135, 35);
-    return m_controller_ptr->click(ConfirmButtonRect);
+    return ctrler.click(ConfirmButtonRect);
 }
\ No newline at end of file
diff --git a/src/MeoAssistance/AbstractTask.h b/src/MeoAssistance/AbstractTask.h
index 31a8ec4694..bdff8d1acb 100644
--- a/src/MeoAssistance/AbstractTask.h
+++ b/src/MeoAssistance/AbstractTask.h
@@ -10,9 +10,6 @@ namespace cv
 }
 
 namespace asst {
-    class WinMacro;
-    class Identify;
-
     class AbstractTask
     {
     public:
@@ -21,7 +18,6 @@ namespace asst {
         AbstractTask(const AbstractTask&) = default;
         AbstractTask(AbstractTask&&) = default;
 
-        virtual void set_ptr(std::shared_ptr<WinMacro> controller_ptr, std::shared_ptr<Identify> identify_ptr);
         virtual bool run() = 0;
 
         virtual void set_exit_flag(bool* exit_flag);
@@ -34,13 +30,9 @@ namespace asst {
         virtual bool sleep(unsigned millisecond);
         virtual bool save_image(const cv::Mat& iamge, const std::string& dir);
         virtual bool need_exit() const noexcept;
-        virtual bool is_ptr_inited() const noexcept;
 
         virtual bool click_return_button();
 
-        std::shared_ptr<WinMacro> m_controller_ptr = nullptr;
-        std::shared_ptr<Identify> m_identify_ptr = nullptr;
-
         AsstCallback m_callback;
         void* m_callback_arg = NULL;
         bool* m_exit_flag = NULL;
diff --git a/src/MeoAssistance/Assistance.cpp b/src/MeoAssistance/Assistance.cpp
index b16cb5aa15..9de9b3f74c 100644
--- a/src/MeoAssistance/Assistance.cpp
+++ b/src/MeoAssistance/Assistance.cpp
@@ -6,113 +6,30 @@
 #include <json.h>
 #include <opencv2/opencv.hpp>
 
-#include "WinMacro.h"
-#include "Configer.h"
-#include "Identify.h"
+#include "Controller.h"
 #include "Logger.hpp"
 #include "AsstAux.h"
-#include "Task.h"
-#include "TaskConfiger.h"
-#include "ItemConfiger.h"
-#include "RecruitConfiger.h"
-#include "InfrastConfiger.h"
-#include "UserConfiger.h"
+#include "Resource.h"
 
 using namespace asst;
 
 Assistance::Assistance(AsstCallback callback, void* callback_arg)
     : m_callback(callback), m_callback_arg(callback_arg)
 {
-    DebugTraceFunction;
+    LogTraceFunction;
 
-    // 检查返回值，若为false则回调错误
-    auto callback_error = [&](const std::string& filename = std::string()) {
-        DebugTraceError("resource broken", filename);
+    bool resource_ret = resource.load(GetResourceDir());
+    if (!resource_ret) {
+        const std::string& error = resource.get_last_error();
+        log.error("resource broken", error);
         if (m_callback == nullptr) {
             return;
         }
         json::value callback_json;
-        callback_json["filename"] = filename;
-        callback_json["what"] = "resource broken";
+        callback_json["type"] = "resource broken";
+        callback_json["what"] = error;
         m_callback(AsstMsg::InitFaild, callback_json, m_callback_arg);
-    };
-
-    /* 项目本身的Configer */
-    bool ret = Configer::get_instance().load(GetResourceDir() + "config.json");
-    if (!ret) {
-        callback_error("config.json");
-        throw "resource broken";
     }
-    ret = TaskConfiger::get_instance().load(GetResourceDir() + "tasks.json");
-    if (!ret) {
-        callback_error("tasks.json");
-        throw "resource broken";
-    }
-    ret = RecruitConfiger::get_instance().load(GetResourceDir() + "recruit.json");
-    if (!ret) {
-        callback_error("recruit.json");
-        throw "resource broken";
-    }
-    ret = InfrastConfiger::get_instance().load(GetResourceDir() + "infrast.json");
-    if (!ret) {
-        callback_error("infrast.json");
-        throw "resource broken";
-    }
-    ret = ItemConfiger::get_instance().load(GetResourceDir() + "item_index.json");
-    if (!ret) {
-        callback_error("item_index.json");
-        throw "resource broken";
-    }
-
-    /* 项目使用的图片模板 */
-    m_identify_ptr = std::make_shared<Identify>();
-    for (const auto& [name, info] : TaskConfiger::get_instance().m_all_tasks_info) {
-        if (info->algorithm != AlgorithmType::MatchTemplate) {
-            continue;
-        }
-        std::string filename = std::dynamic_pointer_cast<MatchTaskInfo>(info)->template_filename;
-        ret = m_identify_ptr->add_image(name, GetResourceDir() + "template\\" + filename);
-        if (!ret) {
-            callback_error(filename);
-            throw "resource broken";
-        }
-    }
-    for (auto& p : std::filesystem::directory_iterator(GetResourceDir() + "template\\special\\")) {
-        if (p.path().extension() == ".png") {
-            std::string filename = p.path().filename().u8string();
-            std::string without_extension = filename.substr(0, filename.size() - 4);
-            ret = m_identify_ptr->add_image(without_extension, p.path().u8string());
-        }
-    }
-
-    /* 第三方库`OcrLite`所需资源*/
-    m_identify_ptr->set_ocr_param(Configer::get_instance().m_options.ocr_gpu_index, Configer::get_instance().m_options.ocr_thread_number);
-    ret = m_identify_ptr->ocr_init_models(GetResourceDir() + "OcrLiteOnnx\\models\\");
-    if (!ret) {
-        callback_error("OcrLiteOnnx\\models\\");
-        throw "resource broken";
-    }
-
-    /* 第三方库`penguin-stats-recognize`（企鹅物流掉落识别）所需资源*/
-    m_identify_ptr->penguin_load_server(Configer::get_instance().m_options.penguin_server);
-    m_identify_ptr->penguin_load_json(GetResourceDir() + "penguin-stats-recognize\\json\\stages.json", GetResourceDir() + "penguin-stats-recognize\\json\\hash_index.json");
-
-    for (const auto& file : std::filesystem::directory_iterator(GetResourceDir() + "penguin-stats-recognize\\items")) {
-        ret = m_identify_ptr->penguin_load_templ(file.path().stem().u8string(), file.path().u8string());
-        if (!ret) {
-            callback_error(file.path().stem().u8string());
-            throw "resource broken";
-        }
-    }
-
-    /* 用户配置 */
-    ret = UserConfiger::get_instance().load(GetCurrentDir() + "user.json");
-    if (!ret) {
-        callback_error("user.json");
-        throw "resource broken";
-    }
-
-    m_controller_ptr = std::make_shared<WinMacro>();
 
     m_working_thread = std::thread(std::bind(&Assistance::working_proc, this));
     m_msg_thread = std::thread(std::bind(&Assistance::msg_proc, this));
@@ -120,11 +37,7 @@ Assistance::Assistance(AsstCallback callback, void* callback_arg)
 
 Assistance::~Assistance()
 {
-    DebugTraceFunction;
-
-    //if (m_controller_ptr != nullptr) {
-    //	m_controller_ptr->show_window();
-    //}
+    LogTraceFunction;
 
     m_thread_exit = true;
     m_thread_idle = true;
@@ -141,15 +54,16 @@ Assistance::~Assistance()
 
 bool asst::Assistance::catch_default()
 {
-    DebugTraceFunction;
+    LogTraceFunction;
 
-    switch (Configer::get_instance().m_options.connect_type) {
+    auto& opt = resource.cfg().get_options();
+    switch (opt.connect_type) {
     case ConnectType::Emulator:
         return catch_emulator();
     case ConnectType::USB:
         return catch_usb();
     case ConnectType::Remote:
-        return catch_remote(Configer::get_instance().m_options.connect_remote_address);
+        return catch_remote(opt.connect_remote_address);
     default:
         return false;
     }
@@ -157,19 +71,20 @@ bool asst::Assistance::catch_default()
 
 bool Assistance::catch_emulator(const std::string& emulator_name)
 {
-    DebugTraceFunction;
+    LogTraceFunction;
 
     stop();
 
     bool ret = false;
     //std::string cor_name = emulator_name;
+    auto& cfg = resource.cfg();
 
     std::unique_lock<std::mutex> lock(m_mutex);
 
     // 自动匹配模拟器，逐个找
     if (emulator_name.empty()) {
-        for (const auto& [name, info] : Configer::get_instance().m_handles) {
-            ret = m_controller_ptr->try_capture(info);
+        for (const auto& [name, info] : cfg.get_emulators_info()) {
+            ret = ctrler.try_capture(info);
             if (ret) {
                 //cor_name = name;
                 break;
@@ -177,7 +92,8 @@ bool Assistance::catch_emulator(const std::string& emulator_name)
         }
     }
     else { // 指定的模拟器
-        ret = m_controller_ptr->try_capture(Configer::get_instance().m_handles[emulator_name]);
+        auto& info = cfg.get_emulators_info().at(emulator_name);
+        ret = ctrler.try_capture(info);
     }
 
     m_inited = ret;
@@ -186,17 +102,18 @@ bool Assistance::catch_emulator(const std::string& emulator_name)
 
 bool asst::Assistance::catch_usb()
 {
-    DebugTraceFunction;
+    LogTraceFunction;
 
     stop();
 
     bool ret = false;
+    auto& cfg = resource.cfg();
 
     std::unique_lock<std::mutex> lock(m_mutex);
 
-    EmulatorInfo remote_info = Configer::get_instance().m_handles["USB"];
+    EmulatorInfo remote_info = cfg.get_emulators_info().at("USB");
 
-    ret = m_controller_ptr->try_capture(remote_info, true);
+    ret = ctrler.try_capture(remote_info, true);
 
     m_inited = ret;
     return ret;
@@ -204,22 +121,23 @@ bool asst::Assistance::catch_usb()
 
 bool asst::Assistance::catch_remote(const std::string& address)
 {
-    DebugTraceFunction;
+    LogTraceFunction;
 
     stop();
 
     bool ret = false;
+    auto& cfg = resource.cfg();
 
     std::unique_lock<std::mutex> lock(m_mutex);
 
-    EmulatorInfo remote_info = Configer::get_instance().m_handles["Remote"];
+    EmulatorInfo remote_info = cfg.get_emulators_info().at("Remote");
     remote_info.adb.connect = StringReplaceAll(remote_info.adb.connect, "[Address]", address);
     remote_info.adb.click = StringReplaceAll(remote_info.adb.click, "[Address]", address);
     remote_info.adb.swipe = StringReplaceAll(remote_info.adb.swipe, "[Address]", address);
     remote_info.adb.display = StringReplaceAll(remote_info.adb.display, "[Address]", address);
     remote_info.adb.screencap = StringReplaceAll(remote_info.adb.screencap, "[Address]", address);
 
-    ret = m_controller_ptr->try_capture(remote_info, true);
+    ret = ctrler.try_capture(remote_info, true);
 
     m_inited = ret;
     return ret;
@@ -232,13 +150,13 @@ bool asst::Assistance::start_sanity()
 
 bool asst::Assistance::start_visit(bool with_shopping)
 {
-    DebugTraceFunction;
+    LogTraceFunction;
     if (!m_thread_idle || !m_inited) {
         return false;
     }
 
     std::unique_lock<std::mutex> lock(m_mutex);
-    m_identify_ptr->clear_cache();
+    resource.templ().clear_hists();
 
     append_match_task("VisitBegin", { "VisitBegin" }, ProcessTaskRetryTimesDefault);
 
@@ -256,8 +174,8 @@ bool asst::Assistance::start_visit(bool with_shopping)
 
 bool Assistance::start_process_task(const std::string& task, int retry_times, bool block)
 {
-    DebugTraceFunction;
-    DebugTrace("Start |", task, block ? "block" : "non block");
+    LogTraceFunction;
+    log.trace("Start |", task, block ? "block" : "non block");
     if (!m_thread_idle || !m_inited) {
         return false;
     }
@@ -266,7 +184,7 @@ bool Assistance::start_process_task(const std::string& task, int retry_times, bo
     if (block) {
         lock = std::unique_lock<std::mutex>(m_mutex);
         //clear_exec_times();
-        m_identify_ptr->clear_cache();
+        resource.templ().clear_hists();
     }
 
     append_match_task(task, { task }, retry_times);
@@ -280,7 +198,7 @@ bool Assistance::start_process_task(const std::string& task, int retry_times, bo
 #ifdef LOG_TRACE
 bool Assistance::start_debug_task()
 {
-    DebugTraceFunction;
+    LogTraceFunction;
     if (!m_thread_idle || !m_inited) {
         return false;
     }
@@ -296,7 +214,7 @@ bool Assistance::start_debug_task()
 
     //	auto ret = get_opers_idtf_result();
     //	if (!ret) {
-    //		DebugTraceInfo("Get opers info error");
+    //		log.info("Get opers info error");
     //		//return false;
     //	}
     //	else {
@@ -307,7 +225,7 @@ bool Assistance::start_debug_task()
     //}
     {
         constexpr static const char* DebugTaskChain = "Debug";
-        auto shift_task_ptr = std::make_shared<ScreenCaptureTask>(task_callback, (void*)this);
+        auto shift_task_ptr = std::make_shared<CreditShoppingTask>(task_callback, (void*)this);
         shift_task_ptr->set_task_chain(DebugTaskChain);
         m_tasks_deque.emplace_back(shift_task_ptr);
     }
@@ -319,16 +237,16 @@ bool Assistance::start_debug_task()
 }
 #endif
 
-bool Assistance::start_open_recruit(const std::vector<int>& required_level, bool set_time)
+bool Assistance::start_recruiting(const std::vector<int>& required_level, bool set_time)
 {
-    DebugTraceFunction;
+    LogTraceFunction;
     if (!m_thread_idle || !m_inited) {
         return false;
     }
 
     std::unique_lock<std::mutex> lock(m_mutex);
 
-    auto task_ptr = std::make_shared<OpenRecruitTask>(task_callback, (void*)this);
+    auto task_ptr = std::make_shared<RecruitTask>(task_callback, (void*)this);
     task_ptr->set_param(required_level, set_time);
     task_ptr->set_retry_times(OpenRecruitTaskRetyrTimesDefault);
     task_ptr->set_task_chain("OpenRecruit");
@@ -340,130 +258,130 @@ bool Assistance::start_open_recruit(const std::vector<int>& required_level, bool
     return true;
 }
 
-bool asst::Assistance::start_to_identify_opers()
-{
-    DebugTraceFunction;
-    if (!m_thread_idle || !m_inited) {
-        return false;
-    }
-
-    std::unique_lock<std::mutex> lock(m_mutex);
-
-    append_match_task("IdentifyOpers", { "OperatorBegin" });
-
-    auto task_ptr = std::make_shared<IdentifyOperTask>(task_callback, (void*)this);
-    task_ptr->set_task_chain("IdentifyOpers");
-    m_tasks_deque.emplace_back(task_ptr);
-
-    m_thread_idle = false;
-    m_condvar.notify_one();
-
-    return true;
-}
-
-bool asst::Assistance::start_infrast()
-{
-    DebugTraceFunction;
-    if (!m_thread_idle || !m_inited) {
-        return false;
-    }
-
-    std::unique_lock<std::mutex> lock(m_mutex);
-    auto ret = get_opers_idtf_result();
-    if (!ret) {
-        DebugTraceInfo("Get opers info error");
-        return false;
-    }
-    constexpr static const char* InfrastTaskCahin = "Infrast";
-    // 换班任务，依次遍历基建设施列表里的最多5个设施，识别并选择最优解干员组合
-    auto shift_task_ptr = std::make_shared<InfrastProductionTask>(task_callback, (void*)this);
-    shift_task_ptr->set_task_chain(InfrastTaskCahin);
-    shift_task_ptr->set_all_opers_info(std::move(ret.value()));
-
-    /* 基建任务整体流程：
-    1. 从任意界面进入基建，使用ProcessTask
-    2. 一键收获贸易站、制造站、干员信赖，使用ProcessTask
-        1) 如果收获了，使用基建全缩放到最小的模板匹配
-        2) 如果没收获，使用基建默认大小的模板匹配
-    3. 进入宿舍，把心情低于阈值的、心情没满但不在工作的，都换下去，使用InfrastDormTask
-    4. 根据用户设置，按顺序进入制造站or贸易站，使用ProcessTask
-    5. 对制造站or贸易站进行换班，使用InfrastStationTask
-    6. 根据用户设置，使用无人机加速制造or贸易，使用ProcessTask
-    7. 会客室线索处理、发电站换班、控制中枢、办公室换班，同样需要根据用户设置决定顺序，TODO
-    8. 再次进入宿舍，把基建中可能换下来的干员（心情不低的）加入宿舍
-    */
-
-    // 1. 从任意界面进入基建，使用ProcessTask
-    // 2. 一键收获贸易站、制造站、干员信赖，使用ProcessTask
-    // 这个任务结束后，是在进入基建后的主界面
-    append_match_task(InfrastTaskCahin, { "InfrastBegin" });
-
-    // 3. 进入宿舍，把心情低于阈值的、心情没满但不在工作的，都换下去
-    auto dorm_task_ptr = std::make_shared<InfrastDormTask>(task_callback, (void*)this);
-    dorm_task_ptr->set_task_chain(InfrastTaskCahin);
-    m_tasks_deque.emplace_back(dorm_task_ptr);
-
-    // 返回基建的主界面
-    append_match_task(InfrastTaskCahin, { "InfrastBegin" });
-
-    // 5. 对制造站or贸易站进行换班，使用InfrastStationTask
-
-    // TODO，这里需要根据用户设置，是先制造站还是先贸易站，或者是别的设施
-    // 从进入制造站，到设施列表的界面
-    append_match_task(InfrastTaskCahin, { "ManufacturingMini", "Manufacturing" });
-
-    // 制造站换班
-    m_tasks_deque.emplace_back(shift_task_ptr);
-
-    // 返回基建的主界面
-    append_match_task(InfrastTaskCahin, { "InfrastBegin" });
-
-    // TODO，这里需要根据用户设置，是先制造站还是先贸易站，或者是别的设施
-    // 从进入贸易站，到设施列表的界面
-    append_match_task(InfrastTaskCahin, { "Trade", "TradeMini" });
-
-    // 贸易站换班
-    m_tasks_deque.emplace_back(shift_task_ptr);
-
-    // 6. 根据用户设置，使用无人机加速制造or贸易，使用ProcessTask
-    // 对贸易站使用无人机加速
-    append_match_task(InfrastTaskCahin, { "UavAssist-Trade" });
-
-    // 返回基建的主界面
-    append_match_task(InfrastTaskCahin, { "InfrastBegin" });
-
-    // 7. 会客室线索处理、发电站换班、控制中枢、办公室换班，同样需要根据用户设置决定顺序，TODO
-    // 发电站换班
-    auto power_task_ptr = std::make_shared<InfrastPowerTask>(task_callback, (void*)this);
-    power_task_ptr->set_task_chain(InfrastTaskCahin);
-    m_tasks_deque.emplace_back(std::move(power_task_ptr));
-
-    // 返回基建的主界面
-    append_match_task(InfrastTaskCahin, { "InfrastBegin" });
-
-    auto office_task_ptr = std::make_shared<InfrastOfficeTask>(task_callback, (void*)this);
-    office_task_ptr->set_task_chain(InfrastTaskCahin);
-    m_tasks_deque.emplace_back(std::move(office_task_ptr));
-
-    // 返回基建的主界面
-    append_match_task(InfrastTaskCahin, { "InfrastBegin" });
-
-    // 8. 再次进入宿舍，把基建中可能换下来的干员（心情不低的）加入宿舍
-    m_tasks_deque.emplace_back(dorm_task_ptr);
-
-    // 全操作完之后，再返回基建的主界面
-    append_match_task(InfrastTaskCahin, { "InfrastBegin" });
-
-    m_thread_idle = false;
-    m_condvar.notify_one();
-
-    return true;
-}
+//bool asst::Assistance::start_to_identify_opers()
+//{
+//    LogTraceFunction;
+//    if (!m_thread_idle || !m_inited) {
+//        return false;
+//    }
+//
+//    std::unique_lock<std::mutex> lock(m_mutex);
+//
+//    append_match_task("IdentifyOpers", { "OperatorBegin" });
+//
+//    auto task_ptr = std::make_shared<IdentifyOperTask>(task_callback, (void*)this);
+//    task_ptr->set_task_chain("IdentifyOpers");
+//    m_tasks_deque.emplace_back(task_ptr);
+//
+//    m_thread_idle = false;
+//    m_condvar.notify_one();
+//
+//    return true;
+//}
+//
+//bool asst::Assistance::start_infrast()
+//{
+//    LogTraceFunction;
+//    if (!m_thread_idle || !m_inited) {
+//        return false;
+//    }
+//
+//    std::unique_lock<std::mutex> lock(m_mutex);
+//    auto ret = get_opers_idtf_result();
+//    if (!ret) {
+//        log.info("Get opers info error");
+//        return false;
+//    }
+//    constexpr static const char* InfrastTaskCahin = "Infrast";
+//    // 换班任务，依次遍历基建设施列表里的最多5个设施，识别并选择最优解干员组合
+//    auto shift_task_ptr = std::make_shared<InfrastProductionTask>(task_callback, (void*)this);
+//    shift_task_ptr->set_task_chain(InfrastTaskCahin);
+//    shift_task_ptr->set_all_opers_info(std::move(ret.value()));
+//
+//    /* 基建任务整体流程：
+//    1. 从任意界面进入基建，使用ProcessTask
+//    2. 一键收获贸易站、制造站、干员信赖，使用ProcessTask
+//        1) 如果收获了，使用基建全缩放到最小的模板匹配
+//        2) 如果没收获，使用基建默认大小的模板匹配
+//    3. 进入宿舍，把心情低于阈值的、心情没满但不在工作的，都换下去，使用InfrastDormTask
+//    4. 根据用户设置，按顺序进入制造站or贸易站，使用ProcessTask
+//    5. 对制造站or贸易站进行换班，使用InfrastStationTask
+//    6. 根据用户设置，使用无人机加速制造or贸易，使用ProcessTask
+//    7. 会客室线索处理、发电站换班、控制中枢、办公室换班，同样需要根据用户设置决定顺序，TODO
+//    8. 再次进入宿舍，把基建中可能换下来的干员（心情不低的）加入宿舍
+//    */
+//
+//    // 1. 从任意界面进入基建，使用ProcessTask
+//    // 2. 一键收获贸易站、制造站、干员信赖，使用ProcessTask
+//    // 这个任务结束后，是在进入基建后的主界面
+//    append_match_task(InfrastTaskCahin, { "InfrastBegin" });
+//
+//    // 3. 进入宿舍，把心情低于阈值的、心情没满但不在工作的，都换下去
+//    auto dorm_task_ptr = std::make_shared<InfrastDormTask>(task_callback, (void*)this);
+//    dorm_task_ptr->set_task_chain(InfrastTaskCahin);
+//    m_tasks_deque.emplace_back(dorm_task_ptr);
+//
+//    // 返回基建的主界面
+//    append_match_task(InfrastTaskCahin, { "InfrastBegin" });
+//
+//    // 5. 对制造站or贸易站进行换班，使用InfrastStationTask
+//
+//    // TODO，这里需要根据用户设置，是先制造站还是先贸易站，或者是别的设施
+//    // 从进入制造站，到设施列表的界面
+//    append_match_task(InfrastTaskCahin, { "ManufacturingMini", "Manufacturing" });
+//
+//    // 制造站换班
+//    m_tasks_deque.emplace_back(shift_task_ptr);
+//
+//    // 返回基建的主界面
+//    append_match_task(InfrastTaskCahin, { "InfrastBegin" });
+//
+//    // TODO，这里需要根据用户设置，是先制造站还是先贸易站，或者是别的设施
+//    // 从进入贸易站，到设施列表的界面
+//    append_match_task(InfrastTaskCahin, { "Trade", "TradeMini" });
+//
+//    // 贸易站换班
+//    m_tasks_deque.emplace_back(shift_task_ptr);
+//
+//    // 6. 根据用户设置，使用无人机加速制造or贸易，使用ProcessTask
+//    // 对贸易站使用无人机加速
+//    append_match_task(InfrastTaskCahin, { "UavAssist-Trade" });
+//
+//    // 返回基建的主界面
+//    append_match_task(InfrastTaskCahin, { "InfrastBegin" });
+//
+//    // 7. 会客室线索处理、发电站换班、控制中枢、办公室换班，同样需要根据用户设置决定顺序，TODO
+//    // 发电站换班
+//    auto power_task_ptr = std::make_shared<InfrastPowerTask>(task_callback, (void*)this);
+//    power_task_ptr->set_task_chain(InfrastTaskCahin);
+//    m_tasks_deque.emplace_back(std::move(power_task_ptr));
+//
+//    // 返回基建的主界面
+//    append_match_task(InfrastTaskCahin, { "InfrastBegin" });
+//
+//    auto office_task_ptr = std::make_shared<InfrastOfficeTask>(task_callback, (void*)this);
+//    office_task_ptr->set_task_chain(InfrastTaskCahin);
+//    m_tasks_deque.emplace_back(std::move(office_task_ptr));
+//
+//    // 返回基建的主界面
+//    append_match_task(InfrastTaskCahin, { "InfrastBegin" });
+//
+//    // 8. 再次进入宿舍，把基建中可能换下来的干员（心情不低的）加入宿舍
+//    m_tasks_deque.emplace_back(dorm_task_ptr);
+//
+//    // 全操作完之后，再返回基建的主界面
+//    append_match_task(InfrastTaskCahin, { "InfrastBegin" });
+//
+//    m_thread_idle = false;
+//    m_condvar.notify_one();
+//
+//    return true;
+//}
 
 void Assistance::stop(bool block)
 {
-    DebugTraceFunction;
-    DebugTrace("Stop |", block ? "block" : "non block");
+    LogTraceFunction;
+    log.trace("Stop |", block ? "block" : "non block");
 
     m_thread_idle = true;
 
@@ -474,36 +392,35 @@ void Assistance::stop(bool block)
     decltype(m_tasks_deque) empty;
     m_tasks_deque.swap(empty);
     clear_exec_times();
-    m_identify_ptr->clear_cache();
+    resource.templ().clear_hists();
 }
 
 bool Assistance::set_param(const std::string& type, const std::string& param, const std::string& value)
 {
-    DebugTraceFunction;
-    DebugTrace("SetParam |", type, param, value);
+    LogTraceFunction;
+    log.trace("SetParam |", type, param, value);
 
-    return TaskConfiger::get_instance().set_param(type, param, value);
+    return resource.task().set_param(type, param, value);
 }
 
 void Assistance::working_proc()
 {
-    DebugTraceFunction;
+    LogTraceFunction;
     auto p_this = this;
 
     int retry_times = 0;
     while (!m_thread_exit) {
-        //DebugTraceScope("Assistance::working_proc Loop");
+        //LogTraceScope("Assistance::working_proc Loop");
         std::unique_lock<std::mutex> lock(m_mutex);
 
         if (!m_thread_idle && !m_tasks_deque.empty()) {
-            //m_controller_ptr->set_idle(false);
+            //controller.set_idle(false);
 
             auto start_time = std::chrono::system_clock::now();
             std::shared_ptr<AbstractTask> task_ptr = m_tasks_deque.front();
             // 先pop出来，如果执行失败再还原回去
             m_tasks_deque.pop_front();
 
-            task_ptr->set_ptr(m_controller_ptr, m_identify_ptr);
             task_ptr->set_exit_flag(&m_thread_idle);
             bool ret = task_ptr->run();
             if (ret) {
@@ -534,13 +451,13 @@ void Assistance::working_proc()
                 }
             }
 
-            int& delay = Configer::get_instance().m_options.task_delay;
+            auto& delay = resource.cfg().get_options().task_delay;
             m_condvar.wait_until(lock, start_time + std::chrono::milliseconds(delay),
                 [&]() -> bool { return m_thread_idle; });
         }
         else {
             m_thread_idle = true;
-            //m_controller_ptr->set_idle(true);
+            //controller.set_idle(true);
             m_condvar.wait(lock);
         }
     }
@@ -548,10 +465,10 @@ void Assistance::working_proc()
 
 void Assistance::msg_proc()
 {
-    DebugTraceFunction;
+    LogTraceFunction;
 
     while (!m_thread_exit) {
-        //DebugTraceScope("Assistance::msg_proc Loop");
+        //LogTraceScope("Assistance::msg_proc Loop");
         std::unique_lock<std::mutex> lock(m_msg_mutex);
         if (!m_msg_queue.empty()) {
             // 结构化绑定只能是引用，后续的pop会使引用失效，所以需要重新构造一份，这里采用了move的方式
@@ -573,7 +490,7 @@ void Assistance::msg_proc()
 
 void Assistance::task_callback(AsstMsg msg, const json::value& detail, void* custom_arg)
 {
-    DebugTrace("Assistance::task_callback |", msg, detail.to_string());
+    log.trace("Assistance::task_callback |", msg, detail.to_string());
 
     Assistance* p_this = (Assistance*)custom_arg;
     json::value more_detail = detail;
@@ -583,7 +500,7 @@ void Assistance::task_callback(AsstMsg msg, const json::value& detail, void* cus
         p_this->stop(false);
         break;
         //case AsstMsg::WindowMinimized:
-        //	p_this->m_controller_ptr->show_window();
+        //	p_this->controller.show_window();
         //	break;
     case AsstMsg::AppendProcessTask:
         more_detail["type"] = "ProcessTask";
@@ -592,9 +509,6 @@ void Assistance::task_callback(AsstMsg msg, const json::value& detail, void* cus
         p_this->append_task(more_detail, true);
         return;	// 这俩消息Assistance会新增任务，外部不需要处理，直接拦掉
         break;
-    case AsstMsg::OpersIdtfResult:
-        set_opers_idtf_result(more_detail);	// 保存到文件
-        break;
     case AsstMsg::StageDrops:
         more_detail = p_this->organize_stage_drop(more_detail);
         break;
@@ -653,70 +567,26 @@ void asst::Assistance::append_callback(AsstMsg msg, json::value detail)
 
 void Assistance::clear_exec_times()
 {
-    for (auto&& pair : TaskConfiger::get_instance().m_all_tasks_info) {
-        pair.second->exec_times = 0;
-    }
-    ItemConfiger::get_instance().clear_drop_count();
-}
-
-void asst::Assistance::set_opers_idtf_result(const json::value& detail)
-{
-    constexpr static const char* Filename = "operators.json";
-    std::ofstream ofs(GetCurrentDir() + Filename, std::ios::out);
-    ofs << detail.format() << std::endl;
-    ofs.close();
-}
-
-std::optional<std::unordered_map<std::string, OperInfrastInfo>> Assistance::get_opers_idtf_result()
-{
-    constexpr static const char* Filename = "operators.json";
-    std::ifstream ifs(GetCurrentDir() + Filename, std::ios::in);
-    if (!ifs.is_open()) {
-        return std::nullopt;
-    }
-    std::stringstream iss;
-    iss << ifs.rdbuf();
-    ifs.close();
-    std::string content(iss.str());
-
-    auto&& parse_ret = json::parse(content);
-    if (!parse_ret) {
-        DebugTraceError(__FUNCTION__, "json parsing error!");
-        return std::nullopt;
-    }
-    json::value root = std::move(parse_ret.value());
-    std::unordered_map<std::string, OperInfrastInfo> opers_info;
-    try {
-        for (const json::value& info_json : root["all"].as_array()) {
-            OperInfrastInfo info;
-            info.name = info_json.at("name").as_string();
-            info.elite = info_json.at("elite").as_integer();
-            info.level = info_json.get("level", 0);
-            opers_info.emplace(info.name, std::move(info));
-        }
-    }
-    catch (json::exception& exp) {
-        DebugTraceError(__FUNCTION__, "json parsing error!", exp.what());
-        return std::nullopt;
-    }
-    return opers_info;
+    resource.task().clear_exec_times();
+    resource.item().clear_drop_count();
 }
 
 json::value asst::Assistance::organize_stage_drop(const json::value& rec)
 {
     json::value dst = rec;
+    auto& item = resource.item();
     for (json::value& drop : dst["drops"].as_array()) {
         std::string id = drop["itemId"].as_string();
         int quantity = drop["quantity"].as_integer();
-        ItemConfiger::get_instance().m_drop_count[id] += quantity;
-        const std::string& name = ItemConfiger::get_instance().m_item_name[id];
+        item.increase_drop_count(id, quantity);
+        const std::string& name = item.get_item_name(id);
         drop["itemName"] = name.empty() ? "未知材料" : name;
     }
     std::vector<json::value> statistics_vec;
-    for (auto&& [id, count] : ItemConfiger::get_instance().m_drop_count) {
+    for (auto&& [id, count] : item.get_drop_count()) {
         json::value info;
         info["itemId"] = id;
-        const std::string& name = ItemConfiger::get_instance().m_item_name[id];
+        const std::string& name = item.get_item_name(id);
         info["itemName"] = name.empty() ? "未知材料" : name;
         info["count"] = count;
         statistics_vec.emplace_back(std::move(info));
@@ -730,7 +600,7 @@ json::value asst::Assistance::organize_stage_drop(const json::value& rec)
 
     dst["statistics"] = json::array(std::move(statistics_vec));
 
-    DebugTrace("organize_stage_drop | ", dst.to_string());
+    log.trace("organize_stage_drop | ", dst.to_string());
 
     return dst;
 }
\ No newline at end of file
diff --git a/src/MeoAssistance/Assistance.h b/src/MeoAssistance/Assistance.h
index 323581e8f3..a69005975f 100644
--- a/src/MeoAssistance/Assistance.h
+++ b/src/MeoAssistance/Assistance.h
@@ -17,7 +17,7 @@ namespace cv {
 }
 
 namespace asst {
-    class WinMacro;
+    class Controller;
     class Identify;
 
     class Assistance
@@ -41,7 +41,7 @@ namespace asst {
         bool start_visit(bool with_shopping = false);
 
         // 开始公开招募操作
-        bool start_open_recruit(const std::vector<int>& required_level, bool set_time = true);
+        bool start_recruiting(const std::vector<int>& required_level, bool set_time = true);
         // 开始干员识别任务
         bool start_to_identify_opers();
         // 开始全自动基建任务
@@ -70,13 +70,8 @@ namespace asst {
         void append_task(const json::value& detail, bool front = false);
         void append_callback(AsstMsg msg, json::value detail);
         void clear_exec_times();
-        static void set_opers_idtf_result(const json::value& detail);	// 保存干员识别结果
-        static std::optional<std::unordered_map<std::string, OperInfrastInfo>>
-            get_opers_idtf_result();	// 读取干员识别结果
         json::value organize_stage_drop(const json::value& rec);     // 整理关卡掉落的材料信息
 
-        std::shared_ptr<WinMacro> m_controller_ptr = nullptr;
-        std::shared_ptr<Identify> m_identify_ptr = nullptr;
         bool m_inited = false;
 
         bool m_thread_exit = false;
diff --git a/src/MeoAssistance/AsstCaller.cpp b/src/MeoAssistance/AsstCaller.cpp
index d42a61960d..51c7b90c56 100644
--- a/src/MeoAssistance/AsstCaller.cpp
+++ b/src/MeoAssistance/AsstCaller.cpp
@@ -156,31 +156,31 @@ const char* AsstGetVersion()
     return asst::Version;
 }
 
-bool AsstStartOpenRecruit(void* p_asst, const int required_level[], int required_len, bool set_time)
+bool AsstStartRecruiting(void* p_asst, const int required_level[], int required_len, bool set_time)
 {
     if (p_asst == nullptr) {
         return false;
     }
     std::vector<int> level_vector;
     level_vector.assign(required_level, required_level + required_len);
-    return ((asst::Assistance*)p_asst)->start_open_recruit(level_vector, set_time);
+    return ((asst::Assistance*)p_asst)->start_recruiting(level_vector, set_time);
 }
 
-bool AsstStartIndertifyOpers(void* p_asst)
-{
-    if (p_asst == nullptr) {
-        return false;
-    }
-    return ((asst::Assistance*)p_asst)->start_to_identify_opers();
-}
-
-bool AsstStartInfrast(void* p_asst)
-{
-    if (p_asst == nullptr) {
-        return false;
-    }
-    return ((asst::Assistance*)p_asst)->start_infrast();
-}
+//bool AsstStartIndertifyOpers(void* p_asst)
+//{
+//    if (p_asst == nullptr) {
+//        return false;
+//    }
+//    return ((asst::Assistance*)p_asst)->start_to_identify_opers();
+//}
+//
+//bool AsstStartInfrast(void* p_asst)
+//{
+//    if (p_asst == nullptr) {
+//        return false;
+//    }
+//    return ((asst::Assistance*)p_asst)->start_infrast();
+//}
 
 bool AsstStartDebugTask(void* p_asst)
 {
diff --git a/src/MeoAssistance/AsstDef.h b/src/MeoAssistance/AsstDef.h
index 1b2c0da218..62675151fe 100644
--- a/src/MeoAssistance/AsstDef.h
+++ b/src/MeoAssistance/AsstDef.h
@@ -13,28 +13,6 @@ namespace json
 }
 
 namespace asst {
-    enum class ProcessTaskAction {
-        Invalid = 0,
-        BasicClick = 0x100,
-        ClickSelf = BasicClick | 1,		// 点击自身位置
-        ClickRect = BasicClick | 2,		// 点击指定区域
-        ClickRand = BasicClick | 4,		// 点击随机区域
-        DoNothing = 0x200,				// 什么都不做
-        Stop = 0x400,					// 停止当前Task
-        StageDrops = 0x800,			// 截图
-        BasicSwipe = 0x1000,
-        SwipeToTheLeft = BasicSwipe | 1,	// 往左划一下
-        SwipeToTheRight = BasicSwipe | 2,	// 往右划一下
-    };
-
-    enum class AlgorithmType {
-        Invaild = -1,
-        JustReturn,
-        MatchTemplate,
-        CompareHist,
-        OcrDetect
-    };
-
     struct Point
     {
         Point() = default;
@@ -72,6 +50,7 @@ namespace asst {
         }
         Rect& operator=(const Rect&) noexcept = default;
         Rect& operator=(Rect&&) noexcept = default;
+        bool empty() const noexcept { return width == 0 || height == 0; }
         bool operator==(const Rect& rhs) const noexcept
         {
             return x == rhs.x && y == rhs.y && width == rhs.width && height == rhs.height;
@@ -90,28 +69,100 @@ namespace asst {
         int height = 0;
     };
 
-    struct TextArea {
-        TextArea() = default;
-        TextArea(const TextArea&) = default;
-        TextArea(TextArea&&) noexcept = default;
-        template<typename ...RectArgs>
-        TextArea(std::string text, RectArgs &&... rect_args)
-            : text(std::move(text)),
-            rect(std::forward<RectArgs>(rect_args)...) {
-            static_assert(std::is_constructible<asst::Rect, RectArgs...>::value,
-                "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;
-        bool operator==(const TextArea& rhs) const noexcept
-        {
+    struct TextRect {
+        TextRect() = default;
+        TextRect(const TextRect&) = default;
+        TextRect(TextRect&&) noexcept = default;
+
+        explicit operator std::string() const noexcept { return text; }
+        explicit operator Rect() const noexcept { return rect; }
+        TextRect& operator=(const TextRect&) = default;
+        TextRect& operator=(TextRect&&) noexcept = default;
+        bool operator==(const TextRect& rhs) const noexcept {
             return text == rhs.text && rect == rhs.rect;
         }
 
         std::string text;
         Rect rect;
     };
+    using TextRectProc = std::function<bool(TextRect&)>;
+
+    enum class AlgorithmType {
+        Invaild = -1,
+        JustReturn,
+        MatchTemplate,
+        CompareHist,
+        OcrDetect
+    };
+
+    struct MatchRect {
+        MatchRect() = default;
+        MatchRect(const MatchRect&) = default;
+        MatchRect(MatchRect&&) noexcept = default;
+
+        explicit operator Rect() const noexcept { return rect; }
+        MatchRect& operator=(const MatchRect&) = default;
+        MatchRect& operator=(MatchRect&&) noexcept = default;
+
+        AlgorithmType algorithm;
+        double score = 0.0;
+        Rect rect;
+    };
+
+    enum class ProcessTaskAction {
+        Invalid = 0,
+        BasicClick = 0x100,
+        ClickSelf = BasicClick | 1,		// 点击自身位置
+        ClickRect = BasicClick | 2,		// 点击指定区域
+        ClickRand = BasicClick | 4,		// 点击随机区域
+        DoNothing = 0x200,				// 什么都不做
+        Stop = 0x400,					// 停止当前Task
+        StageDrops = 0x800,			    // 关卡结束，特化动作
+        BasicSwipe = 0x1000,
+        SwipeToTheLeft = BasicSwipe | 1,	// 往左划一下
+        SwipeToTheRight = BasicSwipe | 2,	// 往右划一下
+    };
+
+    // 任务信息
+    struct TaskInfo {
+        virtual ~TaskInfo() = default;
+        std::string name;								// 任务名
+        AlgorithmType algorithm =						// 图像算法类型
+            AlgorithmType::Invaild;
+        ProcessTaskAction action =						// 要进行的操作
+            ProcessTaskAction::Invalid;
+        std::vector<std::string> next;					// 下一个可能的任务（列表）
+        int exec_times = 0;								// 任务已执行了多少次
+        int max_times = INT_MAX;						// 任务最多执行多少次
+        std::vector<std::string> exceeded_next;			// 达到最多次数了之后，下一个可能的任务（列表）
+        std::vector<std::string> reduce_other_times;	// 执行了该任务后，需要减少别的任务的执行次数。例如执行了吃理智药，则说明上一次点击蓝色开始行动按钮没生效，所以蓝色开始行动要-1
+        asst::Rect specific_rect;						// 指定区域，目前仅针对ClickRect任务有用，会点这个区域
+        int pre_delay = 0;								// 执行该任务前的延时
+        int rear_delay = 0;								// 执行该任务后的延时
+        int retry_times = INT_MAX;						// 未找到图像时的重试次数
+        Rect roi;								        // 要识别的区域，若为0则全图识别
+        Rect result_move;                               // 识别结果移动：有些结果识别到的，和要点击的不是同一个位置。即识别到了res，点击res + result_move的位置
+    };
+
+    // 文字识别任务的信息
+    struct OcrTaskInfo : public TaskInfo {
+        virtual ~OcrTaskInfo() = default;
+        std::vector<std::string> text;					// 文字的容器，匹配到这里面任一个，就算匹配上了
+        bool need_full_match = false;					// 是否需要全匹配，否则搜索到子串就算匹配上了
+        std::unordered_map<std::string, std::string>
+            replace_map;								// 部分文字容易识别错，字符串强制replace之后，再进行匹配
+        bool cache = false;								// 是否使用历史区域
+        std::vector<Rect> region_of_appeared;			// 曾经出现过的区域：上次处理该任务时，在一些rect里识别到过text，这次优先在这些rect里识别，省点性能
+    };
+
+    // 图片匹配任务的信息
+    struct MatchTaskInfo : public TaskInfo {
+        virtual ~MatchTaskInfo() = default;
+        std::string templ_name;					        // 匹配模板图片文件名
+        double templ_threshold = 0;						// 模板匹配阈值
+        double hist_threshold = 0;						// 直方图比较阈值
+        bool cache = false;								// 是否使用缓存（直方图），false时就一直用模板匹配。默认为true
+    };
 
     struct HandleInfo {
         std::string class_name;
@@ -138,116 +189,10 @@ namespace asst {
         std::string path;
     };
 
-    // 任务信息
-    struct TaskInfo {
-        virtual ~TaskInfo() = default;
-        std::string name;								// 任务名
-        AlgorithmType algorithm =						// 图像算法类型
-            AlgorithmType::Invaild;
-        ProcessTaskAction action =						// 要进行的操作
-            ProcessTaskAction::Invalid;
-        std::vector<std::string> next;					// 下一个可能的任务（列表）
-        int exec_times = 0;								// 任务已执行了多少次
-        int max_times = INT_MAX;						// 任务最多执行多少次
-        std::vector<std::string> exceeded_next;			// 达到最多次数了之后，下一个可能的任务（列表）
-        std::vector<std::string> reduce_other_times;	// 执行了该任务后，需要减少别的任务的执行次数。例如执行了吃理智药，则说明上一次点击蓝色开始行动按钮没生效，所以蓝色开始行动要-1
-        asst::Rect specific_area;						// 指定区域，目前仅针对ClickRect任务有用，会点这个区域
-        int pre_delay = 0;								// 执行该任务前的延时
-        int rear_delay = 0;								// 执行该任务后的延时
-        int retry_times = INT_MAX;						// 未找到图像时的重试次数
-        Rect identify_area;								// 要识别的区域，若为0则全图识别
-    };
-
-    // 文字识别任务的信息
-    struct OcrTaskInfo : public TaskInfo {
-        virtual ~OcrTaskInfo() = default;
-        std::vector<std::string> text;					// 文字的容器，匹配到这里面任一个，就算匹配上了
-        bool need_match = false;						// 是否需要全匹配，否则搜索到子串就算匹配上了
-        std::unordered_map<std::string, std::string>
-            replace_map;								// 部分文字容易识别错，字符串强制replace之后，再进行匹配
-        bool cache = false;								// 是否使用历史区域
-        std::vector<Rect> history_area;					// 历史区域：上次处理该任务时，在一些rect里识别到过text，这次优先在这些rect里识别，省点性能
-    };
-
-    // 图片匹配任务的信息
-    struct MatchTaskInfo : public TaskInfo {
-        virtual ~MatchTaskInfo() = default;
-        std::string template_filename;					// 匹配模板图片文件名
-        double templ_threshold = 0;						// 模板匹配阈值
-        double hist_threshold = 0;						// 直方图比较阈值
-        bool cache = false;								// 是否使用缓存（直方图），false时就一直用模板匹配。默认为true
-    };
-
-    enum class ConnectType {
-        Emulator,
-        USB,
-        Remote
-    };
-
-    struct Options {
-        ConnectType connect_type;			// 连接类型
-        std::string connect_remote_address;	// 连接局域网中的安卓设备的地址，仅在connectType为Remote时生效
-        int task_delay = 0;					// 任务间延时：越快操作越快，但会增加CPU消耗
-        int control_delay_lower = 0;		// 点击随机延时下限：每次点击操作会进行随机延时
-        int control_delay_upper = 0;		// 点击随机延时上限：每次点击操作会进行随机延时
-        bool print_window = false;			// 截图功能：开启后每次结算界面会截图到screenshot目录下
-        bool upload_to_penguin = false;     // 上传企鹅物流：每次到结算界面，是否上传企鹅物流数据统计网站 https://penguin-stats.cn/
-        std::string penguin_api;            // 企鹅物流汇报接口
-        std::string penguin_server;         // 企鹅物流汇报接口"server"字段，"CN", "US", "JP" and "KR".
-        int ocr_gpu_index = -1;				// OcrLite使用GPU编号，-1(使用CPU)/0(使用GPU0)/1(使用GPU1)/...
-        int ocr_thread_number = 0;			// OcrLite线程数量
-    };
-
-    struct InfrastOptions {					// 基建的选项
-        double dorm_threshold = 0;			// 宿舍心情百分比阈值，心情百分比小于该值的干员会被放进宿舍
-    };
-
-    // 干员信息，公开招募相关
-    struct OperRecruitInfo {
-        std::string name;
-        std::string type;
-        int level = 0;
-        std::string sex;
-        std::unordered_set<std::string> tags;
-        bool hidden = false;
-        std::string name_en;
-    };
-
-    // 公开招募的干员组合
-    struct OperRecruitCombs {
-        std::vector<OperRecruitInfo> opers;
-        int max_level = 0;
-        int min_level = 0;
-        double avg_level = 0;
-    };
-
-    // 干员信息，基建相关
-    struct OperInfrastInfo {
-        std::string name;
-        int elite = 0;		// 精英化等级
-        int level = 0;		// 等级
-        bool operator==(const OperInfrastInfo& rhs) const {
-            return name == rhs.name;
-        }
-    };
-    // 基建干员组合
-    struct OperInfrastComb {
-        std::vector<OperInfrastInfo> comb;
-        int efficiency = 0;	// 组合的效率
-    };
-
     constexpr double DoubleDiff = 1e-12;
 }
 
 namespace std {
-    template<>
-    class hash<asst::OperInfrastInfo> {
-    public:
-        size_t operator()(const asst::OperInfrastInfo& info) const
-        {
-            return std::hash<std::string>()(info.name);
-        }
-    };
     template<>
     class hash<asst::Rect> {
     public:
@@ -260,9 +205,9 @@ namespace std {
         }
     };
     template<>
-    class hash<asst::TextArea> {
+    class hash<asst::TextRect> {
     public:
-        size_t operator()(const asst::TextArea& textarea) const
+        size_t operator()(const asst::TextRect& textarea) const
         {
             return std::hash<std::string>()(textarea.text)
                 ^ std::hash<asst::Rect>()(textarea.rect);
diff --git a/src/MeoAssistance/Configer.h b/src/MeoAssistance/Configer.h
deleted file mode 100644
index f3cca09ff5..0000000000
--- a/src/MeoAssistance/Configer.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#pragma once
-
-#include "AbstractConfiger.h"
-
-#include <string>
-#include <unordered_map>
-#include <memory>
-
-#include "AsstDef.h"
-
-namespace asst {
-    class Configer : public AbstractConfiger
-    {
-    public:
-        virtual ~Configer() = default;
-
-        static Configer& get_instance() {
-            static Configer unique_instance;
-            return unique_instance;
-        }
-
-        constexpr static int WindowWidthDefault = 1280;
-        constexpr static int WindowHeightDefault = 720;
-        constexpr static double TemplThresholdDefault = 0.9;
-        constexpr static double HistThresholdDefault = 0.9;
-
-        std::string m_version;
-        Options m_options;
-        std::unordered_map<std::string, EmulatorInfo> m_handles;
-        std::unordered_map<std::string, std::string> m_recruit_ocr_replace;
-        std::unordered_map<std::string, std::string> m_infrast_ocr_replace;
-
-        InfrastOptions m_infrast_options;
-
-    protected:
-        Configer() = default;
-        Configer(const Configer& rhs) = default;
-        Configer(Configer&& rhs) noexcept = default;
-
-        Configer& operator=(const Configer& rhs) = default;
-        Configer& operator=(Configer&& rhs) noexcept = default;
-
-        virtual bool parse(const json::value& json) override;
-    };
-}
diff --git a/src/MeoAssistance/WinMacro.cpp b/src/MeoAssistance/Controller.cpp
similarity index 81%
rename from src/MeoAssistance/WinMacro.cpp
rename to src/MeoAssistance/Controller.cpp
index 8f881babd8..006186960c 100644
--- a/src/MeoAssistance/WinMacro.cpp
+++ b/src/MeoAssistance/Controller.cpp
@@ -1,4 +1,4 @@
-#include "WinMacro.h"
+#include "Controller.h"
 
 #include <stdint.h>
 #include <WinUser.h>
@@ -12,15 +12,15 @@
 
 #include "AsstDef.h"
 #include "Logger.hpp"
-#include "Configer.h"
+#include "Resource.h"
 #include "UserConfiger.h"
 
 using namespace asst;
 
-WinMacro::WinMacro()
+Controller::Controller()
     : m_rand_engine(std::chrono::system_clock::now().time_since_epoch().count())
 {
-    DebugTraceFunction;
+    LogTraceFunction;
 
     // 安全属性描述符
     m_pipe_sec_attr.nLength = sizeof(SECURITY_ATTRIBUTES);
@@ -44,13 +44,13 @@ WinMacro::WinMacro()
     m_child_startup_info.hStdOutput = m_pipe_child_write;
     m_child_startup_info.hStdError = m_pipe_child_write;
 
-    auto bind_pipe_working_proc = std::bind(&WinMacro::pipe_working_proc, this);
+    auto bind_pipe_working_proc = std::bind(&Controller::pipe_working_proc, this);
     m_cmd_thread = std::thread(bind_pipe_working_proc);
 }
 
-asst::WinMacro::~WinMacro()
+asst::Controller::~Controller()
 {
-    DebugTraceFunction;
+    LogTraceFunction;
 
     m_thread_exit = true;
     //m_thread_idle = true;
@@ -67,27 +67,27 @@ asst::WinMacro::~WinMacro()
     ::CloseHandle(m_pipe_child_write);
 }
 
-Rect asst::WinMacro::shaped_correct(const Rect& rect) const
+Rect asst::Controller::shaped_correct(const Rect& rect) const
 {
     if (rect.width == 0 || rect.height == 0) {
         return rect;
     }
     // 明日方舟在异形屏上，有的地方是按比例缩放的，有的地方又是直接位移。没法整，这里简单粗暴一点截一个长条
     Rect dst = rect;
-    if (m_scale_size.first != Configer::WindowWidthDefault) {	// 说明是宽屏
+    if (m_scale_size.first != GeneralConfiger::WindowWidthDefault) {	// 说明是宽屏
         dst.x = 0;
         dst.width = m_scale_size.first - 1;
     }
-    else if (m_scale_size.second != Configer::WindowHeightDefault) { // 说明是偏方形屏
+    else if (m_scale_size.second != GeneralConfiger::WindowHeightDefault) { // 说明是偏方形屏
         dst.y = 0;
         dst.height = m_scale_size.second - 1;
     }
     return dst;
 }
 
-void asst::WinMacro::pipe_working_proc()
+void asst::Controller::pipe_working_proc()
 {
-    DebugTraceFunction;
+    LogTraceFunction;
 
     while (!m_thread_exit) {
         std::unique_lock<std::mutex> cmd_queue_lock(m_cmd_queue_mutex);
@@ -119,9 +119,9 @@ void asst::WinMacro::pipe_working_proc()
     }
 }
 
-bool WinMacro::try_capture(const EmulatorInfo& info, bool without_handle)
+bool Controller::try_capture(const EmulatorInfo& info, bool without_handle)
 {
-    DebugTraceFunction;
+    LogTraceFunction;
 
     const HandleInfo& handle_info = info.handle;
     std::string adb_dir;
@@ -177,7 +177,7 @@ bool WinMacro::try_capture(const EmulatorInfo& info, bool without_handle)
             if (emulator_path.empty()) {
                 return false;
             }
-            UserConfiger::get_instance().set_emulator_path(info.name, emulator_path);
+            resource.cfg().set_emulator_path(info.name, emulator_path);
         }
         else {
             emulator_path = info.path;
@@ -186,7 +186,7 @@ bool WinMacro::try_capture(const EmulatorInfo& info, bool without_handle)
         // 到这一步说明句柄和权限没问题了，接下来就是adb的事情了
         m_emulator_info = info;
         m_handle = window_handle;
-        DebugTrace("Handle:", m_handle, "Name:", m_emulator_info.name);
+        log.trace("Handle:", m_handle, "Name:", m_emulator_info.name);
 
         adb_dir = emulator_path.substr(0, emulator_path.find_last_of('\\') + 1);
         adb_dir = '"' + StringReplaceAll(m_emulator_info.adb.path, "[EmulatorPath]", adb_dir) + '"';
@@ -215,21 +215,21 @@ bool WinMacro::try_capture(const EmulatorInfo& info, bool without_handle)
     m_emulator_info.adb.display_height = (std::min)(size_value1, size_value2);
 
     constexpr double DefaultRatio =
-        static_cast<double>(Configer::WindowWidthDefault) / static_cast<double>(Configer::WindowHeightDefault);
+        static_cast<double>(GeneralConfiger::WindowWidthDefault) / static_cast<double>(GeneralConfiger::WindowHeightDefault);
     double cur_ratio = static_cast<double>(m_emulator_info.adb.display_width) / static_cast<double>(m_emulator_info.adb.display_height);
 
     if (cur_ratio >= DefaultRatio	// 说明是宽屏或默认16:9，按照高度计算缩放
         || std::fabs(cur_ratio - DefaultRatio) < DoubleDiff)
     {
-        int scale_width = cur_ratio * Configer::WindowHeightDefault;
-        m_scale_size = std::make_pair(scale_width, Configer::WindowHeightDefault);
-        m_control_scale = static_cast<double>(m_emulator_info.adb.display_height) / static_cast<double>(Configer::WindowHeightDefault);
+        int scale_width = cur_ratio * GeneralConfiger::WindowHeightDefault;
+        m_scale_size = std::make_pair(scale_width, GeneralConfiger::WindowHeightDefault);
+        m_control_scale = static_cast<double>(m_emulator_info.adb.display_height) / static_cast<double>(GeneralConfiger::WindowHeightDefault);
     }
     else
     {	// 否则可能是偏正方形的屏幕，按宽度计算
-        int scale_height = Configer::WindowWidthDefault / cur_ratio;
-        m_scale_size = std::make_pair(Configer::WindowWidthDefault, scale_height);
-        m_control_scale = static_cast<double>(m_emulator_info.adb.display_width) / static_cast<double>(Configer::WindowWidthDefault);
+        int scale_height = GeneralConfiger::WindowWidthDefault / cur_ratio;
+        m_scale_size = std::make_pair(GeneralConfiger::WindowWidthDefault, scale_height);
+        m_control_scale = static_cast<double>(m_emulator_info.adb.display_width) / static_cast<double>(GeneralConfiger::WindowWidthDefault);
     }
 
     m_emulator_info.adb.click = StringReplaceAll(m_emulator_info.adb.click, "[Adb]", adb_dir);
@@ -239,9 +239,9 @@ bool WinMacro::try_capture(const EmulatorInfo& info, bool without_handle)
     return true;
 }
 
-//void asst::WinMacro::set_idle(bool flag)
+//void asst::Controller::set_idle(bool flag)
 //{
-//	DebugTraceFunction;
+//	LogTraceFunction;
 //
 //	m_thread_idle = flag;
 //	if (!flag) {
@@ -252,9 +252,9 @@ bool WinMacro::try_capture(const EmulatorInfo& info, bool without_handle)
 //	}
 //}
 
-std::vector<unsigned char> WinMacro::call_command(const std::string& cmd)
+std::vector<unsigned char> Controller::call_command(const std::string& cmd)
 {
-    DebugTraceFunction;
+    LogTraceFunction;
 
     static std::mutex pipe_mutex;
     std::unique_lock<std::mutex> pipe_lock(pipe_mutex);
@@ -287,17 +287,17 @@ std::vector<unsigned char> WinMacro::call_command(const std::string& cmd)
 
     ::CloseHandle(process_info.hProcess);
     ::CloseHandle(process_info.hThread);
-    DebugTrace("Call", cmd, "ret", exit_ret, ", output size:", pipe_data.size());
+    log.trace("Call", cmd, "ret", exit_ret, ", output size:", pipe_data.size());
     if (!pipe_data.empty() && pipe_data.size() < 4096) {
-        DebugTrace("output:", std::string(pipe_data.cbegin(), pipe_data.cend()));
+        log.trace("output:", std::string(pipe_data.cbegin(), pipe_data.cend()));
     }
 
     return pipe_data;
 }
 
-void asst::WinMacro::convert_lf(std::vector<unsigned char>& data)
+void asst::Controller::convert_lf(std::vector<unsigned char>& data)
 {
-    DebugTraceFunction;
+    LogTraceFunction;
 
     if (data.empty() || data.size() <= 1) {
         return;
@@ -328,7 +328,7 @@ void asst::WinMacro::convert_lf(std::vector<unsigned char>& data)
     data.erase(next_iter, data.end());
 }
 
-Point asst::WinMacro::rand_point_in_rect(const Rect& rect)
+Point asst::Controller::rand_point_in_rect(const Rect& rect)
 {
     int x = 0, y = 0;
     if (rect.width == 0) {
@@ -351,7 +351,7 @@ Point asst::WinMacro::rand_point_in_rect(const Rect& rect)
     return Point(x, y);
 }
 
-int asst::WinMacro::push_cmd(const std::string& cmd)
+int asst::Controller::push_cmd(const std::string& cmd)
 {
     std::unique_lock<std::mutex> lock(m_cmd_queue_mutex);
     m_cmd_queue.emplace(cmd);
@@ -359,16 +359,16 @@ int asst::WinMacro::push_cmd(const std::string& cmd)
     return ++m_push_id;
 }
 
-void asst::WinMacro::wait(unsigned id) const noexcept
+void asst::Controller::wait(unsigned id) const noexcept
 {
     while (id > m_completed_id) {
         std::this_thread::yield();
     }
 }
 
-bool asst::WinMacro::screencap()
+bool asst::Controller::screencap()
 {
-    DebugTraceFunction;
+    LogTraceFunction;
 
     auto data = call_command(m_emulator_info.adb.screencap);
     if (!data.empty()) {
@@ -377,12 +377,12 @@ bool asst::WinMacro::screencap()
         }
         m_cache_image = cv::imdecode(data, cv::IMREAD_COLOR);
         if (m_cache_image.empty()) {
-            DebugTraceInfo("Data is not empty, but image is empty, try to convert lf");
+            log.info("Data is not empty, but image is empty, try to convert lf");
             convert_lf(data);
             m_cache_image = cv::imdecode(data, cv::IMREAD_COLOR);
             if (m_cache_image.empty()) {
                 m_image_convert_lf = false;
-                DebugTraceError("convert lf and retry decode falied!");
+                log.error("convert lf and retry decode falied!");
                 return false;
             }
             m_image_convert_lf = true;
@@ -391,7 +391,7 @@ bool asst::WinMacro::screencap()
         return true;
     }
     else {
-        DebugTraceError("Data is empty!");
+        log.error("Data is empty!");
         return false;
     }
 
@@ -400,25 +400,25 @@ bool asst::WinMacro::screencap()
     //m_cache_image = std::move(temp_image);
 }
 
-int WinMacro::click(const Point& p, bool block)
+int Controller::click(const Point& p, bool block)
 {
     int x = p.x * m_control_scale;
     int y = p.y * m_control_scale;
-    //DebugTrace("Click, raw:", p.x, p.y, "corr:", x, y);
+    //log.trace("Click, raw:", p.x, p.y, "corr:", x, y);
 
     return click_without_scale(Point(x, y), block);
 }
 
-int WinMacro::click(const Rect& rect, bool block)
+int Controller::click(const Rect& rect, bool block)
 {
     return click(rand_point_in_rect(rect), block);
 }
 
-int asst::WinMacro::click_without_scale(const Point& p, bool block)
+int asst::Controller::click_without_scale(const Point& p, bool block)
 {
     if (p.x < 0 || p.x >= m_emulator_info.adb.display_width
         || p.y < 0 || p.y >= m_emulator_info.adb.display_height) {
-        DebugTraceError("click point out of range");
+        log.error("click point out of range");
     }
     std::string cur_cmd = StringReplaceAll(m_emulator_info.adb.click, "[x]", std::to_string(p.x));
     cur_cmd = StringReplaceAll(cur_cmd, "[y]", std::to_string(p.y));
@@ -429,34 +429,34 @@ int asst::WinMacro::click_without_scale(const Point& p, bool block)
     return id;
 }
 
-int asst::WinMacro::click_without_scale(const Rect& rect, bool block)
+int asst::Controller::click_without_scale(const Rect& rect, bool block)
 {
     return click_without_scale(rand_point_in_rect(rect), block);
 }
 
-int asst::WinMacro::swipe(const Point& p1, const Point& p2, int duration, bool block, int extra_delay)
+int asst::Controller::swipe(const Point& p1, const Point& p2, int duration, bool block, int extra_delay)
 {
     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);
+    //log.trace("Swipe, raw:", p1.x, p1.y, p2.x, p2.y, "corr:", x1, y1, x2, y2);
 
     return swipe_without_scale(Point(x1, y1), Point(x2, y2), duration, block, extra_delay);
 }
 
-int asst::WinMacro::swipe(const Rect& r1, const Rect& r2, int duration, bool block, int extra_delay)
+int asst::Controller::swipe(const Rect& r1, const Rect& r2, int duration, bool block, int extra_delay)
 {
     return swipe(rand_point_in_rect(r1), rand_point_in_rect(r2), duration, block, extra_delay);
 }
 
-int asst::WinMacro::swipe_without_scale(const Point& p1, const Point& p2, int duration, bool block, int extra_delay)
+int asst::Controller::swipe_without_scale(const Point& p1, const Point& p2, int duration, bool block, int extra_delay)
 {
     if (p1.x < 0 || p1.x >= m_emulator_info.adb.display_width
         || p1.y < 0 || p1.y >= m_emulator_info.adb.display_height
         || p2.x < 0 || p2.x >= m_emulator_info.adb.display_width
         || p2.y < 0 || p2.y >= m_emulator_info.adb.display_height) {
-        DebugTraceError("swipe point out of range");
+        log.error("swipe point out of range");
     }
     std::string cur_cmd = StringReplaceAll(m_emulator_info.adb.swipe, "[x1]", std::to_string(p1.x));
     cur_cmd = StringReplaceAll(cur_cmd, "[y1]", std::to_string(p1.y));
@@ -477,12 +477,12 @@ int asst::WinMacro::swipe_without_scale(const Point& p1, const Point& p2, int du
     return id;
 }
 
-int asst::WinMacro::swipe_without_scale(const Rect& r1, const Rect& r2, int duration, bool block, int extra_delay)
+int asst::Controller::swipe_without_scale(const Rect& r1, const Rect& r2, int duration, bool block, int extra_delay)
 {
     return swipe_without_scale(rand_point_in_rect(r1), rand_point_in_rect(r2), duration, block, extra_delay);
 }
 
-cv::Mat asst::WinMacro::get_image(bool raw)
+cv::Mat asst::Controller::get_image(bool raw)
 {
     if (!screencap()) {
         return cv::Mat();
diff --git a/src/MeoAssistance/WinMacro.h b/src/MeoAssistance/Controller.h
similarity index 87%
rename from src/MeoAssistance/WinMacro.h
rename to src/MeoAssistance/Controller.h
index 554d333d33..8619d086c1 100644
--- a/src/MeoAssistance/WinMacro.h
+++ b/src/MeoAssistance/Controller.h
@@ -18,15 +18,19 @@
 #include "AsstDef.h"
 
 namespace asst {
-    class WinMacro
+    class Controller
     {
     public:
-        WinMacro();
-        ~WinMacro();
+        Controller(const Controller&) = delete;
+        Controller(Controller&&) = delete;
+        ~Controller();
+
+        static Controller& get_instance() {
+            static Controller unique_instance;
+            return unique_instance;
+        }
 
         bool try_capture(const EmulatorInfo& info, bool without_handle = false);
-        //void set_idle(bool flag);
-
         cv::Mat get_image(bool raw = false);
 
         // 点击和滑动都是异步执行，返回该任务的id
@@ -43,7 +47,12 @@ namespace asst {
 
         // 异形屏矫正
         Rect shaped_correct(const Rect& rect) const;
+
+        Controller& operator=(const Controller&) = delete;
+        Controller& operator=(Controller&&) = delete;
     private:
+        Controller();
+
         void pipe_working_proc();
         std::vector<unsigned char> call_command(const std::string& cmd);
         int push_cmd(const std::string& cmd);
@@ -81,4 +90,6 @@ namespace asst {
         std::pair<int, int> m_scale_size;
         double m_control_scale = 1.0;
     };
+
+    static auto& ctrler = Controller::get_instance();
 }
diff --git a/src/MeoAssistance/CreditShopImageAnalyzer.cpp b/src/MeoAssistance/CreditShopImageAnalyzer.cpp
new file mode 100644
index 0000000000..24bba53063
--- /dev/null
+++ b/src/MeoAssistance/CreditShopImageAnalyzer.cpp
@@ -0,0 +1,123 @@
+#include "CreditShopImageAnalyzer.h"
+
+#include "MultiMatchImageAnalyzer.h"
+#include "OcrImageAnalyzer.h"
+#include "MatchImageAnalyzer.h"
+#include "Resource.h"
+
+#include "AsstAux.h"
+
+bool asst::CreditShopImageAnalyzer::analyze()
+{
+    m_credit_points.clear();
+    m_need_to_buy.clear();
+    m_result.clear();
+
+    return credit_point_analyze()
+        && commoditys_analyze()
+        && sold_out_analyze();
+}
+
+bool asst::CreditShopImageAnalyzer::credit_point_analyze()
+{
+    const static auto credit_point_task_ptr = std::dynamic_pointer_cast<MatchTaskInfo>(
+        resource.task().task_ptr("CreditShop-CreditPoint"));
+
+    // 识别信用点的图标
+    MultiMatchImageAnalyzer mm_annlyzer(
+        m_image,
+        credit_point_task_ptr->roi,
+        credit_point_task_ptr->templ_name,
+        credit_point_task_ptr->templ_threshold);
+
+    if (!mm_annlyzer.analyze()) {
+        return false;
+    }
+    auto credit_points_result = mm_annlyzer.get_result();
+    if (credit_points_result.empty()) {
+        return false;
+    }
+    // 按位置排个序
+    std::sort(credit_points_result.begin(), credit_points_result.end(),
+        [](const MatchRect& lhs, const MatchRect& rhs) -> bool {
+            if (std::abs(lhs.rect.y - rhs.rect.y) < 5) {	// y差距较小则理解为是同一排的，按x排序
+                return lhs.rect.x < rhs.rect.x;
+            }
+            else {
+                return lhs.rect.y < rhs.rect.y;
+            }
+        }
+    );
+    m_credit_points.reserve(credit_points_result.size());
+    for (const MatchRect& mr : credit_points_result) {
+        m_credit_points.emplace_back(mr.rect);
+    }
+
+    return true;
+}
+
+bool asst::CreditShopImageAnalyzer::commoditys_analyze()
+{
+    for (const Rect& credit_point : m_credit_points) {
+        // 商品名的区域
+        Rect name(credit_point.x - 80, credit_point.y - 210, 230, 70);
+        if (name.x < 0) {
+            name.x = 0;
+        }
+
+        // TODO，哪些要买哪些不买，提供个接口出去
+        static const std::vector<std::string> not_to_buy_names = { "碳", "家具" };
+
+        OcrImageAnalyzer ocr_analyzer(m_image, name);
+        if (!ocr_analyzer.analyze()) {
+            continue;
+        }
+        const auto& ocr_res = ocr_analyzer.get_result();
+
+        auto find_iter = std::find_first_of(ocr_res.cbegin(), ocr_res.cend(), not_to_buy_names.cbegin(), not_to_buy_names.cend(),
+            [](const auto& lhs, const std::string& rhs) -> bool {
+                return lhs.text.find(rhs) != std::string::npos;
+            });
+        if (find_iter != ocr_res.cend()) { // 找到了不需要买的名字
+#ifdef  LOG_TRACE
+            cv::putText(m_image, "Not to buy", cv::Point(credit_point.x, credit_point.y), 1, 2, cv::Scalar(255, 0, 0));
+#endif //  LOG_TRACE
+            continue;
+        }
+        Rect commodity(credit_point.x - 60, credit_point.y - 180, 220, 220);
+#ifdef  LOG_TRACE
+        cv::rectangle(m_image, make_rect<cv::Rect>(commodity), cv::Scalar(0, 0, 255), 2);
+#endif
+        m_need_to_buy.emplace_back(commodity);
+    }
+    return !m_need_to_buy.empty();
+}
+
+bool asst::CreditShopImageAnalyzer::sold_out_analyze()
+{
+    const static auto sold_out_task_ptr = std::dynamic_pointer_cast<MatchTaskInfo>(
+        resource.task().task_ptr("CreditShop-SoldOut"));
+
+    // 识别是否售罄
+    MatchImageAnalyzer sold_out_analyzer(
+        m_image,
+        sold_out_task_ptr->roi,
+        sold_out_task_ptr->templ_name,
+        sold_out_task_ptr->templ_threshold);
+
+    for (const Rect& commodity : m_need_to_buy) {
+        sold_out_analyzer.set_roi(commodity);
+        if (sold_out_analyzer.analyze()) {
+#ifdef  LOG_TRACE
+            cv::rectangle(m_image, make_rect<cv::Rect>(commodity), cv::Scalar(0, 0, 255));
+            cv::putText(m_image, "Sold Out", cv::Point(commodity.x, commodity.y), 1, 2, cv::Scalar(255, 0, 0));
+#endif //  LOG_TRACE
+
+            // 如果识别到了售罄，那这个商品就不用买了，跳过
+            continue;
+        }
+        m_result.emplace_back(commodity);
+    }
+
+    return !m_result.empty();
+}
\ No newline at end of file
diff --git a/src/MeoAssistance/CreditShopImageAnalyzer.h b/src/MeoAssistance/CreditShopImageAnalyzer.h
new file mode 100644
index 0000000000..7e4de30a83
--- /dev/null
+++ b/src/MeoAssistance/CreditShopImageAnalyzer.h
@@ -0,0 +1,25 @@
+#pragma once
+#include "AbstractImageAnalyzer.h"
+
+namespace asst {
+    class CreditShopImageAnalyzer final : public AbstractImageAnalyzer
+    {
+    public:
+        using AbstractImageAnalyzer::AbstractImageAnalyzer;
+        virtual ~CreditShopImageAnalyzer() = default;
+
+        virtual bool analyze() override;
+
+        const std::vector<Rect>& get_result() const noexcept {
+            return m_result;
+        }
+    protected:
+        bool credit_point_analyze();
+        bool commoditys_analyze();
+        bool sold_out_analyze();
+
+        std::vector<Rect> m_credit_points;
+        std::vector<Rect> m_need_to_buy;
+        std::vector<Rect> m_result;
+    };
+}
diff --git a/src/MeoAssistance/CreditShoppingTask.cpp b/src/MeoAssistance/CreditShoppingTask.cpp
index ba645de6d7..1e60bd91eb 100644
--- a/src/MeoAssistance/CreditShoppingTask.cpp
+++ b/src/MeoAssistance/CreditShoppingTask.cpp
@@ -5,116 +5,75 @@
 
 #include <opencv2/opencv.hpp>
 
-#include "Identify.h"
-#include "WinMacro.h"
-#include "Configer.h"
+#include "Controller.h"
+#include "CreditShopImageAnalyzer.h"
+#include "MatchImageAnalyzer.h"
+#include "OcrImageAnalyzer.h"
+#include "Resource.h"
 
 bool asst::CreditShoppingTask::run()
 {
-    if (m_controller_ptr == nullptr
-        || m_identify_ptr == nullptr)
-    {
-        m_callback(AsstMsg::PtrIsNull, json::value(), m_callback_arg);
+    const cv::Mat& image = ctrler.get_image();
+
+    CreditShopImageAnalyzer shop_analyzer(image);
+    if (!shop_analyzer.analyze()) {
         return false;
     }
+    const auto& shopping_list = shop_analyzer.get_result();
 
-    cv::Mat image = m_controller_ptr->get_image();
-
-    // 识别信用点的图标
-    auto find_res_vec = m_identify_ptr->find_all_images(image, "CreditPoint", Configer::TemplThresholdDefault, false);
-
-    // 按位置排个序
-    std::sort(find_res_vec.begin(), find_res_vec.end(), [](
-        const auto& lhs, const auto& rhs) -> bool {
-            if (std::abs(lhs.rect.y - rhs.rect.y) < 5) {	// y差距较小则理解为是同一排的，按x排序
-                return lhs.rect.x < rhs.rect.x;
-            }
-            else {
-                return lhs.rect.y < rhs.rect.y;
-            }
-        });
-
-    // 计算哪些商品是需要买的
-    std::vector<Rect> need_to_buy;
-    for (const auto& res : find_res_vec) {
-        cv::Rect name_rect;
-        name_rect.x = res.rect.x - 80;
-        name_rect.y = res.rect.y - 210;
-        name_rect.width = 230;
-        name_rect.height = 70;
-        if (name_rect.x < 0) {
-            name_rect.x = 0;
-        }
-        // 过滤掉不买的
-        // TODO，哪些要买哪些不买，提供个接口出去
-        static const std::vector<std::string> not_to_buy_names = { "碳", "家具" };
-        const auto& ocr_res = m_identify_ptr->ocr_detect(image(name_rect));
-        auto find_iter = std::find_first_of(ocr_res.cbegin(), ocr_res.cend(), not_to_buy_names.cbegin(), not_to_buy_names.cend(),
-            [](const auto& lhs, const std::string& rhs) -> bool {
-                return lhs.text.find(rhs) != std::string::npos;
-            });
-        if (find_iter != ocr_res.cend()) {
-#ifdef  LOG_TRACE
-            cv::putText(image, "Not to buy", cv::Point(res.rect.x, res.rect.y), 1, 2, cv::Scalar(255, 0, 0));
-#endif //  LOG_TRACE
-            continue;
-        }
-        Rect commodity_rect(res.rect.x - 60, res.rect.y - 180, 220, 220);
-        // 识别“售罄”
-        auto sold_out_res = m_identify_ptr->find_image(image(make_rect<cv::Rect>(commodity_rect)), "SoldOut");
-
-#ifdef  LOG_TRACE
-        cv::rectangle(image, make_rect<cv::Rect>(commodity_rect), cv::Scalar(0, 0, 255));
-        if (sold_out_res.score >= Configer::TemplThresholdDefault) {
-            cv::putText(image, "Sold Out", cv::Point(commodity_rect.x, commodity_rect.y), 1, 2, cv::Scalar(255, 0, 0));
-        }
-#endif //  LOG_TRACE
-
-        if (sold_out_res.score >= Configer::TemplThresholdDefault) {
-            continue;
-        }
-        need_to_buy.emplace_back(commodity_rect.center_zoom(0.8));
-    }
-
-    for (const Rect& commodity_rect : need_to_buy) {
+    for (const Rect& commodity : shopping_list) {
         if (need_exit()) {
             return false;
         }
-        m_controller_ptr->click(commodity_rect);
-        sleep(1000);
-        image = m_controller_ptr->get_image();
+        ctrler.click(commodity);
+
+        static int pre_delay = 1000;
+        static int rare_delay = 1000;
+
+        sleep(pre_delay);
 
         // “购买商品”按钮
         static Rect buy_it_rect;
-        if (buy_it_rect.width == 0) {
-            auto buy_it_res = m_identify_ptr->find_image(image, "BuyIt", Configer::TemplThresholdDefault);
-            if (buy_it_res.score < Configer::TemplThresholdDefault) {
-                // 没事别到“购买商品”按钮，不应该出现这种情况，TODO 报错
+        if (buy_it_rect.empty()) {
+            const auto buy_it_task_ptr = std::dynamic_pointer_cast<MatchTaskInfo>(
+                resource.task().task_ptr("CreditShop-BuyIt"));
+
+            const cv::Mat& buy_image = ctrler.get_image();
+            MatchImageAnalyzer buy_it_analyzer(
+                buy_image,
+                buy_it_task_ptr->roi,
+                buy_it_task_ptr->templ_name,
+                buy_it_task_ptr->templ_threshold);
+            if (!buy_it_analyzer.analyze()) {
+                // 没识别到“购买商品”按钮，不应该出现这种情况，TODO 报错
                 return false;
             }
-            buy_it_rect = buy_it_res.rect;
+            buy_it_rect = buy_it_analyzer.get_result().rect;
+            pre_delay = buy_it_task_ptr->pre_delay;
+            rare_delay = buy_it_task_ptr->rear_delay;
         }
+
         if (need_exit()) {
             return false;
         }
-        m_controller_ptr->click(buy_it_rect);
-        sleep(1000);
+        ctrler.click(buy_it_rect);
+        sleep(rare_delay);
+
         // 识别是否信用不足无法购买
-        image = m_controller_ptr->get_image();
-        static const std::vector<std::string> shopping_finished = { "信用不足", "无法购买" };
-        const auto& ocr_res = ocr_detect(image(cv::Rect(940, 60, 339, 110)));
-        auto find_iter = std::find_first_of(ocr_res.cbegin(), ocr_res.cend(), shopping_finished.cbegin(), shopping_finished.cend(),
-            [](const auto& lhs, const std::string& rhs) -> bool {
-                return lhs.text.find(rhs) != std::string::npos;
-            });
-        if (find_iter != ocr_res.cend()) {
+        const cv::Mat& prompt_image = ctrler.get_image();
+
+        const static auto no_money_task_ptr = std::dynamic_pointer_cast<OcrTaskInfo>(
+            resource.task().task_ptr("CreditShop-NoMoney"));
+        OcrImageAnalyzer prompt_analyzer(prompt_image, no_money_task_ptr->roi);
+        prompt_analyzer.set_required(no_money_task_ptr->text);
+        if (prompt_analyzer.analyze()) {
             click_return_button();
             return true;
         }
 
         // 这里随便点一下都行，把购买完弹出来物品的界面取消掉
-        m_controller_ptr->click(buy_it_rect);
-        sleep(1000);
+        ctrler.click(buy_it_rect);
+        sleep(rare_delay);
     }
 
     return true;
diff --git a/src/MeoAssistance/CreditShoppingTask.h b/src/MeoAssistance/CreditShoppingTask.h
index 2a9331fe1b..0c8b2396a4 100644
--- a/src/MeoAssistance/CreditShoppingTask.h
+++ b/src/MeoAssistance/CreditShoppingTask.h
@@ -1,15 +1,16 @@
 #pragma once
-#include "OcrAbstractTask.h"
+
+#include "AbstractTask.h"
 
 #include <vector>
 
 #include "AsstDef.h"
 
 namespace asst {
-    class CreditShoppingTask : public OcrAbstractTask
+    class CreditShoppingTask : public AbstractTask
     {
     public:
-        using OcrAbstractTask::OcrAbstractTask;
+        using AbstractTask::AbstractTask;
         virtual ~CreditShoppingTask() = default;
         virtual bool run() override;
     private:
diff --git a/src/MeoAssistance/Configer.cpp b/src/MeoAssistance/GeneralConfiger.cpp
similarity index 71%
rename from src/MeoAssistance/Configer.cpp
rename to src/MeoAssistance/GeneralConfiger.cpp
index 1ca5da5602..3b25fd3d6c 100644
--- a/src/MeoAssistance/Configer.cpp
+++ b/src/MeoAssistance/GeneralConfiger.cpp
@@ -1,16 +1,8 @@
-#include "Configer.h"
-
-#include <fstream>
-#include <sstream>
-#include <algorithm>
+#include "GeneralConfiger.h"
 
 #include <json.h>
 
-#include "Logger.hpp"
-
-using namespace asst;
-
-bool asst::Configer::parse(const json::value& json)
+bool asst::GeneralConfiger::parse(const json::value& json)
 {
     m_version = json.at("version").as_string();
 
@@ -28,13 +20,6 @@ bool asst::Configer::parse(const json::value& json)
         m_options.penguin_server = options_json.get("penguinServer", "CN");
         m_options.ocr_thread_number = options_json.at("ocrThreadNumber").as_integer();
     }
-    DebugTrace("Options", options_json.to_string());
-
-    const json::value& infrast_options_json = json.at("infrastOptions");
-    {
-        m_infrast_options.dorm_threshold = infrast_options_json.get("dormThreshold", 0.3);
-    }
-    DebugTrace("InfrastOptions", infrast_options_json.to_string());
 
     for (const auto& [name, emulator_json] : json.at("emulator").as_object()) {
         EmulatorInfo emulator_info;
@@ -56,14 +41,7 @@ bool asst::Configer::parse(const json::value& json)
 
         emulator_info.path = emulator_json.get("path", std::string());
 
-        m_handles.emplace(name, std::move(emulator_info));
-    }
-
-    for (const json::value& rep : json.at("infrastOcrReplace").as_array()) {
-        m_infrast_ocr_replace.emplace(rep.as_array()[0].as_string(), rep.as_array()[1].as_string());
-    }
-    for (const json::value& rep : json.at("recruitOcrReplace").as_array()) {
-        m_recruit_ocr_replace.emplace(rep.as_array()[0].as_string(), rep.as_array()[1].as_string());
+        m_emulators_info.emplace(name, std::move(emulator_info));
     }
 
     return true;
diff --git a/src/MeoAssistance/GeneralConfiger.h b/src/MeoAssistance/GeneralConfiger.h
new file mode 100644
index 0000000000..8bdd44cbb5
--- /dev/null
+++ b/src/MeoAssistance/GeneralConfiger.h
@@ -0,0 +1,73 @@
+#pragma once
+
+#include "AbstractConfiger.h"
+
+#include <string>
+#include <unordered_map>
+#include <memory>
+
+#include "AsstDef.h"
+
+namespace asst {
+    enum class ConnectType {
+        Emulator,
+        USB,
+        Remote
+    };
+
+    struct Options {
+        ConnectType connect_type;			// 连接类型
+        std::string connect_remote_address;	// 连接局域网中的安卓设备的地址，仅在connectType为Remote时生效
+        int task_delay = 0;					// 任务间延时：越快操作越快，但会增加CPU消耗
+        int control_delay_lower = 0;		// 点击随机延时下限：每次点击操作会进行随机延时
+        int control_delay_upper = 0;		// 点击随机延时上限：每次点击操作会进行随机延时
+        bool print_window = false;			// 截图功能：开启后每次结算界面会截图到screenshot目录下
+        bool upload_to_penguin = false;     // 上传企鹅物流：每次到结算界面，是否上传企鹅物流数据统计网站 https://penguin-stats.cn/
+        std::string penguin_api;            // 企鹅物流汇报接口
+        std::string penguin_server;         // 企鹅物流汇报接口"server"字段，"CN", "US", "JP" and "KR".
+        int ocr_gpu_index = -1;				// OcrLite使用GPU编号，-1(使用CPU)/0(使用GPU0)/1(使用GPU1)/...
+        int ocr_thread_number = 0;			// OcrLite线程数量
+    };
+
+    class GeneralConfiger : public AbstractConfiger
+    {
+    public:
+        virtual ~GeneralConfiger() = default;
+
+        constexpr static int WindowWidthDefault = 1280;
+        constexpr static int WindowHeightDefault = 720;
+
+        const std::string& get_version() const noexcept
+        {
+            return m_version;
+        }
+        const Options& get_options() const noexcept
+        {
+            return m_options;
+        }
+        const std::unordered_map<std::string, EmulatorInfo>& get_emulators_info() const noexcept
+        {
+            return m_emulators_info;
+        }
+
+        void set_options(Options opt) noexcept
+        {
+            m_options = std::move(opt);
+        }
+        void set_emulator_info(std::string name, EmulatorInfo emu)
+        {
+            m_emulators_info.emplace(std::move(name), std::move(emu));
+        }
+        void set_emulator_path(std::string name, std::string path)
+        {
+            m_emulators_info[name].path = path;
+        }
+
+    protected:
+        virtual bool parse(const json::value& json) override;
+
+        std::string m_version;
+        Options m_options;
+        std::unordered_map<std::string, EmulatorInfo> m_emulators_info;
+    };
+}
diff --git a/src/MeoAssistance/Identify.cpp b/src/MeoAssistance/Identify.cpp
deleted file mode 100644
index 1596803cf3..0000000000
--- a/src/MeoAssistance/Identify.cpp
+++ /dev/null
@@ -1,349 +0,0 @@
-#include "Identify.h"
-
-#include <algorithm>
-#include <numeric>
-#include <filesystem>
-
-#include <opencv2/opencv.hpp>
-#include <opencv2/imgproc/types_c.h>
-
-#include <json.h>
-
-namespace penguin {
-#include <penguin-stats-recognize/penguin_wasm.h>
-}
-
-#include "Logger.hpp"
-#include "AsstAux.h"
-#include "Configer.h"
-
-using namespace asst;
-using namespace cv;
-
-bool Identify::add_image(const std::string& name, const std::string& path)
-{
-    Mat image = imread(path);
-    if (image.empty()) {
-        return false;
-    }
-    m_mat_map.emplace(name, image);
-    return true;
-}
-
-Mat Identify::image_2_hist(const cv::Mat& src)
-{
-    //Mat src_hsv;
-    //cvtColor(src, src_hsv, COLOR_BGR2HSV);
-
-    int histSize[] = { 50, 60 };
-    float h_ranges[] = { 0, 180 };
-    float s_ranges[] = { 0, 256 };
-    const float* ranges[] = { h_ranges, s_ranges };
-    int channels[] = { 0, 1 };
-
-    MatND src_hist;
-
-    calcHist(&src, 1, channels, Mat(), src_hist, 2, histSize, ranges);
-    normalize(src_hist, src_hist, 0, 1, NORM_MINMAX);
-
-    return src_hist;
-}
-
-double Identify::image_hist_comp(const cv::Mat& src, const cv::MatND& hist)
-{
-    // keep the interface return value unchanged
-    return 1 - compareHist(image_2_hist(src), hist, CV_COMP_BHATTACHARYYA);
-}
-
-std::vector<TextArea> asst::Identify::ocr_detect(const cv::Mat& image)
-{
-    OcrResult ocr_results = m_ocr_lite.detect(image,
-        50, 0,
-        0.2f, 0.3f,
-        2.0f, false, false);
-
-    std::vector<TextArea> result;
-    for (TextBlock& text_block : ocr_results.textBlocks) {
-        if (text_block.boxPoint.size() != 4) {
-            continue;
-        }
-        // the rect like ↓
-        // 0 - 1
-        // 3 - 2
-        int x = text_block.boxPoint.at(0).x;
-        int y = text_block.boxPoint.at(0).y;
-        int width = text_block.boxPoint.at(1).x - x;
-        int height = text_block.boxPoint.at(3).y - y;
-        result.emplace_back(std::move(text_block.text), x, y, width, height);
-    }
-    return result;
-}
-
-std::pair<double, cv::Point> Identify::match_template(const cv::Mat& image, const cv::Mat& templ)
-{
-    //Mat image_hsv;
-    //Mat templ_hsv;
-    //cvtColor(image, image_hsv, COLOR_BGR2HSV);
-    //cvtColor(templ, templ_hsv, COLOR_BGR2HSV);
-
-    Mat matched;
-    matchTemplate(image, templ, matched, cv::TM_CCOEFF_NORMED);
-
-    double minVal = 0, maxVal = 0;
-    cv::Point minLoc, maxLoc;
-    minMaxLoc(matched, &minVal, &maxVal, &minLoc, &maxLoc);
-    return { maxVal, maxLoc };
-}
-
-asst::Identify::FindImageResult asst::Identify::find_image(
-    const cv::Mat& image, const std::string& templ_name, double add_cache_thres, bool rect_zoom)
-{
-    if (m_mat_map.find(templ_name) == m_mat_map.cend()) {
-        return { AlgorithmType::JustReturn, 0, Rect() };
-    }
-
-    // 有缓存，用直方图比较，CPU占用会低很多，但要保证每次按钮图片的位置不变
-    if (m_cache_map.find(templ_name) != m_cache_map.cend()) {
-        const auto& [raw_rect, hist] = m_cache_map.at(templ_name);
-        double value = image_hist_comp(image(raw_rect), hist);
-        Rect dst_rect = make_rect<asst::Rect>(raw_rect);
-        if (rect_zoom) {
-            dst_rect = dst_rect.center_zoom(0.8);
-        }
-        return { AlgorithmType::CompareHist, value, dst_rect };
-    }
-    else {	// 没缓存就模板匹配
-        const cv::Mat& templ_mat = m_mat_map.at(templ_name);
-        const auto& [value, point] = match_template(image, templ_mat);
-        cv::Rect raw_rect(point.x, point.y, templ_mat.cols, templ_mat.rows);
-        if (value >= add_cache_thres) {
-            m_cache_map.emplace(templ_name, std::make_pair(raw_rect, image_2_hist(image(raw_rect))));
-        }
-        Rect dst_rect = make_rect<asst::Rect>(raw_rect);
-        if (rect_zoom) {
-            dst_rect = dst_rect.center_zoom(0.8);
-        }
-        return { AlgorithmType::MatchTemplate, value, dst_rect };
-    }
-}
-
-std::vector<asst::Identify::FindImageResult> asst::Identify::find_all_images(
-    const cv::Mat& image, const std::string& templ_name, double threshold, bool rect_zoom) const
-{
-    if (m_mat_map.find(templ_name) == m_mat_map.cend()) {
-        return std::vector<FindImageResult>();
-    }
-    const cv::Mat& templ_mat = m_mat_map.at(templ_name);
-
-    //Mat image_hsv;
-    //Mat templ_hsv;
-    //cvtColor(image, image_hsv, COLOR_BGR2HSV);
-    //cvtColor(templ_mat, templ_hsv, COLOR_BGR2HSV);
-
-    Mat matched;
-    matchTemplate(image, templ_mat, matched, cv::TM_CCOEFF_NORMED);
-
-    std::vector<FindImageResult> results;
-    int mini_distance = (std::min)(templ_mat.cols, templ_mat.rows) * 0.5;
-    for (int i = 0; i != matched.rows; ++i) {
-        for (int j = 0; j != matched.cols; ++j) {
-            auto value = matched.at<float>(i, j);
-            if (value >= threshold) {
-                Rect rect = Rect(j, i, templ_mat.cols, templ_mat.rows);
-                if (rect_zoom) {
-                    rect = rect.center_zoom(0.8);
-                }
-
-                bool need_push = true;
-                // 如果有两个点离得太近，只取里面得分高的那个
-                // 一般相邻的都是刚刚push进去的，这里倒序快一点
-                for (auto iter = results.rbegin(); iter != results.rend(); ++iter) {
-                    if (std::abs(j - iter->rect.x) < mini_distance
-                        && std::abs(i - iter->rect.y) < mini_distance) {
-                        if (iter->score < value) {
-                            iter->rect = rect;
-                            iter->score = value;
-                        }	// else 这个点就放弃了
-                        need_push = false;
-                        break;
-                    }
-                }
-                if (need_push) {
-                    results.emplace_back(AlgorithmType::MatchTemplate, value, std::move(rect));
-                }
-            }
-        }
-    }
-
-    std::sort(results.begin(), results.end(), [](const auto& lhs, const auto& rhs) -> bool {
-        return lhs.score > rhs.score;
-        });
-
-#ifdef LOG_TRACE
-    cv::Mat draw_mat = image.clone();
-    for (const auto& info : results) {
-        cv::rectangle(draw_mat, make_rect<cv::Rect>(info.rect), cv::Scalar(0, 0, 255), 1);
-        cv::putText(draw_mat, std::to_string(info.score), cv::Point(info.rect.x, info.rect.y), 1, 1.0, cv::Scalar(0, 0, 255));
-    }
-#endif
-
-    return results;
-}
-
-void Identify::clear_cache()
-{
-    m_cache_map.clear();
-}
-
-// gpu_index是ncnn框架的参数，现在换了onnx的，已经没有这个参数了，但是为了保持接口一致性，保留这个参数，实际不起作用
-void asst::Identify::set_ocr_param(int gpu_index, int number_thread)
-{
-    m_ocr_lite.setNumThread(number_thread);
-}
-
-bool asst::Identify::ocr_init_models(const std::string& dir)
-{
-    constexpr static const char* DetName = "dbnet.onnx";
-    constexpr static const char* ClsName = "angle_net.onnx";
-    constexpr static const char* RecName = "crnn_lite_lstm.onnx";
-    constexpr static const char* KeysName = "keys.txt";
-
-    const std::string dst_filename = dir + DetName;
-    const std::string cls_filename = dir + ClsName;
-    const std::string rec_filename = dir + RecName;
-    const std::string keys_filename = dir + KeysName;
-
-    return m_ocr_lite.initModels(dst_filename, cls_filename, rec_filename, keys_filename);
-}
-
-std::optional<asst::Rect> asst::Identify::find_text(const cv::Mat& image, const std::string& text)
-{
-    std::vector<TextArea> results = ocr_detect(image);
-    for (const TextArea& res : results) {
-        if (res.text == text) {
-            return res.rect;
-        }
-    }
-    return std::nullopt;
-}
-
-std::vector<TextArea> asst::Identify::find_text(const cv::Mat& image, const std::vector<std::string>& texts)
-{
-    std::vector<TextArea> dst;
-    std::vector<TextArea> detect_result = ocr_detect(image);
-    for (TextArea& res : detect_result) {
-        for (const std::string& t : texts) {
-            if (res.text == t) {
-                dst.emplace_back(std::move(res));
-            }
-        }
-    }
-    return dst;
-}
-
-std::vector<TextArea> asst::Identify::find_text(const cv::Mat& image, const std::unordered_set<std::string>& texts)
-{
-    std::vector<TextArea> dst;
-    std::vector<TextArea> detect_result = ocr_detect(image);
-    for (TextArea& res : detect_result) {
-        for (const std::string& t : texts) {
-            if (res.text == t) {
-                dst.emplace_back(std::move(res));
-            }
-        }
-    }
-    return dst;
-}
-
-bool asst::Identify::penguin_load_server(const std::string& server)
-{
-    penguin::load_server(server.c_str());
-    return true;
-}
-
-bool asst::Identify::penguin_load_json(const std::string& stage_path, const std::string& hash_path)
-{
-    auto load_file = [](const std::string& path) -> std::string {
-        std::ifstream ifs(path, std::ios::in);
-        if (!ifs.is_open()) {
-            return std::string();
-        }
-        std::stringstream iss;
-        iss << ifs.rdbuf();
-        ifs.close();
-        return iss.str();
-    };
-
-    auto stage_parse_ret = json::parse(load_file(stage_path));
-    if (!stage_parse_ret) {
-        return false;
-    }
-    // stage_json 来自 https://penguin-stats.io/PenguinStats/api/v2/stages
-    // 和接口需要的json有点区别，这里做个转换
-    json::value stage_json = std::move(stage_parse_ret.value());
-    json::object cvt_stage_json;
-    try {
-        for (const json::value& stage_info : stage_json.as_array()) {
-            if (!stage_info.exist("dropInfos")) {   // 这种一般是以前的活动关，现在已经关闭了的
-                continue;
-            }
-            std::string key = stage_info.at("code").as_string();
-            json::value stage_dst;
-            stage_dst["stageId"] = stage_info.at("stageId");
-            std::vector<json::value> drops_vector;
-            for (const json::value& drop_info : stage_info.at("dropInfos").as_array()) {
-                if (drop_info.exist("itemId")) {
-                    if (drop_info.at("dropType").as_string() == "FURNITURE") {  // 幸运掉落，家具啥的，企鹅物流不接，忽略掉
-                        continue;
-                    }
-                    drops_vector.emplace_back(drop_info.at("itemId"));
-                }
-            }
-            stage_dst["drops"] = json::array(std::move(drops_vector));
-            const std::string& server = Configer::get_instance().m_options.penguin_server;
-            stage_dst["existence"] = stage_info.at("existence").at(server).at("exist");
-
-            cvt_stage_json.emplace(std::move(key), std::move(stage_dst));
-        }
-    }
-    catch (json::exception& e) {
-        DebugTraceError(stage_path, "parse error", e.what());
-        return false;
-    }
-    std::string cvt_stage_string = cvt_stage_json.to_string();
-    //DebugTrace("stage_index | ", cvt_stage_string);
-    penguin::load_json(cvt_stage_string.c_str(), load_file(hash_path).c_str());
-    return true;
-}
-
-bool asst::Identify::penguin_load_templ(const std::string& item_id, const std::string& path)
-{
-    cv::Mat image = cv::imread(path);
-
-    std::vector<uchar> buf;
-    cv::imencode(".png", image, buf);
-
-    penguin::load_templ(item_id.c_str(), buf.data(), buf.size());
-
-    return true;
-}
-
-std::string asst::Identify::penguin_recognize(const cv::Mat& image)
-{
-    std::vector<uchar> buf;
-    cv::imencode(".png", image, buf);
-    std::string res = penguin::recognize(buf.data(), buf.size());
-    DebugTrace("penguin_recognize | ", res);
-    return res;
-}
-
-/*
-std::pair<double, asst::Rect> Identify::findImageWithFile(const cv::Mat& cur, const std::string& filename)
-{
-    Mat image = imread(filename);
-    if (image.empty()) {
-        return { 0, asst::Rect() };
-    }
-    return findImage(cur, image);
-}
-*/
\ No newline at end of file
diff --git a/src/MeoAssistance/Identify.h b/src/MeoAssistance/Identify.h
deleted file mode 100644
index f196c1a1bc..0000000000
--- a/src/MeoAssistance/Identify.h
+++ /dev/null
@@ -1,72 +0,0 @@
-#pragma once
-
-#include <unordered_map>
-#include <unordered_set>
-#include <utility>
-#include <tuple>
-#include <optional>
-
-#include <opencv2/opencv.hpp>
-#include <OcrLiteOnnx/OcrLiteCaller.h>
-
-#include "AsstDef.h"
-
-namespace asst {
-    class WinMacro;
-
-    class Identify
-    {
-    public:
-        struct FindImageResult {
-            FindImageResult() = default;
-            FindImageResult(AlgorithmType algorithm, double value, asst::Rect rect)
-                : algorithm(algorithm), score(value), rect(rect) {
-                ;
-            }
-            AlgorithmType algorithm;
-            double score = 0.0;
-            asst::Rect rect;
-        };
-    public:
-        Identify() = default;
-        ~Identify() = default;
-
-        /*** OpenCV package ***/
-        bool add_image(const std::string& name, const std::string& path);
-
-        constexpr static double NotAddCache = 999.0;
-        FindImageResult find_image(
-            const cv::Mat& image, const std::string& templ_name, double add_cache_thres = NotAddCache, bool rect_zoom = true);
-        std::vector<FindImageResult> find_all_images(
-            const cv::Mat& image, const std::string& templ_name, double threshold = 0, bool rect_zoom = true) const;
-
-        void clear_cache();
-
-        /*** OcrLite package ***/
-        void set_ocr_param(int gpu_index, int thread_number);
-        bool ocr_init_models(const std::string& dir);
-
-        std::vector<TextArea> ocr_detect(const cv::Mat& image);
-
-        [[deprecated]] std::optional<Rect> find_text(const cv::Mat& image, const std::string& text);
-        [[deprecated]] std::vector<TextArea> find_text(const cv::Mat& image, const std::vector<std::string>& texts);
-        [[deprecated]] std::vector<TextArea> find_text(const cv::Mat& image, const std::unordered_set<std::string>& texts);
-
-        /*** Penguin package ***/
-        bool penguin_load_server(const std::string& server);
-        bool penguin_load_json(const std::string& stage_path, const std::string& hash_path);
-        bool penguin_load_templ(const std::string& item_id, const std::string& path);
-        std::string penguin_recognize(const cv::Mat& image);
-
-    private:
-        cv::Mat image_2_hist(const cv::Mat& src);
-        double image_hist_comp(const cv::Mat& src, const cv::MatND& hist);
-        // return pair< suitability, raw opencv::point>
-        std::pair<double, cv::Point> match_template(const cv::Mat& image, const cv::Mat& templ);
-
-        std::unordered_map<std::string, cv::Mat> m_mat_map;
-        std::unordered_map<std::string, std::pair<cv::Rect, cv::Mat>> m_cache_map;	// 位置、直方图缓存
-
-        OcrLiteCaller m_ocr_lite;
-    };
-}
diff --git a/src/MeoAssistance/IdentifyOperTask.cpp b/src/MeoAssistance/IdentifyOperTask.cpp
deleted file mode 100644
index ca1a0d6f0d..0000000000
--- a/src/MeoAssistance/IdentifyOperTask.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-#include "IdentifyOperTask.h"
-
-#include <functional>
-#include <thread>
-#include <future>
-#include <algorithm>
-#include <unordered_map>
-#include <unordered_set>
-#include <fstream>
-
-#include <opencv2/opencv.hpp>
-
-#include "Configer.h"
-#include "InfrastConfiger.h"
-#include "Identify.h"
-#include "WinMacro.h"
-#include "Logger.hpp"
-
-using namespace asst;
-
-asst::IdentifyOperTask::IdentifyOperTask(AsstCallback callback, void* callback_arg)
-    : InfrastAbstractTask(callback, callback_arg)
-{
-    m_cropped_height_ratio = 0.043;
-    m_cropped_upper_y_ratio = 0.480;
-    m_cropped_lower_y_ratio = 0.923;
-
-    m_swipe_begin = Rect(Configer::WindowWidthDefault * 0.9, Configer::WindowHeightDefault * 0.5, 0, 0);
-    m_swipe_end = Rect(Configer::WindowWidthDefault * 0.1, Configer::WindowHeightDefault * 0.5, 0, 0);
-}
-
-bool asst::IdentifyOperTask::run()
-{
-    if (m_controller_ptr == nullptr
-        || m_identify_ptr == nullptr)
-    {
-        m_callback(AsstMsg::PtrIsNull, json::value(), m_callback_arg);
-        return false;
-    }
-
-    auto&& detect_ret = swipe_and_detect();
-    if (!detect_ret) {
-        return false;
-    }
-    const auto& detected_opers = std::move(detect_ret.value());
-
-    json::value result_json;
-    std::vector<json::value> opers_json_vec;
-    for (const auto& [name, info] : detected_opers) {
-        json::value info_json;
-        info_json["name"] = info.name;
-        info_json["elite"] = info.elite;
-        //info_json["level"] = info.level;
-        opers_json_vec.emplace_back(std::move(info_json));
-    }
-    result_json["all"] = json::array(opers_json_vec);
-
-    // 查找没有哪些干员（也可能是没识别到）
-    std::vector<json::value> not_found_vector;
-    for (const std::string& name : InfrastConfiger::get_instance().m_all_opers_name) {
-        auto iter = std::find_if(detected_opers.cbegin(), detected_opers.cend(),
-            [&](const auto& pair) -> bool {
-                return pair.first == name;
-            });
-        if (iter == detected_opers.cend()) {
-            not_found_vector.emplace_back(name);
-            DebugTrace("Not Found", name);
-        }
-    }
-    result_json["not_found"] = json::array(not_found_vector);
-
-    m_callback(AsstMsg::OpersIdtfResult, result_json, m_callback_arg);
-
-    return true;
-}
-
-std::optional<std::unordered_map<std::string, OperInfrastInfo>> asst::IdentifyOperTask::swipe_and_detect()
-{
-    json::value task_start_json = json::object{
-        { "task_type",  "IdentifyOperTask" },
-        { "task_chain", m_task_chain},
-    };
-    m_callback(AsstMsg::TaskStart, task_start_json, m_callback_arg);
-
-    std::unordered_map<std::string, OperInfrastInfo> detected_opers;
-
-    int times = 0;
-    bool reverse = false;
-    // 一边识别一边滑动，把所有干员名字抓出来
-    // 正向完整滑一遍，再反向完整滑一遍，提高识别率
-    while (true) {
-        if (need_exit()) {
-            return std::nullopt;
-        }
-        const cv::Mat& image = m_controller_ptr->get_image(true);
-
-        // 异步进行滑动操作
-        std::future<bool> swipe_future = std::async(
-            std::launch::async, &IdentifyOperTask::swipe, this, reverse, WinMacro::SwipeExtraDelayDefault);
-
-        auto cur_name_textarea = detect_operators_name(image);
-
-        int oper_numer = detected_opers.size();
-        for (const TextArea& textarea : cur_name_textarea) {
-            int elite = detect_elite(image, textarea.rect);
-            if (elite == -1) {
-                continue;
-            }
-            OperInfrastInfo info;
-            info.elite = elite;
-            info.name = textarea.text;
-            detected_opers.emplace(textarea.text, std::move(info));
-        }
-
-        json::value opers_json;
-        std::vector<json::value> opers_json_vec;
-        for (const auto& [name, info] : detected_opers) {
-            json::value info_json;
-            info_json["name"] = info.name;
-            info_json["elite"] = info.elite;
-            //info_json["level"] = info.level;
-            opers_json_vec.emplace_back(std::move(info_json));
-        }
-        opers_json["all"] = json::array(opers_json_vec);
-        m_callback(AsstMsg::OpersDetected, opers_json, m_callback_arg);
-
-        // 正向滑动的时候
-        if (!reverse) {
-            ++times;
-            // 说明本次识别一个新的都没识别到，应该是滑动到最后了，直接结束循环
-            if (oper_numer == detected_opers.size()) {
-                reverse = true;
-            }
-        }
-        else {	// 反向滑动的时候
-            if (--times <= 0) {
-                break;
-            }
-        }
-        // 阻塞等待本次滑动结束
-        if (!swipe_future.get()) {
-            return std::nullopt;
-        }
-    }
-    return detected_opers;
-}
-
-int asst::IdentifyOperTask::detect_elite(const cv::Mat& image, const asst::Rect name_rect)
-{
-    cv::Rect elite_rect;
-    // 因为有的名字长有的名字短，但是右对齐的，所以跟着右边走
-    elite_rect.x = name_rect.x + name_rect.width - image.cols * 0.1;
-    elite_rect.y = name_rect.y - image.rows * 0.14;
-    if (elite_rect.x < 0 || elite_rect.y < 0) {
-        return -1;
-    }
-    elite_rect.width = image.cols * 0.04;
-    elite_rect.height = image.rows * 0.1;
-    cv::Mat elite_mat = image(elite_rect);
-
-    auto&& [algorithm1, score1, point1] = m_identify_ptr->find_image(elite_mat, "Elite1");
-    auto&& [algorithm2, score2, point2] = m_identify_ptr->find_image(elite_mat, "Elite2");
-    if (score1 > score2 && score1 > 0.7) {
-        return 1;
-    }
-    else if (score2 > score1 && score2 > 0.7) {
-        return 2;
-    }
-    else {
-        return 0;
-    }
-}
\ No newline at end of file
diff --git a/src/MeoAssistance/IdentifyOperTask.h b/src/MeoAssistance/IdentifyOperTask.h
deleted file mode 100644
index 42d6e318cc..0000000000
--- a/src/MeoAssistance/IdentifyOperTask.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#pragma once
-
-#include "InfrastAbstractTask.h"
-
-namespace asst {
-    // 识别干员任务，会将识别到的信息写入文件中
-    class IdentifyOperTask : public InfrastAbstractTask
-    {
-    public:
-        IdentifyOperTask(AsstCallback callback, void* callback_arg);
-        virtual ~IdentifyOperTask() = default;
-
-        virtual bool run() override;
-
-    protected:
-        // 一边滑动一边识别
-        std::optional<std::unordered_map<std::string, OperInfrastInfo>> swipe_and_detect();
-
-        // 检测干员精英化等级
-        int detect_elite(const cv::Mat& image, const asst::Rect name_rect);
-    };
-}
diff --git a/src/MeoAssistance/InfrastAbstractTask.cpp b/src/MeoAssistance/InfrastAbstractTask.cpp
deleted file mode 100644
index 2d9b95a807..0000000000
--- a/src/MeoAssistance/InfrastAbstractTask.cpp
+++ /dev/null
@@ -1,264 +0,0 @@
-#include "InfrastAbstractTask.h"
-
-#include <numeric>
-
-#include <opencv2/opencv.hpp>
-
-#include "WinMacro.h"
-#include "Identify.h"
-#include "Configer.h"
-#include "InfrastConfiger.h"
-#include "Logger.hpp"
-
-using namespace asst;
-
-asst::InfrastAbstractTask::InfrastAbstractTask(AsstCallback callback, void* callback_arg)
-    : OcrAbstractTask(callback, callback_arg),
-    m_swipe_begin(Configer::WindowWidthDefault * 0.9, Configer::WindowHeightDefault * 0.5, 0, 0),
-    m_swipe_end(Configer::WindowWidthDefault * 0.5, Configer::WindowHeightDefault * 0.5, 0, 0)
-{
-}
-
-bool asst::InfrastAbstractTask::swipe_to_the_left()
-{
-    DebugTraceFunction;
-
-    constexpr int SwipeTimes = 5;
-
-    m_swipe_duration = 100;
-    // 往左使劲滑几下
-    bool ret = false;
-    for (int i = 0; i != SwipeTimes; ++i) {
-        ret = swipe(true, 0);
-        if (!ret) {
-            break;
-        }
-    }
-    m_swipe_duration = SwipeDurationDefault;
-    if (!ret) {
-        return false;
-    }
-    return true;
-}
-
-bool asst::InfrastAbstractTask::click_clear_button()
-{
-    DebugTraceFunction;
-
-    const static Rect ClearButtonRect(430, 655, 150, 40);
-    return m_controller_ptr->click(ClearButtonRect);
-}
-
-bool asst::InfrastAbstractTask::click_confirm_button()
-{
-    DebugTraceFunction;
-
-    const static Rect ConfirmButtonRect(1105, 655, 150, 40);
-    return m_controller_ptr->click(ConfirmButtonRect);
-}
-
-bool asst::InfrastAbstractTask::swipe(bool reverse, int extra_delay)
-{
-    DebugTraceFunction;
-
-    //#ifndef LOG_TRACE
-    if (!reverse) {
-        m_controller_ptr->swipe(m_swipe_begin, m_swipe_end, m_swipe_duration, true, extra_delay);
-        ++m_swipe_times;
-    }
-    else {
-        m_controller_ptr->swipe(m_swipe_end, m_swipe_begin, m_swipe_duration, true, extra_delay);
-        --m_swipe_times;
-    }
-    return true;
-    //#else
-    //	return true;
-    //#endif
-}
-
-bool asst::InfrastAbstractTask::swipe_left()
-{
-    DebugTraceFunction;
-
-    const static Rect right_rect(Configer::WindowWidthDefault * 0.8,
-        Configer::WindowHeightDefault * 0.4,
-        Configer::WindowWidthDefault * 0.1,
-        Configer::WindowHeightDefault * 0.2);
-
-    const static Rect left_rect(Configer::WindowWidthDefault * 0.1,
-        Configer::WindowHeightDefault * 0.4,
-        Configer::WindowWidthDefault * 0.1,
-        Configer::WindowHeightDefault * 0.2);
-
-    m_controller_ptr->swipe(left_rect, right_rect);
-
-    return true;
-}
-
-bool asst::InfrastAbstractTask::swipe_right()
-{
-    DebugTraceFunction;
-
-    const static Rect right_rect(Configer::WindowWidthDefault * 0.8,
-        Configer::WindowHeightDefault * 0.4,
-        Configer::WindowWidthDefault * 0.1,
-        Configer::WindowHeightDefault * 0.2);
-
-    const static Rect left_rect(Configer::WindowWidthDefault * 0.1,
-        Configer::WindowHeightDefault * 0.4,
-        Configer::WindowWidthDefault * 0.1,
-        Configer::WindowHeightDefault * 0.2);
-
-    m_controller_ptr->swipe(right_rect, left_rect);
-
-    return true;
-}
-
-bool asst::InfrastAbstractTask::append_task_to_back_to_infrast_home()
-{
-    const static json::value append_json = json::object{
-        { "task", "InfrastBegin" },
-        { "task_chain", m_task_chain }
-    };
-    m_callback(AsstMsg::AppendProcessTask, append_json, m_callback_arg);
-    return true;
-}
-
-std::vector<TextArea> asst::InfrastAbstractTask::detect_operators_name(const cv::Mat& image)
-{
-    DebugTraceFunction;
-
-    // 裁剪出来干员名的一个长条形图片，没必要把整张图片送去识别
-    int cropped_height = image.rows * m_cropped_height_ratio;
-    int cropped_upper_y = image.rows * m_cropped_upper_y_ratio;
-    cv::Mat upper_part_name_image = image(cv::Rect(0, cropped_upper_y, image.cols, cropped_height));
-    // ocr库，单色图片识别效果好很多；但是只接受三通道的图片，所以这里转两次，送进去单色的、三通道的图片
-    cv::cvtColor(upper_part_name_image, upper_part_name_image, cv::COLOR_BGR2GRAY);
-    cv::cvtColor(upper_part_name_image, upper_part_name_image, cv::COLOR_GRAY2BGR);
-
-    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);
-    // 把这一块涂黑，避免后面被特征检测的误识别了
-    for (const TextArea& textarea : upper_part_names) {
-        cv::Rect rect(textarea.rect.x, textarea.rect.y - cropped_upper_y, textarea.rect.width, textarea.rect.height);
-        // 这里是转过灰度图再转回来的，相当于深拷贝，不会影响原图
-        cv::rectangle(upper_part_name_image, rect, cv::Scalar(0, 0, 0), -1);
-    }
-
-    // 下半部分的干员
-    int cropped_lower_y = image.rows * m_cropped_lower_y_ratio;
-    cv::Mat lower_part_name_image = image(cv::Rect(0, cropped_lower_y, image.cols, cropped_height));
-    // ocr库，单色图片识别效果好很多；但是只接受三通道的图片，所以这里转两次，送进去单色的、三通道的图片
-    cv::cvtColor(lower_part_name_image, lower_part_name_image, cv::COLOR_BGR2GRAY);
-    cv::cvtColor(lower_part_name_image, lower_part_name_image, cv::COLOR_GRAY2BGR);
-
-    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);
-    // 把这一块涂黑，避免后面被特征检测的误识别了
-    for (const TextArea& textarea : lower_part_names) {
-        cv::Rect rect(textarea.rect.x, textarea.rect.y - cropped_lower_y, textarea.rect.width, textarea.rect.height);
-        // 这里是转过灰度图再转回来的，相当于深拷贝，不会影响原图
-        cv::rectangle(lower_part_name_image, rect, cv::Scalar(0, 0, 0), -1);
-    }
-
-    // 上下两部分识别结果合并
-    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()));
-
-    return all_opers_textarea;
-}
-
-bool asst::InfrastAbstractTask::enter_station(const std::vector<std::string>& templ_names, int index, double threshold)
-{
-    DebugTraceFunction;
-
-    cv::Mat image = m_controller_ptr->get_image();
-
-    std::vector<asst::Identify::FindImageResult> max_score_reslut;
-    json::value callback_json;
-    callback_json["algorithm"] = "MatchTemplate";
-    callback_json["threshold"] = threshold;
-
-    std::string max_score_name;
-    for (const auto& templ : templ_names) {
-        auto cur_result = m_identify_ptr->find_all_images(image, templ, threshold);
-        callback_json["name"] = templ;
-
-        if (cur_result.empty()) {
-            callback_json["value"] = 0;
-            callback_json["rect"] = json::array({ 0, 0, 0, 0 });
-            m_callback(AsstMsg::ImageFindResult, callback_json, m_callback_arg);
-            continue;
-        }
-        Rect& rect = cur_result.at(0).rect;
-        callback_json["value"] = cur_result.at(0).score;
-        callback_json["rect"] = make_rect<json::array>(rect);
-        m_callback(AsstMsg::ImageFindResult, callback_json, m_callback_arg);
-
-        if (max_score_reslut.empty()
-            || cur_result.at(0).score > max_score_reslut.at(0).score) {	// find_all_image里是排过序的，直接取第一个就是最大得分
-            max_score_reslut = std::move(cur_result);
-            max_score_name = templ;
-        }
-    }
-
-    if (max_score_reslut.empty()) {
-        DebugTraceError("The number of matches is empty");
-        return false;
-    }
-    callback_json["name"] = max_score_name;
-    Rect& rect = max_score_reslut.at(0).rect;
-    callback_json["size"] = max_score_reslut.size();
-    callback_json["value"] = max_score_reslut.at(0).score;
-    callback_json["rect"] = make_rect<json::array>(rect);
-    m_callback(AsstMsg::ImageMatched, callback_json, m_callback_arg);
-
-    if (index >= max_score_reslut.size()) {
-        DebugTraceError("The number of matches is too few", index, max_score_reslut.size());
-        return false;
-    }
-
-    // 按照坐标排个序，左上的排前面
-    std::sort(max_score_reslut.begin(), max_score_reslut.end(), [](
-        const auto& lhs, const auto& rhs) -> bool {
-            if (std::abs(lhs.rect.y - rhs.rect.y) < 5) {	// y差距较小则理解为是同一排的，按x排序
-                return lhs.rect.x < rhs.rect.x;
-            }
-            else {
-                return lhs.rect.y < rhs.rect.y;
-            }
-        });
-
-    m_controller_ptr->click(max_score_reslut.at(index).rect);
-    return sleep(1000);
-}
-
-bool asst::InfrastAbstractTask::click_first_operator()
-{
-    DebugTraceFunction;
-
-    const static Rect FirstOperatorRect(420, 80, 125, 270);
-    return m_controller_ptr->click(FirstOperatorRect);
-}
\ No newline at end of file
diff --git a/src/MeoAssistance/InfrastAbstractTask.h b/src/MeoAssistance/InfrastAbstractTask.h
deleted file mode 100644
index fa6e61df71..0000000000
--- a/src/MeoAssistance/InfrastAbstractTask.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#pragma once
-
-#include "OcrAbstractTask.h"
-#include "AsstDef.h"
-
-namespace asst {
-    class InfrastAbstractTask : public OcrAbstractTask
-    {
-    public:
-        InfrastAbstractTask(AsstCallback callback, void* callback_arg);
-        virtual ~InfrastAbstractTask() = default;
-        virtual bool run() = 0;
-        virtual void on_run_fails(int retry_times) override {
-            append_task_to_back_to_infrast_home();
-        }
-    protected:
-        virtual bool swipe_to_the_left();   // 滑动到最左侧
-        virtual bool click_clear_button();
-        virtual bool click_confirm_button();
-        virtual bool swipe(bool reverse = false, int extra_delay = 1000);
-        virtual bool swipe_left();          // 往左划（只滑一下）
-        virtual bool swipe_right();         // 往右划（只滑一下）
-        virtual bool append_task_to_back_to_infrast_home();	// 添加返回主界面的任务
-
-        // 检测干员名
-        virtual std::vector<TextArea> detect_operators_name(const cv::Mat& image);
-        virtual bool enter_station(const std::vector<std::string>& templ_names, int index, double threshold = 0.8);
-        virtual bool click_first_operator();
-
-        constexpr static int SwipeDurationDefault = 2000;
-
-        double m_cropped_height_ratio = 0.052;	// 图片裁剪出干员名的长条形图片 的高度比例（相比原图）
-        double m_cropped_upper_y_ratio = 0.441;	// 图片裁剪出干员名的长条形图片，上半部分干员名的裁剪区域y坐标比例（相比原图）
-        double m_cropped_lower_y_ratio = 0.831;	// 图片裁剪出干员名的长条形图片，下半部分干员名的裁剪区域y坐标比例（相比原图）
-        Rect m_swipe_begin;									// 边滑动边识别，单次滑动起始点（Rect内随机点）
-        Rect m_swipe_end;									// 边滑动边识别，单次滑动结束点（Rect内随机点）
-        int m_swipe_duration = SwipeDurationDefault;		// 滑动持续时间，时间越长滑的越慢
-        int m_swipe_times = 0;								// 滑动了几次，正向滑动增加，反向滑动减少
-        bool m_keep_swipe = false;							// keep_swipe函数是否结束的标志位
-    };
-}
diff --git a/src/MeoAssistance/InfrastConfiger.cpp b/src/MeoAssistance/InfrastConfiger.cpp
deleted file mode 100644
index fa7194307f..0000000000
--- a/src/MeoAssistance/InfrastConfiger.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-#include "InfrastConfiger.h"
-
-#include <fstream>
-#include <sstream>
-
-#include <json.h>
-
-#include "Logger.hpp"
-
-using namespace asst;
-
-bool InfrastConfiger::parse(const json::value& json)
-{
-    // 通用的干员信息
-    for (const json::value& name : json.at("allNames").as_array()) {
-        m_all_opers_name.emplace(name.as_string());
-    }
-
-    // 每个基建设施中的干员组合信息
-    for (const json::value& facility : json.at("infrast").as_array()) {
-        std::string key = facility.at("facility").as_string();
-
-        std::vector<OperInfrastComb> combs_vec;
-        for (const json::value& comb_json : facility.at("combs").as_array()) {
-            std::vector<OperInfrastInfo> opers;
-            for (const json::value& oper : comb_json.at("opers").as_array()) {
-                OperInfrastInfo info;
-                info.name = oper.at("name").as_string();
-                info.elite = oper.get("elite", 0);
-                info.level = oper.get("level", 0);
-                opers.emplace_back(std::move(info));
-            }
-            OperInfrastComb comb;
-            comb.comb = std::move(opers);
-            comb.efficiency = comb_json.at("efficiency").as_integer();
-
-            combs_vec.emplace_back(std::move(comb));
-        }
-        m_infrast_combs.emplace(key, std::move(combs_vec));
-
-        std::vector<std::string> end_name_vec;
-        for (const json::value& name : facility.at("endFlag").as_array()) {
-            end_name_vec.emplace_back(name.as_string());
-        }
-        m_infrast_end_flag.emplace(key, std::move(end_name_vec));
-    }
-
-    return true;
-}
\ No newline at end of file
diff --git a/src/MeoAssistance/InfrastConfiger.h b/src/MeoAssistance/InfrastConfiger.h
deleted file mode 100644
index 34fb23ab70..0000000000
--- a/src/MeoAssistance/InfrastConfiger.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#pragma once
-
-#include "AbstractConfiger.h"
-
-#include <string>
-#include <unordered_map>
-#include <unordered_set>
-
-#include "AsstDef.h"
-
-namespace asst {
-    class InfrastConfiger : public AbstractConfiger
-    {
-    public:
-        virtual ~InfrastConfiger() = default;
-
-        static InfrastConfiger& get_instance() {
-            static InfrastConfiger unique_instance;
-            return unique_instance;
-        }
-
-        std::unordered_set<std::string> m_all_opers_name;				// 所有干员的名字
-        // 各个设施内的可能干员组合，注意值是vector，是有序的
-        std::unordered_map<std::string, std::vector<OperInfrastComb>> m_infrast_combs;
-        // 各个设施的识别结束标记，识别到这个名字就停止继续识别了，一般放列表中最后几个人名
-        std::unordered_map<std::string, std::vector<std::string>> m_infrast_end_flag;
-
-    protected:
-        InfrastConfiger() = default;
-        InfrastConfiger(const InfrastConfiger& rhs) = default;
-        InfrastConfiger(InfrastConfiger&& rhs) noexcept = default;
-
-        InfrastConfiger& operator=(const InfrastConfiger& rhs) = default;
-        InfrastConfiger& operator=(InfrastConfiger&& rhs) noexcept = default;
-
-        virtual bool parse(const json::value& json) override;
-    };
-}
diff --git a/src/MeoAssistance/InfrastDormTask.cpp b/src/MeoAssistance/InfrastDormTask.cpp
deleted file mode 100644
index efd48026f1..0000000000
--- a/src/MeoAssistance/InfrastDormTask.cpp
+++ /dev/null
@@ -1,366 +0,0 @@
-#include "InfrastDormTask.h"
-
-#include <future>
-#include <thread>
-
-#include <opencv2/opencv.hpp>
-
-#include "WinMacro.h"
-#include "Identify.h"
-#include "Configer.h"
-
-using namespace asst;
-
-bool asst::InfrastDormTask::run()
-{
-    if (m_controller_ptr == nullptr
-        || m_identify_ptr == nullptr)
-    {
-        m_callback(AsstMsg::PtrIsNull, json::value(), m_callback_arg);
-        return false;
-    }
-
-    json::value task_start_json = json::object{
-        { "task_type",  "InfrastDormTask" },
-        { "task_chain", m_task_chain}
-    };
-    m_callback(AsstMsg::TaskStart, task_start_json, m_callback_arg);
-
-    bool ret = enter_station({ "Dorm", "DormMini" }, m_dorm_begin, 0.8);
-    if (!ret) {
-        return false;
-    }
-
-    int dorm_index = m_dorm_begin;
-    for (; dorm_index < DormNum; ++dorm_index) {
-        if (need_exit()) {
-            return false;
-        }
-        if (dorm_index != m_dorm_begin) {
-            ret = enter_next_dorm();
-            if (!ret) {
-                return false;
-            }
-        }
-        json::value enter_json;
-        enter_json["station"] = "Dorm";
-        enter_json["index"] = dorm_index;
-        m_callback(AsstMsg::EnterStation, enter_json, m_callback_arg);
-
-        enter_operator_selection();
-        int selected = select_operators(true);
-        if (selected == -1) {
-            ret = false;
-            break;
-        }
-        else if (selected < MaxOperNumInDorm) {	// 如果选不满5个人，说明没有更多需要休息的了，直接结束宿舍任务
-            break;
-        }
-    }
-    m_dorm_begin = dorm_index;
-
-    m_callback(AsstMsg::TaskCompleted, task_start_json, m_callback_arg);
-
-    return ret;
-}
-
-bool asst::InfrastDormTask::click_confirm_button()
-{
-    InfrastAbstractTask::click_confirm_button();
-    if (!sleep(300)) {
-        return false;
-    }
-
-    // 点完确定后，如果把工作中的干员撤下来了，会再弹出来一个确认的界面，如果没撤下来则不会弹出。先识别一下再决定要不要点击
-    auto&& [algorithm, score, second_confirm_rect] =
-        m_identify_ptr->find_image(m_controller_ptr->get_image(), "DormConfirm");
-    if (score >= Configer::TemplThresholdDefault) {
-        m_controller_ptr->click(second_confirm_rect);
-    }
-    return sleep(2000);
-}
-
-bool asst::InfrastDormTask::enter_next_dorm()
-{
-    static const Rect swipe_down_begin(		// 向下滑动起点
-        Configer::WindowWidthDefault * 0.3,
-        Configer::WindowHeightDefault * 0.8,
-        Configer::WindowWidthDefault * 0.2,
-        Configer::WindowWidthDefault * 0.1);
-    static const Rect swipe_down_end(		// 向下滑动终点
-        Configer::WindowWidthDefault * 0.3,
-        Configer::WindowHeightDefault * 0.2,
-        Configer::WindowWidthDefault * 0.2,
-        Configer::WindowWidthDefault * 0.1);
-
-    static const int swipe_dwon_duration = 1000;	// 向下滑动持续时间
-
-    // 游戏bug，宿舍中如果“进驻信息”已被选中，直接进行滑动会被滑的很远
-    // 所以这里先检查一下，如果进驻信息被选中了，就先把它关了，再进行滑动
-    auto find_result = m_identify_ptr->find_image(m_controller_ptr->get_image(), "StationInfoSelected");
-    if (find_result.score >= 0.75) {
-        m_controller_ptr->click(find_result.rect);
-    }
-
-    m_controller_ptr->swipe(swipe_down_begin, swipe_down_end, swipe_dwon_duration);
-
-    static const Rect double_click_rect(
-        Configer::WindowWidthDefault * 0.4,
-        Configer::WindowHeightDefault * 0.4,
-        Configer::WindowWidthDefault * 0.2,
-        Configer::WindowWidthDefault * 0.2
-    );
-
-    // 游戏中的宿舍里，双击可以让当前设施回到正确的位置
-    m_controller_ptr->click(double_click_rect);
-    m_controller_ptr->click(double_click_rect);
-
-    return true;
-}
-
-bool asst::InfrastDormTask::enter_operator_selection()
-{
-    // 有这些文字之一就说明“进驻信息”这个按钮已经点开了
-    constexpr static std::array<std::string_view, 3> info_opened_flags = {
-        "当前房间入住信息","进驻人数","清空"
-    };
-
-    std::vector<TextArea> ocr_result = ocr_detect();
-
-    bool is_info_opened =
-        std::find_first_of(
-            ocr_result.cbegin(), ocr_result.cend(),
-            info_opened_flags.cbegin(), info_opened_flags.cend(),
-            [](const TextArea& lhs, const std::string_view& rhs)
-            -> bool { return lhs.text == rhs; })
-        != ocr_result.cend();
-
-    constexpr static std::string_view station_info = "进驻信息";
-    // 如果“进驻信息”窗口没点开，那就点开
-    if (!is_info_opened) {
-        auto station_info_iter = std::find_if(ocr_result.cbegin(), ocr_result.cend(),
-            [](const TextArea& textarea) -> bool {
-                return textarea.text == station_info;
-            });
-        m_controller_ptr->click(station_info_iter->rect);
-        if (!sleep(1000)) {
-            return false;
-        }
-        ocr_result = ocr_detect();
-    }
-
-    // 点击这里面任意一个，都可以进入干员选择页面
-    constexpr static std::array<std::string_view, 4> enter_operator_page_buttons = {
-        "进驻","休息中","空闲中","心情"
-    };
-
-    auto button_iter = std::find_first_of(
-        ocr_result.cbegin(), ocr_result.cend(),
-        enter_operator_page_buttons.cbegin(), enter_operator_page_buttons.cend(),
-        [](const TextArea& lhs, const std::string_view& rhs)
-        -> bool { return lhs.text == rhs; });
-    if (button_iter == ocr_result.cend()) {
-        // TODO 报错
-        return false;
-    }
-    m_controller_ptr->click(button_iter->rect);
-    return sleep(2000);
-}
-
-int asst::InfrastDormTask::select_operators(bool need_to_the_left)
-{
-    if (need_to_the_left) {
-        if (!swipe_to_the_left()) {
-            return false;
-        }
-    }
-    cv::Mat image = m_controller_ptr->get_image();
-
-    json::value shift_json;
-    shift_json["station"] = "Dorm";
-
-    // 识别“休息中”的干员
-    auto resting_result = m_identify_ptr->find_all_images(image, "Resting", 0.8);
-    if (resting_result.size() == MaxOperNumInDorm) {	// 如果所有人都在休息，那这个宿舍不用换班，直接关了
-        click_return_button();
-        m_callback(AsstMsg::NoNeedToShift, shift_json, m_callback_arg);
-        return resting_result.size();
-    }
-
-    // 识别“注意力涣散”的干员
-    // TODO，这个阈值太低了，不正常，有时间再调整一下模板图片
-    //auto listless_result = m_identify_ptr->find_all_images(image, "Listless", 0.6);
-    const static std::array<std::string, 1> ListlessKeyword = { "注意力" };
-    auto listless_result = text_search(m_identify_ptr->ocr_detect(image), ListlessKeyword);
-    // 识别正在工作中的干员的心情状态
-    double mood_threshold = Configer::get_instance().m_infrast_options.dorm_threshold;
-    auto work_mood_result = detect_mood_status_at_work(image, mood_threshold);
-
-    m_callback(AsstMsg::ReadyToShift, shift_json, m_callback_arg);
-
-    click_clear_button();
-    // 把“休息中”的干员，都再次选上
-    for (const auto& resting : resting_result) {
-        m_controller_ptr->click(resting.rect);
-    }
-    int count = resting_result.size();
-
-    // 选择“注意力涣散”的干员
-    for (const auto& listless : listless_result) {
-        if (count >= MaxOperNumInDorm) {
-            break;
-        }
-        m_controller_ptr->click(listless.rect);
-        ++count;
-    }
-    // 选择心情较低的干员
-    for (const auto& mood_status : work_mood_result) {
-        if (count >= MaxOperNumInDorm) {
-            break;
-        }
-        m_controller_ptr->click(mood_status.rect);
-        ++count;
-    }
-    if (count >= MaxOperNumInDorm) {
-        click_confirm_button();
-        m_callback(AsstMsg::ShiftCompleted, shift_json, m_callback_arg);
-        return count;
-    }
-
-    while (count < MaxOperNumInDorm) {
-        if (need_exit()) {
-            return false;
-        }
-        swipe();
-        image = m_controller_ptr->get_image();
-        work_mood_result = detect_mood_status_at_work(image, mood_threshold);
-        // 选择心情较低的干员
-        for (const auto& mood_status : work_mood_result) {
-            if (count >= MaxOperNumInDorm) {
-                break;
-            }
-            m_controller_ptr->click(mood_status.rect);
-            ++count;
-        }
-        if (count >= MaxOperNumInDorm) {
-            break;
-        }
-        // 识别到满心情的笑脸，就说明后面的都是满心情的（心情排序的），没必要继续滑动识别后面的了
-        auto rest_result = m_identify_ptr->find_image(image, "SmileyAtRest");
-        if (rest_result.score > Configer::TemplThresholdDefault) {
-            break;
-        }
-    }
-    click_confirm_button();
-
-    m_callback(AsstMsg::ShiftCompleted, shift_json, m_callback_arg);
-    return count;
-}
-
-std::vector<InfrastDormTask::MoodStatus> InfrastDormTask::detect_mood_status_at_work(const cv::Mat& image, double process_threshold) const
-{
-    constexpr static int MoodWidth = Configer::WindowWidthDefault * 0.0664;		// 心情进度条长度（满心情的时候）
-    constexpr static int MoodHeight = Configer::WindowHeightDefault * 0.00416 + 0.5;	// 心情进度条高度
-
-#ifdef LOG_TRACE
-    cv::Mat draw_image = image.clone();
-#endif
-
-    // 把工作中的那个黄色笑脸全抓出来
-    auto smiley_result = m_identify_ptr->find_all_images(image, "SmileyAtWork", 0.88, false);
-
-    std::vector<MoodStatus> moods_vec;
-    for (const auto& smiley : smiley_result) {
-        // 检查进度条是否超出了图片范围
-        if (smiley.rect.x + smiley.rect.width + MoodWidth >= image.cols) {
-            continue;
-        }
-        // 根据黄色笑脸往右推心情进度条的区域
-        cv::Rect process_rect(
-            smiley.rect.x + smiley.rect.width,
-            smiley.rect.y,
-            MoodWidth,
-            smiley.rect.height);
-        cv::Mat process_mat = image(process_rect);
-
-        cv::Mat process_gray;
-        cv::cvtColor(process_mat, process_gray, cv::COLOR_BGR2GRAY);
-
-        int max_white_length = 0;	// 最长的横向连续的白色长条的长度
-        for (int i = 0; i != process_gray.rows; ++i) {
-            int cur_white_length = 0;
-            cv::uint8_t left_value = 250;	// 当前点左侧的点的值
-            for (int j = 0; j != process_gray.cols; ++j) {
-                constexpr static cv::uint8_t LowerLimit = 180;
-                constexpr static cv::uint8_t DiffThreshold = 20;
-
-                auto value = process_gray.at<cv::uint8_t>(i, j);
-                if (value >= LowerLimit && left_value - value < DiffThreshold) {	// 右边的颜色相比左边变化在阈值以内，都认为是连续的
-                    left_value = value;
-                    ++cur_white_length;
-                    if (max_white_length < cur_white_length) {
-                        max_white_length = cur_white_length;
-                    }
-                }
-                else {
-                    if (max_white_length < cur_white_length) {
-                        max_white_length = cur_white_length;
-                    }
-                    left_value = 250;
-                    cur_white_length = 0;
-                }
-            }
-        }
-
-        MoodStatus mood_status;
-        mood_status.actual_length = max_white_length;
-        mood_status.process = static_cast<double>(max_white_length) / MoodWidth;
-        mood_status.rect = asst::Rect(smiley.rect.x, smiley.rect.y,
-            smiley.rect.width + process_rect.width, smiley.rect.height + process_rect.height);
-        mood_status.actual_rect = asst::Rect(process_rect.x, process_rect.y,
-            max_white_length, process_rect.height);
-#ifdef LOG_TRACE
-        cv::Rect cv_actual_rect(mood_status.actual_rect.x, mood_status.actual_rect.y,
-            mood_status.actual_rect.width, mood_status.actual_rect.height);
-        cv::rectangle(draw_image, cv_actual_rect, cv::Scalar(0, 0, 255), 1);
-        cv::putText(draw_image, std::to_string(mood_status.process), cv::Point(cv_actual_rect.x, cv_actual_rect.y), cv::FONT_HERSHEY_PLAIN, 1, cv::Scalar(0, 0, 255));
-#endif
-        if (mood_status.process == 0 || mood_status.process >= 1) {
-            // 值为0说明是“注意力涣散”，红色哭脸被错误的识别成黄色笑脸了，这里直接忽略这个值
-            // 值为1说明是“空闲中”，绿色笑脸被误识别了，也直接忽略了
-        }
-        else if (mood_status.process <= process_threshold) {	// 心情小于阈值的直接加入结果
-            moods_vec.emplace_back(std::move(mood_status));
-        }
-        else {
-            // 既不在工作中，也不在休息中，但是心情值还大于阈值的，也需要加入结果中
-            // 思路：根据心情进度条的位置，往上裁剪出“工作中”or“休息中”的那一块区域
-            // 进行模板匹配，如果没匹配上，则认为这个干员既不在工作，也不在休息
-            constexpr static int HeightDiff = Configer::WindowHeightDefault * 0.13;
-            constexpr static int OnShiftHeight = Configer::WindowHeightDefault * 0.08;
-            cv::Rect on_shift_rect(mood_status.rect.x, mood_status.rect.y - HeightDiff, mood_status.rect.width, OnShiftHeight);
-            // “休息中”的笑脸前面的模板匹配是对不上的，走不到这里，所以这里只匹配“工作中”即可
-            auto find_result = m_identify_ptr->find_image(image(on_shift_rect), "OnShift");
-            if (find_result.score < 0.45) {
-                moods_vec.emplace_back(std::move(mood_status));
-            }
-        }
-    }
-
-    std::sort(moods_vec.begin(), moods_vec.end(),
-        [](const auto& lhs, const auto& rhs) -> bool {
-            // 按剩余心情进度排个序，少的在前面
-            if (lhs.actual_length != rhs.actual_length) {
-                return lhs.actual_length < rhs.actual_length;
-            }
-            // 如果剩余心情相等，优先选靠左侧、靠上侧的，更符合用户直觉
-            else if (lhs.rect.x != rhs.rect.x) {
-                return lhs.rect.x < rhs.rect.x;
-            }
-            else {
-                return lhs.rect.y < rhs.rect.y;
-            }
-        });
-
-    return moods_vec;
-}
\ No newline at end of file
diff --git a/src/MeoAssistance/InfrastDormTask.h b/src/MeoAssistance/InfrastDormTask.h
deleted file mode 100644
index 74f3daacb1..0000000000
--- a/src/MeoAssistance/InfrastDormTask.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#pragma once
-
-#include "InfrastAbstractTask.h"
-
-namespace asst {
-    class InfrastDormTask : public InfrastAbstractTask
-    {
-    public:
-        using InfrastAbstractTask::InfrastAbstractTask;
-        virtual ~InfrastDormTask() = default;
-
-        virtual bool run() override;
-
-        bool set_dorm_begin(int index) {
-            if (index < 0 || index >= DormNum) {
-                return false;
-            }
-            m_dorm_begin = index;
-            return true;
-        }
-    protected:
-        struct MoodStatus {
-            Rect rect;					// 心情进度条在原图中的位置（总的进度条）
-            Rect actual_rect;			// 心情进度条在原图中的位置（白色有效部分）
-            int actual_length;			// 心情进度条白色有效部分的长度（像素点数量）
-            double process = 0.0;		// 心情进度条剩余百分比
-            int time_left_hour = 0;	// 剩余工作时间（小时数）
-        };
-        constexpr static int MaxOperNumInDorm = 5;	// 宿舍最大干员数
-        constexpr static int DormNum = 4;			// 宿舍数量
-
-        virtual bool click_confirm_button() override;
-        // 进入下一个宿舍
-        bool enter_next_dorm();
-        // 进入当前宿舍的干员选择界面
-        bool enter_operator_selection();
-        // 选择干员，返回本宿舍入住了几个干员
-        int select_operators(bool need_to_the_left = false);
-        // 检测正在工作中的干员心情状态
-        std::vector<MoodStatus> detect_mood_status_at_work(
-            const cv::Mat& image, double process_threshold = 1.0) const;
-
-        int m_dorm_begin = 0;				// 从第几个宿舍开始
-    };
-}
diff --git a/src/MeoAssistance/InfrastOfficeTask.cpp b/src/MeoAssistance/InfrastOfficeTask.cpp
deleted file mode 100644
index e4a96a8e6c..0000000000
--- a/src/MeoAssistance/InfrastOfficeTask.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-#include "InfrastOfficeTask.h"
-
-#include "Configer.h"
-#include "Identify.h"
-#include "WinMacro.h"
-
-bool asst::InfrastOfficeTask::run()
-{
-    if (m_controller_ptr == nullptr
-        || m_identify_ptr == nullptr)
-    {
-        m_callback(AsstMsg::PtrIsNull, json::value(), m_callback_arg);
-        return false;
-    }
-
-    json::value task_start_json = json::object{
-        { "task_type",  "InfrastOfficeTask" },
-        { "task_chain", m_task_chain}
-    };
-    m_callback(AsstMsg::TaskStart, task_start_json, m_callback_arg);
-
-    bool ret = swipe_right();
-    ret &= enter_station({ "Office", "OfficeMini" }, 0);
-    if (!ret) {
-        return false;
-    }
-    json::value enter_json;
-    enter_json["station"] = "Office";
-    enter_json["index"] = 0;
-    m_callback(AsstMsg::EnterStation, enter_json, m_callback_arg);
-
-    if (enter_operator_selection()) {
-        m_callback(AsstMsg::ReadyToShift, enter_json, m_callback_arg);
-        select_operators(true);
-        m_callback(AsstMsg::ShiftCompleted, enter_json, m_callback_arg);
-    }
-    else {
-        m_callback(AsstMsg::NoNeedToShift, enter_json, m_callback_arg);
-    }
-    m_callback(AsstMsg::TaskCompleted, task_start_json, m_callback_arg);
-
-    return true;
-}
-
-bool asst::InfrastOfficeTask::enter_operator_selection()
-{
-    auto suspended_result = m_identify_ptr->find_image(m_controller_ptr->get_image(), "ContactSuspended");
-    if (suspended_result.score > Configer::TemplThresholdDefault) {
-        m_controller_ptr->click(suspended_result.rect);
-        return sleep(1000);
-    }
-    else {
-        return false;
-    }
-}
-
-int asst::InfrastOfficeTask::select_operators(bool need_to_the_left)
-{
-    bool ret = false;
-    if (need_to_the_left) {
-        ret = swipe_to_the_left();
-    }
-    // 办公室干员不用做识别，直接选择第一个即可
-    ret &= click_first_operator();
-    ret &= click_confirm_button();
-    if (!ret) {
-        return -1;
-    }
-
-    // 办公室只选了一个人，固定return 1
-    return 1;
-}
\ No newline at end of file
diff --git a/src/MeoAssistance/InfrastOfficeTask.h b/src/MeoAssistance/InfrastOfficeTask.h
deleted file mode 100644
index f7df3de335..0000000000
--- a/src/MeoAssistance/InfrastOfficeTask.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-#include "InfrastAbstractTask.h"
-
-namespace asst {
-    class InfrastOfficeTask : public InfrastAbstractTask
-    {
-    public:
-        using InfrastAbstractTask::InfrastAbstractTask;
-        virtual ~InfrastOfficeTask() = default;
-
-        virtual bool run() override;
-    protected:
-        // 进入干员选择界面
-        bool enter_operator_selection();
-        // 选择干员，返回本次选择了几个干员，DuckType，办公室固定返回 1
-        int select_operators(bool need_to_the_left = false);
-    };
-}
diff --git a/src/MeoAssistance/InfrastPowerTask.cpp b/src/MeoAssistance/InfrastPowerTask.cpp
deleted file mode 100644
index 792c2212a3..0000000000
--- a/src/MeoAssistance/InfrastPowerTask.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-#include "InfrastPowerTask.h"
-
-#include "WinMacro.h"
-#include "Identify.h"
-#include "Configer.h"
-
-bool asst::InfrastPowerTask::run()
-{
-    if (m_controller_ptr == nullptr
-        || m_identify_ptr == nullptr)
-    {
-        m_callback(AsstMsg::PtrIsNull, json::value(), m_callback_arg);
-        return false;
-    }
-
-    json::value task_start_json = json::object{
-        { "task_type",  "InfrastPowerTask" },
-        { "task_chain", m_task_chain}
-    };
-    m_callback(AsstMsg::TaskStart, task_start_json, m_callback_arg);
-
-    bool is_the_left = false;
-    for (int i = 0; i != PowerNum; ++i) {
-        if (need_exit()) {
-            return false;
-        }
-        swipe_left();
-        if (!enter_station({ "Power", "PowerMini" }, i)) {
-            return false;
-        }
-        json::value enter_json;
-        enter_json["station"] = "Power";
-        enter_json["index"] = i;
-        m_callback(AsstMsg::EnterStation, enter_json, m_callback_arg);
-
-        if (enter_operator_selection()) {
-            m_callback(AsstMsg::ReadyToShift, enter_json, m_callback_arg);
-            select_operators(!is_the_left);
-            if (!is_the_left) {
-                is_the_left = true;
-            }
-            m_callback(AsstMsg::ShiftCompleted, enter_json, m_callback_arg);
-        }
-        else {
-            m_callback(AsstMsg::NoNeedToShift, enter_json, m_callback_arg);
-        }
-        if (!sleep(1000)) {
-            return false;
-        }
-        click_return_button();
-        if (!sleep(1000)) {
-            return false;
-        }
-    }
-    m_callback(AsstMsg::TaskCompleted, task_start_json, m_callback_arg);
-    return true;
-}
-
-bool asst::InfrastPowerTask::enter_operator_selection()
-{
-    // 有这些文字之一就说明“进驻信息”这个按钮已经点开了
-    static constexpr std::array<std::string_view, 3> info_opened_flags = {
-        "当前房间入住信息","进驻人数","清空"
-    };
-
-    std::vector<TextArea> ocr_result = ocr_detect();
-
-    bool is_info_opened =
-        std::find_first_of(
-            ocr_result.cbegin(), ocr_result.cend(),
-            info_opened_flags.cbegin(), info_opened_flags.cend(),
-            [](const TextArea& lhs, const std::string_view& rhs)
-            -> bool { return lhs.text == rhs; })
-        != ocr_result.cend();
-
-    static constexpr std::string_view station_info = "进驻信息";
-    // 如果“进驻信息”窗口没点开，那就点开
-    if (!is_info_opened) {
-        auto station_info_iter = std::find_if(ocr_result.cbegin(), ocr_result.cend(),
-            [](const TextArea& textarea) -> bool {
-                return textarea.text == station_info;
-            });
-        m_controller_ptr->click(station_info_iter->rect);
-        sleep(1000);
-    }
-
-    cv::Mat image = m_controller_ptr->get_image();
-    auto goin_result = m_identify_ptr->find_image(image, "GoIn");
-    // 如果找到了GoIn（“进驻”按钮），进点进去，准备选择干员
-    if (goin_result.score > Configer::TemplThresholdDefault) {
-        m_controller_ptr->click(goin_result.rect);
-        return sleep(1000);
-    }
-    else {
-        return false;	// 否则说明这个发电站是有人在的，不用换班
-    }
-}
-
-int asst::InfrastPowerTask::select_operators(bool need_to_the_left)
-{
-    bool ret = false;
-    if (need_to_the_left) {
-        ret = swipe_to_the_left();
-    }
-    // 发电站干员不用做识别，直接选择第一个即可
-    ret &= click_first_operator();
-    ret &= click_confirm_button();
-    if (!ret) {
-        return -1;
-    }
-
-    // 发电站固定只选择一个干员，return 1
-    return 1;
-}
\ No newline at end of file
diff --git a/src/MeoAssistance/InfrastPowerTask.h b/src/MeoAssistance/InfrastPowerTask.h
deleted file mode 100644
index 50fa9eac60..0000000000
--- a/src/MeoAssistance/InfrastPowerTask.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#pragma once
-#include "InfrastAbstractTask.h"
-
-namespace asst {
-    // 发电站换班任务
-    // 任务开始前需要处在基建主界面
-    class InfrastPowerTask : public InfrastAbstractTask
-    {
-    public:
-        using InfrastAbstractTask::InfrastAbstractTask;
-        virtual ~InfrastPowerTask() = default;
-
-        virtual bool run() override;
-    protected:
-        constexpr static int PowerNum = 3;			// 发电站数量
-
-        // 进入当前发电站的干员选择界面
-        bool enter_operator_selection();
-        // 选择干员，返回本次选择了几个干员，DuckType，发电站固定返回 1
-        int select_operators(bool need_to_the_left = false);
-    };
-}
diff --git a/src/MeoAssistance/InfrastProductionTask.cpp b/src/MeoAssistance/InfrastProductionTask.cpp
deleted file mode 100644
index 76707e1de8..0000000000
--- a/src/MeoAssistance/InfrastProductionTask.cpp
+++ /dev/null
@@ -1,283 +0,0 @@
-#include "InfrastProductionTask.h"
-
-#include <thread>
-#include <future>
-#include <algorithm>
-#include <future>
-#include <list>
-
-#include <opencv2/opencv.hpp>
-
-#include "Configer.h"
-#include "InfrastConfiger.h"
-#include "WinMacro.h"
-#include "Identify.h"
-#include "AsstAux.h"
-
-using namespace asst;
-
-bool asst::InfrastProductionTask::run()
-{
-    if (m_controller_ptr == nullptr
-        || m_identify_ptr == nullptr)
-    {
-        m_callback(AsstMsg::PtrIsNull, json::value(), m_callback_arg);
-        return false;
-    }
-
-    json::value task_start_json = json::object{
-        { "task_type",  "InfrastProductionTask" },
-        { "task_chain", m_task_chain}
-    };
-    m_callback(AsstMsg::TaskStart, task_start_json, m_callback_arg);
-
-    cv::Mat image = m_controller_ptr->get_image();
-    // 先识别一下有几个制造站/贸易站
-    const static std::array<std::string, 4> facility_number_key = { "02", "03", "04", "05" };
-    std::vector<Rect> facility_number_rect;
-    facility_number_rect.emplace_back(Rect());	// 假装给01 push一个，后面循环好写=。=
-
-    for (const std::string& key : facility_number_key) {
-        auto&& [algorithm, score, temp_rect] = m_identify_ptr->find_image(image, key);
-        if (score >= Configer::TemplThresholdDefault) {
-            facility_number_rect.emplace_back(temp_rect);
-        }
-        else {
-            break;
-        }
-    }
-
-    std::unordered_map<std::string, OperInfrastInfo> available_opers;
-    for (size_t i = 0; i != facility_number_rect.size(); ++i) {
-        if (need_exit()) {
-            return false;
-        }
-        if (i != 0) {
-            // 点到这个基建
-            m_controller_ptr->click(facility_number_rect[i]);
-            sleep(300);
-            image = m_controller_ptr->get_image();
-        }
-        json::value enter_json;
-        enter_json["station"] = "Production";
-        enter_json["index"] = i;
-        m_callback(AsstMsg::EnterStation, enter_json, m_callback_arg);
-
-        // 如果当前界面没有添加干员的按钮，那就不换班
-        auto&& [algorithm1, score1, add_rect1] = m_identify_ptr->find_image(image, "AddOperator");
-        auto&& [algorithm2, score2, add_rect2] = m_identify_ptr->find_image(image, "AddOperator-Trade");
-        if (score1 < Configer::TemplThresholdDefault && score2 < Configer::TemplThresholdDefault) {
-            m_callback(AsstMsg::NoNeedToShift, enter_json, m_callback_arg);
-            continue;
-        }
-
-        // 识别当前正在造什么
-        for (const auto& [key, useless_value] : InfrastConfiger::get_instance().m_infrast_combs) {
-            auto&& [algorithm, score, useless_rect] = m_identify_ptr->find_image(image, key);
-            if (score >= Configer::TemplThresholdDefault) {
-                m_facility = key;
-                break;
-            }
-        }
-        enter_json["production"] = m_facility;
-        m_callback(AsstMsg::StationInfo, enter_json, m_callback_arg);
-
-        m_callback(AsstMsg::ReadyToShift, enter_json, m_callback_arg);
-
-        //点击添加干员的那个按钮
-        Rect add_rect = score1 >= score2 ? std::move(add_rect1) : std::move(add_rect2);
-        m_controller_ptr->click(add_rect);
-        if (!sleep(2000)) {
-            return false;
-        }
-
-        click_clear_button();
-        sleep(300);
-
-        if (available_opers.empty()) {
-            auto detect_ret = swipe_and_detect();
-            if (!detect_ret) {
-                return false;
-            }
-            available_opers = std::move(detect_ret.value());
-        }
-        auto optimal_comb = calc_optimal_comb(available_opers);
-        if (swipe_and_select(optimal_comb)) {
-            m_callback(AsstMsg::ShiftCompleted, enter_json, m_callback_arg);
-            // 从可用干员中，把刚才已经刚刚已经使用了的干员去掉
-            for (const std::string& name : optimal_comb) {
-                available_opers.erase(name);
-            }
-        }
-        else { // 刚算出来的干员没选上，可能考虑重新识别或者报错，TODO
-        }
-    }
-    m_callback(AsstMsg::TaskCompleted, task_start_json, m_callback_arg);
-
-    return true;
-}
-
-std::optional<std::unordered_map<std::string, OperInfrastInfo>> asst::InfrastProductionTask::swipe_and_detect()
-{
-    if (!swipe_to_the_left()) {
-        return std::nullopt;
-    }
-
-    std::vector<std::string> end_flag_vec = InfrastConfiger::get_instance().m_infrast_end_flag[m_facility];
-
-    std::unordered_map<std::string, OperInfrastInfo> cur_opers_info;
-    // 因为有些干员在宿舍休息，或者被其他基建占用了，所以需要重新识别一遍当前可用的干员
-    for (int i = 0; i != SwipeMaxTimes; ++i) {
-        if (need_exit()) {
-            return std::nullopt;
-        }
-        const cv::Mat& image = m_controller_ptr->get_image(true);
-        // 异步进行滑动操作
-        std::future<bool> swipe_future = std::async(
-            std::launch::async, &InfrastProductionTask::swipe, this, false, WinMacro::SwipeExtraDelayDefault);
-
-        auto cur_name_textarea = detect_operators_name(image);
-        for (const TextArea& textarea : cur_name_textarea) {
-            OperInfrastInfo info;
-            // 考虑map中没有这个名字的情况：包括一开始识别漏了、抽到了新干员但没更新等，也有可能是本次识别错了
-            // TODO，这里可以抛个回调出去，提示这种case
-            if (m_all_opers_info.find(textarea.text) == m_all_opers_info.cend()) {
-                info.name = textarea.text;
-                info.elite = 0;
-                info.level = 0;
-            }
-            else {
-                info = m_all_opers_info[textarea.text];
-            }
-            cur_opers_info.emplace(textarea.text, std::move(info));
-        }
-
-        json::value opers_json;
-        std::vector<json::value> opers_json_vec;
-        for (const auto& [name, info] : cur_opers_info) {
-            json::value info_json;
-            info_json["name"] = info.name;
-            info_json["elite"] = info.elite;
-            //info_json["level"] = info.level;
-            opers_json_vec.emplace_back(std::move(info_json));
-        }
-        opers_json["all"] = json::array(opers_json_vec);
-        m_callback(AsstMsg::OpersDetected, opers_json, m_callback_arg);
-
-        bool break_flag = false;
-        // 如果找到了end_flag_vec中的名字，说明已经识别到有当前基建技能的最后一个干员了，就不用接着识别了
-        auto find_iter = std::find_first_of(
-            cur_opers_info.cbegin(), cur_opers_info.cend(),
-            end_flag_vec.cbegin(), end_flag_vec.cend(),
-            [](const auto& lhs, const auto& rhs) ->bool {
-                return lhs.first == rhs;
-            });
-        if (find_iter != cur_opers_info.cend()) {
-            break_flag = true;
-        }
-        // 阻塞等待异步的滑动结束
-        if (!swipe_future.get()) {
-            return std::nullopt;
-        }
-        if (break_flag) {
-            break;
-        }
-    }
-    return cur_opers_info;
-}
-
-std::vector<std::string> asst::InfrastProductionTask::calc_optimal_comb(
-    const std::unordered_map<std::string, OperInfrastInfo>& cur_opers_info) const
-{
-    // 配置文件中的干员组合，和抓出来的干员名比对，如果组合中的干员都有，那就用这个组合
-    // 注意配置中的干员组合需要是有序的
-    // Todo 时间复杂度起飞了，需要优化下
-
-    OperInfrastComb three_optimal_comb;		// 三人组合的最优解
-    OperInfrastComb single_optimal_comb;	// 由三个单人组成的组合 中的最优解
-    for (const OperInfrastComb& comb : InfrastConfiger::get_instance().m_infrast_combs[m_facility]) {
-        if (comb.comb.size() == 3) {
-            int count = 0;
-            for (const OperInfrastInfo& info : comb.comb) {
-                // 找到了干员名，而且当前精英化等级需要大于等于配置文件中要求的精英化等级
-                auto find_iter = cur_opers_info.find(info.name);
-                if (find_iter != cur_opers_info.cend()
-                    && find_iter->second.elite >= info.elite) {
-                    ++count;
-                }
-                else {
-                    break;
-                }
-            }
-            if (count == 3) {
-                three_optimal_comb = comb;
-                break;
-            }
-        }
-        else if (comb.comb.size() == 1) {
-            const auto& cur_info = comb.comb.at(0);
-            auto find_iter = cur_opers_info.find(cur_info.name);
-            if (find_iter != cur_opers_info.cend()
-                && find_iter->second.elite >= cur_info.elite) {
-                single_optimal_comb.comb.emplace_back(cur_info);
-                single_optimal_comb.efficiency += comb.efficiency;
-                if (single_optimal_comb.comb.size() >= 3) {
-                    break;
-                }
-            }
-        }
-        else {
-            // 配置文件中没有两人的，不可能走到这里，TODO，报错。
-            // 以后游戏更新了有双人的再说，思路是一样的，找出双人组合中干员都有的+单人组合中有的。
-            // 再建一个OperInfrastComb，比一下效率
-        }
-    }
-    OperInfrastComb optimal_comb = three_optimal_comb.efficiency >= single_optimal_comb.efficiency
-        ? three_optimal_comb : single_optimal_comb;
-
-    std::vector<std::string> optimal_opers_name;
-    for (const auto& info : optimal_comb.comb) {
-        optimal_opers_name.emplace_back(info.name);
-    }
-
-    json::value opers_json;
-    opers_json["comb"] = json::array(optimal_opers_name);
-    m_callback(AsstMsg::InfrastComb, opers_json, m_callback_arg);
-
-    return optimal_opers_name;
-}
-
-bool asst::InfrastProductionTask::swipe_and_select(const std::vector<std::string>& name_comb, int swipe_max_times)
-{
-    swipe_to_the_left();
-
-    auto need_to_select = name_comb;
-    // 一边滑动一边点击最优解中的干员
-    for (int i = 0; i != swipe_max_times; ++i) {
-        if (need_exit()) {
-            return false;
-        }
-        const cv::Mat& image = m_controller_ptr->get_image(true);
-        auto cur_name_textarea = detect_operators_name(image);
-
-        for (TextArea& text_area : cur_name_textarea) {
-            // 点过了就不会再点了，直接从最优解vector里面删了
-            auto iter = std::find(need_to_select.begin(), need_to_select.end(), text_area.text);
-            if (iter != need_to_select.end()) {
-                m_controller_ptr->click_without_scale(text_area.rect);
-                sleep(200);
-                need_to_select.erase(iter);
-            }
-        }
-        if (need_to_select.empty()) {
-            break;
-        }
-        // 因为滑动和点击是矛盾的，这里没法异步做
-        if (!swipe()) {
-            return false;
-        }
-    }
-    // 点击“确定”按钮，确定完要联网加载的，比较慢，多sleep一会
-    bool ret = click_confirm_button();
-    return ret && sleep(2000);
-}
\ No newline at end of file
diff --git a/src/MeoAssistance/InfrastProductionTask.h b/src/MeoAssistance/InfrastProductionTask.h
deleted file mode 100644
index 599c22db53..0000000000
--- a/src/MeoAssistance/InfrastProductionTask.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#pragma once
-
-#include "InfrastAbstractTask.h"
-
-namespace asst {
-    // 基建生产站任务（包括制造站、贸易站）
-    // 任务开始前需要处在“设施列表 01 02 03...”的界面
-    class InfrastProductionTask : public InfrastAbstractTask
-    {
-    public:
-        using InfrastAbstractTask::InfrastAbstractTask;
-        virtual ~InfrastProductionTask() = default;
-
-        virtual bool run() override;
-
-        void set_all_opers_info(std::unordered_map<std::string, OperInfrastInfo> infos) {
-            m_all_opers_info = std::move(infos);
-        }
-    protected:
-        constexpr static int SwipeMaxTimes = 17;
-        constexpr static int MaxOperNumber = 3;		// 单个制造站/贸易站最大干员数
-        constexpr static int MaxStationNumber = 5;	// 设施最大数量（基建里最多只有5个制造站）
-
-        // 一边滑动一边识别
-        std::optional<std::unordered_map<std::string, OperInfrastInfo>> swipe_and_detect();
-        // 计算最优解干员组合
-        std::vector<std::string> calc_optimal_comb(const std::unordered_map<std::string, OperInfrastInfo>& cur_opers_info) const;
-        // 一边滑动一边识别并点击干员名
-        bool swipe_and_select(const std::vector<std::string>& name_comb, int swipe_max_times = SwipeMaxTimes);
-
-        std::string m_facility;	// 设施名（制造站、贸易站、控制中枢……）
-        std::unordered_map<std::string, OperInfrastInfo> m_all_opers_info;
-    };
-}
\ No newline at end of file
diff --git a/src/MeoAssistance/ItemConfiger.cpp b/src/MeoAssistance/ItemConfiger.cpp
index 071058ed45..3176e74385 100644
--- a/src/MeoAssistance/ItemConfiger.cpp
+++ b/src/MeoAssistance/ItemConfiger.cpp
@@ -2,11 +2,6 @@
 
 #include <json.h>
 
-void asst::ItemConfiger::clear_drop_count()
-{
-    m_drop_count.clear();
-}
-
 bool asst::ItemConfiger::parse(const json::value& json)
 {
     for (const auto& [id, item_json] : json.as_object()) {
diff --git a/src/MeoAssistance/ItemConfiger.h b/src/MeoAssistance/ItemConfiger.h
index a961fa4bc1..db37a12895 100644
--- a/src/MeoAssistance/ItemConfiger.h
+++ b/src/MeoAssistance/ItemConfiger.h
@@ -10,26 +10,50 @@ namespace asst {
     public:
         virtual ~ItemConfiger() = default;
 
-        static ItemConfiger& get_instance() {
-            static ItemConfiger unique_instance;
-            return unique_instance;
+        const std::string& get_item_name(const std::string& id) const noexcept
+        {
+            if (auto iter = m_item_name.find(id);
+                iter != m_item_name.cend()) {
+                return iter->second;
+            }
+            else {
+                return std::string();
+            }
         }
+        const std::unordered_map<std::string, int>& get_drop_count() const noexcept {
+            return m_drop_count;
+        }
+        std::unordered_map<std::string, int>& get_drop_count() noexcept {
+            return m_drop_count;
+        }
+        int get_drop_count(const std::string& id) const noexcept
+        {
+            if (auto iter = m_drop_count.find(id);
+                iter != m_drop_count.cend()) {
+                return iter->second;
+            }
+            else {
+                return 0;
+            }
+        }
+        void set_drop_count(std::string id, int count)
+        {
+            m_drop_count.emplace(std::move(id), count);
+        }
+        void increase_drop_count(std::string id, int count) {
+            m_drop_count[std::move(id)] += count;
+        }
+        void clear_drop_count() noexcept
+        {
+            m_drop_count.clear();
+        }
+
+    protected:
+        virtual bool parse(const json::value& json) override;
 
         // key：材料编号Id，value：材料名（zh，utf8）
         std::unordered_map<std::string, std::string> m_item_name;
         // key：材料编号Id，value：数量
         std::unordered_map<std::string, int> m_drop_count;
-
-        void clear_drop_count();
-
-    protected:
-        ItemConfiger() = default;
-        ItemConfiger(const ItemConfiger& rhs) = default;
-        ItemConfiger(ItemConfiger&& rhs) noexcept = default;
-
-        ItemConfiger& operator=(const ItemConfiger& rhs) = default;
-        ItemConfiger& operator=(ItemConfiger&& rhs) noexcept = default;
-
-        virtual bool parse(const json::value& json) override;
     };
 }
diff --git a/src/MeoAssistance/Logger.hpp b/src/MeoAssistance/Logger.hpp
index b64c9e0086..7113085b0f 100644
--- a/src/MeoAssistance/Logger.hpp
+++ b/src/MeoAssistance/Logger.hpp
@@ -25,19 +25,19 @@ namespace asst {
         }
 
         template <typename... Args>
-        inline void log_trace(Args &&... args)
+        inline void trace(Args &&... args)
         {
             constexpr static std::string_view level = "TRC";
             log(level, std::forward<Args>(args)...);
         }
         template <typename... Args>
-        inline void log_info(Args &&... args)
+        inline void info(Args &&... args)
         {
             constexpr static std::string_view level = "INF";
             log(level, std::forward<Args>(args)...);
         }
         template <typename... Args>
-        inline void log_error(Args &&... args)
+        inline void error(Args &&... args)
         {
             constexpr static std::string_view level = "ERR";
             log(level, std::forward<Args>(args)...);
@@ -70,13 +70,13 @@ namespace asst {
         }
         void log_init_info()
         {
-            log_trace("-----------------------------");
-            log_trace("MeoAssistance Process Start");
-            log_trace("Version", asst::Version);
-            log_trace("Build DataTime", __DATE__, __TIME__);
-            log_trace("Working Path", GetCurrentDir());
-            log_trace("Resource Path", GetResourceDir());
-            log_trace("-----------------------------");
+            trace("-----------------------------");
+            trace("MeoAssistance Process Start");
+            trace("Version", asst::Version);
+            trace("Build DataTime", __DATE__, __TIME__);
+            trace("Working Path", GetCurrentDir());
+            trace("Resource Path", GetResourceDir());
+            trace("-----------------------------");
         }
 
         template <typename... Args>
@@ -133,22 +133,21 @@ namespace asst {
             : m_func_name(func_name),
             m_start_time(std::chrono::system_clock::now())
         {
-            Logger::get_instance().log_trace(m_func_name, " | enter");
+            Logger::get_instance().trace(m_func_name, " | enter");
         }
         ~LoggerAux()
         {
             auto duration = std::chrono::system_clock::now() - m_start_time;
-            Logger::get_instance().log_trace(m_func_name, " | leave,",
+            Logger::get_instance().trace(m_func_name, " | leave,",
                 std::chrono::duration_cast<std::chrono::milliseconds>(duration).count(), "ms");
         }
     private:
         std::string m_func_name;
         std::chrono::time_point<std::chrono::system_clock> m_start_time;
     };
-}
 
-#define DebugTrace			Logger::get_instance().log_trace
-#define DebugTraceInfo		Logger::get_instance().log_info
-#define DebugTraceError		Logger::get_instance().log_error
-#define DebugTraceFunction	LoggerAux _func_aux(__FUNCTION__)
-#define DebugTraceScope		LoggerAux _func_aux
\ No newline at end of file
+    static auto& log = Logger::get_instance();
+
+#define LogTraceFunction    LoggerAux _func_aux(__FUNCTION__)
+#define LogTraceScope	    LoggerAux _func_aux
+}
\ No newline at end of file
diff --git a/src/MeoAssistance/MatchImageAnalyzer.cpp b/src/MeoAssistance/MatchImageAnalyzer.cpp
new file mode 100644
index 0000000000..7e66acc9a5
--- /dev/null
+++ b/src/MeoAssistance/MatchImageAnalyzer.cpp
@@ -0,0 +1,92 @@
+#include "MatchImageAnalyzer.h"
+
+#include "Resource.h"
+#include "AsstAux.h"
+#include "Logger.hpp"
+
+asst::MatchImageAnalyzer::MatchImageAnalyzer(const cv::Mat& image, const Rect& roi, std::string templ_name, double templ_thres, double hist_thres)
+    : AbstractImageAnalyzer(image, roi),
+    m_templ_name(std::move(templ_name)),
+    m_templ_thres(templ_thres),
+    m_hist_thres(hist_thres)
+{
+    ;
+}
+
+bool asst::MatchImageAnalyzer::analyze()
+{
+    log.trace("MatchImageAnalyzer::analyze | ", m_templ_name);
+
+    if (m_use_cache) {
+        auto&& [hist, roi] = resource.templ().get_hist(m_templ_name);
+        if (!hist.empty() && comp_hist(hist, roi)) {
+            return true;
+        }
+    }
+    const cv::Mat& templ = resource.templ().get_templ(m_templ_name);
+    if (templ.empty()) {
+        log.error("templ is empty!");
+        return false;
+    }
+    if (match_templ(templ)) {
+        if (m_use_cache) {
+            resource.templ().emplace_hist(m_templ_name, to_hist(templ), make_rect<cv::Rect>(m_result.rect));
+        }
+        return true;
+    }
+    return false;
+}
+
+cv::Mat asst::MatchImageAnalyzer::to_hist(const cv::Mat& src)
+{
+    constexpr int histSize[] = { 50, 60 };
+    constexpr float h_ranges[] = { 0, 180 };
+    constexpr float s_ranges[] = { 0, 256 };
+    const float* ranges[] = { h_ranges, s_ranges };
+    constexpr int channels[] = { 0, 1 };
+
+    cv::MatND hist;
+
+    cv::calcHist(&src, 1, channels, cv::Mat(), hist, 2, histSize, ranges);
+    cv::normalize(hist, hist, 0, 1, cv::NORM_MINMAX);
+
+    return hist;
+}
+
+bool asst::MatchImageAnalyzer::match_templ(const cv::Mat& templ)
+{
+    cv::Mat matched;
+    cv::matchTemplate(m_image(make_rect<cv::Rect>(m_roi)), templ, matched, cv::TM_CCOEFF_NORMED);
+
+    double min_val = 0.0, max_val = 0.0;
+    cv::Point min_loc, max_loc;
+    cv::minMaxLoc(matched, &min_val, &max_val, &min_loc, &max_loc);
+
+    log.trace("match_templ | score:", max_val, "point:", max_loc);
+
+    if (max_val >= m_templ_thres) {
+        Rect rect(max_loc.x + m_roi.x, max_loc.y + m_roi.y, templ.cols, templ.rows);
+        m_result = { AlgorithmType::MatchTemplate, max_val, rect };
+        return true;
+    }
+    else {
+        return false;
+    }
+}
+
+bool asst::MatchImageAnalyzer::comp_hist(const cv::Mat& hist, const cv::Rect roi)
+{
+    cv::Mat roi_image = m_image(make_rect<cv::Rect>(m_roi))(roi);
+    double score = 1.0 - cv::compareHist(to_hist(roi_image), hist, cv::HISTCMP_BHATTACHARYYA);
+
+    log.trace("comp_hist | score:", score);
+
+    if (score >= m_hist_thres) {
+        Rect rect(roi.x + m_roi.x, roi.y + m_roi.y, hist.cols, hist.rows);
+        m_result = { AlgorithmType::CompareHist, score, rect };
+        return true;
+    }
+    else {
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/src/MeoAssistance/MatchImageAnalyzer.h b/src/MeoAssistance/MatchImageAnalyzer.h
new file mode 100644
index 0000000000..bab96ccf11
--- /dev/null
+++ b/src/MeoAssistance/MatchImageAnalyzer.h
@@ -0,0 +1,43 @@
+#pragma once
+#include "AbstractImageAnalyzer.h"
+
+namespace asst {
+    class MatchImageAnalyzer : public AbstractImageAnalyzer
+    {
+    public:
+        using AbstractImageAnalyzer::AbstractImageAnalyzer;
+        MatchImageAnalyzer(const cv::Mat& image, const Rect& roi, std::string templ_name, double templ_thres = 0.0, double hist_thres = 0.0);
+        virtual ~MatchImageAnalyzer() = default;
+
+        virtual bool analyze() override;
+        void set_use_cache(bool is_use) noexcept {
+            m_use_cache = is_use;
+        }
+        void set_templ_name(std::string templ_name) noexcept {
+            m_templ_name = std::move(templ_name);
+        }
+        void set_threshold(double templ_thres, double hist_thres = 0.0) noexcept {
+            m_templ_thres = templ_thres;
+            m_hist_thres = hist_thres;
+        }
+
+        //const std::vector<MatchRect>& get_result() const noexcept {
+        //    return m_result;
+        //}
+        const MatchRect& get_result() const noexcept {
+            return m_result;
+        }
+
+    protected:
+        static cv::Mat to_hist(const cv::Mat& src);
+
+        virtual bool match_templ(const cv::Mat& templ);
+        virtual bool comp_hist(const cv::Mat& hist, const cv::Rect roi);
+
+        std::string m_templ_name;
+        MatchRect m_result;
+        double m_templ_thres = 0.0;
+        double m_hist_thres = 0.0;
+        bool m_use_cache = false;
+    };
+}
diff --git a/src/MeoAssistance/MeoAssistance.vcxproj b/src/MeoAssistance/MeoAssistance.vcxproj
index 39be3099e9..3fb0089c7b 100644
--- a/src/MeoAssistance/MeoAssistance.vcxproj
+++ b/src/MeoAssistance/MeoAssistance.vcxproj
@@ -1,215 +1,220 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="RelWithDebInfo|x64">
-      <Configuration>RelWithDebInfo</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\include\AsstCaller.h" />
-    <ClInclude Include="..\..\include\AsstPort.h" />
-    <ClInclude Include="AbstractConfiger.h" />
-    <ClInclude Include="AbstractTask.h" />
-    <ClInclude Include="Assistance.h" />
-    <ClInclude Include="AsstAux.h" />
-    <ClInclude Include="AsstDef.h" />
-    <ClInclude Include="AsstMsg.h" />
-    <ClInclude Include="Configer.h" />
-    <ClInclude Include="CreditShoppingTask.h" />
-    <ClInclude Include="Identify.h" />
-    <ClInclude Include="IdentifyOperTask.h" />
-    <ClInclude Include="InfrastAbstractTask.h" />
-    <ClInclude Include="InfrastConfiger.h" />
-    <ClInclude Include="InfrastDormTask.h" />
-    <ClInclude Include="InfrastOfficeTask.h" />
-    <ClInclude Include="InfrastPowerTask.h" />
-    <ClInclude Include="InfrastProductionTask.h" />
-    <ClInclude Include="ItemConfiger.h" />
-    <ClInclude Include="Logger.hpp" />
-    <ClInclude Include="OcrAbstractTask.h" />
-    <ClInclude Include="OpenRecruitTask.h" />
-    <ClInclude Include="PenguinUploader.h" />
-    <ClInclude Include="ProcessTask.h" />
-    <ClInclude Include="RecruitConfiger.h" />
-    <ClInclude Include="ScreenCaptureTask.h" />
-    <ClInclude Include="Task.h" />
-    <ClInclude Include="TaskConfiger.h" />
-    <ClInclude Include="UserConfiger.h" />
-    <ClInclude Include="Version.h" />
-    <ClInclude Include="WinMacro.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="AbstractConfiger.cpp" />
-    <ClCompile Include="AbstractTask.cpp" />
-    <ClCompile Include="CreditShoppingTask.cpp" />
-    <ClCompile Include="IdentifyOperTask.cpp" />
-    <ClCompile Include="InfrastAbstractTask.cpp" />
-    <ClCompile Include="InfrastConfiger.cpp" />
-    <ClCompile Include="Assistance.cpp" />
-    <ClCompile Include="AsstCaller.cpp" />
-    <ClCompile Include="Configer.cpp" />
-    <ClCompile Include="Identify.cpp" />
-    <ClCompile Include="InfrastDormTask.cpp" />
-    <ClCompile Include="InfrastOfficeTask.cpp" />
-    <ClCompile Include="InfrastPowerTask.cpp" />
-    <ClCompile Include="InfrastProductionTask.cpp" />
-    <ClCompile Include="ItemConfiger.cpp" />
-    <ClCompile Include="OcrAbstractTask.cpp" />
-    <ClCompile Include="OpenRecruitTask.cpp" />
-    <ClCompile Include="PenguinUploader.cpp" />
-    <ClCompile Include="ProcessTask.cpp" />
-    <ClCompile Include="RecruitConfiger.cpp" />
-    <ClCompile Include="ScreenCaptureTask.cpp" />
-    <ClCompile Include="TaskConfiger.cpp" />
-    <ClCompile Include="UserConfiger.cpp" />
-    <ClCompile Include="WinMacro.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\resource\config.json" />
-    <None Include="..\..\resource\infrast.json" />
-    <None Include="..\..\resource\recruit.json" />
-    <None Include="..\..\resource\tasks.json" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>16.0</VCProjectVersion>
-    <Keyword>Win32Proj</Keyword>
-    <ProjectGuid>{362d1e30-f5ae-4279-9985-65c27b3ba300}</ProjectGuid>
-    <RootNamespace>MeoAssistance</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(SolutionDir)include;$(SolutionDir)3rdparty\include;$(SolutionDir)3rdparty\include\meojson;$(SolutionDir)\3rdparty\include\opencv;$(SolutionDir)\3rdparty\include\opencv2;$(SolutionDir)3drPart\include\OcrLiteNcnn;;$(IncludePath)</IncludePath>
-    <LibraryPath>$(TargetDir);$(Solution)\3rdparty\lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(SolutionDir)include;$(SolutionDir)3rdparty\include;$(SolutionDir)3rdparty\include\meojson;$(SolutionDir)3rdparty\include\opencv;$(SolutionDir)3rdparty\include\opencv2;$(SolutionDir)3drPart\include\OcrLiteNcnn;$(IncludePath)</IncludePath>
-    <LibraryPath>$(TargetDir);$(Solution)\3rdparty\lib;$(LibraryPath)</LibraryPath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;MEO_DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <LanguageStandard_C>stdc11</LanguageStandard_C>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <Optimization>MaxSpeed</Optimization>
-      <AdditionalOptions>/utf-8 /MP %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>libmeojson.lib;OcrLiteOnnx.lib;opencv_world453.lib;penguin-stats-recognize.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
-      <AdditionalLibraryDirectories>$(SolutionDir)3rdparty\lib\</AdditionalLibraryDirectories>
-    </Link>
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="RelWithDebInfo|x64">
+      <Configuration>RelWithDebInfo</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\include\AsstCaller.h" />
+    <ClInclude Include="..\..\include\AsstPort.h" />
+    <ClInclude Include="AbstractConfiger.h" />
+    <ClInclude Include="AbstractImageAnalyzer.h" />
+    <ClInclude Include="AbstractResource.h" />
+    <ClInclude Include="AbstractTask.h" />
+    <ClInclude Include="Assistance.h" />
+    <ClInclude Include="AsstAux.h" />
+    <ClInclude Include="AsstDef.h" />
+    <ClInclude Include="AsstMsg.h" />
+    <ClInclude Include="CreditShopImageAnalyzer.h" />
+    <ClInclude Include="GeneralConfiger.h" />
+    <ClInclude Include="CreditShoppingTask.h" />
+    <ClInclude Include="MultiMatchImageAnalyzer.h" />
+    <ClInclude Include="OcrImageAnalyzer.h" />
+    <ClInclude Include="OcrPack.h" />
+    <ClInclude Include="PenguinPack.h" />
+    <ClInclude Include="RecruitImageAnalyzer.h" />
+    <ClInclude Include="Resource.h" />
+    <ClInclude Include="ItemConfiger.h" />
+    <ClInclude Include="Logger.hpp" />
+    <ClInclude Include="RecruitTask.h" />
+    <ClInclude Include="PenguinUploader.h" />
+    <ClInclude Include="ProcessTask.h" />
+    <ClInclude Include="ProcessTaskImageAnalyzer.h" />
+    <ClInclude Include="RecruitConfiger.h" />
+    <ClInclude Include="ScreenCaptureTask.h" />
+    <ClInclude Include="Task.h" />
+    <ClInclude Include="TaskData.h" />
+    <ClInclude Include="MatchImageAnalyzer.h" />
+    <ClInclude Include="TemplResource.h" />
+    <ClInclude Include="UserConfiger.h" />
+    <ClInclude Include="Version.h" />
+    <ClInclude Include="Controller.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="AbstractConfiger.cpp" />
+    <ClCompile Include="AbstractImageAnalyzer.cpp" />
+    <ClCompile Include="AbstractResource.cpp" />
+    <ClCompile Include="AbstractTask.cpp" />
+    <ClCompile Include="CreditShopImageAnalyzer.cpp" />
+    <ClCompile Include="CreditShoppingTask.cpp" />
+    <ClCompile Include="MultiMatchImageAnalyzer.cpp" />
+    <ClCompile Include="OcrImageAnalyzer.cpp" />
+    <ClCompile Include="OcrPack.cpp" />
+    <ClCompile Include="PenguinPack.cpp" />
+    <ClCompile Include="RecruitImageAnalyzer.cpp" />
+    <ClCompile Include="Resource.cpp" />
+    <ClCompile Include="Assistance.cpp" />
+    <ClCompile Include="AsstCaller.cpp" />
+    <ClCompile Include="GeneralConfiger.cpp" />
+    <ClCompile Include="ItemConfiger.cpp" />
+    <ClCompile Include="RecruitTask.cpp" />
+    <ClCompile Include="PenguinUploader.cpp" />
+    <ClCompile Include="ProcessTask.cpp" />
+    <ClCompile Include="ProcessTaskImageAnalyzer.cpp" />
+    <ClCompile Include="RecruitConfiger.cpp" />
+    <ClCompile Include="ScreenCaptureTask.cpp" />
+    <ClCompile Include="TaskData.cpp" />
+    <ClCompile Include="MatchImageAnalyzer.cpp" />
+    <ClCompile Include="TemplResource.cpp" />
+    <ClCompile Include="UserConfiger.cpp" />
+    <ClCompile Include="Controller.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\resource\config.json" />
+    <None Include="..\..\resource\recruit.json" />
+    <None Include="..\..\resource\tasks.json" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>16.0</VCProjectVersion>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{362d1e30-f5ae-4279-9985-65c27b3ba300}</ProjectGuid>
+    <RootNamespace>MeoAssistance</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <IncludePath>$(SolutionDir)include;$(SolutionDir)3rdparty\include;$(SolutionDir)3rdparty\include\meojson;$(SolutionDir)\3rdparty\include\opencv;$(SolutionDir)\3rdparty\include\opencv2;$(SolutionDir)3drPart\include\OcrLiteNcnn;;$(IncludePath)</IncludePath>
+    <LibraryPath>$(TargetDir);$(Solution)\3rdparty\lib;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <IncludePath>$(SolutionDir)include;$(SolutionDir)3rdparty\include;$(SolutionDir)3rdparty\include\meojson;$(SolutionDir)3rdparty\include\opencv;$(SolutionDir)3rdparty\include\opencv2;$(SolutionDir)3drPart\include\OcrLiteNcnn;$(IncludePath)</IncludePath>
+    <LibraryPath>$(TargetDir);$(Solution)\3rdparty\lib;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;MEO_DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <Optimization>MaxSpeed</Optimization>
+      <AdditionalOptions>/utf-8 /MP %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>libmeojson.lib;OcrLiteOnnx.lib;opencv_world453.lib;penguin-stats-recognize.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
+      <AdditionalLibraryDirectories>$(SolutionDir)3rdparty\lib\</AdditionalLibraryDirectories>
+    </Link>
+    <PreBuildEvent>
+      <Command>
+      </Command>
+    </PreBuildEvent>
+    <PostBuildEvent>
       <Command>xcopy /e /y /i /c $(SolutionDir)resource $(TargetDir)resource
-xcopy /e /y /i /c $(SolutionDir)3rdparty\resource $(TargetDir)resource</Command>
-    </PostBuildEvent>
-    <PostBuildEvent>
-      <Message>copy resource</Message>
-    </PostBuildEvent>
-    <PreLinkEvent>
-      <Command>xcopy /e /y /i /c $(SolutionDir)3rdparty\bin $(TargetDir)</Command>
-    </PreLinkEvent>
-    <PreLinkEvent>
-      <Message>copy 3rd party dll</Message>
-    </PreLinkEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>
-      </FunctionLevelLinking>
-      <IntrinsicFunctions>false</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;MEO_DLL_EXPORTS;LOG_TRACE;DEBUG_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <LanguageStandard_C>stdc11</LanguageStandard_C>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <Optimization>Disabled</Optimization>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <AdditionalOptions>/utf-8 /MP %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>libmeojson.lib;OcrLiteOnnx.lib;opencv_world453.lib;penguin-stats-recognize.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
-      <AdditionalLibraryDirectories>$(SolutionDir)3rdparty\lib\</AdditionalLibraryDirectories>
-    </Link>
-    <PreBuildEvent>
-      <Command>
-      </Command>
-    </PreBuildEvent>
-    <PostBuildEvent>
+xcopy /e /y /i /c $(SolutionDir)3rdparty\resource $(TargetDir)resource</Command>
+    </PostBuildEvent>
+    <PostBuildEvent>
+      <Message>copy resource</Message>
+    </PostBuildEvent>
+    <PreLinkEvent>
+      <Command>xcopy /e /y /i /c $(SolutionDir)3rdparty\bin $(TargetDir)</Command>
+    </PreLinkEvent>
+    <PreLinkEvent>
+      <Message>copy 3rd party dll</Message>
+    </PreLinkEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>
+      </FunctionLevelLinking>
+      <IntrinsicFunctions>false</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;MEO_DLL_EXPORTS;LOG_TRACE;DEBUG_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <Optimization>Disabled</Optimization>
+      <WholeProgramOptimization>false</WholeProgramOptimization>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <AdditionalOptions>/utf-8 /MP %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>libmeojson.lib;OcrLiteOnnx.lib;opencv_world453.lib;penguin-stats-recognize.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
+      <AdditionalLibraryDirectories>$(SolutionDir)3rdparty\lib\</AdditionalLibraryDirectories>
+    </Link>
+    <PreBuildEvent>
+      <Command>
+      </Command>
+    </PreBuildEvent>
+    <PostBuildEvent>
       <Command>xcopy /e /y /i /c $(SolutionDir)resource $(TargetDir)resource
-xcopy /e /y /i /c $(SolutionDir)3rdparty\resource $(TargetDir)resource</Command>
-    </PostBuildEvent>
-    <PostBuildEvent>
-      <Message>copy resource</Message>
-    </PostBuildEvent>
-    <PreLinkEvent>
-      <Command>xcopy /e /y /i /c $(SolutionDir)3rdparty\bin $(TargetDir)</Command>
-    </PreLinkEvent>
-    <PreLinkEvent>
-      <Message>copy 3rd party dll</Message>
-    </PreLinkEvent>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-  <ProjectExtensions>
-    <VisualStudio>
-      <UserProperties />
-    </VisualStudio>
-  </ProjectExtensions>
+xcopy /e /y /i /c $(SolutionDir)3rdparty\resource $(TargetDir)resource</Command>
+    </PostBuildEvent>
+    <PostBuildEvent>
+      <Message>copy resource</Message>
+    </PostBuildEvent>
+    <PreLinkEvent>
+      <Command>xcopy /e /y /i /c $(SolutionDir)3rdparty\bin $(TargetDir)</Command>
+    </PreLinkEvent>
+    <PreLinkEvent>
+      <Message>copy 3rd party dll</Message>
+    </PreLinkEvent>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/src/MeoAssistance/MeoAssistance.vcxproj.filters b/src/MeoAssistance/MeoAssistance.vcxproj.filters
index 534ff1072a..d4403586bf 100644
--- a/src/MeoAssistance/MeoAssistance.vcxproj.filters
+++ b/src/MeoAssistance/MeoAssistance.vcxproj.filters
@@ -1,224 +1,245 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="源文件">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="头文件">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
-    </Filter>
-    <Filter Include="资源文件">
-      <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="头文件\Caller">
-      <UniqueIdentifier>{81d86994-0d89-4cc2-aa6f-d726a0bd0490}</UniqueIdentifier>
-    </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="头文件\Task">
-      <UniqueIdentifier>{3b93d9f2-728c-4a22-bc13-57ce7df5806c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="源文件\Task">
-      <UniqueIdentifier>{1ef28df7-c174-4032-bbcf-9722ae53852d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="源文件\Caller">
-      <UniqueIdentifier>{557d6d96-11d9-46e1-b611-b2b8216abea6}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="源文件\utils">
-      <UniqueIdentifier>{a5c43813-70af-4b0e-94ac-9ddecc2e4a3c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="头文件\utils">
-      <UniqueIdentifier>{87c9dee5-847b-41e6-818e-387a6385ea8b}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Identify.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-    <ClInclude Include="WinMacro.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-    <ClInclude Include="Assistance.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-    <ClInclude Include="InfrastConfiger.h">
-      <Filter>头文件\Configer</Filter>
-    </ClInclude>
-    <ClInclude Include="RecruitConfiger.h">
-      <Filter>头文件\Configer</Filter>
-    </ClInclude>
-    <ClInclude Include="Configer.h">
-      <Filter>头文件\Configer</Filter>
-    </ClInclude>
-    <ClInclude Include="AsstDef.h">
-      <Filter>头文件\utils</Filter>
-    </ClInclude>
-    <ClInclude Include="AsstAux.h">
-      <Filter>头文件\utils</Filter>
-    </ClInclude>
-    <ClInclude Include="Version.h">
-      <Filter>头文件\utils</Filter>
-    </ClInclude>
-    <ClInclude Include="Logger.hpp">
-      <Filter>头文件\utils</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\AsstCaller.h">
-      <Filter>头文件\Caller</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\AsstPort.h">
-      <Filter>头文件\Caller</Filter>
-    </ClInclude>
-    <ClInclude Include="AbstractTask.h">
-      <Filter>头文件\Task</Filter>
-    </ClInclude>
-    <ClInclude Include="InfrastProductionTask.h">
-      <Filter>头文件\Task</Filter>
-    </ClInclude>
-    <ClInclude Include="OcrAbstractTask.h">
-      <Filter>头文件\Task</Filter>
-    </ClInclude>
-    <ClInclude Include="OpenRecruitTask.h">
-      <Filter>头文件\Task</Filter>
-    </ClInclude>
-    <ClInclude Include="ProcessTask.h">
-      <Filter>头文件\Task</Filter>
-    </ClInclude>
-    <ClInclude Include="AsstMsg.h">
-      <Filter>头文件\utils</Filter>
-    </ClInclude>
-    <ClInclude Include="Task.h">
-      <Filter>头文件\Task</Filter>
-    </ClInclude>
-    <ClInclude Include="IdentifyOperTask.h">
-      <Filter>头文件\Task</Filter>
-    </ClInclude>
-    <ClInclude Include="AbstractConfiger.h">
-      <Filter>头文件\Configer</Filter>
-    </ClInclude>
-    <ClInclude Include="InfrastDormTask.h">
-      <Filter>头文件\Task</Filter>
-    </ClInclude>
-    <ClInclude Include="InfrastAbstractTask.h">
-      <Filter>头文件\Task</Filter>
-    </ClInclude>
-    <ClInclude Include="InfrastPowerTask.h">
-      <Filter>头文件\Task</Filter>
-    </ClInclude>
-    <ClInclude Include="InfrastOfficeTask.h">
-      <Filter>头文件\Task</Filter>
-    </ClInclude>
-    <ClInclude Include="TaskConfiger.h">
-      <Filter>头文件\Configer</Filter>
-    </ClInclude>
-    <ClInclude Include="UserConfiger.h">
-      <Filter>头文件\Configer</Filter>
-    </ClInclude>
-    <ClInclude Include="ScreenCaptureTask.h">
-      <Filter>头文件\Task</Filter>
-    </ClInclude>
-    <ClInclude Include="CreditShoppingTask.h">
-      <Filter>头文件\Task</Filter>
-    </ClInclude>
-    <ClInclude Include="PenguinUploader.h">
-      <Filter>头文件\utils</Filter>
-    </ClInclude>
-    <ClInclude Include="ItemConfiger.h">
-      <Filter>头文件\Configer</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="WinMacro.cpp">
-      <Filter>源文件</Filter>
-    </ClCompile>
-    <ClCompile Include="Assistance.cpp">
-      <Filter>源文件</Filter>
-    </ClCompile>
-    <ClCompile Include="InfrastConfiger.cpp">
-      <Filter>源文件\Configer</Filter>
-    </ClCompile>
-    <ClCompile Include="Identify.cpp">
-      <Filter>源文件</Filter>
-    </ClCompile>
-    <ClCompile Include="RecruitConfiger.cpp">
-      <Filter>源文件\Configer</Filter>
-    </ClCompile>
-    <ClCompile Include="Configer.cpp">
-      <Filter>源文件\Configer</Filter>
-    </ClCompile>
-    <ClCompile Include="AbstractTask.cpp">
-      <Filter>源文件\Task</Filter>
-    </ClCompile>
-    <ClCompile Include="InfrastProductionTask.cpp">
-      <Filter>源文件\Task</Filter>
-    </ClCompile>
-    <ClCompile Include="OcrAbstractTask.cpp">
-      <Filter>源文件\Task</Filter>
-    </ClCompile>
-    <ClCompile Include="OpenRecruitTask.cpp">
-      <Filter>源文件\Task</Filter>
-    </ClCompile>
-    <ClCompile Include="ProcessTask.cpp">
-      <Filter>源文件\Task</Filter>
-    </ClCompile>
-    <ClCompile Include="AsstCaller.cpp">
-      <Filter>源文件\Caller</Filter>
-    </ClCompile>
-    <ClCompile Include="IdentifyOperTask.cpp">
-      <Filter>源文件\Task</Filter>
-    </ClCompile>
-    <ClCompile Include="AbstractConfiger.cpp">
-      <Filter>源文件\Configer</Filter>
-    </ClCompile>
-    <ClCompile Include="InfrastDormTask.cpp">
-      <Filter>源文件\Task</Filter>
-    </ClCompile>
-    <ClCompile Include="InfrastAbstractTask.cpp">
-      <Filter>源文件\Task</Filter>
-    </ClCompile>
-    <ClCompile Include="InfrastPowerTask.cpp">
-      <Filter>源文件\Task</Filter>
-    </ClCompile>
-    <ClCompile Include="InfrastOfficeTask.cpp">
-      <Filter>源文件\Task</Filter>
-    </ClCompile>
-    <ClCompile Include="TaskConfiger.cpp">
-      <Filter>源文件\Configer</Filter>
-    </ClCompile>
-    <ClCompile Include="UserConfiger.cpp">
-      <Filter>源文件\Configer</Filter>
-    </ClCompile>
-    <ClCompile Include="ScreenCaptureTask.cpp">
-      <Filter>源文件\Task</Filter>
-    </ClCompile>
-    <ClCompile Include="CreditShoppingTask.cpp">
-      <Filter>源文件\Task</Filter>
-    </ClCompile>
-    <ClCompile Include="PenguinUploader.cpp">
-      <Filter>源文件\utils</Filter>
-    </ClCompile>
-    <ClCompile Include="ItemConfiger.cpp">
-      <Filter>源文件\Configer</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\resource\config.json">
-      <Filter>资源文件</Filter>
-    </None>
-    <None Include="..\..\resource\infrast.json">
-      <Filter>资源文件</Filter>
-    </None>
-    <None Include="..\..\resource\recruit.json">
-      <Filter>资源文件</Filter>
-    </None>
-    <None Include="..\..\resource\tasks.json">
-      <Filter>资源文件</Filter>
-    </None>
-  </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="源文件">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="头文件">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
+    </Filter>
+    <Filter Include="资源文件">
+      <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="头文件\Caller">
+      <UniqueIdentifier>{81d86994-0d89-4cc2-aa6f-d726a0bd0490}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="头文件\Task">
+      <UniqueIdentifier>{3b93d9f2-728c-4a22-bc13-57ce7df5806c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="源文件\Task">
+      <UniqueIdentifier>{1ef28df7-c174-4032-bbcf-9722ae53852d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="源文件\Caller">
+      <UniqueIdentifier>{557d6d96-11d9-46e1-b611-b2b8216abea6}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="头文件\ImageAnalyzer">
+      <UniqueIdentifier>{1a8ffc31-8eb3-4af6-9065-634de2463a3e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="源文件\ImageAnalyzer">
+      <UniqueIdentifier>{c6a0898b-5dd7-4437-981c-00e53b30a60d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="头文件\Resource">
+      <UniqueIdentifier>{07a812fe-6b28-4be0-b6d4-33554824d3c5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="源文件\Resource">
+      <UniqueIdentifier>{74bd94e1-4973-412a-a17a-d8457de387af}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="头文件\Utils">
+      <UniqueIdentifier>{87c9dee5-847b-41e6-818e-387a6385ea8b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="源文件\Utils">
+      <UniqueIdentifier>{a5c43813-70af-4b0e-94ac-9ddecc2e4a3c}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Controller.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+    <ClInclude Include="Assistance.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+    <ClInclude Include="RecruitConfiger.h">
+      <Filter>头文件\Resource</Filter>
+    </ClInclude>
+    <ClInclude Include="GeneralConfiger.h">
+      <Filter>头文件\Resource</Filter>
+    </ClInclude>
+    <ClInclude Include="AsstDef.h">
+      <Filter>头文件\Utils</Filter>
+    </ClInclude>
+    <ClInclude Include="AsstAux.h">
+      <Filter>头文件\Utils</Filter>
+    </ClInclude>
+    <ClInclude Include="Version.h">
+      <Filter>头文件\Utils</Filter>
+    </ClInclude>
+    <ClInclude Include="Logger.hpp">
+      <Filter>头文件\Utils</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\AsstCaller.h">
+      <Filter>头文件\Caller</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\AsstPort.h">
+      <Filter>头文件\Caller</Filter>
+    </ClInclude>
+    <ClInclude Include="AbstractTask.h">
+      <Filter>头文件\Task</Filter>
+    </ClInclude>
+    <ClInclude Include="RecruitTask.h">
+      <Filter>头文件\Task</Filter>
+    </ClInclude>
+    <ClInclude Include="ProcessTask.h">
+      <Filter>头文件\Task</Filter>
+    </ClInclude>
+    <ClInclude Include="AsstMsg.h">
+      <Filter>头文件\Utils</Filter>
+    </ClInclude>
+    <ClInclude Include="Task.h">
+      <Filter>头文件\Task</Filter>
+    </ClInclude>
+    <ClInclude Include="AbstractConfiger.h">
+      <Filter>头文件\Resource</Filter>
+    </ClInclude>
+    <ClInclude Include="TaskData.h">
+      <Filter>头文件\Resource</Filter>
+    </ClInclude>
+    <ClInclude Include="UserConfiger.h">
+      <Filter>头文件\Resource</Filter>
+    </ClInclude>
+    <ClInclude Include="ScreenCaptureTask.h">
+      <Filter>头文件\Task</Filter>
+    </ClInclude>
+    <ClInclude Include="CreditShoppingTask.h">
+      <Filter>头文件\Task</Filter>
+    </ClInclude>
+    <ClInclude Include="PenguinUploader.h">
+      <Filter>头文件\Utils</Filter>
+    </ClInclude>
+    <ClInclude Include="ItemConfiger.h">
+      <Filter>头文件\Resource</Filter>
+    </ClInclude>
+    <ClInclude Include="AbstractImageAnalyzer.h">
+      <Filter>头文件\ImageAnalyzer</Filter>
+    </ClInclude>
+    <ClInclude Include="ProcessTaskImageAnalyzer.h">
+      <Filter>头文件\ImageAnalyzer</Filter>
+    </ClInclude>
+    <ClInclude Include="TemplResource.h">
+      <Filter>头文件\Resource</Filter>
+    </ClInclude>
+    <ClInclude Include="AbstractResource.h">
+      <Filter>头文件\Resource</Filter>
+    </ClInclude>
+    <ClInclude Include="OcrPack.h">
+      <Filter>头文件\Resource</Filter>
+    </ClInclude>
+    <ClInclude Include="PenguinPack.h">
+      <Filter>头文件\Resource</Filter>
+    </ClInclude>
+    <ClInclude Include="OcrImageAnalyzer.h">
+      <Filter>头文件\ImageAnalyzer</Filter>
+    </ClInclude>
+    <ClInclude Include="MatchImageAnalyzer.h">
+      <Filter>头文件\ImageAnalyzer</Filter>
+    </ClInclude>
+    <ClInclude Include="RecruitImageAnalyzer.h">
+      <Filter>头文件\ImageAnalyzer</Filter>
+    </ClInclude>
+    <ClInclude Include="Resource.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+    <ClInclude Include="CreditShopImageAnalyzer.h">
+      <Filter>头文件\ImageAnalyzer</Filter>
+    </ClInclude>
+    <ClInclude Include="MultiMatchImageAnalyzer.h">
+      <Filter>头文件\ImageAnalyzer</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="Controller.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="Assistance.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="RecruitConfiger.cpp">
+      <Filter>源文件\Resource</Filter>
+    </ClCompile>
+    <ClCompile Include="GeneralConfiger.cpp">
+      <Filter>源文件\Resource</Filter>
+    </ClCompile>
+    <ClCompile Include="AbstractTask.cpp">
+      <Filter>源文件\Task</Filter>
+    </ClCompile>
+    <ClCompile Include="RecruitTask.cpp">
+      <Filter>源文件\Task</Filter>
+    </ClCompile>
+    <ClCompile Include="ProcessTask.cpp">
+      <Filter>源文件\Task</Filter>
+    </ClCompile>
+    <ClCompile Include="AsstCaller.cpp">
+      <Filter>源文件\Caller</Filter>
+    </ClCompile>
+    <ClCompile Include="AbstractConfiger.cpp">
+      <Filter>源文件\Resource</Filter>
+    </ClCompile>
+    <ClCompile Include="TaskData.cpp">
+      <Filter>源文件\Resource</Filter>
+    </ClCompile>
+    <ClCompile Include="UserConfiger.cpp">
+      <Filter>源文件\Resource</Filter>
+    </ClCompile>
+    <ClCompile Include="ScreenCaptureTask.cpp">
+      <Filter>源文件\Task</Filter>
+    </ClCompile>
+    <ClCompile Include="CreditShoppingTask.cpp">
+      <Filter>源文件\Task</Filter>
+    </ClCompile>
+    <ClCompile Include="PenguinUploader.cpp">
+      <Filter>源文件\Utils</Filter>
+    </ClCompile>
+    <ClCompile Include="ItemConfiger.cpp">
+      <Filter>源文件\Resource</Filter>
+    </ClCompile>
+    <ClCompile Include="AbstractImageAnalyzer.cpp">
+      <Filter>源文件\ImageAnalyzer</Filter>
+    </ClCompile>
+    <ClCompile Include="ProcessTaskImageAnalyzer.cpp">
+      <Filter>源文件\ImageAnalyzer</Filter>
+    </ClCompile>
+    <ClCompile Include="TemplResource.cpp">
+      <Filter>源文件\Resource</Filter>
+    </ClCompile>
+    <ClCompile Include="AbstractResource.cpp">
+      <Filter>源文件\Resource</Filter>
+    </ClCompile>
+    <ClCompile Include="OcrPack.cpp">
+      <Filter>源文件\Resource</Filter>
+    </ClCompile>
+    <ClCompile Include="PenguinPack.cpp">
+      <Filter>源文件\Resource</Filter>
+    </ClCompile>
+    <ClCompile Include="OcrImageAnalyzer.cpp">
+      <Filter>源文件\ImageAnalyzer</Filter>
+    </ClCompile>
+    <ClCompile Include="MatchImageAnalyzer.cpp">
+      <Filter>源文件\ImageAnalyzer</Filter>
+    </ClCompile>
+    <ClCompile Include="RecruitImageAnalyzer.cpp">
+      <Filter>源文件\ImageAnalyzer</Filter>
+    </ClCompile>
+    <ClCompile Include="Resource.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="CreditShopImageAnalyzer.cpp">
+      <Filter>源文件\ImageAnalyzer</Filter>
+    </ClCompile>
+    <ClCompile Include="MultiMatchImageAnalyzer.cpp">
+      <Filter>源文件\ImageAnalyzer</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\resource\config.json">
+      <Filter>资源文件</Filter>
+    </None>
+    <None Include="..\..\resource\recruit.json">
+      <Filter>资源文件</Filter>
+    </None>
+    <None Include="..\..\resource\tasks.json">
+      <Filter>资源文件</Filter>
+    </None>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/MeoAssistance/MultiMatchImageAnalyzer.cpp b/src/MeoAssistance/MultiMatchImageAnalyzer.cpp
new file mode 100644
index 0000000000..e9542313ec
--- /dev/null
+++ b/src/MeoAssistance/MultiMatchImageAnalyzer.cpp
@@ -0,0 +1,63 @@
+#include "MultiMatchImageAnalyzer.h"
+
+#include "Logger.hpp"
+#include "Resource.h"
+
+asst::MultiMatchImageAnalyzer::MultiMatchImageAnalyzer(const cv::Mat& image, const Rect& roi, std::string templ_name, double templ_thres)
+    : AbstractImageAnalyzer(image, roi),
+    m_templ_name(templ_name),
+    m_templ_thres(templ_thres)
+{
+    ;
+}
+
+bool asst::MultiMatchImageAnalyzer::analyze()
+{
+    log.trace("MultiMatchImageAnalyzer::analyze | ", m_templ_name);
+    const cv::Mat& templ = resource.templ().get_templ(m_templ_name);
+    if (templ.empty()) {
+        log.error("templ is empty!");
+        return false;
+    }
+
+    return multi_match_templ(templ);
+}
+
+bool asst::MultiMatchImageAnalyzer::multi_match_templ(const cv::Mat& templ)
+{
+    cv::Mat matched;
+    cv::matchTemplate(m_image, templ, matched, cv::TM_CCOEFF_NORMED);
+
+    int mini_distance = (std::min)(templ.cols, templ.rows) * 0.5;
+    for (int i = 0; i != matched.rows; ++i) {
+        for (int j = 0; j != matched.cols; ++j) {
+            auto value = matched.at<float>(i, j);
+            if (value >= m_templ_thres) {
+                Rect rect(j, i, templ.cols, templ.rows);
+                bool need_push = true;
+                // 如果有两个点离得太近，只取里面得分高的那个
+                // 一般相邻的都是刚刚push进去的，这里倒序快一点
+                for (auto iter = m_result.rbegin(); iter != m_result.rend(); ++iter) {
+                    if (std::abs(j - iter->rect.x) < mini_distance
+                        && std::abs(i - iter->rect.y) < mini_distance)
+                    {
+                        if (iter->score < value) {
+                            iter->rect = rect;
+                            iter->score = value;
+                        }	// else 这个点就放弃了
+                        need_push = false;
+                        break;
+                    }
+                }
+                if (need_push) {
+                    m_result.emplace_back(MatchRect{ AlgorithmType::MatchTemplate, value, rect });
+                }
+            }
+        }
+    }
+    if (!m_result.empty()) {
+        return true;
+    }
+
+    return false;
+}
\ No newline at end of file
diff --git a/src/MeoAssistance/MultiMatchImageAnalyzer.h b/src/MeoAssistance/MultiMatchImageAnalyzer.h
new file mode 100644
index 0000000000..64cb67f2d7
--- /dev/null
+++ b/src/MeoAssistance/MultiMatchImageAnalyzer.h
@@ -0,0 +1,31 @@
+#pragma once
+#include "AbstractImageAnalyzer.h"
+
+namespace asst {
+    class MultiMatchImageAnalyzer : public AbstractImageAnalyzer
+    {
+    public:
+        using AbstractImageAnalyzer::AbstractImageAnalyzer;
+        MultiMatchImageAnalyzer(const cv::Mat& image, const Rect& roi, std::string templ_name, double templ_thres);
+        virtual ~MultiMatchImageAnalyzer() = default;
+
+        virtual bool analyze() override;
+
+        void set_templ_name(std::string templ_name) noexcept {
+            m_templ_name = std::move(templ_name);
+        }
+        void set_threshold(double templ_thres) noexcept {
+            m_templ_thres = templ_thres;
+        }
+        const std::vector<MatchRect>& get_result() const noexcept {
+            return m_result;
+        }
+
+    protected:
+        virtual bool multi_match_templ(const cv::Mat& templ);
+
+        std::string m_templ_name;
+        double m_templ_thres = 0.0;
+        std::vector<MatchRect> m_result;
+    };
+}
diff --git a/src/MeoAssistance/OcrAbstractTask.cpp b/src/MeoAssistance/OcrAbstractTask.cpp
deleted file mode 100644
index 45952453c8..0000000000
--- a/src/MeoAssistance/OcrAbstractTask.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-#include "OcrAbstractTask.h"
-
-#include <opencv2/opencv.hpp>
-
-#include "AsstAux.h"
-#include "Identify.h"
-#include "WinMacro.h"
-
-using namespace asst;
-
-std::vector<TextArea> OcrAbstractTask::ocr_detect(bool use_raw_image)
-{
-    const cv::Mat& image = m_controller_ptr->get_image(use_raw_image);
-
-    return ocr_detect(image);
-}
-
-std::vector<TextArea> OcrAbstractTask::ocr_detect(const cv::Mat& image)
-{
-    std::vector<TextArea> dst = m_identify_ptr->ocr_detect(image);
-
-    std::vector<json::value> all_text_json_vector;
-    for (const TextArea& text_area : dst) {
-        all_text_json_vector.emplace_back(text_area.text);
-    }
-    json::value all_text_json;
-    all_text_json["text"] = json::array(all_text_json_vector);
-    all_text_json["task_chain"] = m_task_chain;
-    m_callback(AsstMsg::TextDetected, all_text_json, m_callback_arg);
-
-    return dst;
-}
-
-bool asst::OcrAbstractTask::click_text(const cv::Mat& image, const std::string& text)
-{
-    for (const TextArea& textarea : ocr_detect(image)) {
-        if (textarea.text == text) {
-            m_controller_ptr->click(textarea.rect);
-            return true;
-        }
-    }
-    return false;
-}
\ No newline at end of file
diff --git a/src/MeoAssistance/OcrAbstractTask.h b/src/MeoAssistance/OcrAbstractTask.h
deleted file mode 100644
index 0c3557df02..0000000000
--- a/src/MeoAssistance/OcrAbstractTask.h
+++ /dev/null
@@ -1,99 +0,0 @@
-#pragma once
-
-#include "AbstractTask.h"
-
-#include "AsstDef.h"
-#include "AsstAux.h"
-
-namespace asst {
-    class OcrAbstractTask : public AbstractTask
-    {
-    public:
-        using AbstractTask::AbstractTask;
-        virtual ~OcrAbstractTask() = default;
-
-        virtual bool run() override = 0;
-
-    protected:
-        std::vector<TextArea> ocr_detect(bool use_raw_image = false);
-        std::vector<TextArea> ocr_detect(const cv::Mat& image);
-        bool click_text(const cv::Mat& image, const std::string& text);
-
-        // 文字匹配，要求相等
-        template<typename TextAreaArray, typename FilterArray, typename ReplaceMap>
-        std::vector<TextArea> text_match(const TextAreaArray& src,
-            const FilterArray& filter_array, const ReplaceMap& replace_map)
-        {
-            static_assert(std::is_constructible<TextArea, TextAreaArray::value_type>::value,
-                "Parameter can't be used to construct a asst::TextArea");
-            std::vector<TextArea> dst;
-            for (const TextArea& text_area : src) {
-                TextArea temp = text_area;
-                for (const auto& [old_str, new_str] : replace_map) {
-                    temp.text = StringReplaceAll(temp.text, old_str, new_str);
-                }
-                for (const auto& text : filter_array) {
-                    if (temp.text == text) {
-                        dst.emplace_back(std::move(temp));
-                    }
-                }
-            }
-            return dst;
-        }
-        // 文字匹配，要求相等
-        template<typename TextAreaArray, typename FilterArray>
-        std::vector<TextArea> text_match(const TextAreaArray& src,
-            const FilterArray& filter_array)
-        {
-            static_assert(std::is_constructible<TextArea, TextAreaArray::value_type>::value,
-                "Parameter can't be used to construct a asst::TextArea");
-            std::vector<TextArea> dst;
-            for (const TextArea& text_area : src) {
-                for (const auto& text : filter_array) {
-                    if (text_area.text == text) {
-                        dst.emplace_back(text_area);
-                    }
-                }
-            }
-            return dst;
-        }
-
-        // 文字搜索，是子串即可
-        template<typename TextAreaArray, typename FilterArray, typename ReplaceMap>
-        std::vector<TextArea> text_search(const TextAreaArray& src,
-            const FilterArray& filter_array, const ReplaceMap& replace_map)
-        {
-            static_assert(std::is_constructible<TextArea, TextAreaArray::value_type>::value,
-                "Parameter can't be used to construct a asst::TextArea");
-            std::vector<TextArea> dst;
-            for (const TextArea& text_area : src) {
-                TextArea temp = text_area;
-                for (const auto& [old_str, new_str] : replace_map) {
-                    temp.text = StringReplaceAll(temp.text, old_str, new_str);
-                }
-                for (const auto& text : filter_array) {
-                    if (temp.text.find(text) != std::string::npos) {
-                        dst.emplace_back(text, std::move(temp.rect));
-                    }
-                }
-            }
-            return dst;
-        }
-        template<typename TextAreaArray, typename FilterArray>
-        std::vector<TextArea> text_search(const TextAreaArray& src,
-            const FilterArray& filter_array)
-        {
-            static_assert(std::is_constructible<TextArea, TextAreaArray::value_type>::value,
-                "Parameter can't be used to construct a asst::TextArea");
-            std::vector<TextArea> dst;
-            for (const TextArea& text_area : src) {
-                for (const auto& text : filter_array) {
-                    if (text_area.text.find(text) != std::string::npos) {
-                        dst.emplace_back(text, text_area.rect);
-                    }
-                }
-            }
-            return dst;
-        }
-    };
-}
\ No newline at end of file
diff --git a/src/MeoAssistance/OcrImageAnalyzer.cpp b/src/MeoAssistance/OcrImageAnalyzer.cpp
new file mode 100644
index 0000000000..f12cccf87b
--- /dev/null
+++ b/src/MeoAssistance/OcrImageAnalyzer.cpp
@@ -0,0 +1,57 @@
+#include "OcrImageAnalyzer.h"
+
+#include "Resource.h"
+#include "AsstAux.h"
+#include "Logger.hpp"
+
+bool asst::OcrImageAnalyzer::analyze()
+{
+    std::vector<TextRectProc> preds_vec;
+
+    if (!m_replace.empty()) {
+        TextRectProc text_replace = [&](TextRect& tr) -> bool {
+            for (const auto& [old_str, new_str] : m_replace) {
+                tr.text = StringReplaceAll(tr.text, old_str, new_str);
+            }
+            return true;
+        };
+        preds_vec.emplace_back(text_replace);
+    }
+
+    if (!m_required.empty()) {
+        if (m_full_match) {
+            TextRectProc required_match = [&](TextRect& tr) -> bool {
+                return std::find(m_required.cbegin(), m_required.cend(), tr.text) != m_required.cend();
+            };
+            preds_vec.emplace_back(required_match);
+        }
+        else {
+            TextRectProc required_search = [&](TextRect& tr) -> bool {
+                auto is_sub = [&tr](const std::string& str) -> bool {
+                    return tr.text.find(str) != std::string::npos;
+                };
+                return std::find_if(m_required.cbegin(), m_required.cend(), is_sub) != m_required.cend();
+            };
+            preds_vec.emplace_back(required_search);
+        }
+    }
+
+    preds_vec.emplace_back(m_pred);
+
+    TextRectProc all_pred = [&](TextRect& tr) -> bool {
+        for (auto pred : preds_vec) {
+            if (pred && !pred(tr)) {
+                return false;
+            }
+        }
+        return true;
+    };
+    m_ocr_result = resource.ocr().recognize(m_image, m_roi, all_pred);
+    //log.trace("ocr result", m_ocr_result);
+    if (!m_ocr_result.empty()) {
+        return true;
+    }
+    else {
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/src/MeoAssistance/OcrImageAnalyzer.h b/src/MeoAssistance/OcrImageAnalyzer.h
new file mode 100644
index 0000000000..8579ffda81
--- /dev/null
+++ b/src/MeoAssistance/OcrImageAnalyzer.h
@@ -0,0 +1,56 @@
+#pragma once
+#include "AbstractImageAnalyzer.h"
+
+#include <vector>
+#include <unordered_map>
+#include <functional>
+
+#include "AsstDef.h"
+
+namespace asst {
+    class OcrImageAnalyzer : public AbstractImageAnalyzer
+    {
+    public:
+        using AbstractImageAnalyzer::AbstractImageAnalyzer;
+        virtual ~OcrImageAnalyzer() = default;
+
+        virtual bool analyze() override;
+
+        //template<typename RequiredArray>
+        //void set_required(RequiredArray required, bool full_match) noexcept {
+        //    static_assert(std::is_constructible<std::string, required::value_type>::value,
+        //        "Parameter can't be used to construct a std::string");
+        //    m_required.assign(std::make_move_iterator(required.begin()), std::make_move_iterator(required.end()));
+        //    m_full_match = full_match;
+        //}
+        void set_required(std::vector<std::string> required, bool full_match = false) noexcept {
+            m_required = std::move(required);
+            m_full_match = full_match;
+        }
+
+        //template<typename ReplaceMap>
+        //void set_replace(ReplaceMap replace) noexcept {
+        //    static_assert(std::is_constructible<m_replace::value_type, required::value_type>::value,
+        //        "Parameter can't be used to construct a replace map");
+        //    std::unordered_map<std::string, std::string> temp_map(
+        //        std::make_move_iterator(replace.begin()), std::make_move_iterator(replace.end());
+        //    m_replace.swap(temp_map);
+        //}
+        void set_replace(std::unordered_map<std::string, std::string> replace) noexcept {
+            m_replace = std::move(replace);
+        }
+        void set_pred(const TextRectProc& pred) {
+            m_pred = pred;
+        }
+        const std::vector<TextRect>& get_result() const noexcept {
+            return m_ocr_result;
+        }
+
+    protected:
+        std::vector<TextRect> m_ocr_result;
+        std::vector<std::string> m_required;
+        bool m_full_match = false;
+        std::unordered_map<std::string, std::string> m_replace;
+        TextRectProc m_pred = nullptr;
+    };
+}
diff --git a/src/MeoAssistance/OcrPack.cpp b/src/MeoAssistance/OcrPack.cpp
new file mode 100644
index 0000000000..8fd1f43fbe
--- /dev/null
+++ b/src/MeoAssistance/OcrPack.cpp
@@ -0,0 +1,80 @@
+#include "OcrPack.h"
+
+#include <opencv2/opencv.hpp>
+#include <OcrLiteOnnx/OcrLiteCaller.h>
+
+#include "AsstAux.h"
+
+asst::OcrPack::OcrPack()
+    : m_ocr_ptr(std::make_unique<OcrLiteCaller>())
+{
+}
+
+asst::OcrPack::~OcrPack() = default;
+
+bool asst::OcrPack::load(const std::string & dir)
+{
+    constexpr static const char* DetName = "\\models\\dbnet.onnx";
+    constexpr static const char* ClsName = "\\models\\angle_net.onnx";
+    constexpr static const char* RecName = "\\models\\crnn_lite_lstm.onnx";
+    constexpr static const char* KeysName = "\\models\\keys.txt";
+
+    const std::string dst_filename = dir + DetName;
+    const std::string cls_filename = dir + ClsName;
+    const std::string rec_filename = dir + RecName;
+    const std::string keys_filename = dir + KeysName;
+
+    return m_ocr_ptr->initModels(dst_filename, cls_filename, rec_filename, keys_filename);
+}
+
+void asst::OcrPack::set_param(int gpu_index, int thread_number)
+{
+    (void*)gpu_index;   // gpu_index是ncnn的参数，onnx架构的没有，预留参数接口
+    m_ocr_ptr->setNumThread(thread_number);
+}
+
+std::vector<asst::TextRect> asst::OcrPack::recognize(const cv::Mat & image, const asst::TextRectProc & pred)
+{
+    constexpr int padding = 50;
+    constexpr int maxSideLen = 0;
+    constexpr float boxScoreThresh = 0.2f;
+    constexpr float boxThresh = 0.3f;
+    constexpr float unClipRatio = 2.0f;
+    constexpr bool doAngle = false;
+    constexpr bool mostAngle = false;
+
+    OcrResult ocr_results = m_ocr_ptr->detect(image,
+        padding, maxSideLen,
+        boxScoreThresh, boxThresh,
+        unClipRatio, doAngle, mostAngle);
+
+    std::vector<TextRect> result;
+    for (TextBlock& text_block : ocr_results.textBlocks) {
+        if (text_block.boxPoint.size() != 4) {
+            continue;
+        }
+        // the rect like ↓
+        // 0 - 1
+        // 3 - 2
+        int x = text_block.boxPoint.at(0).x;
+        int y = text_block.boxPoint.at(0).y;
+        int width = text_block.boxPoint.at(1).x - x;
+        int height = text_block.boxPoint.at(3).y - y;
+
+        TextRect ta{ std::move(text_block.text), Rect(x, y, width, height) };
+        if (!pred || pred(ta)) {
+            result.emplace_back(std::move(ta));
+        }
+    }
+    return result;
+}
+
+std::vector<asst::TextRect> asst::OcrPack::recognize(const cv::Mat & image, const asst::Rect & roi, const asst::TextRectProc & pred)
+{
+    auto rect_cor = [&roi, &pred](TextRect& ta) -> bool {
+        ta.rect.x += roi.x;
+        ta.rect.y += roi.y;
+        return pred(ta);
+    };
+    return recognize(image(make_rect<cv::Rect>(roi)), rect_cor);
+}
\ No newline at end of file
diff --git a/src/MeoAssistance/OcrPack.h b/src/MeoAssistance/OcrPack.h
new file mode 100644
index 0000000000..9e877cb2f2
--- /dev/null
+++ b/src/MeoAssistance/OcrPack.h
@@ -0,0 +1,31 @@
+#pragma once
+#include "AbstractResource.h"
+
+#include <memory>
+#include <functional>
+
+#include "AsstDef.h"
+
+class OcrLiteCaller;
+namespace cv {
+    class Mat;
+}
+
+namespace asst {
+    class OcrPack final : public AbstractResource
+    {
+    public:
+        OcrPack();
+        virtual ~OcrPack();
+
+        virtual bool load(const std::string& dir) override;
+        void set_param(int gpu_index, int thread_number);
+
+        std::vector<TextRect> recognize(const cv::Mat& image, const TextRectProc& pred = nullptr);
+        std::vector<TextRect> recognize(const cv::Mat& image, const Rect& roi, const TextRectProc& pred = nullptr);
+
+    private:
+
+        std::unique_ptr<OcrLiteCaller> m_ocr_ptr;
+    };
+}
diff --git a/src/MeoAssistance/PenguinPack.cpp b/src/MeoAssistance/PenguinPack.cpp
new file mode 100644
index 0000000000..fdc08094ef
--- /dev/null
+++ b/src/MeoAssistance/PenguinPack.cpp
@@ -0,0 +1,105 @@
+#include "PenguinPack.h"
+
+#include <fstream>
+#include <sstream>
+#include <filesystem>
+
+#include <opencv2/opencv.hpp>
+#include <json.h>
+namespace penguin {
+#include <penguin-stats-recognize/penguin_wasm.h>
+}
+
+bool asst::PenguinPack::load(const std::string& dir)
+{
+    bool ret = load_json(dir + "\\json\\stages.json", dir + "\\json\\hash_index.json");
+
+    for (const auto& file : std::filesystem::directory_iterator(dir + "\\items")) {
+        ret &= load_templ(file.path().stem().u8string(), file.path().u8string());
+    }
+    return ret;
+}
+
+void asst::PenguinPack::set_language(const std::string& server)
+{
+    m_language = server;
+    penguin::load_server(server.c_str());
+}
+
+std::string asst::PenguinPack::recognize(const cv::Mat& image)
+{
+    std::vector<uchar> buf;
+    cv::imencode(".png", image, buf);
+    return penguin::recognize(buf.data(), buf.size());
+}
+
+bool asst::PenguinPack::load_json(const std::string& stage_path, const std::string& hash_path)
+{
+    auto load_file = [](const std::string& path) -> std::string {
+        std::ifstream ifs(path, std::ios::in);
+        if (!ifs.is_open()) {
+            return std::string();
+        }
+        std::stringstream iss;
+        iss << ifs.rdbuf();
+        ifs.close();
+        return iss.str();
+    };
+
+    auto stage_parse_ret = json::parse(load_file(stage_path));
+    if (!stage_parse_ret) {
+        m_last_error = stage_path + " parsing failed";
+        return false;
+    }
+    // stage_json 来自 https://penguin-stats.io/PenguinStats/api/v2/stages
+    // 和接口需要的json有点区别，这里做个转换
+    json::value stage_json = std::move(stage_parse_ret.value());
+    json::object cvt_stage_json;
+    try {
+        for (const json::value& stage_info : stage_json.as_array()) {
+            if (!stage_info.exist("dropInfos")) {   // 这种一般是以前的活动关，现在已经关闭了的
+                continue;
+            }
+            std::string key = stage_info.at("code").as_string();
+            json::value stage_dst;
+            stage_dst["stageId"] = stage_info.at("stageId");
+            std::vector<json::value> drops_vector;
+            for (const json::value& drop_info : stage_info.at("dropInfos").as_array()) {
+                if (drop_info.exist("itemId")) {
+                    // 幸运掉落，家具啥的，企鹅物流不接，忽略掉
+                    if (drop_info.at("dropType").as_string() == "FURNITURE") {
+                        continue;
+                    }
+                    drops_vector.emplace_back(drop_info.at("itemId"));
+                }
+            }
+            stage_dst["drops"] = json::array(std::move(drops_vector));
+            stage_dst["existence"] = stage_info.at("existence").at(m_language).at("exist");
+
+            cvt_stage_json.emplace(std::move(key), std::move(stage_dst));
+        }
+    }
+    catch (json::exception& e) {
+        m_last_error = stage_path + " parsing error " + e.what();
+        return false;
+    }
+    std::string cvt_stage_string = cvt_stage_json.to_string();
+    penguin::load_json(cvt_stage_string.c_str(), load_file(hash_path).c_str());
+    return true;
+}
+
+bool asst::PenguinPack::load_templ(const std::string& item_id, const std::string& path)
+{
+    cv::Mat image = cv::imread(path);
+    if (image.empty()) {
+        m_last_error = "templ is empty";
+        return false;
+    }
+
+    std::vector<uchar> buf;
+    cv::imencode(".png", image, buf);
+
+    penguin::load_templ(item_id.c_str(), buf.data(), buf.size());
+
+    return true;
+}
\ No newline at end of file
diff --git a/src/MeoAssistance/PenguinPack.h b/src/MeoAssistance/PenguinPack.h
new file mode 100644
index 0000000000..3a32612dd3
--- /dev/null
+++ b/src/MeoAssistance/PenguinPack.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#include "AbstractResource.h"
+
+namespace cv {
+    class Mat;
+}
+
+namespace asst {
+    class PenguinPack final : public AbstractResource
+    {
+    public:
+        PenguinPack() = default;
+        virtual ~PenguinPack() = default;
+
+        virtual bool load(const std::string& dir) override;
+        void set_language(const std::string& server);
+
+        std::string recognize(const cv::Mat& image);
+    private:
+        bool load_json(const std::string& stage_path, const std::string& hash_path);
+        bool load_templ(const std::string& item_id, const std::string& path);
+
+        std::string m_language = "CN";
+    };
+}
diff --git a/src/MeoAssistance/PenguinUploader.cpp b/src/MeoAssistance/PenguinUploader.cpp
index 70969104bf..2c45549972 100644
--- a/src/MeoAssistance/PenguinUploader.cpp
+++ b/src/MeoAssistance/PenguinUploader.cpp
@@ -1,10 +1,10 @@
-#include "PenguinUploader.h"
+#include "PenguinUploader.h"
 
 #include <Windows.h>
 
 #include <json.h>
 
-#include "Configer.h"
+#include "Resource.h"
 #include "Version.h"
 #include "Logger.hpp"
 #include "AsstAux.h"
@@ -25,7 +25,7 @@ std::string asst::PenguinUploader::cvt_json(const std::string& rec_res)
 
     // Doc: https://developer.penguin-stats.io/public-api/api-v2-instruction/report-api
     json::value body;
-    body["server"] = Configer::get_instance().m_options.penguin_server;
+    body["server"] = resource.cfg().get_options().penguin_server;
     body["stageId"] = rec["stage"]["stageId"];
     body["drops"] = rec["drops"];
     body["source"] = "MeoAssistance";
@@ -37,9 +37,9 @@ std::string asst::PenguinUploader::cvt_json(const std::string& rec_res)
 bool asst::PenguinUploader::request_penguin(const std::string& body)
 {
     std::string curl_cmd = R"(curl -H "Content-Type: application/json" -v -i )";
-    curl_cmd += "-d \"" + StringReplaceAll(body, "\"", "\\\"") + "\" \"" + Configer::get_instance().m_options.penguin_api + '"';
+    curl_cmd += "-d \"" + StringReplaceAll(body, "\"", "\\\"") + "\" \"" + resource.cfg().get_options().penguin_api + '"';
 
-    DebugTrace("request_penguin |", curl_cmd);
+    log.trace("request_penguin |", curl_cmd);
 
     SECURITY_ATTRIBUTES pipe_sec_attr = { 0 };
     pipe_sec_attr.nLength = sizeof(SECURITY_ATTRIBUTES);
@@ -79,7 +79,7 @@ bool asst::PenguinUploader::request_penguin(const std::string& body)
 
         DWORD exit_ret = -1;
         ::GetExitCodeProcess(pi.hProcess, &exit_ret);
-        DebugTrace("curl say:", pipe_str);
+        log.trace("curl say:", pipe_str);
         CloseHandle(pi.hProcess);
         CloseHandle(pi.hThread);
     }
diff --git a/src/MeoAssistance/PenguinUploader.h b/src/MeoAssistance/PenguinUploader.h
index a205335d19..556951fb9f 100644
--- a/src/MeoAssistance/PenguinUploader.h
+++ b/src/MeoAssistance/PenguinUploader.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <string>
 
diff --git a/src/MeoAssistance/ProcessTask.cpp b/src/MeoAssistance/ProcessTask.cpp
index 7d0130c526..5245a46dea 100644
--- a/src/MeoAssistance/ProcessTask.cpp
+++ b/src/MeoAssistance/ProcessTask.cpp
@@ -3,26 +3,18 @@
 #include <chrono>
 #include <random>
 
-#include <opencv2/opencv.hpp>
+#include <json.h>
 
 #include "AsstAux.h"
-#include "Configer.h"
-#include "TaskConfiger.h"
-#include "WinMacro.h"
-#include "Identify.h"
+#include "Controller.h"
 #include "PenguinUploader.h"
+#include "ProcessTaskImageAnalyzer.h"
+#include "Resource.h"
 
 using namespace asst;
 
 bool ProcessTask::run()
 {
-    if (m_controller_ptr == NULL
-        || m_identify_ptr == NULL)
-    {
-        m_callback(AsstMsg::PtrIsNull, json::value(), m_callback_arg);
-        return false;
-    }
-
     json::value task_start_json = json::object{
         { "task_type",  "ProcessTask" },
         { "task_chain", m_task_chain},
@@ -30,13 +22,23 @@ bool ProcessTask::run()
     };
     m_callback(AsstMsg::TaskStart, task_start_json, m_callback_arg);
 
-    std::shared_ptr<TaskInfo> task_info_ptr = nullptr;
-
-    Rect rect;
-    task_info_ptr = match_image(&rect);
+    ProcessTaskImageAnalyzer analyzer(ctrler.get_image(), m_cur_tasks_name);
+    if (!analyzer.analyze()) {
+        return false;
+    }
     if (need_exit()) {
         return false;
     }
+    auto task_info_ptr = analyzer.get_result();
+    Rect rect = analyzer.get_rect();
+    const auto& res_move = task_info_ptr->result_move;
+    if (!res_move.empty()) {
+        rect.x += res_move.x;
+        rect.y += res_move.y;
+        rect.width = res_move.width;
+        rect.height = res_move.height;
+    }
+
     if (!task_info_ptr) {
         m_callback(AsstMsg::ProcessTaskNotMatched, task_start_json, m_callback_arg);
         return false;
@@ -71,14 +73,14 @@ bool ProcessTask::run()
     bool need_stop = false;
     switch (task_info_ptr->action) {
     case ProcessTaskAction::ClickRect:
-        rect = task_info_ptr->specific_area;
+        rect = task_info_ptr->specific_rect;
         [[fallthrough]];
     case ProcessTaskAction::ClickSelf:
         exec_click_task(rect);
         break;
     case ProcessTaskAction::ClickRand:
     {
-        static const Rect full_rect(0, 0, Configer::WindowWidthDefault - 1, Configer::WindowHeightDefault - 1);
+        static const Rect full_rect(0, 0, GeneralConfiger::WindowWidthDefault, GeneralConfiger::WindowHeightDefault);
         exec_click_task(full_rect);
     } break;
     case ProcessTaskAction::SwipeToTheLeft:
@@ -93,15 +95,16 @@ bool ProcessTask::run()
         break;
     case ProcessTaskAction::StageDrops:
     {
-        cv::Mat image = m_controller_ptr->get_image(true);
-        std::string res = m_identify_ptr->penguin_recognize(image);
+        cv::Mat image = ctrler.get_image(true);
+        std::string res = resource.penguin().recognize(image);
         m_callback(AsstMsg::StageDrops, json::parse(res).value(), m_callback_arg);
 
-        if (Configer::get_instance().m_options.print_window) {
+        auto& opt = resource.cfg().get_options();
+        if (opt.print_window) {
             static const std::string dirname = GetCurrentDir() + "screenshot\\";
             save_image(image, dirname);
         }
-        if (Configer::get_instance().m_options.upload_to_penguin) {
+        if (opt.upload_to_penguin) {
             PenguinUploader::upload(res);
         }
     }
@@ -116,7 +119,7 @@ bool ProcessTask::run()
     // 例如，进入吃理智药的界面了，相当于上一次点蓝色开始行动没生效
     // 所以要给蓝色开始行动的次数减一
     for (const std::string& reduce : task_info_ptr->reduce_other_times) {
-        --TaskConfiger::get_instance().m_all_tasks_info[reduce]->exec_times;
+        --resource.task().task_ptr(reduce)->exec_times;
     }
 
     if (need_stop) {
@@ -140,212 +143,16 @@ bool ProcessTask::run()
     return true;
 }
 
-std::shared_ptr<TaskInfo> ProcessTask::match_image(Rect* matched_rect)
-{
-    // 如果第一个任务就是JustReturn的，那就没必要截图了（截图还挺费时间的）
-    // 直接处理下然后返回
-    bool is_front_return = false;
-    if (m_cur_tasks_name.size() >= 1) {
-        auto front_ptr = TaskConfiger::get_instance().m_all_tasks_info[m_cur_tasks_name.front()];
-        if (front_ptr != nullptr
-            && front_ptr->algorithm == AlgorithmType::JustReturn) {
-            is_front_return = true;
-        }
-    }
-    cv::Mat cur_image;
-    if (!is_front_return) {
-        cur_image = m_controller_ptr->get_image();
-        if (cur_image.empty()) {
-            m_callback(AsstMsg::ImageIsEmpty, json::value(), m_callback_arg);
-            return nullptr;
-        }
-    }
-
-    std::unordered_set<TextArea> ocr_cache;
-    // 逐个匹配当前可能的任务
-    for (const std::string& task_name : m_cur_tasks_name) {
-        if (need_exit()) {
-            return nullptr;
-        }
-        std::shared_ptr<TaskInfo> task_info_ptr = TaskConfiger::get_instance().m_all_tasks_info[task_name];
-        if (task_info_ptr == nullptr) {	// 说明配置文件里没这个任务
-            m_callback(AsstMsg::PtrIsNull, json::value(), m_callback_arg);
-            continue;
-        }
-        json::value callback_json;
-        bool matched = false;
-        Rect rect;
-
-        switch (task_info_ptr->algorithm)
-        {
-        case AlgorithmType::JustReturn:
-            callback_json["algorithm"] = "JustReturn";
-            matched = true;
-            break;
-        case AlgorithmType::MatchTemplate:
-        {
-            std::shared_ptr<MatchTaskInfo> match_task_info_ptr =
-                std::dynamic_pointer_cast<MatchTaskInfo>(task_info_ptr);
-            double templ_threshold = match_task_info_ptr->templ_threshold;
-            double hist_threshold = match_task_info_ptr->hist_threshold;
-            double add_cache_thres = match_task_info_ptr->cache ? templ_threshold : Identify::NotAddCache;
-            cv::Mat identify_image;
-            const auto& identify_area = m_controller_ptr->shaped_correct(match_task_info_ptr->identify_area);
-            if (identify_area.width == 0) {
-                identify_image = cur_image;
-            }
-            else {
-                identify_image = cur_image(make_rect<cv::Rect>(identify_area));
-            }
-            auto&& [algorithm, score, temp_rect] =
-                m_identify_ptr->find_image(identify_image, task_name, add_cache_thres);
-            rect = std::move(temp_rect);
-            rect.x += identify_area.x;
-            rect.y += identify_area.y;
-            callback_json["value"] = score;
-
-            if (algorithm == AlgorithmType::MatchTemplate) {
-                callback_json["threshold"] = templ_threshold;
-                callback_json["algorithm"] = "MatchTemplate";
-                if (score >= templ_threshold) {
-                    matched = true;
-                }
-            }
-            else if (algorithm == AlgorithmType::CompareHist) {
-                callback_json["threshold"] = hist_threshold;
-                callback_json["algorithm"] = "CompareHist";
-                if (score >= hist_threshold) {
-                    matched = true;
-                }
-            }
-            else {
-                continue;
-            }
-        }
-        break;
-        case AlgorithmType::OcrDetect:
-        {
-            std::shared_ptr<OcrTaskInfo> ocr_task_info_ptr =
-                std::dynamic_pointer_cast<OcrTaskInfo>(task_info_ptr);
-            std::vector<TextArea> match_result;
-
-            // 处理ocr匹配结果
-            auto proc_match_result = [&](const Rect& rect_offset) -> bool {
-                if (!match_result.empty()) {
-                    callback_json["text"] = match_result.at(0).text;
-                    rect = match_result.at(0).rect;
-                    rect.x += rect_offset.x;
-                    rect.y += rect_offset.y;
-                    matched = true;
-                    return true;
-                }
-                else {
-                    matched = false;
-                    return false;
-                }
-            };
-
-            bool need_match = ocr_task_info_ptr->need_match;
-            const auto& identify_area = m_controller_ptr->shaped_correct(ocr_task_info_ptr->identify_area);
-
-            // 先从缓存里找找有没有（同一张图片，之前其他任务识别的），找到了直接就不识别了
-            std::vector<TextArea> temp_match;
-            if (need_match) {
-                temp_match = text_match(ocr_cache, ocr_task_info_ptr->text, ocr_task_info_ptr->replace_map);
-            }
-            else {
-                temp_match = text_search(ocr_cache, ocr_task_info_ptr->text, ocr_task_info_ptr->replace_map);
-            }
-            // 即使在缓存里找到了，也得在识别区域里才行，不然过滤掉
-            for (const TextArea& textarea : temp_match) {
-                if (identify_area.include(textarea.rect)) {
-                    match_result.emplace_back(textarea);
-                }
-            }
-            if (proc_match_result(Rect())) {
-                callback_json["algorithm"] = "OcrDetectCache";
-                break;
-            }
-
-            auto identify_roi = [&](const Rect roi) -> bool {
-                cv::Mat roi_image = cur_image(make_rect<cv::Rect>(roi));
-                std::vector<TextArea> all_text_area = ocr_detect(roi_image);
-                // 校正选区坐标，并加入ocr识别缓存
-                for (TextArea& textarea : all_text_area) {
-                    textarea.rect.x += roi.x;
-                    textarea.rect.y += roi.y;
-                    ocr_cache.emplace(textarea);
-                }
-                if (need_match) {
-                    match_result = text_match(all_text_area, ocr_task_info_ptr->text, ocr_task_info_ptr->replace_map);
-                }
-                else {
-                    match_result = text_search(all_text_area, ocr_task_info_ptr->text, ocr_task_info_ptr->replace_map);
-                }
-                return !match_result.empty();
-            };
-
-            // 先在历史区域里识别
-            for (const auto& history_area : ocr_task_info_ptr->history_area) {
-                Rect roi_rect = history_area.center_zoom(2.0, Configer::WindowWidthDefault, Configer::WindowHeightDefault);
-                if (identify_roi(roi_rect)) {
-                    callback_json["roi"] = make_rect<json::array>(roi_rect);
-                    break;
-                }
-            }
-            if (proc_match_result(Rect())) {
-                callback_json["algorithm"] = "OcrDetectRoi";
-                break;
-            }
-
-            // 如果历史区域里没识别到，那再在用完整的区域识别一次
-            identify_roi(identify_area);
-
-            // 把本次完整识别到的区域加入历史区域
-            if (ocr_task_info_ptr->cache) {
-                for (const auto& textarea : match_result) {
-                    ocr_task_info_ptr->history_area.emplace_back(textarea.rect);
-                }
-            }
-
-            if (proc_match_result(Rect())) {
-                callback_json["algorithm"] = "OcrDetect";
-                break;
-            }
-            callback_json["algorithm"] = "OcrDetectNotMatched";
-        }
-        break;
-        //CompareHist是MatchTemplate的衍生算法，不应作为单独的配置参数出现
-        //case AlgorithmType::CompareHist:
-        //	break;
-        default:
-            // TODO：抛个报错的回调出去
-            break;
-        }
-
-        callback_json["rect"] = make_rect<json::array>(rect);
-        callback_json["name"] = task_name;
-        if (matched_rect != NULL) {
-            *matched_rect = std::move(rect);
-        }
-        m_callback(AsstMsg::ImageFindResult, callback_json, m_callback_arg);
-        if (matched) {
-            m_callback(AsstMsg::ImageMatched, callback_json, m_callback_arg);
-            return task_info_ptr;
-        }
-    }
-    return nullptr;
-}
-
 // 随机延时功能
 bool asst::ProcessTask::delay_random()
 {
-    if (Configer::get_instance().m_options.control_delay_upper != 0) {
+    auto& opt = resource.cfg().get_options();
+    if (opt.control_delay_upper != 0) {
         static std::default_random_engine rand_engine(
             std::chrono::system_clock::now().time_since_epoch().count());
         static std::uniform_int_distribution<unsigned> rand_uni(
-            Configer::get_instance().m_options.control_delay_lower,
-            Configer::get_instance().m_options.control_delay_upper);
+            opt.control_delay_lower,
+            opt.control_delay_upper);
 
         unsigned rand_delay = rand_uni(rand_engine);
 
@@ -360,7 +167,7 @@ void ProcessTask::exec_click_task(const Rect& matched_rect)
         return;
     }
 
-    m_controller_ptr->click(matched_rect);
+    ctrler.click(matched_rect);
 }
 
 void asst::ProcessTask::exec_swipe_task(ProcessTaskAction action)
@@ -368,23 +175,20 @@ void asst::ProcessTask::exec_swipe_task(ProcessTaskAction action)
     if (!delay_random()) {
         return;
     }
-    const static Rect right_rect(Configer::WindowWidthDefault * 0.8,
-        Configer::WindowHeightDefault * 0.4,
-        Configer::WindowWidthDefault * 0.1,
-        Configer::WindowHeightDefault * 0.2);
+    auto& width = resource.cfg().WindowWidthDefault;
+    auto& height = resource.cfg().WindowWidthDefault;
 
-    const static Rect left_rect(Configer::WindowWidthDefault * 0.1,
-        Configer::WindowHeightDefault * 0.4,
-        Configer::WindowWidthDefault * 0.1,
-        Configer::WindowHeightDefault * 0.2);
+    const static Rect right_rect(width * 0.8, height * 0.4, width * 0.1, height * 0.2);
+
+    const static Rect left_rect(width * 0.1, height * 0.4, width * 0.1, height * 0.2);
 
     switch (action)
     {
     case asst::ProcessTaskAction::SwipeToTheLeft:
-        m_controller_ptr->swipe(left_rect, right_rect);
+        ctrler.swipe(left_rect, right_rect);
         break;
     case asst::ProcessTaskAction::SwipeToTheRight:
-        m_controller_ptr->swipe(right_rect, left_rect);
+        ctrler.swipe(right_rect, left_rect);
         break;
     default:	// 走不到这里，TODO 报个错
         break;
diff --git a/src/MeoAssistance/ProcessTask.h b/src/MeoAssistance/ProcessTask.h
index a79001d940..d901555aac 100644
--- a/src/MeoAssistance/ProcessTask.h
+++ b/src/MeoAssistance/ProcessTask.h
@@ -1,13 +1,14 @@
 #pragma once
 
-#include "OcrAbstractTask.h"
+#include "AbstractTask.h"
+#include "AsstDef.h"
 
 namespace asst {
     // 流程任务，按照配置文件里的设置的流程运行
-    class ProcessTask : public OcrAbstractTask
+    class ProcessTask : public AbstractTask
     {
     public:
-        using OcrAbstractTask::OcrAbstractTask;
+        using AbstractTask::AbstractTask;
         virtual ~ProcessTask() = default;
 
         virtual bool run() override;
@@ -17,9 +18,8 @@ namespace asst {
         }
 
     protected:
-        std::shared_ptr<TaskInfo> match_image(asst::Rect* matched_rect = NULL);
         bool delay_random();
-        void exec_click_task(const asst::Rect& matched_rect);
+        void exec_click_task(const Rect& matched_rect);
         void exec_swipe_task(ProcessTaskAction action);
 
         std::vector<std::string> m_cur_tasks_name;
diff --git a/src/MeoAssistance/ProcessTaskImageAnalyzer.cpp b/src/MeoAssistance/ProcessTaskImageAnalyzer.cpp
new file mode 100644
index 0000000000..ee1235251a
--- /dev/null
+++ b/src/MeoAssistance/ProcessTaskImageAnalyzer.cpp
@@ -0,0 +1,142 @@
+#include "ProcessTaskImageAnalyzer.h"
+
+#include "Resource.h"
+#include "MatchImageAnalyzer.h"
+#include "OcrImageAnalyzer.h"
+#include "AsstAux.h"
+
+asst::ProcessTaskImageAnalyzer::ProcessTaskImageAnalyzer(const cv::Mat& image, std::vector<std::string> tasks_name)
+    : AbstractImageAnalyzer(image),
+    m_tasks_name(std::move(tasks_name))
+{
+    ;
+}
+
+asst::ProcessTaskImageAnalyzer::~ProcessTaskImageAnalyzer() = default;
+
+bool asst::ProcessTaskImageAnalyzer::match_analyze(std::shared_ptr<TaskInfo> task_ptr)
+{
+    std::shared_ptr<MatchTaskInfo> match_task_ptr = std::dynamic_pointer_cast<MatchTaskInfo>(task_ptr);
+
+    if (!m_match_analyzer) {
+        m_match_analyzer = std::make_unique<MatchImageAnalyzer>(m_image);
+    }
+    m_match_analyzer->set_roi(match_task_ptr->roi);
+    m_match_analyzer->set_templ_name(match_task_ptr->templ_name);
+    m_match_analyzer->set_threshold(match_task_ptr->templ_threshold, match_task_ptr->hist_threshold);
+    m_match_analyzer->set_use_cache(match_task_ptr->cache);
+
+    if (m_match_analyzer->analyze()) {
+        m_result = match_task_ptr;
+        m_result_rect = m_match_analyzer->get_result().rect;
+        return true;
+    }
+    return false;
+}
+
+bool asst::ProcessTaskImageAnalyzer::ocr_analyze(std::shared_ptr<TaskInfo> task_ptr)
+{
+    std::shared_ptr<OcrTaskInfo> ocr_task_ptr = std::dynamic_pointer_cast<OcrTaskInfo>(task_ptr);
+
+    // 先尝试从缓存的结果里找
+    for (const TextRect& tr : m_ocr_cache) {
+        TextRect temp = tr;
+        for (const auto& [old_str, new_str] : ocr_task_ptr->replace_map) {
+            temp.text = StringReplaceAll(temp.text, old_str, new_str);
+        }
+        for (const auto& text : ocr_task_ptr->text) {
+            bool flag = false;
+            if (ocr_task_ptr->need_full_match) {
+                if (temp.text == text) {
+                    flag = true;
+                }
+            }
+            else if (temp.text.find(text) != std::string::npos) {
+                flag = true;
+            }
+            // 即使找到了，也得在ROI里才行，不然过滤掉
+            if (flag && ocr_task_ptr->roi.include(tr.rect)) {
+                m_result = ocr_task_ptr;
+                m_result_rect = tr.rect;
+                return true;
+            }
+        }
+    }
+    if (!m_ocr_analyzer) {
+        m_ocr_analyzer = std::make_unique<OcrImageAnalyzer>(m_image);
+    }
+    m_ocr_analyzer->set_required(ocr_task_ptr->text);
+    m_ocr_analyzer->set_replace(ocr_task_ptr->replace_map);
+
+    // 识别区域文字，并加入缓存
+    auto analyze_roi = [&](const Rect& roi) -> bool {
+        m_ocr_analyzer->set_roi(roi);
+        bool ret = m_ocr_analyzer->analyze();
+
+        const auto& ocr_result = m_ocr_analyzer->get_result();
+        m_ocr_cache.insert(m_ocr_cache.end(), ocr_result.begin(), ocr_result.end());
+        if (ret) {
+            m_result = ocr_task_ptr;
+            m_result_rect = ocr_result.front().rect;
+            return true;
+        }
+        return false;
+    };
+
+    // 在曾经识别到过的历史区域里识别
+    for (const Rect& region : ocr_task_ptr->region_of_appeared) {
+        bool ret = analyze_roi(region.center_zoom(2.0));
+        if (ret) {
+            return true;
+        }
+    }
+
+    // 都没有的话，再完整的识别整个ROI
+    return analyze_roi(ocr_task_ptr->roi);
+}
+
+void asst::ProcessTaskImageAnalyzer::reset() noexcept
+{
+    m_ocr_cache.clear();
+    m_ocr_analyzer = nullptr;
+    m_match_analyzer = nullptr;
+}
+
+bool asst::ProcessTaskImageAnalyzer::analyze()
+{
+    for (const std::string& task_name : m_tasks_name) {
+        auto task_ptr = resource.task().task_ptr(task_name);
+
+        switch (task_ptr->algorithm)
+        {
+        case AlgorithmType::JustReturn:
+            m_result = task_ptr;
+            return true;
+        case AlgorithmType::MatchTemplate:
+            if (match_analyze(task_ptr)) {
+                return true;
+            }
+            break;
+        case AlgorithmType::OcrDetect:
+            if (ocr_analyze(task_ptr)) {
+                return true;
+            }
+            break;
+        default:
+            break;
+        }
+    }
+    return false;
+}
+
+void asst::ProcessTaskImageAnalyzer::set_image(const cv::Mat & image, const Rect & roi)
+{
+    AbstractImageAnalyzer::set_image(image, roi);
+    reset();
+}
+
+void asst::ProcessTaskImageAnalyzer::set_roi(const Rect & roi) noexcept
+{
+    AbstractImageAnalyzer::set_roi(roi);
+    reset();
+}
\ No newline at end of file
diff --git a/src/MeoAssistance/ProcessTaskImageAnalyzer.h b/src/MeoAssistance/ProcessTaskImageAnalyzer.h
new file mode 100644
index 0000000000..f2e6b0fdbd
--- /dev/null
+++ b/src/MeoAssistance/ProcessTaskImageAnalyzer.h
@@ -0,0 +1,46 @@
+#pragma once
+#include "AbstractImageAnalyzer.h"
+
+#include <vector>
+#include <string>
+#include <memory>
+
+#include "AsstDef.h"
+
+namespace asst {
+    class OcrImageAnalyzer;
+    class MatchImageAnalyzer;
+
+    class ProcessTaskImageAnalyzer final : public AbstractImageAnalyzer
+    {
+    public:
+        using AbstractImageAnalyzer::AbstractImageAnalyzer;
+        ProcessTaskImageAnalyzer(const cv::Mat& image, std::vector<std::string> tasks_name);
+        virtual ~ProcessTaskImageAnalyzer();
+
+        virtual bool analyze() override;
+        virtual void set_image(const cv::Mat& image, const Rect& roi = Rect()) override;
+        virtual void set_roi(const Rect& roi) noexcept override;
+
+        void set_tasks(std::vector<std::string> tasks_name) {
+            m_tasks_name = std::move(tasks_name);
+        }
+        std::shared_ptr<TaskInfo> get_result() const noexcept {
+            return m_result;
+        }
+        const Rect& get_rect() const noexcept {
+            return m_result_rect;
+        }
+    protected:
+        bool match_analyze(std::shared_ptr<TaskInfo> task_ptr);
+        bool ocr_analyze(std::shared_ptr<TaskInfo> task_ptr);
+        void reset() noexcept;
+
+        std::unique_ptr<OcrImageAnalyzer> m_ocr_analyzer = nullptr;
+        std::unique_ptr<MatchImageAnalyzer> m_match_analyzer = nullptr;
+        std::vector<std::string> m_tasks_name;
+        std::shared_ptr<TaskInfo> m_result;
+        Rect m_result_rect;
+        std::vector<TextRect> m_ocr_cache;
+    };
+}
diff --git a/src/MeoAssistance/RecruitConfiger.cpp b/src/MeoAssistance/RecruitConfiger.cpp
index 40e5b2c84f..daa3573542 100644
--- a/src/MeoAssistance/RecruitConfiger.cpp
+++ b/src/MeoAssistance/RecruitConfiger.cpp
@@ -1,15 +1,9 @@
 #include "RecruitConfiger.h"
 
-#include <fstream>
-#include <sstream>
 #include <algorithm>
 
 #include <json.h>
 
-#include "Logger.hpp"
-
-using namespace asst;
-
 bool asst::RecruitConfiger::parse(const json::value& json)
 {
     for (const json::value& oper : json.as_array()) {
diff --git a/src/MeoAssistance/RecruitConfiger.h b/src/MeoAssistance/RecruitConfiger.h
index 2de0905c0f..ed1f6736e6 100644
--- a/src/MeoAssistance/RecruitConfiger.h
+++ b/src/MeoAssistance/RecruitConfiger.h
@@ -9,31 +9,46 @@
 #include "AsstDef.h"
 
 namespace asst {
+    // 干员信息，公开招募相关
+    struct OperRecruitInfo {
+        std::string name;
+        std::string type;
+        int level = 0;
+        std::string sex;
+        std::unordered_set<std::string> tags;
+        bool hidden = false;
+        std::string name_en;
+    };
+
+    // 公开招募的干员组合
+    struct OperRecruitCombs {
+        std::vector<OperRecruitInfo> opers;
+        int max_level = 0;
+        int min_level = 0;
+        double avg_level = 0;
+    };
+
     class RecruitConfiger : public AbstractConfiger
     {
     public:
         virtual ~RecruitConfiger() = default;
+        constexpr static int CorrectNumberOfTags = 5;
 
-        static RecruitConfiger& get_instance() {
-            static RecruitConfiger unique_instance;
-            return unique_instance;
+        const std::unordered_set<std::string>& get_all_tags() const noexcept
+        {
+            return m_all_tags;
         }
+        const std::vector<OperRecruitInfo>& get_all_opers() const noexcept
+        {
+            return m_all_opers;
+        }
+
+    protected:
+        virtual bool parse(const json::value& json) override;
 
         std::unordered_set<std::string> m_all_tags;
         std::unordered_set<std::string> m_all_types;
 
         std::vector<OperRecruitInfo> m_all_opers;
-
-        constexpr static int CorrectNumberOfTags = 5;
-
-    protected:
-        RecruitConfiger() = default;
-        RecruitConfiger(const RecruitConfiger& rhs) = default;
-        RecruitConfiger(RecruitConfiger&& rhs) noexcept = default;
-
-        RecruitConfiger& operator=(const RecruitConfiger& rhs) = default;
-        RecruitConfiger& operator=(RecruitConfiger&& rhs) noexcept = default;
-
-        virtual bool parse(const json::value& json) override;
     };
 }
\ No newline at end of file
diff --git a/src/MeoAssistance/RecruitImageAnalyzer.cpp b/src/MeoAssistance/RecruitImageAnalyzer.cpp
new file mode 100644
index 0000000000..8558522e8c
--- /dev/null
+++ b/src/MeoAssistance/RecruitImageAnalyzer.cpp
@@ -0,0 +1,68 @@
+#include "RecruitImageAnalyzer.h"
+
+#include "Resource.h"
+#include "OcrImageAnalyzer.h"
+#include "MatchImageAnalyzer.h"
+
+bool asst::RecruitImageAnalyzer::analyze()
+{
+    bool time_ret = time_analyze();
+    bool tags_ret = tags_analyze();
+
+    return time_ret || tags_ret;
+}
+
+bool asst::RecruitImageAnalyzer::tags_analyze()
+{
+    const static auto tags_task_ptr = std::dynamic_pointer_cast<OcrTaskInfo>(
+        resource.task().task_ptr("RecruitTags"));
+
+    static bool analyzer_inited = false;
+    static OcrImageAnalyzer tags_analyzer;
+    if (!analyzer_inited) {
+        tags_analyzer.set_roi(tags_task_ptr->roi);
+        auto& all_tags_set = resource.recruit().get_all_tags();
+        std::vector<std::string> all_tags_vec;
+        all_tags_vec.assign(all_tags_set.begin(), all_tags_set.end());
+        tags_analyzer.set_required(std::move(all_tags_vec));
+        tags_analyzer.set_replace(tags_task_ptr->replace_map);
+        analyzer_inited = true;
+    }
+
+    tags_analyzer.set_image(m_image);
+
+    if (tags_analyzer.analyze()) {
+        m_tags_result = tags_analyzer.get_result();
+        return true;
+        //if (m_tags_result.size() == resource.recruit().CorrectNumberOfTags) {
+        //    return true;
+        //}
+    }
+    return false;
+}
+
+bool asst::RecruitImageAnalyzer::time_analyze()
+{
+    const static auto time_task_ptr = std::dynamic_pointer_cast<MatchTaskInfo>(
+        resource.task().task_ptr("RecruitTime"));
+
+    MatchImageAnalyzer time_analyzer(
+        m_image,
+        time_task_ptr->roi,
+        time_task_ptr->templ_name,
+        time_task_ptr->templ_threshold);
+
+    if (time_analyzer.analyze()) {
+        Rect rect = time_analyzer.get_result().rect;
+        const auto& res_move = time_task_ptr->result_move;
+        if (!res_move.empty()) {
+            rect.x += res_move.x;
+            rect.y += res_move.y;
+            rect.width = res_move.width;
+            rect.height = res_move.height;
+        }
+        m_set_time_rect.emplace_back(rect);
+        return true;
+    }
+    return false;
+}
\ No newline at end of file
diff --git a/src/MeoAssistance/RecruitImageAnalyzer.h b/src/MeoAssistance/RecruitImageAnalyzer.h
new file mode 100644
index 0000000000..6d66bd66be
--- /dev/null
+++ b/src/MeoAssistance/RecruitImageAnalyzer.h
@@ -0,0 +1,28 @@
+#pragma once
+#include "AbstractImageAnalyzer.h"
+
+#include "AsstDef.h"
+
+namespace asst {
+    class RecruitImageAnalyzer final : public AbstractImageAnalyzer
+    {
+    public:
+        using AbstractImageAnalyzer::AbstractImageAnalyzer;
+        virtual ~RecruitImageAnalyzer() = default;
+
+        virtual bool analyze() override;
+
+        const std::vector<TextRect>& get_tags_result() const noexcept {
+            return m_tags_result;
+        }
+        const std::vector<Rect>& get_set_time_rect() const noexcept {
+            return m_set_time_rect;
+        }
+    protected:
+        bool tags_analyze();
+        bool time_analyze();
+
+        std::vector<TextRect> m_tags_result;
+        std::vector<Rect> m_set_time_rect;
+    };
+}
diff --git a/src/MeoAssistance/OpenRecruitTask.cpp b/src/MeoAssistance/RecruitTask.cpp
similarity index 76%
rename from src/MeoAssistance/OpenRecruitTask.cpp
rename to src/MeoAssistance/RecruitTask.cpp
index 3b75f0c2f3..cebf504726 100644
--- a/src/MeoAssistance/OpenRecruitTask.cpp
+++ b/src/MeoAssistance/RecruitTask.cpp
@@ -1,71 +1,43 @@
-#include "OpenRecruitTask.h"
+#include "RecruitTask.h"
 
 #include <map>
 #include <vector>
 #include <algorithm>
 #include <future>
 
-#include "WinMacro.h"
-#include "Configer.h"
-#include "Identify.h"
-#include "TaskConfiger.h"
-#include "RecruitConfiger.h"
-#include "AsstAux.h"
+#include "Controller.h"
+#include "RecruitImageAnalyzer.h"
+#include "Resource.h"
 
 using namespace asst;
 
-bool OpenRecruitTask::run()
+bool RecruitTask::run()
 {
-    if (m_controller_ptr == NULL
-        || m_identify_ptr == NULL)
-    {
-        m_callback(AsstMsg::PtrIsNull, json::value(), m_callback_arg);
-        return false;
-    }
-
     json::value task_start_json = json::object{
-        { "task_type",  "OpenRecruitTask" },
+        { "task_type",  "RecruitTask" },
         { "task_chain", m_task_chain},
     };
     m_callback(AsstMsg::TaskStart, task_start_json, m_callback_arg);
 
-    const cv::Mat& image = m_controller_ptr->get_image();
+    const cv::Mat& image = ctrler.get_image();
     if (image.empty()) {
         m_callback(AsstMsg::ImageIsEmpty, task_start_json, m_callback_arg);
         return false;
     }
 
-    /* 设置招募时间9小时 */
-    auto set_time_foo = [&](bool flag) -> void {
-        if (!flag) {
-            return;
-        }
-        const static cv::Rect identify_area = make_rect<cv::Rect>(
-            m_controller_ptr->shaped_correct(Rect(340, 140, 510, 160)));
-        auto&& [algorithm, score, second_confirm_rect] =
-            m_identify_ptr->find_image(image(identify_area), "RecruitTime");
+    RecruitImageAnalyzer analyzer(image);
+    if (!analyzer.analyze()) {
+        return false;
+    }
 
-        const static auto time_reduce_task_ptr = std::dynamic_pointer_cast<MatchTaskInfo>(
-            TaskConfiger::get_instance().m_all_tasks_info["RecruitTime"]);
-
-        if (score >= time_reduce_task_ptr->templ_threshold) {
-            m_controller_ptr->click(time_reduce_task_ptr->specific_area, false);
-        }
-    };
-    std::future<void> set_time_future = std::async(std::launch::async, set_time_foo, m_set_time);
-
-    const static cv::Rect identify_area = make_rect<cv::Rect>(
-        m_controller_ptr->shaped_correct(Rect(200, 200, 800, 500)));
-    /* Find all text */
-    std::vector<TextArea> all_text_area = ocr_detect(image(identify_area));
-
-    /* Filter out all tags from all text */
-    std::vector<TextArea> all_tags = text_match(
-        all_text_area, RecruitConfiger::get_instance().m_all_tags, Configer::get_instance().m_recruit_ocr_replace);
+    for (const auto& rect : analyzer.get_set_time_rect()) {
+        ctrler.click(rect, false);
+    }
+    const std::vector<TextRect>& all_tags = analyzer.get_tags_result();
 
     std::unordered_set<std::string> all_tags_name;
     std::vector<json::value> all_tags_json_vector;
-    for (const TextArea& text_area : all_tags) {
+    for (const TextRect& text_area : all_tags) {
         all_tags_name.emplace(text_area.text);
         all_tags_json_vector.emplace_back(text_area.text);
     }
@@ -111,7 +83,7 @@ bool OpenRecruitTask::run()
     // 例如 key: { "狙击"、"群攻" }，value: OperRecruitCombs.opers{ "陨星", "白雪", "空爆" }
     std::map<std::vector<std::string>, OperRecruitCombs> result_map;
     for (const std::vector<std::string>& comb : all_combs) {
-        for (const OperRecruitInfo& cur_oper : RecruitConfiger::get_instance().m_all_opers) {
+        for (const OperRecruitInfo& cur_oper : resource.recruit().get_all_opers()) {
             int matched_count = 0;
             for (const std::string& tag : comb) {
                 if (cur_oper.tags.find(tag) != cur_oper.tags.cend()) {
@@ -209,8 +181,6 @@ bool OpenRecruitTask::run()
     results_json["result"] = json::array(std::move(result_json_vector));
     m_callback(AsstMsg::RecruitResult, results_json, m_callback_arg);
 
-    set_time_future.wait();
-
     /* 点击最优解的tags */
     if (!m_required_level.empty() && !result_vector.empty()) {
         if (std::find(m_required_level.cbegin(), m_required_level.cend(), result_vector[0].second.min_level)
@@ -219,12 +189,9 @@ bool OpenRecruitTask::run()
         }
         const std::vector<std::string>& final_tags_name = result_vector[0].first;
 
-        for (const TextArea& text_area : all_tags) {
+        for (const TextRect& text_area : all_tags) {
             if (std::find(final_tags_name.cbegin(), final_tags_name.cend(), text_area.text) != final_tags_name.cend()) {
-                Rect click_rect = text_area.rect;
-                click_rect.x += identify_area.x;
-                click_rect.y += identify_area.y;
-                m_controller_ptr->click(click_rect, false);
+                ctrler.click(text_area.rect, false);
             }
         }
     }
@@ -232,7 +199,7 @@ bool OpenRecruitTask::run()
     return true;
 }
 
-void OpenRecruitTask::set_param(std::vector<int> required_level, bool set_time)
+void RecruitTask::set_param(std::vector<int> required_level, bool set_time)
 {
     m_required_level = std::move(required_level);
     m_set_time = set_time;
diff --git a/src/MeoAssistance/OpenRecruitTask.h b/src/MeoAssistance/RecruitTask.h
similarity index 61%
rename from src/MeoAssistance/OpenRecruitTask.h
rename to src/MeoAssistance/RecruitTask.h
index a06aa9e8ff..aa1b1f30ec 100644
--- a/src/MeoAssistance/OpenRecruitTask.h
+++ b/src/MeoAssistance/RecruitTask.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include "OcrAbstractTask.h"
+#include "AbstractTask.h"
 
 namespace asst {
-    class OpenRecruitTask : public OcrAbstractTask
+    class RecruitTask : public AbstractTask
     {
     public:
-        using OcrAbstractTask::OcrAbstractTask;
-        virtual ~OpenRecruitTask() = default;
+        using AbstractTask::AbstractTask;
+        virtual ~RecruitTask() = default;
 
         virtual bool run() override;
         virtual void set_param(std::vector<int> required_level, bool set_time = true);
diff --git a/src/MeoAssistance/Resource.cpp b/src/MeoAssistance/Resource.cpp
new file mode 100644
index 0000000000..b546349a51
--- /dev/null
+++ b/src/MeoAssistance/Resource.cpp
@@ -0,0 +1,71 @@
+#include "Resource.h"
+
+#include <filesystem>
+#include <fstream>
+#include <sstream>
+
+#include <json.h>
+
+#include "AsstDef.h"
+
+bool asst::Resource::load(const std::string& dir)
+{
+    constexpr static const char* TemplsFilename = "template";
+    constexpr static const char* GeneralCfgFilename = "config.json";
+    constexpr static const char* TaskDataFilename = "tasks.json";
+    constexpr static const char* RecruitCfgFilename = "recruit.json";
+    constexpr static const char* ItemCfgFilename = "item_index.json";
+    constexpr static const char* UserCfgFilename = "..\\user.json";
+    constexpr static const char* OcrResourceFilename = "OcrLiteOnnx";
+    constexpr static const char* PenguinResourceFilename = "penguin-stats-recognize";
+
+    /* 加载各个Json配置文件 */
+    if (!m_general_cfg_unique_ins.load(dir + GeneralCfgFilename)) {
+        m_last_error = m_general_cfg_unique_ins.get_last_error();
+        return false;
+    }
+    if (!m_task_data_unique_ins.load(dir + TaskDataFilename)) {
+        m_last_error = m_task_data_unique_ins.get_last_error();
+        return false;
+    }
+
+    if (!m_recruit_cfg_unique_ins.load(dir + RecruitCfgFilename)) {
+        m_last_error = m_recruit_cfg_unique_ins.get_last_error();
+        return false;
+    }
+    if (!m_item_cfg_unique_ins.load(dir + ItemCfgFilename)) {
+        m_last_error = m_item_cfg_unique_ins.get_last_error();
+        return false;
+    }
+    if (!m_user_cfg_unique_ins.load(dir + UserCfgFilename)) {
+        m_last_error = m_user_cfg_unique_ins.get_last_error();
+        return false;
+    }
+    /* 根据用户配置，覆盖原有的部分配置 */
+    for (const auto& [name, path] : m_user_cfg_unique_ins.get_emulator_path()) {
+        m_general_cfg_unique_ins.set_emulator_path(name, path);
+    }
+    const auto& opt = m_general_cfg_unique_ins.get_options();
+
+    /* 加载模板图片资源 */
+    m_templ_resource_unique_ins.set_load_required(m_task_data_unique_ins.get_templ_required());
+    if (!m_templ_resource_unique_ins.load(dir + TemplsFilename)) {
+        m_last_error = m_templ_resource_unique_ins.get_last_error();
+        return false;
+    }
+
+    /* 加载OCR库所需要的资源 */
+    m_ocr_pack_unique_ins.set_param(opt.ocr_gpu_index, opt.ocr_thread_number);
+    if (!m_ocr_pack_unique_ins.load(dir + OcrResourceFilename)) {
+        m_last_error = m_ocr_pack_unique_ins.get_last_error();
+        return false;
+    }
+    /* 加载企鹅统计库所需要的资源 */
+    m_penguin_pack_unique_ins.set_language(opt.penguin_server);
+    if (!m_penguin_pack_unique_ins.load(dir + PenguinResourceFilename)) {
+        m_last_error = m_penguin_pack_unique_ins.get_last_error();
+        return false;
+    }
+
+    return true;
+}
\ No newline at end of file
diff --git a/src/MeoAssistance/Resource.h b/src/MeoAssistance/Resource.h
new file mode 100644
index 0000000000..4bad59f1dd
--- /dev/null
+++ b/src/MeoAssistance/Resource.h
@@ -0,0 +1,92 @@
+#pragma once
+
+#include "AbstractResource.h"
+
+#include <utility>
+#include <memory>
+
+#include <opencv2/opencv.hpp>
+
+#include "TemplResource.h"
+#include "GeneralConfiger.h"
+#include "TaskData.h"
+#include "RecruitConfiger.h"
+#include "ItemConfiger.h"
+#include "UserConfiger.h"
+#include "OcrPack.h"
+#include "PenguinPack.h"
+
+namespace asst {
+    class Resource : public AbstractResource
+    {
+    public:
+        virtual ~Resource() = default;
+
+        static Resource& get_instance() {
+            static Resource unique_instance;
+            return unique_instance;
+        }
+
+        virtual bool load(const std::string& dir) override;
+
+        TemplResource& templ() noexcept {
+            return m_templ_resource_unique_ins;
+        }
+        GeneralConfiger& cfg() noexcept {
+            return m_general_cfg_unique_ins;
+        }
+        TaskData& task() noexcept {
+            return m_task_data_unique_ins;
+        }
+        RecruitConfiger& recruit() noexcept {
+            return m_recruit_cfg_unique_ins;
+        }
+        ItemConfiger& item() noexcept {
+            return m_item_cfg_unique_ins;
+        }
+        OcrPack& ocr() noexcept {
+            return m_ocr_pack_unique_ins;
+        }
+        PenguinPack& penguin() noexcept {
+            return m_penguin_pack_unique_ins;
+        }
+
+        const TemplResource& templ() const noexcept {
+            return m_templ_resource_unique_ins;
+        }
+        const GeneralConfiger& cfg() const noexcept {
+            return m_general_cfg_unique_ins;
+        }
+        const TaskData& task() const noexcept {
+            return m_task_data_unique_ins;
+        }
+        const RecruitConfiger& recruit() const noexcept {
+            return m_recruit_cfg_unique_ins;
+        }
+        const ItemConfiger& item() const noexcept {
+            return m_item_cfg_unique_ins;
+        }
+        const OcrPack& ocr() const noexcept {
+            return m_ocr_pack_unique_ins;
+        }
+        const PenguinPack& penguin() const noexcept {
+            return m_penguin_pack_unique_ins;
+        }
+
+        Resource& operator=(const Resource&) = delete;
+        Resource& operator=(Resource&&) noexcept = delete;
+    private:
+        Resource() = default;
+
+        TemplResource m_templ_resource_unique_ins;
+        GeneralConfiger m_general_cfg_unique_ins;
+        TaskData m_task_data_unique_ins;
+        RecruitConfiger m_recruit_cfg_unique_ins;
+        ItemConfiger m_item_cfg_unique_ins;
+        UserConfiger m_user_cfg_unique_ins;
+        OcrPack m_ocr_pack_unique_ins;
+        PenguinPack m_penguin_pack_unique_ins;
+    };
+
+    static auto& resource = Resource::get_instance();
+}
diff --git a/src/MeoAssistance/ScreenCaptureTask.cpp b/src/MeoAssistance/ScreenCaptureTask.cpp
index b9072af928..da0dd68cf5 100644
--- a/src/MeoAssistance/ScreenCaptureTask.cpp
+++ b/src/MeoAssistance/ScreenCaptureTask.cpp
@@ -2,20 +2,11 @@
 
 #include "AsstAux.h"
 
-#include "WinMacro.h"
-#include "Identify.h"
+#include "Controller.h"
 
 bool asst::ScreenCaptureTask::run()
 {
-    if (m_controller_ptr == nullptr
-        || m_identify_ptr == nullptr)
-    {
-        m_callback(AsstMsg::PtrIsNull, json::value(), m_callback_arg);
-        return false;
-    }
-
-    auto image = m_controller_ptr->get_image();
-    auto res = m_identify_ptr->penguin_recognize(image);
+    const auto& image = ctrler.get_image();
 
     static const std::string dirname = GetCurrentDir() + "template\\";
     return save_image(image, dirname);
diff --git a/src/MeoAssistance/Task.h b/src/MeoAssistance/Task.h
index 2232ed7e6d..be5b6ac882 100644
--- a/src/MeoAssistance/Task.h
+++ b/src/MeoAssistance/Task.h
@@ -1,11 +1,6 @@
 #pragma once
 
 #include "ProcessTask.h"
-#include "OpenRecruitTask.h"
-#include "IdentifyOperTask.h"
-#include "InfrastProductionTask.h"
-#include "InfrastDormTask.h"
-#include "InfrastPowerTask.h"
-#include "InfrastOfficeTask.h"
+#include "RecruitTask.h"
 #include "ScreenCaptureTask.h"
 #include "CreditShoppingTask.h"
\ No newline at end of file
diff --git a/src/MeoAssistance/TaskConfiger.h b/src/MeoAssistance/TaskConfiger.h
deleted file mode 100644
index 81de1324e1..0000000000
--- a/src/MeoAssistance/TaskConfiger.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma once
-
-#include "AbstractConfiger.h"
-
-#include <unordered_map>
-
-namespace asst {
-    struct TaskInfo;
-
-    class TaskConfiger : public AbstractConfiger
-    {
-    public:
-        virtual ~TaskConfiger() = default;
-
-        static TaskConfiger& get_instance() {
-            static TaskConfiger unique_instance;
-            return unique_instance;
-        }
-
-        bool set_param(const std::string& type, const std::string& param, const std::string& value);
-
-        std::unordered_map<std::string, std::shared_ptr<TaskInfo>> m_all_tasks_info;
-    protected:
-        virtual bool parse(const json::value& json);
-    };
-}
\ No newline at end of file
diff --git a/src/MeoAssistance/TaskConfiger.cpp b/src/MeoAssistance/TaskData.cpp
similarity index 51%
rename from src/MeoAssistance/TaskConfiger.cpp
rename to src/MeoAssistance/TaskData.cpp
index e2c0af079a..a9a3fa63da 100644
--- a/src/MeoAssistance/TaskConfiger.cpp
+++ b/src/MeoAssistance/TaskData.cpp
@@ -1,55 +1,88 @@
-#include "TaskConfiger.h"
+#include "TaskData.h"
 
 #include <algorithm>
 
 #include <json.h>
 
 #include "AsstDef.h"
-#include "Logger.hpp"
-#include "Configer.h"
+#include "GeneralConfiger.h"
+#include "TemplResource.h"
 
-using namespace asst;
-
-bool TaskConfiger::set_param(const std::string& type, const std::string& param, const std::string& value)
+bool asst::TaskData::set_param(const std::string& type, const std::string& param, const std::string& value)
 {
     // 暂时只用到了这些，总的参数太多了，后面要用啥再加上
     if (type == "task.action") {
-        if (m_all_tasks_info.find(param) == m_all_tasks_info.cend()) {
+        if (auto iter = m_all_tasks_info.find(param);
+            iter == m_all_tasks_info.cend()) {
             return false;
         }
-        auto task_info_ptr = m_all_tasks_info[param];
-        std::string action = value;
-        std::transform(action.begin(), action.end(), action.begin(), ::tolower);
-        if (action == "clickself") {
-            task_info_ptr->action = ProcessTaskAction::ClickSelf;
-        }
-        else if (action == "clickrand") {
-            task_info_ptr->action = ProcessTaskAction::ClickRand;
-        }
-        else if (action == "donothing" || action.empty()) {
-            task_info_ptr->action = ProcessTaskAction::DoNothing;
-        }
-        else if (action == "stop") {
-            task_info_ptr->action = ProcessTaskAction::Stop;
-        }
-        else if (action == "clickrect") {
-            task_info_ptr->action = ProcessTaskAction::ClickRect;
-        }
         else {
-            DebugTraceError("Task", param, "'s action error:", action);
-            return false;
+            auto& task_info_ptr = iter->second;
+            std::string action = value;
+            std::transform(action.begin(), action.end(), action.begin(), ::tolower);
+            if (action == "clickself") {
+                task_info_ptr->action = ProcessTaskAction::ClickSelf;
+            }
+            else if (action == "clickrand") {
+                task_info_ptr->action = ProcessTaskAction::ClickRand;
+            }
+            else if (action == "donothing" || action.empty()) {
+                task_info_ptr->action = ProcessTaskAction::DoNothing;
+            }
+            else if (action == "stop") {
+                task_info_ptr->action = ProcessTaskAction::Stop;
+            }
+            else if (action == "clickrect") {
+                task_info_ptr->action = ProcessTaskAction::ClickRect;
+            }
+            else {
+                m_last_error = "Task " + param + " 's action error: " + action;
+                return false;
+            }
         }
     }
     else if (type == "task.maxTimes") {
-        if (m_all_tasks_info.find(param) == m_all_tasks_info.cend()) {
+        if (auto iter = m_all_tasks_info.find(param);
+            iter == m_all_tasks_info.cend()) {
             return false;
         }
-        m_all_tasks_info[param]->max_times = std::stoi(value);
+        else {
+            iter->second->max_times = std::stoi(value);
+        }
     }
     return true;
+}
+
+const std::shared_ptr<asst::TaskInfo>& asst::TaskData::task_ptr(const std::string& name) const noexcept
+{
+    if (auto iter = m_all_tasks_info.find(name);
+        iter != m_all_tasks_info.cend())
+    {
+        return iter->second;
+    }
+    else {
+        return nullptr;
+    }
+}
+
+const std::unordered_set<std::string>& asst::TaskData::get_templ_required() const noexcept
+{
+    return m_templ_required;
+}
+
+std::shared_ptr<asst::TaskInfo>& asst::TaskData::task_ptr(std::string name)
+{
+    return m_all_tasks_info[std::move(name)];
 }
 
-bool asst::TaskConfiger::parse(const json::value& json)
+void asst::TaskData::clear_exec_times()
+{
+    for (auto&& [key, task] : m_all_tasks_info) {
+        task->exec_times = 0;
+    }
+}
+
+bool asst::TaskData::parse(const json::value& json)
 {
     for (const auto& [name, task_json] : json.as_object()) {
         std::string algorithm_str = task_json.get("algorithm", "matchtemplate");
@@ -64,9 +97,10 @@ bool asst::TaskConfiger::parse(const json::value& json)
         else if (algorithm_str == "ocrdetect") {
             algorithm = AlgorithmType::OcrDetect;
         }
-        //else if (algorithm_str == "comparehist") {} // CompareHist是MatchTemplate的衍生算法，不应作为单独的配置参数出现
+        // CompareHist是MatchTemplate的衍生算法，不应作为单独的配置参数出现
+        // else if (algorithm_str == "comparehist") {}
         else {
-            DebugTraceError("Algorithm error:", algorithm_str);
+            m_last_error = "algorithm error " + algorithm_str;
             return false;
         }
 
@@ -78,9 +112,15 @@ bool asst::TaskConfiger::parse(const json::value& json)
         case AlgorithmType::MatchTemplate:
         {
             auto match_task_info_ptr = std::make_shared<MatchTaskInfo>();
-            match_task_info_ptr->template_filename = task_json.at("template").as_string();
-            match_task_info_ptr->templ_threshold = task_json.get("templThreshold", Configer::TemplThresholdDefault);
-            match_task_info_ptr->hist_threshold = task_json.get("histThreshold", Configer::HistThresholdDefault);
+            match_task_info_ptr->templ_name = task_json.get("template", name + ".png");
+            m_templ_required.emplace(match_task_info_ptr->templ_name);
+
+            match_task_info_ptr->templ_threshold = task_json.get(
+                "templThreshold",
+                TemplResource::TemplThresholdDefault);
+            match_task_info_ptr->hist_threshold = task_json.get(
+                "histThreshold",
+                TemplResource::HistThresholdDefault);
             match_task_info_ptr->cache = task_json.get("cache", true);
             task_info_ptr = match_task_info_ptr;
         }
@@ -91,10 +131,10 @@ bool asst::TaskConfiger::parse(const json::value& json)
             for (const json::value& text : task_json.at("text").as_array()) {
                 ocr_task_info_ptr->text.emplace_back(text.as_string());
             }
-            ocr_task_info_ptr->need_match = task_json.get("need_match", false);
+            ocr_task_info_ptr->need_full_match = task_json.get("need_match", false);
             if (task_json.exist("ocrReplace")) {
-                for (const auto& [key, value] : task_json.at("ocrReplace").as_object()) {
-                    ocr_task_info_ptr->replace_map.emplace(key, value.as_string());
+                for (const json::value& rep : task_json.at("ocrReplace").as_array()) {
+                    ocr_task_info_ptr->replace_map.emplace(rep.as_array()[0].as_string(), rep.as_array()[1].as_string());
                 }
             }
             ocr_task_info_ptr->cache = task_json.get("cache", true);
@@ -104,7 +144,7 @@ bool asst::TaskConfiger::parse(const json::value& json)
         }
         task_info_ptr->algorithm = algorithm;
         task_info_ptr->name = name;
-        std::string action = task_json.at("action").as_string();
+        std::string action = task_json.get("action", std::string());
         std::transform(action.begin(), action.end(), action.begin(), ::tolower);
         if (action == "clickself") {
             task_info_ptr->action = ProcessTaskAction::ClickSelf;
@@ -120,12 +160,12 @@ bool asst::TaskConfiger::parse(const json::value& json)
         }
         else if (action == "clickrect") {
             task_info_ptr->action = ProcessTaskAction::ClickRect;
-            const json::value& area_json = task_json.at("specificArea");
-            task_info_ptr->specific_area = Rect(
-                area_json[0].as_integer(),
-                area_json[1].as_integer(),
-                area_json[2].as_integer(),
-                area_json[3].as_integer());
+            const json::value& rect_json = task_json.at("specificRect");
+            task_info_ptr->specific_rect = Rect(
+                rect_json[0].as_integer(),
+                rect_json[1].as_integer(),
+                rect_json[2].as_integer(),
+                rect_json[3].as_integer());
         }
         else if (action == "stagedrops") {
             task_info_ptr->action = ProcessTaskAction::StageDrops;
@@ -137,7 +177,7 @@ bool asst::TaskConfiger::parse(const json::value& json)
             task_info_ptr->action = ProcessTaskAction::SwipeToTheRight;
         }
         else {
-            DebugTraceError("Task:", name, "error:", action);
+            m_last_error = "Task: " + name + " error: " + action;
             return false;
         }
 
@@ -159,21 +199,36 @@ bool asst::TaskConfiger::parse(const json::value& json)
                 task_info_ptr->reduce_other_times.emplace_back(reduce.as_string());
             }
         }
-        if (task_json.exist("identifyArea")) {
-            const json::array& area_arr = task_json.at("identifyArea").as_array();
-            task_info_ptr->identify_area = Rect(
+        if (task_json.exist("roi")) {
+            const json::array& area_arr = task_json.at("roi").as_array();
+            task_info_ptr->roi = Rect(
                 area_arr[0].as_integer(),
                 area_arr[1].as_integer(),
                 area_arr[2].as_integer(),
                 area_arr[3].as_integer());
         }
         else {
-            task_info_ptr->identify_area = Rect(0, 0, Configer::WindowWidthDefault, Configer::WindowHeightDefault);
+            task_info_ptr->roi = Rect(
+                0, 0,
+                GeneralConfiger::WindowWidthDefault,
+                GeneralConfiger::WindowHeightDefault);
         }
 
-        const json::array& next_arr = task_json.at("next").as_array();
-        for (const json::value& next : next_arr) {
-            task_info_ptr->next.emplace_back(next.as_string());
+        if (task_json.exist("next")) {
+            for (const json::value& next : task_json.at("next").as_array()) {
+                task_info_ptr->next.emplace_back(next.as_string());
+            }
+        }
+        if (task_json.exist("resultMove")) {
+            const json::array& move_arr = task_json.at("resultMove").as_array();
+            task_info_ptr->result_move = Rect(
+                move_arr[0].as_integer(),
+                move_arr[1].as_integer(),
+                move_arr[2].as_integer(),
+                move_arr[3].as_integer());
+        }
+        else {
+            task_info_ptr->result_move = Rect();
         }
 
         m_all_tasks_info.emplace(name, task_info_ptr);
diff --git a/src/MeoAssistance/TaskData.h b/src/MeoAssistance/TaskData.h
new file mode 100644
index 0000000000..74c73fae40
--- /dev/null
+++ b/src/MeoAssistance/TaskData.h
@@ -0,0 +1,30 @@
+#pragma once
+
+#include "AbstractConfiger.h"
+
+#include <unordered_map>
+#include <unordered_set>
+#include <memory>
+
+namespace asst {
+    struct TaskInfo;
+
+    class TaskData : public AbstractConfiger
+    {
+    public:
+        virtual ~TaskData() = default;
+
+        bool set_param(const std::string& type, const std::string& param, const std::string& value);
+
+        const std::shared_ptr<TaskInfo>& task_ptr(const std::string& name) const noexcept;
+        const std::unordered_set<std::string>& get_templ_required() const noexcept;
+        std::shared_ptr<TaskInfo>& task_ptr(std::string name);
+        void clear_exec_times();
+
+    protected:
+        virtual bool parse(const json::value& json);
+
+        std::unordered_map<std::string, std::shared_ptr<TaskInfo>> m_all_tasks_info;
+        std::unordered_set<std::string> m_templ_required;
+    };
+}
\ No newline at end of file
diff --git a/src/MeoAssistance/TemplResource.cpp b/src/MeoAssistance/TemplResource.cpp
new file mode 100644
index 0000000000..cceba6031c
--- /dev/null
+++ b/src/MeoAssistance/TemplResource.cpp
@@ -0,0 +1,69 @@
+#include "TemplResource.h"
+
+#include <filesystem>
+#include <array>
+#include <string_view>
+
+void asst::TemplResource::set_load_required(std::unordered_set<std::string> required) noexcept
+{
+    m_templs_filename = std::move(required);
+}
+
+bool asst::TemplResource::load(const std::string& dir)
+{
+    for (const std::string& filename : m_templs_filename) {
+        std::string filepath = dir + "\\" + filename;
+        if (std::filesystem::exists(filepath)) {
+            cv::Mat templ = cv::imread(filepath);
+            emplace_templ(filename, std::move(templ));
+        }
+        else {
+            m_last_error = filepath + " not exists";
+            return false;
+        }
+    }
+
+    return true;
+}
+
+bool asst::TemplResource::exist_templ(const std::string& key) const noexcept
+{
+    return m_templs.find(key) != m_templs.cend();
+}
+
+const cv::Mat& asst::TemplResource::get_templ(const std::string& key) const noexcept
+{
+    if (auto iter = m_templs.find(key);
+        iter != m_templs.cend()) {
+        return iter->second;
+    }
+    else {
+        return cv::Mat();
+    }
+}
+
+const std::pair<cv::Mat, cv::Rect>& asst::TemplResource::get_hist(const std::string& key) const noexcept
+{
+    if (auto iter = m_hists.find(key);
+        iter != m_hists.cend()) {
+        return iter->second;
+    }
+    else {
+        return std::pair<cv::Mat, cv::Rect>();
+    }
+}
+
+void asst::TemplResource::emplace_templ(std::string key, cv::Mat templ)
+{
+    m_templs.emplace(std::move(key), std::move(templ));
+}
+
+void asst::TemplResource::emplace_hist(std::string key, cv::Mat hist, cv::Rect roi)
+{
+    m_hists.emplace(std::move(key), std::make_pair(std::move(hist), std::move(roi)));
+}
+
+void asst::TemplResource::clear_hists() noexcept
+{
+    m_hists.clear();
+}
\ No newline at end of file
diff --git a/src/MeoAssistance/TemplResource.h b/src/MeoAssistance/TemplResource.h
new file mode 100644
index 0000000000..5d9290332e
--- /dev/null
+++ b/src/MeoAssistance/TemplResource.h
@@ -0,0 +1,34 @@
+#pragma once
+
+#include "AbstractResource.h"
+
+#include <unordered_set>
+#include <unordered_map>
+
+#include <opencv2/opencv.hpp>
+
+namespace asst {
+    class TemplResource : public AbstractResource
+    {
+    public:
+        constexpr static double TemplThresholdDefault = 0.9;
+        constexpr static double HistThresholdDefault = 0.9;
+
+        virtual ~TemplResource() = default;
+
+        void set_load_required(std::unordered_set<std::string> required) noexcept;
+        virtual bool load(const std::string& dir) override;
+
+        bool exist_templ(const std::string& key) const noexcept;
+        const cv::Mat& get_templ(const std::string& key) const noexcept;
+        const std::pair<cv::Mat, cv::Rect>& get_hist(const std::string& key) const noexcept;
+
+        void emplace_templ(std::string key, cv::Mat templ);
+        void emplace_hist(std::string key, cv::Mat hist, cv::Rect roi);
+        void clear_hists() noexcept;
+    private:
+        std::unordered_set<std::string> m_templs_filename;
+        std::unordered_map<std::string, cv::Mat> m_templs;
+        std::unordered_map<std::string, std::pair<cv::Mat, cv::Rect>> m_hists;
+    };
+}
diff --git a/src/MeoAssistance/UserConfiger.cpp b/src/MeoAssistance/UserConfiger.cpp
index d39e2bf691..320f120810 100644
--- a/src/MeoAssistance/UserConfiger.cpp
+++ b/src/MeoAssistance/UserConfiger.cpp
@@ -4,7 +4,7 @@
 
 #include <json.h>
 
-#include "Configer.h"
+constexpr static const char* EmulatorPathKey = "emulatorPath";
 
 bool asst::UserConfiger::load(const std::string& filename)
 {
@@ -15,15 +15,15 @@ bool asst::UserConfiger::load(const std::string& filename)
 
 bool asst::UserConfiger::set_emulator_path(const std::string& name, const std::string& path)
 {
-    m_raw_json["emulatorPath"][name] = path;
+    m_emulators_path.emplace(name, path);
     return save();
 }
 
 bool asst::UserConfiger::parse(const json::value& json)
 {
-    if (json.exist("emulatorPath")) {
-        for (const auto& [name, path] : json.at("emulatorPath").as_object()) {
-            Configer::get_instance().m_handles[name].path = path.as_string();
+    if (json.exist(EmulatorPathKey)) {
+        for (const auto& [name, path] : json.at(EmulatorPathKey).as_object()) {
+            m_emulators_path.emplace(name, path.as_string());
         }
     }
     m_raw_json = json;
@@ -33,6 +33,10 @@ bool asst::UserConfiger::parse(const json::value& json)
 
 bool asst::UserConfiger::save()
 {
+    for (const auto& [name, path] : m_emulators_path) {
+        m_raw_json[EmulatorPathKey][name] = path;
+    }
+
     std::ofstream ofs(m_filename, std::ios::out);
     if (!ofs.is_open()) {
         return false;
diff --git a/src/MeoAssistance/UserConfiger.h b/src/MeoAssistance/UserConfiger.h
index 968d5709ba..afc308d8dd 100644
--- a/src/MeoAssistance/UserConfiger.h
+++ b/src/MeoAssistance/UserConfiger.h
@@ -3,21 +3,30 @@
 #include "AbstractConfiger.h"
 
 #include <json_value.h>
+#include <unordered_map>
 
 namespace asst {
     class UserConfiger :public AbstractConfiger
     {
     public:
         virtual ~UserConfiger() = default;
-
-        static UserConfiger& get_instance() {
-            static UserConfiger unique_instance;
-            return unique_instance;
-        }
-
         virtual bool load(const std::string& filename) override;
 
         bool set_emulator_path(const std::string& name, const std::string& path);
+        const std::string& get_emulator_path(const std::string& name) const noexcept
+        {
+            if (auto iter = m_emulators_path.find(name);
+                iter != m_emulators_path.cend()) {
+                return iter->second;
+            }
+            else {
+                return std::string();
+            }
+        }
+        const std::unordered_map<std::string, std::string>& get_emulator_path() const noexcept
+        {
+            return m_emulators_path;
+        }
 
     protected:
         virtual bool parse(const json::value& json) override;
@@ -25,5 +34,6 @@ namespace asst {
 
         json::value m_raw_json;
         std::string m_filename;
+        std::unordered_map<std::string, std::string> m_emulators_path;
     };
 }
\ No newline at end of file
diff --git a/src/MeoAsstGui/Helper/AsstProxy.cs b/src/MeoAsstGui/Helper/AsstProxy.cs
index a77b320d77..459c037200 100644
--- a/src/MeoAsstGui/Helper/AsstProxy.cs
+++ b/src/MeoAsstGui/Helper/AsstProxy.cs
@@ -29,11 +29,11 @@ namespace MeoAsstGui
 
         [DllImport("MeoAssistance.dll")] static private extern bool AsstStartVisit(IntPtr ptr, bool with_shopping);
 
-        [DllImport("MeoAssistance.dll")] static private extern bool AsstStartOpenRecruit(IntPtr ptr, int[] required_level, int required_len, bool set_time);
+        [DllImport("MeoAssistance.dll")] static private extern bool AsstStartRecruiting(IntPtr ptr, int[] required_level, int required_len, bool set_time);
 
-        [DllImport("MeoAssistance.dll")] static private extern bool AsstStartIndertifyOpers(IntPtr ptr);
+        //[DllImport("MeoAssistance.dll")] static private extern bool AsstStartIndertifyOpers(IntPtr ptr);
 
-        [DllImport("MeoAssistance.dll")] static private extern bool AsstStartInfrast(IntPtr ptr);
+        //[DllImport("MeoAssistance.dll")] static private extern bool AsstStartInfrast(IntPtr ptr);
 
         [DllImport("MeoAssistance.dll")] static private extern bool AsstStartDebugTask(IntPtr ptr);
 
@@ -275,9 +275,9 @@ namespace MeoAsstGui
             AsstSetParam(_ptr, type, param, value);
         }
 
-        public bool AsstStartOpenRecruit(int[] required_level, int required_len, bool set_time)
+        public bool AsstStartRecruiting(int[] required_level, int required_len, bool set_time)
         {
-            return AsstStartOpenRecruit(_ptr, required_level, required_len, set_time);
+            return AsstStartRecruiting(_ptr, required_level, required_len, set_time);
         }
     }
 
diff --git a/src/MeoAsstGui/ViewModels/RecruitViewModel.cs b/src/MeoAsstGui/ViewModels/RecruitViewModel.cs
index d961c1eeb5..852ef806eb 100644
--- a/src/MeoAsstGui/ViewModels/RecruitViewModel.cs
+++ b/src/MeoAsstGui/ViewModels/RecruitViewModel.cs
@@ -136,7 +136,7 @@ namespace MeoAsstGui
                 levelList.Add(6);
             }
 
-            asstProxy.AsstStartOpenRecruit(levelList.ToArray(), levelList.Count, AutoSetTime);
+            asstProxy.AsstStartRecruiting(levelList.ToArray(), levelList.Count, AutoSetTime);
         }
     }
 }
\ No newline at end of file
diff --git a/tools/TestCaller/main.cpp b/tools/TestCaller/main.cpp
index 9cf937fbee..5e7e3db6a7 100644
--- a/tools/TestCaller/main.cpp
+++ b/tools/TestCaller/main.cpp
@@ -22,7 +22,7 @@ int main(int argc, char** argv)
         //AsstStartDebugTask(ptr);
         {
             const int required[] = { 3, 4, 5, 6 };
-            AsstStartOpenRecruit(ptr, required, sizeof(required) / sizeof(int), true);
+            AsstStartRecruiting(ptr, required, sizeof(required) / sizeof(int), true);
         }
 
         ch = getchar();