diff --git a/module/cafe_reward.py b/module/cafe_reward.py index ab8253363..7ce738484 100644 --- a/module/cafe_reward.py +++ b/module/cafe_reward.py @@ -81,8 +81,8 @@ def cn_implement(self): op = np.full(2, False, dtype=bool) if not image.compare_image(self, 'cafe_0.0', 3): op[0] = True - if self.ocrCN.ocr_for_single_line(image.screenshot_cut(self, (801, 586, 875, 606), self.latest_img_array))[ - 'text'] == "可以使用": + res = self.ocrCN.ocr_for_single_line(image.screenshot_cut(self, (801, 586, 875, 606), self.latest_img_array))['text'].replace('', '') + if res == "可以使用": op[1] = True if op[0]: self.logger.info("Collect Cafe Earnings") diff --git a/module/lesson.py b/module/lesson.py index 0128d9490..6ac8b2cb2 100644 --- a/module/lesson.py +++ b/module/lesson.py @@ -39,10 +39,10 @@ def get_region_num(self, region_name, letter_dict=None, region_name_len=None): self.latest_img_array = self.get_screenshot_array() t1 = time.time() name = self.ocrCN.ocr_for_single_line(self.latest_img_array[97:128, 925:1240])['text'] - name.replace('', '') + name = name.replace('', '') t2 = time.time() self.logger.info("ocr_lesson_name:" + str(t2 - t1)) - for i in range(4, -1, -1): + for i in range(6, -1, -1): if name[i] in ['评', '级', ' '] or name[i].isdigit(): name = name[i + 1:] break