diff --git a/imgs/maps/37007/target.jpg b/imgs/maps/37007/target.jpg index 0dbd0c71..bdaa8bf8 100644 Binary files a/imgs/maps/37007/target.jpg and b/imgs/maps/37007/target.jpg differ diff --git a/states.py b/states.py index 123c8939..f634c0cb 100644 --- a/states.py +++ b/states.py @@ -183,7 +183,6 @@ def route(self): time.sleep(0.5) if self.ts.nothing: self.in_battle = time.time() - print('nothing') if time.time()-self.in_battle>7: if self.threshold == 0.97 and fail_cnt==0: log.info("匹配不到任何图标") @@ -201,7 +200,6 @@ def route(self): time.sleep(0.25) self.threshold = 0.97 time.sleep(0.1) - # 匹配到图片 res=1时等待一段时间 else: fail_cnt = 0 @@ -654,7 +652,9 @@ def normal(self): self.get_screen() self.press("esc") self.confirm_time = time.time() - return 0 + else: + return 0 + return 1 def find_latest_modified_file(self, folder_path): files = [ diff --git a/utils/utils.py b/utils/utils.py index 5fa78c8c..f7961f9a 100644 --- a/utils/utils.py +++ b/utils/utils.py @@ -705,8 +705,6 @@ def nof(self): "f", 0.4443, 0.4417, mask="mask_f1" ),not isrun(self) ava = a and b - #print(a,b) - #print(self.ts.text,ava) if ava: if self.ts.sim("区域"): self.init_map()