fix bug

1. 匹配到get_ship之后不 能成功获取舰船的bug
2. 修改change_difficult逻辑，未通关简单难度仍然能使用

autowsgr/__init__.py

@@ -1 +1 @@
-__version__ = "0.2.2.23"
+__version__ = "0.2.2.24"

autowsgr/fight/event/event.py

@@ -36,10 +36,14 @@ def get_difficulty(self):
         Returns:
             简单 0,困难 1
         这里同时有检查 _go_map_page 是否成功的功能
+        如果未能检测到难度图标，但是检测到进入活动地图，默认没有通过简单难度，返回简单 0.
         """
         res = self.timer.wait_images(self.common_image["hard"] + self.common_image["easy"])
         if res is None:
-            self.logger.error("ImageNotFoundErr", "difficulty image not found")
+            self.logger.error("ImageNotFoundErr: difficulty image not found")
+            if self.timer.wait_image(self.event_image[2]):
+                self.logger.info("成功进入活动页面，未检测到切换难度图标，请检查是否通关简单难度")
+                return 0
             self.timer.log_screen()
             raise ImageNotFoundErr()
 
@@ -55,7 +59,9 @@ def change_difficulty(self, chapter, retry=True):
         if r_difficulty != difficulty:
             time.sleep(0.2)
             if int(chapter in "Hh"):
-                self.timer.click_images(self.common_image["hard"])
+                if not self.timer.click_images(self.common_image["hard"]):
+                    self.logger.error("请检查是否通关简单难度")
+                    raise ImageNotFoundErr("Can't change difficulty")
             else:
                 self.timer.click_images(self.common_image["easy"])
 

autowsgr/game/game_operation.py

@@ -49,9 +49,9 @@ def run(self, force=False):
 
 def get_ship(timer: Timer, max_times=1):
     """获取掉落舰船"""
-    timer.wait_image(IMG.symbol_image[8])
+    timer.wait_image([IMG.symbol_image[8]] + [IMG.symbol_image[13]])
     timer.got_ship_num += 1
-    while timer.wait_image(IMG.symbol_image[8], timeout=0.5):
+    while timer.wait_image([IMG.symbol_image[8]] + [IMG.symbol_image[13]], timeout=1):
         timer.Android.click(915, 515, delay=0.25, times=1)