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

Merge pull request #1199 from BluettDream/dev_fix_restart

fix(Restart): auto cancel continue battle
huangrunheng 1 год назад
Родитель
Сommit
5ff7808eab

+ 3 - 1
tasks/GameUi/page.py

@@ -4,6 +4,7 @@ import traceback
 from module.atom.click import RuleClick
 
 from tasks.GameUi.assets import GameUiAssets as G
+from tasks.Restart.assets import RestartAssets
 from tasks.base_task import BaseTask as BT
 from tasks.RyouToppa.assets import RyouToppaAssets
 
@@ -35,7 +36,8 @@ class Page:
 page_login = Page(G.I_CHECK_LOGIN_FORM)
 # Main Home 主页
 page_main = Page(G.I_CHECK_MAIN)
-page_main.additional = [G.I_AD_CLOSE_RED, G.I_BACK_FRIENDS]
+page_main.additional = [G.I_AD_CLOSE_RED, G.I_BACK_FRIENDS, RestartAssets.I_CANCEL_BATTLE,
+                        RestartAssets.I_LOGIN_SCROOLL_CLOSE]
 # 召唤summon
 page_summon = Page(G.I_CHECK_SUMMON)
 page_summon.link(button=G.I_SUMMON_GOTO_MAIN, destination=page_main)

+ 2 - 0
tasks/Restart/assets.py

@@ -95,6 +95,8 @@ class RestartAssets:
 	I_EARLY_SERVER = RuleImage(roi_front=(596,269,115,33), roi_back=(596,269,115,33), threshold=0.8, method="Template matching", file="./tasks/Restart/login/login_early_server.png")
 	# 取消体验服切换弹窗 
 	I_EARLY_SERVER_CANCEL = RuleImage(roi_front=(435,404,172,56), roi_back=(435,404,172,56), threshold=0.8, method="Template matching", file="./tasks/Restart/login/login_early_server_cancel.png")
+	# 取消继续战斗 
+	I_CANCEL_BATTLE = RuleImage(roi_front=(471,395,129,55), roi_back=(367,227,545,296), threshold=0.8, method="Template matching", file="./tasks/Restart/login/login_cancel_battle.png")
 
 
 	# Ocr Rule Assets

+ 4 - 1
tasks/Restart/login.py

@@ -38,7 +38,10 @@ class LoginHandler(BaseTask, RestartAssets):
                 orientation_timer.reset()
 
             self.screenshot()
-
+            # 取消继续战斗
+            if self.appear_then_click(self.I_CANCEL_BATTLE, interval=0.8):
+                logger.info('Cancel continue battle')
+                continue
             # 确认进入庭院
             if self.appear_then_click(self.I_LOGIN_SCROOLL_CLOSE, interval=2, threshold=0.9):
                 logger.info('Open scroll')

+ 9 - 0
tasks/Restart/login/image.json

@@ -142,5 +142,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "取消体验服切换弹窗"
+  },
+  {
+    "itemName": "cancel_battle",
+    "imageName": "login_cancel_battle.png",
+    "roiFront": "471,395,129,55",
+    "roiBack": "367,227,545,296",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "取消继续战斗"
   }
 ]

BIN
tasks/Restart/login/login_cancel_battle.png