Просмотр исходного кода

fix(restart): 一键收获取消结界经验溢出提示

- 添加 I_HARVEST_ONE_KEY_CANCEL 图片资源
- 在 finish 按钮后的 while 循环中添加取消按钮点击逻辑
lhye 9 месяцев назад
Родитель
Сommit
db9d35be25
2 измененных файлов с 7 добавлено и 0 удалено
  1. 2 0
      tasks/Restart/assets.py
  2. 5 0
      tasks/Restart/login.py

+ 2 - 0
tasks/Restart/assets.py

@@ -57,6 +57,8 @@ class RestartAssets:
 	I_HARVEST_ONE_KEY_FINISH_BUTTON = RuleImage(roi_front=(1100,570,82,75), roi_back=(1100,570,130,130), threshold=0.8, method="Template matching", file="./tasks/Restart/harvest/harvest_harvest_one_key_finish_button.png")
 	# 万华牌跳过按钮 
 	I_HARVEST_ONE_KEY_WANHUA_CARD_SKIP = RuleImage(roi_front=(1120,0,43,18), roi_back=(1120,0,160,80), threshold=0.8, method="Template matching", file="./tasks/Restart/harvest/harvest_harvest_one_key_wanhua_card_skip.png")
+	# 一键收获取消按钮 
+	I_HARVEST_ONE_KEY_CANCEL = RuleImage(roi_front=(430,230,420,270), roi_back=(430,230,420,270), threshold=0.8, method="Template matching", file="./tasks/Restart/harvest/harvest_harvest_one_key_cancel.png")
 	# 一键收获成功标识 
 	I_HARVEST_ONE_KEY_SUCCESS = RuleImage(roi_front=(280,16,161,35), roi_back=(280,16,230,70), threshold=0.8, method="Template matching", file="./tasks/Restart/harvest/harvest_harvest_one_key_success.png")
 

+ 5 - 0
tasks/Restart/login.py

@@ -321,6 +321,11 @@ class LoginHandler(BaseTask, RestartAssets, GameUiAssets):
                 logger.info('Click wanhua card skip button')
                 start_time = time.time()
                 continue
+            
+            if self.appear_then_click(self.I_HARVEST_ONE_KEY_CANCEL, interval=1):
+                logger.info('Click one key harvest cancel button')
+                start_time = time.time()
+                continue
         
         if self.appear(self.I_HARVEST_ONE_KEY_SUCCESS):
             self.click(self.C_HARVEST_ONE_KEY_CLOSE_AREA, interval=1)