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

Merge pull request #1659 from lhye/dev

bugfix: 版本更新后,无闲庭图标,修复重启及庭院additional任务里,无法自动展开底部卷轴的问题
huangrunheng 4 месяцев назад
Родитель
Сommit
410aa1901d

+ 9 - 1
tasks/GameUi/game_ui.py

@@ -316,8 +316,16 @@ class GameUi(BaseTask, GameUiAssets):
         if not page.additional:
             return
         for btn in page.additional:
+            # 支持反向条件操作: [条件元素, 操作元素, True]。不出现条件图片时点击另一个区域。
+            if isinstance(btn, list) and len(btn) == 3 and btn[2] is True:
+                condition, action, invert = btn
+                self.maybe_screenshot(skip_first_screenshot)
+                if not self.appear(condition):
+                    if self.appear_then_operate(action, interval=interval, skip_first_screenshot=False):
+                        logger.info(f'Page {page} additional invert conditional not {condition} -> {action} executed')
+                        skip_first_screenshot = False
             # 支持复合条件操作: [条件元素, 操作元素]。出现条件图片时点击另一个区域。
-            if isinstance(btn, list) and len(btn) == 2:
+            elif isinstance(btn, list) and len(btn) == 2:
                 condition, action = btn
                 self.maybe_screenshot(skip_first_screenshot)
                 if self.appear(condition):

+ 2 - 2
tasks/GameUi/page.py

@@ -54,8 +54,8 @@ 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, RestartAssets.I_CANCEL_BATTLE,
-                        [RestartAssets.I_LOGIN_COURTYARD, RestartAssets.C_LOGIN_SCROLL_CLOSE_AREA],
-                            GGA.I_CHAT_CLOSE_BUTTON, G.I_CLOSE_CHAT_WINDOW]
+                            GGA.I_CHAT_CLOSE_BUTTON, G.I_CLOSE_CHAT_WINDOW,
+                            [G.I_MAIN_GOTO_SHIKIGAMI_RECORDS, RestartAssets.C_LOGIN_SCROLL_CLOSE_AREA, True]]
 # 召唤summon
 page_summon = Page(G.I_CHECK_SUMMON)
 page_summon.link(button=G.I_SUMMON_GOTO_MAIN, destination=page_main)

+ 0 - 2
tasks/Restart/assets.py

@@ -100,8 +100,6 @@ class RestartAssets:
 	I_LOGIN_SCROOLL_OPEN = RuleImage(roi_front=(1208,609,33,83), roi_back=(1208,609,33,83), threshold=0.8, method="Template matching", file="./tasks/Restart/login/login_login_scrooll_open.png")
 	# 庭院卷轴关闭 
 	I_LOGIN_SCROOLL_CLOSE = RuleImage(roi_front=(1181,634,28,39), roi_back=(1162,595,77,112), threshold=0.7, method="Template matching", file="./tasks/Restart/login/login_login_scrooll_close.png")
-	# 闲庭图片(用户新增,用于判断是否需要点击卷轴关闭区域) 
-	I_LOGIN_COURTYARD = RuleImage(roi_front=(40,640,100,50), roi_back=(40,640,100,50), threshold=0.8, method="Template matching", file="./tasks/Restart/login/login_courtyard.png")
 	# 卷轴关闭区域点击(用户新增,用于点击I_LOGIN_SCROOLL_CLOSE的区域而不依赖图片识别) 
 	I_LOGIN_SCROLL_CLOSE_AREA = RuleImage(roi_front=(1181,634,28,39), roi_back=(1162,595,77,112), threshold=0.8, method="Template matching", file="./tasks/Restart/login/login_scroll_close_area.png")
 	# description 

+ 18 - 29
tasks/Restart/login.py

@@ -7,10 +7,11 @@ from module.exception import RequestHumanTakeover, GameTooManyClickError, GameSt
 from module.logger import logger
 from tasks.Restart.assets import RestartAssets
 from tasks.GameUi.assets import GameUiAssets
