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

Merge pull request #50 from endlesswxk/dev

Dev
huangrunheng 3 лет назад
Родитель
Сommit
11cf2b7cef

BIN
tasks/KekkaiUtilize/utilize/utilize_u_taiko_6.png


+ 4 - 0
tasks/Restart/assets.py

@@ -50,6 +50,8 @@ class RestartAssets:
 	I_LOGIN_8 = RuleImage(roi_front=(178,572,53,60), roi_back=(19,547,223,105), threshold=0.8, method="Template matching", file="./tasks/Restart/login/login_login_8.png")
 	# 登录时候不观看CG视频 
 	I_WATCH_VIDEO_CANCEL = RuleImage(roi_front=(466,396,130,61), roi_back=(466,396,130,61), threshold=0.8, method="Template matching", file="./tasks/Restart/login/login_watch_video_cancel.png")
+	# 指定角色进入游戏,默认第一个 
+	I_LOGIN_SPECIFIC_SERVE = RuleImage(roi_front=(24,33,52,47), roi_back=(24,33,52,47), threshold=0.8, method="Template matching", file="./tasks/Restart/login/login_login_specific_serve.png")
 
 
 	# Ocr Rule Assets
@@ -59,5 +61,7 @@ class RestartAssets:
 	O_LOGIN_ENTER_GAME = RuleOcr(roi=(550,567,176,56), area=(558,574,154,49), mode="Single", method="Default", keyword="进入游戏", name="login_enter_game")
 	# 点击屏幕跳过 
 	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_SPECIFIC_SERVE = RuleOcr(roi=(524,600,242,53), area=(516,75,662,585), mode="Single", method="Default", keyword="点击屏幕进入游戏", name="login_specific_serve")
 
 

+ 4 - 3
tasks/Restart/login.py

@@ -33,8 +33,6 @@ class LoginHandler(BaseTask, RestartAssets):
 
             self.screenshot()
 
-
-
             # 确认进入庭院
             if self.appear_then_click(self.I_LOGIN_SCROOLL_CLOSE, interval=2):
                 logger.info('Open scroll')
@@ -71,7 +69,10 @@ class LoginHandler(BaseTask, RestartAssets):
             if self.appear_then_click(self.I_LOGIN_YELLOW_CLOSE, interval=0.6):
                 logger.info('Close yellow close')
                 continue
-
+            # 点击屏幕进入游戏
+            if self.appear(self.I_LOGIN_SPECIFIC_SERVE, interval=0.6) and self.ocr_appear_click(self.O_LOGIN_SPECIFIC_SERVE, interval=0.6):
+                logger.info('login specific user')
+                continue
             # 点击’进入游戏‘
             if not self.appear(self.I_LOGIN_8):
                 continue

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

@@ -52,5 +52,14 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "登录时候不观看CG视频"
+  },
+  {
+    "itemName": "login_specific_serve",
+    "imageName": "login_login_specific_serve.png",
+    "roiFront": "24,33,52,47",
+    "roiBack": "24,33,52,47",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "指定角色进入游戏,默认第一个"
   }
 ]

BIN
tasks/Restart/login/login_login_specific_serve.png


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

@@ -25,5 +25,14 @@
     "method": "Default",
     "keyword": "点击屏幕跳过",
     "description": "点击屏幕跳过"
+  },
+  {
+    "itemName": "login_specific_serve",
+    "roiFront": "524,600,242,53",
+    "roiBack": "516,75,662,585",
+    "mode": "Single",
+    "method": "Default",
+    "keyword": "点击屏幕进入游戏",
+    "description": "登录指定角色,默认第一个"
   }
 ]