Browse Source

fix:切换账号

mbby 3 months ago
parent
commit
3c7962cf48

+ 1 - 3
config/template.json

@@ -28,9 +28,7 @@
       "combat_screenshot_interval": 1.0,
       "task_hoarding_duration": 0,
       "when_task_queue_empty": "goto_main",
-      "schedule_rule": "Filter",
-      "queue_mode": false,
-      "queue_idle_threshold": 10
+      "schedule_rule": "Filter"
     }
   },
   "restart": {

+ 7 - 5
tasks/Component/SwitchAccount/assets.py

@@ -41,13 +41,15 @@ class SwitchAccountAssets:
 	# 选择服务器界面 底部角色所属服务器名 列表 
 	O_SA_SELECT_SVR_SVR_LIST = RuleOcr(roi=(205,540,815,25), area=(205,540,815,25), mode="FULL", method="Default", keyword="", name="sa_select_svr_svr_list")
 	# 选择服务器界面 底部角色名 列表 
-	O_SA_SELECT_SVR_CHARACTER_LIST = RuleOcr(roi=(205,570,815,40), area=(205,570,815,40), mode="FULL", method="Default", keyword="", name="sa_select_svr_character_list")
+	O_SA_SELECT_SVR_CHARACTER_LIST = RuleOcr(roi=(418,131,641,481), area=(417,135,647,482), mode="Full", method="Default", keyword="", name="sa_select_svr_character_list")
 	# 选择账号界面 账号列表 
 	O_SA_ACCOUNT_ACCOUNT_LIST = RuleOcr(roi=(460,280,440,330), area=(460,280,440,330), mode="FULL", method="Default", keyword="", name="sa_account_account_list")
 	# 选择账号界面 已选择的账号 
 	O_SA_ACCOUNT_ACCOUNT_SELECTED = RuleOcr(roi=(460,280,370,50), area=(460,280,370,50), mode="SINGLE", method="Default", keyword="", name="sa_account_account_selected")
 	# 登录界面 用户中心(区别于游戏内用户中心) 账户名 
 	O_SA_LOGIN_FORM_USER_CENTER_ACCOUNT = RuleOcr(roi=(290,185,290,50), area=(290,185,290,50), mode="SINGLE", method="Default", keyword="", name="sa_login_form_user_center_account")
+	# 判断是否在 选择服务器 界面的文本特质 
+	O_SA_CHECK_SELCET_SVR = RuleOcr(roi=(252,145,97,32), area=(248,141,102,38), mode="Single", method="Default", keyword="已有角色", name="sa_check_selcet_svr")
 
 
 	# Swipe Rule Assets
@@ -77,12 +79,12 @@ class SwitchAccountAssets:
 	# 登录界面-选取账号界面-账号下拉菜单-已经打开标志. 
 	I_SA_ACCOUNT_LOGIN_BTN = RuleImage(roi_front=(400,400,480,90), roi_back=(400,400,480,90), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchAccount/res/sa_account_login_btn.png")
 	# 登录界面-选择手机类型为苹果. 
-	I_SA_LOGIN_FORM_APPLE = RuleImage(roi_front=(490,350,100,100), roi_back=(490,350,100,100), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchAccount/res/sa_login_form_apple.png")
+	I_SA_LOGIN_FORM_APPLE = RuleImage(roi_front=(508,354,100,100), roi_back=(508,355,100,100), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchAccount/res/res_sa_login_form_apple.png")
 	# 登录界面-选择手机类型为android 
-	I_SA_LOGIN_FORM_ANDROID = RuleImage(roi_front=(690,350,100,100), roi_back=(690,350,100,100), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchAccount/res/sa_login_form_android.png")
+	I_SA_LOGIN_FORM_ANDROID = RuleImage(roi_front=(671.3333333333333,353.33333333333337,100,100), roi_back=(670.6666666666667,352.33333333333337,100,100), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchAccount/res/res_sa_login_form_android.png")
 	# 判断是否在 选择服务器 界面的标志物 角色的服务器图标还未显示时 
-	I_SA_CHECK_SELECT_SVR_1 = RuleImage(roi_front=(240,530,120,40), roi_back=(240,530,120,40), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchAccount/res/sa_check_select_svr.png")
+	I_SA_CHECK_SELECT_SVR_1 = RuleImage(roi_front=(213,133,181,60), roi_back=(210,128,185,68), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchAccount/res/res_sa_check_select_svr_1.png")
 	# 判断是否在 选择服务器 界面的标志物 角色的服务器图标已经显示时 
-	I_SA_CHECK_SELECT_SVR_2 = RuleImage(roi_front=(240,410,120,40), roi_back=(240,410,120,40), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchAccount/res/sa_check_select_svr.png")
+	I_SA_CHECK_SELECT_SVR_2 = RuleImage(roi_front=(209.99999999999994,131.33333333333337,184,64.33333333333334), roi_back=(207.33333333333331,127.00000000000006,187,70), threshold=0.8, method="Template matching", file="./tasks/Component/SwitchAccount/res/res_sa_check_select_svr_2.png")
 
 

+ 3 - 2
tasks/Component/SwitchAccount/login_account.py

@@ -89,7 +89,8 @@ class LoginAccount(BaseTask, SwitchAccountAssets):
         @rtype:
         """
         logger.info("start switch_character")
-        self.ui_click(self.C_SA_LOGIN_FORM_SWITCH_SVR_BTN, self.I_SA_CHECK_SELECT_SVR_1)
+        # 改成对比是否出现 已有角色 
+        self.ui_click(self.C_SA_LOGIN_FORM_SWITCH_SVR_BTN, self.O_SA_CHECK_SELCET_SVR)
         # 展开底部角色列表,显示角色所属服务器
         self.screenshot()
         while (not self.appear(self.I_SA_CHECK_SELECT_SVR_2)) and self.appear(self.I_SA_CHECK_SELECT_SVR_1):
@@ -134,7 +135,7 @@ class LoginAccount(BaseTask, SwitchAccountAssets):
                 break
             logger.info(f'{characterName} not found,start swipe')
             lastCharacterNameList = characterNameList
-            self.swipe(self.S_SA_SVR_SWIPE_LEFT)
+            self.swipe(self.S_SA_ACCOUNT_LIST_UP)
             # 等待滑动动画完成
             time.sleep(1.5)
 

+ 12 - 3
tasks/Component/SwitchAccount/ocr.json

@@ -19,9 +19,9 @@
   },
   {
     "itemName": "sa_select_svr_character_list",
-    "roiFront": "205,570,815,40",
-    "roiBack": "205,570,815,40",
-    "mode": "FULL",
+    "roiFront": "418,131,641,481",
+    "roiBack": "417,135,647,482",
+    "mode": "Full",
     "method": "Default",
     "keyword": "",
     "description": "选择服务器界面 底部角色名 列表"
@@ -52,5 +52,14 @@
     "method": "Default",
     "keyword": "",
     "description": "登录界面 用户中心(区别于游戏内用户中心) 账户名"
+  },
+  {
+    "itemName": "sa_check_selcet_svr",
+    "roiFront": "252,145,97,32",
+    "roiBack": "248,141,102,38",
+    "mode": "Single",
+    "method": "Default",
+    "keyword": "已有角色",
+    "description": "判断是否在 选择服务器 界面的文本特质"
   }
 ]

+ 13 - 13
tasks/Component/SwitchAccount/res/image.json

@@ -21,7 +21,7 @@
     "itemName": "sa_user_center_profile",
     "imageName": "sa_user_center_profile.png",
     "roiFront": "590,60,90,55",
-    "roiBack":  "590,60,90,55",
+    "roiBack": "590,60,90,55",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "游戏内-点击头像弹出的设置界面-顶部设置字样"
@@ -82,36 +82,36 @@
   },
   {
     "itemName": "sa_login_form_apple",
-    "imageName": "sa_login_form_apple.png",
-    "roiFront": "490,350,100,100",
-    "roiBack": "490,350,100,100",
+    "imageName": "res_sa_login_form_apple.png",
+    "roiFront": "508,354,100,100",
+    "roiBack": "508,355,100,100",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "登录界面-选择手机类型为苹果."
   },
   {
     "itemName": "sa_login_form_android",
-    "imageName": "sa_login_form_android.png",
-    "roiFront": "690,350,100,100",
-    "roiBack": "690,350,100,100",
+    "imageName": "res_sa_login_form_android.png",
+    "roiFront": "671.3333333333333,353.33333333333337,100,100",
+    "roiBack": "670.6666666666667,352.33333333333337,100,100",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "登录界面-选择手机类型为android"
   },
   {
     "itemName": "sa_check_select_svr_1",
-    "imageName": "sa_check_select_svr.png",
-    "roiFront": "240,530,120,40",
-    "roiBack": "240,530,120,40",
+    "imageName": "res_sa_check_select_svr_1.png",
+    "roiFront": "213,133,181,60",
+    "roiBack": "210,128,185,68",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "判断是否在 选择服务器 界面的标志物 角色的服务器图标还未显示时"
   },
   {
     "itemName": "sa_check_select_svr_2",
-    "imageName": "sa_check_select_svr.png",
-    "roiFront": "240,410,120,40",
-    "roiBack": "240,410,120,40",
+    "imageName": "res_sa_check_select_svr_2.png",
+    "roiFront": "209.99999999999994,131.33333333333337,184,64.33333333333334",
+    "roiBack": "207.33333333333331,127.00000000000006,187,70",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "判断是否在 选择服务器 界面的标志物 角色的服务器图标已经显示时"

BIN
tasks/Component/SwitchAccount/res/res_sa_check_select_svr_1.png


BIN
tasks/Component/SwitchAccount/res/res_sa_check_select_svr_2.png


BIN
tasks/Component/SwitchAccount/res/res_sa_login_form_android.png


BIN
tasks/Component/SwitchAccount/res/res_sa_login_form_apple.png


+ 1 - 1
tasks/FindJade/script_task.py

@@ -106,7 +106,7 @@ if __name__ == '__main__':
 
     # SimplePatch.patch()
 
-    c = Config('oas1')
+    c = Config('翻小号')
     d = Device(c)
     t = ScriptTask(c, d)