From aa9ffbd8b8fb9ac4008ad7ccb02571c12289e4d2 Mon Sep 17 00:00:00 2001
From: veadex <65024689+veadex@users.noreply.github.com>
Date: Sat, 27 Apr 2024 16:24:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9click=5Fimage=E6=9C=AA?=
 =?UTF-8?q?=E6=89=BE=E5=88=B0=E5=9B=BE=E7=89=87=E7=9A=84=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 autowsgr/__init__.py                    | 2 +-
 autowsgr/controller/emulator.py         | 2 +-
 autowsgr/data/default_ship_names.yaml   | 4 ++--
 autowsgr/data/ocr/ship_name.yaml        | 4 ++--
 autowsgr/fight/event/event_2024_0419.py | 2 +-
 other_data/ship_name_example.yaml       | 4 ++--
 tools/crawler.py                        | 1 -
 7 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/autowsgr/__init__.py b/autowsgr/__init__.py
index 3c2e8b20..4a22f214 100644
--- a/autowsgr/__init__.py
+++ b/autowsgr/__init__.py
@@ -1 +1 @@
-__version__ = "0.2.2.28"
+__version__ = "0.2.2.29"
diff --git a/autowsgr/controller/emulator.py b/autowsgr/controller/emulator.py
index b0eb4fa7..24c936d3 100644
--- a/autowsgr/controller/emulator.py
+++ b/autowsgr/controller/emulator.py
@@ -314,7 +314,7 @@ def click_image(self, image, must_click=False, timeout=0, delay=0.5):
             NotFoundErr: 如果在 timeout 时间内未找到则抛出该异常
         """
         pos = self.wait_images_position(image, gap=0.03, timeout=timeout)
-        if pos == False:
+        if pos is None:
             if must_click == False:
                 return False
             else:
diff --git a/autowsgr/data/default_ship_names.yaml b/autowsgr/data/default_ship_names.yaml
index 8e4e5056..17973f3f 100644
--- a/autowsgr/data/default_ship_names.yaml
+++ b/autowsgr/data/default_ship_names.yaml
@@ -808,8 +808,8 @@ No.406: # 哈曼
   - "哈曼"
 No.407: # 吕特晏斯
   - "吕特晏斯"
-No.408: # 肥鱼
-  - "肥鱼"
+No.408: # 鲃鱼
+  - "鲃鱼"
 No.409: # 新泽西
   - "新泽西"
 No.410: # 萨勒姆
diff --git a/autowsgr/data/ocr/ship_name.yaml b/autowsgr/data/ocr/ship_name.yaml
index 8e4e5056..17973f3f 100644
--- a/autowsgr/data/ocr/ship_name.yaml
+++ b/autowsgr/data/ocr/ship_name.yaml
@@ -808,8 +808,8 @@ No.406: # 哈曼
   - "哈曼"
 No.407: # 吕特晏斯
   - "吕特晏斯"
-No.408: # 肥鱼
-  - "肥鱼"
+No.408: # 鲃鱼
+  - "鲃鱼"
 No.409: # 新泽西
   - "新泽西"
 No.410: # 萨勒姆
diff --git a/autowsgr/fight/event/event_2024_0419.py b/autowsgr/fight/event/event_2024_0419.py
index bb1462e9..7fc46093 100644
--- a/autowsgr/fight/event/event_2024_0419.py
+++ b/autowsgr/fight/event/event_2024_0419.py
@@ -73,7 +73,7 @@ def _go_fight_prepare_page(self) -> None:
             else:
                 self.timer.click_image(self.event_image[4], timeout=3)  # 点击取消每日答题按钮
 
-        if not self.timer.image_exist(self.Info.event_image[1], need_screen_shot=0):
+        if not self.timer.image_exist(self.Info.event_image[1]):
             self.timer.Android.click(*NODE_POSITION[self.map])
 
         # 选择入口
diff --git a/other_data/ship_name_example.yaml b/other_data/ship_name_example.yaml
index 8e4e5056..17973f3f 100644
--- a/other_data/ship_name_example.yaml
+++ b/other_data/ship_name_example.yaml
@@ -808,8 +808,8 @@ No.406: # 哈曼
   - "哈曼"
 No.407: # 吕特晏斯
   - "吕特晏斯"
-No.408: # 肥鱼
-  - "肥鱼"
+No.408: # 鲃鱼
+  - "鲃鱼"
 No.409: # 新泽西
   - "新泽西"
 No.410: # 萨勒姆
diff --git a/tools/crawler.py b/tools/crawler.py
index 60e81144..8b7b8431 100644
--- a/tools/crawler.py
+++ b/tools/crawler.py
@@ -20,7 +20,6 @@
     1058: "奥希金斯",
     1185: "机灵",
     1408: "肥鱼",
-    408: "肥鱼",
 }