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

Merge pull request #1773 from runhey/dev

fix(Restart): Support original login screen compatibility
huangrunheng 2 месяцев назад
Родитель
Сommit
e7365e86be
4 измененных файлов с 14 добавлено и 2 удалено
  1. 2 0
      tasks/Restart/assets.py
  2. 1 1
      tasks/Restart/login.py
  3. 9 0
      tasks/Restart/login/ocr.json
  4. 2 1
      tasks/Restart/script_task.py

+ 2 - 0
tasks/Restart/assets.py

@@ -139,6 +139,8 @@ class RestartAssets:
 	O_LOGIN_NETWORK = RuleOcr(roi=(534,649,189,39), area=(210,492,100,100), mode="Single", method="Default", keyword="正在连接服务器", name="login_network")
 	O_LOGIN_NETWORK = RuleOcr(roi=(534,649,189,39), area=(210,492,100,100), mode="Single", method="Default", keyword="正在连接服务器", name="login_network")
 	# Ocr-description 
 	# Ocr-description 
 	O_LOGIN_ENTER_GAME = RuleOcr(roi=(589,544,101,107), area=(558,574,154,49), mode="Single", method="Default", keyword="进入", name="login_enter_game")
 	O_LOGIN_ENTER_GAME = RuleOcr(roi=(589,544,101,107), area=(558,574,154,49), mode="Single", method="Default", keyword="进入", name="login_enter_game")
+	# Ocr-description 
+	O_LOGIN_ENTER_GAME_ORIGIN = RuleOcr(roi=(550,567,176,56), area=(558,574,154,49), mode="Single", method="Default", keyword="进入游戏", name="login_enter_game_origin")
 	# 点击屏幕跳过 
 	# 点击屏幕跳过 
 	O_LOGIN_SKIP_1 = RuleOcr(roi=(1046,35,130,37), area=(1046,35,130,37), mode="Single", method="Default", keyword="点击屏幕跳过", name="login_skip_1")
 	O_LOGIN_SKIP_1 = RuleOcr(roi=(1046,35,130,37), area=(1046,35,130,37), mode="Single", method="Default", keyword="点击屏幕跳过", name="login_skip_1")
 	# 登录指定角色,默认第一个 
 	# 登录指定角色,默认第一个 

+ 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):
                 if self.appear_then_click(self.I_EARLY_SERVER_CANCEL):
                     logger.info('Cancel switch from early server to normal server')
                     logger.info('Cancel switch from early server to normal server')
                     continue
                     continue
-            if self.ocr_appear_click(self.O_LOGIN_ENTER_GAME, interval=3):
+            if self.ocr_appear_click(self.O_LOGIN_ENTER_GAME_ORIGIN, interval=3) or self.ocr_appear_click(self.O_LOGIN_ENTER_GAME, interval=3):
                 self.wait_until_appear(self.I_LOGIN_SPECIFIC_SERVE, True, wait_time=5)
                 self.wait_until_appear(self.I_LOGIN_SPECIFIC_SERVE, True, wait_time=5)
                 continue
                 continue
 
 

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

@@ -17,6 +17,15 @@
     "keyword": "进入",
     "keyword": "进入",
     "description": "Ocr-description"
     "description": "Ocr-description"
   },
   },
+  {
+    "itemName": "login_enter_game_origin",
+    "roiFront": "550,567,176,56",
+    "roiBack": "558,574,154,49",
+    "mode": "Single",
+    "method": "Default",
+    "keyword": "进入游戏",
+    "description": "兼容原先的进入游戏"
+  },
   {
   {
     "itemName": "login_skip_1",
     "itemName": "login_skip_1",
     "roiFront": "1046,35,130,37",
     "roiFront": "1046,35,130,37",

+ 2 - 1
tasks/Restart/script_task.py

@@ -80,7 +80,8 @@ if __name__ == '__main__':
     config = Config('oas1')
     config = Config('oas1')
     device = Device(config)
     device = Device(config)
     task = ScriptTask(config, device)
     task = ScriptTask(config, device)
-    task.app_restart()
+    for i in range(3):
+        task.app_restart()
     # task.config.update_scheduler()
     # task.config.update_scheduler()
     # task.delay_pending_tasks()
     # task.delay_pending_tasks()