+from tasks.Component.GeneralBuff.assets import GeneralBuffAssets
 from tasks.base_task import BaseTask
 import time
 
-class LoginHandler(BaseTask, RestartAssets, GameUiAssets):
+class LoginHandler(BaseTask, RestartAssets, GameUiAssets, GeneralBuffAssets):
     character: str
 
     def __init__(self, *wargs, **kwargs):
@@ -43,34 +44,22 @@ class LoginHandler(BaseTask, RestartAssets, GameUiAssets):
             if self.appear_then_click(self.I_CANCEL_BATTLE, interval=0.8):
                 logger.info('Cancel continue battle')
                 continue
-            # 确认进入庭院(优化:当出现闲庭图片时,点击卷轴关闭区域,然后判断式神录按钮出现就代表登录成功)
-            if self.appear(self.I_LOGIN_COURTYARD, interval=0.2):
-                if self.click(self.C_LOGIN_SCROLL_CLOSE_AREA, interval=2):
-                    logger.info('Click scroll close area because courtyard appears')
-                    self.screenshot()  # 点击后立即获取最新截图,确保后续状态检查准确
-                    continue
-            # 确认进入庭院(兜底:未检测到闲庭图片时,如果识别到卷轴处于关闭状态,直接点击卷轴将其展开)
-            if self.appear_then_click(self.I_LOGIN_SCROOLL_CLOSE, interval=1):
-                logger.info('Click closed scroll to open it')
-                self.screenshot()
-                continue
-            if self.appear(self.I_MAIN_GOTO_SHIKIGAMI_RECORDS, interval=0.2):
-                if confirm_timer.reached():
-                    logger.info('Login to main confirm (shikigami records button appears)')
-                    break
-            elif self.appear(self.I_LOGIN_SCROOLL_OPEN, interval=0.2):
-                if confirm_timer.reached():
-                    logger.info('Login to main confirm (scroll open)')
-                    break
-            else:
-                confirm_timer.reset()
-            # 登录成功
-            if self.appear(self.I_MAIN_GOTO_SHIKIGAMI_RECORDS, interval=0.5):
-                logger.info('Login success: shikigami records button appears')
-                login_success = True
-            elif self.appear(self.I_LOGIN_SCROOLL_OPEN, interval=0.5):
-                logger.info('Login success: scroll open')
-                login_success = True
+            # 确认进入庭院(优化:先检测加成图标确认在庭院页面,再检测式神录图标)
+            if self.appear(self.I_BUFF_1, interval=0.2):
+                # 加成图标存在,确认在庭院页面
+                if self.appear(self.I_MAIN_GOTO_SHIKIGAMI_RECORDS, interval=0.2):
+                    # 式神录图标存在,认为已在庭院
+                    if confirm_timer.reached():
+                        logger.info('Login to main confirm (buff and shikigami records button appears)')
+                        break
+                    login_success = True
+                else:
+                    # 式神录图标不存在,点击展开卷轴
+                    if self.click(self.C_LOGIN_SCROLL_CLOSE_AREA, interval=2):
+                        logger.info('Click scroll expand area because shikigami records not found')
+                        self.screenshot()
+                        continue
+                    confirm_timer.reset()
 
             # 网络异常
             # if self.ocr_appear(self.O_LOGIN_NETWORK):

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

@@ -17,15 +17,6 @@
     "threshold": 0.7,
     "description": "庭院卷轴关闭"
   },
-  {
-    "itemName": "login_courtyard",
-    "imageName": "login_courtyard.png",
-    "roiFront": "40,640,100,50",
-    "roiBack": "40,640,100,50",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "闲庭图片(用户新增,用于判断是否需要点击卷轴关闭区域)"
-  },
   {
     "itemName": "login_scroll_close_area",
     "imageName": "login_scroll_close_area.png",

BIN
tasks/Restart/login/login_courtyard.png