From 15472ee32a6f93a0a4f81c9052468c898b7e16a9 Mon Sep 17 00:00:00 2001 From: Zhao Zuohong Date: Thu, 11 Jul 2024 11:25:06 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=A0=BC=E5=BC=8F=E5=8C=96?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- arknights_mower/solvers/report.py | 34 +++++++++++++++++------ arknights_mower/utils/digit_reader.py | 6 +++- arknights_mower/utils/logic_expression.py | 2 -- auto_get_res_new.py | 6 ++-- 4 files changed, 34 insertions(+), 14 deletions(-) diff --git a/arknights_mower/solvers/report.py b/arknights_mower/solvers/report.py index 92d9e5a9f..70a17905e 100644 --- a/arknights_mower/solvers/report.py +++ b/arknights_mower/solvers/report.py @@ -45,7 +45,9 @@ def __init__( self.record_path = get_path("@app/tmp/report.csv") self.low_range_gray = (100, 100, 100) self.high_range_gray = (255, 255, 255) - self.date = (datetime.datetime.now() - datetime.timedelta(hours=4)).date().__str__() + self.date = ( + (datetime.datetime.now() - datetime.timedelta(hours=4)).date().__str__() + ) self.digitReader = DigitReader() self.send_message_config = send_message_config self.send_report = send_report @@ -152,26 +154,40 @@ def crop_report(self): assist_pt = self.find("riic/assistants") area = { "iron_order": [[1620, trade_pt[1][1] + 10], [1740, assist_pt[0][1] - 50]], - "iron_order_number": [[1820, trade_pt[1][1] + 10], [1870, assist_pt[0][1] - 65]], + "iron_order_number": [ + [1820, trade_pt[1][1] + 10], + [1870, assist_pt[0][1] - 65], + ], "orundum": [[1620, trade_pt[1][1] + 45], [1870, assist_pt[0][1]]], - "orundum_number": [[1820, trade_pt[1][1] + 55], [1860, assist_pt[0][1] - 20]], + "orundum_number": [ + [1820, trade_pt[1][1] + 55], + [1860, assist_pt[0][1] - 20], + ], } img = cv2.cvtColor(self.recog.img, cv2.COLOR_RGB2HSV) img = cv2.inRange(img, (98, 0, 150), (102, 255, 255)) self.report_res["作战录像"] = self.get_number(img, exp_area, height=19) self.report_res["赤金"] = self.get_number(img, iron_area, height=19) - self.report_res["龙门币订单"] = self.get_number(img, area["iron_order"], height=19) + self.report_res["龙门币订单"] = self.get_number( + img, area["iron_order"], height=19 + ) self.report_res["合成玉"] = self.get_number(img, area["orundum"], height=19) logger.info("蓝字读取完成") img = cv2.cvtColor(self.recog.img, cv2.COLOR_RGB2HSV) img = cv2.inRange(img, (0, 0, 50), (100, 100, 170)) - self.report_res["龙门币订单数"] = self.get_number(img, area["iron_order_number"], height=19, thres=200) - self.report_res["合成玉订单数量"] = self.get_number(img, area["orundum_number"], height=19, thres=200) + self.report_res["龙门币订单数"] = self.get_number( + img, area["iron_order_number"], height=19, thres=200 + ) + self.report_res["合成玉订单数量"] = self.get_number( + img, area["orundum_number"], height=19, thres=200 + ) logger.info("订单数读取完成") - def get_number(self, img, scope: tp.Scope, height: int | None = 18, thres: int | None = 100): + def get_number( + self, img, scope: tp.Scope, height: int | None = 18, thres: int | None = 100 + ): img = cropimg(img, scope) default_height = 29 @@ -185,7 +201,9 @@ def get_number(self, img, scope: tp.Scope, height: int | None = 18, thres: int | value = 0 for x, y, w, h in rect: digit = cropimg(img, ((x, y), (x + w, y + h))) - digit = cv2.copyMakeBorder(digit, 10, 10, 10, 10, cv2.BORDER_CONSTANT, None, (0,)) + digit = cv2.copyMakeBorder( + digit, 10, 10, 10, 10, cv2.BORDER_CONSTANT, None, (0,) + ) score = [] for i in range(10): diff --git a/arknights_mower/utils/digit_reader.py b/arknights_mower/utils/digit_reader.py index 41581c0ff..19da94bcd 100644 --- a/arknights_mower/utils/digit_reader.py +++ b/arknights_mower/utils/digit_reader.py @@ -214,7 +214,11 @@ def 识别制造加速总剩余时间(self, img_grey, h, w): ch = [str(result[k]) for k in sorted(result)] print(ch) if len(ch) == 6: - return (int(f"{ch[0]}{ch[1]}"), int(f"{ch[2]}{ch[3]}"), int(f"{ch[4]}{ch[5]}")) + return ( + int(f"{ch[0]}{ch[1]}"), + int(f"{ch[2]}{ch[3]}"), + int(f"{ch[4]}{ch[5]}"), + ) else: return ( int(f"{ch[0]}{ch[1]}{ch[2]}"), diff --git a/arknights_mower/utils/logic_expression.py b/arknights_mower/utils/logic_expression.py index fa79de894..4bfe6c02a 100644 --- a/arknights_mower/utils/logic_expression.py +++ b/arknights_mower/utils/logic_expression.py @@ -1,5 +1,3 @@ - - class LogicExpression: def __init__(self, left=None, operator=None, right=None): self.operator = operator diff --git a/auto_get_res_new.py b/auto_get_res_new.py index b74f189dd..7666305d4 100644 --- a/auto_get_res_new.py +++ b/auto_get_res_new.py @@ -563,7 +563,7 @@ def 获得干员基建描述(self): ) 干员技能详情["buffer_des"] = ex_string self.所有buff.extend(ex_string) - + 干员技能详情["des"] = text 干员技能详情["roomType"] = roomType[ buff_table[item2["buffId"]][2] @@ -641,7 +641,7 @@ def 添加基建技能图标(self): 数据处理器 = Arknights数据处理器() -数据处理器.添加物品() #显示在仓库里的物品 +数据处理器.添加物品() # 显示在仓库里的物品 数据处理器.添加干员() @@ -649,7 +649,7 @@ def 添加基建技能图标(self): 数据处理器.读取活动关卡() -#和 数据处理器.添加物品() 有联动 ， 添加物品提供了分类的图片位置 +# 和 数据处理器.添加物品() 有联动 ， 添加物品提供了分类的图片位置 数据处理器.批量训练并保存扫仓库模型() print("批量训练并保存扫仓库模型,完成")