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

fix(Restart): 适配十周年登录按钮点击范围

weirj2016-ai 2 месяцев назад
Родитель
Сommit
b08097922a
3 измененных файлов с 10 добавлено и 3 удалено
  1. 2 1
      tasks/Restart/assets.py
  2. 1 1
      tasks/Restart/login.py
  3. 7 1
      tasks/Restart/login/click.json

+ 2 - 1
tasks/Restart/assets.py

@@ -93,6 +93,8 @@ class RestartAssets:
 	C_LOGIN_ENSURE_LOGIN_CHARACTER_IN_SAME_SVR = RuleClick(roi_front=(600,240,500,400), roi_back=(600,240,500,400), name="login_ensure_login_character_in_same_svr")
 	# 卷轴关闭区域点击(用户新增,用于点击I_LOGIN_SCROOLL_CLOSE的区域而不依赖图片识别) 
 	C_LOGIN_SCROLL_CLOSE_AREA = RuleClick(roi_front=(1181,634,28,39), roi_back=(1162,595,77,112), name="login_scroll_close_area")
+	# 十周年登录界面进入游戏按钮随机点击区域
+	C_LOGIN_ENTER_GAME_BUTTON = RuleClick(roi_front=(589,544,101,107), roi_back=(589,544,101,107), name="login_enter_game_button")
 
 
 	# Image Rule Assets
@@ -144,4 +146,3 @@ class RestartAssets:
 	# 登录指定角色,默认第一个 
 	O_LOGIN_SPECIFIC_SERVE = RuleOcr(roi=(110,120,350,600), area=(110,120,350,600), mode="Full", method="Default", keyword="", name="login_specific_serve")
 
-

+ 1 - 1
tasks/Restart/login.py

@@ -139,7 +139,7 @@ class LoginHandler(BaseTask, RestartAssets, GameUiAssets, GeneralBuffAssets):
                 if self.appear_then_click(self.I_EARLY_SERVER_CANCEL):
                     logger.info('Cancel switch from early server to normal server')
                     continue
-            if self.ocr_appear_click(self.O_LOGIN_ENTER_GAME, interval=3):
+            if self.ocr_appear_click(self.O_LOGIN_ENTER_GAME, self.C_LOGIN_ENTER_GAME_BUTTON, interval=3):
                 self.wait_until_appear(self.I_LOGIN_SPECIFIC_SERVE, True, wait_time=5)
                 continue
 

+ 7 - 1
tasks/Restart/login/click.json

@@ -10,5 +10,11 @@
     "roiFront": "1181,634,28,39",
     "roiBack": "1162,595,77,112",
     "description": "卷轴关闭区域点击(用户新增,用于点击I_LOGIN_SCROOLL_CLOSE的区域而不依赖图片识别)"
+  },
+  {
+    "itemName": "login_enter_game_button",
+    "roiFront": "589,544,101,107",
+    "roiBack": "589,544,101,107",
+    "description": "十周年登录界面进入游戏按钮随机点击区域"
   }
-]
+]