Parcourir la source

1.关闭绑定手机号弹窗
2.关闭阴阳师精灵弹窗
3.针对合区导致同区存在多个账号的,增加配置选项
4.其他小优化

ChengRanORZ il y a 2 ans
Parent
commit
abbc3be233

+ 19 - 2
tasks/Restart/assets.py

@@ -47,6 +47,15 @@ class RestartAssets:
 	I_HARVEST_SOUL_3 = RuleImage(roi_front=(313,489,188,33), roi_back=(302,472,216,60), threshold=0.8, method="Template matching", file="./tasks/Restart/harvest/harvest_harvest_soul_3.png")
 	# 寮包 
 	I_HARVEST_GUILD_REWARD = RuleImage(roi_front=(244,498,41,42), roi_back=(200,403,817,157), threshold=0.8, method="Template matching", file="./tasks/Restart/harvest/harvest_harvest_guild_reward.png")
+	# 宠物小屋关闭按钮 
+	I_HARVEST_BACK_PET_HOUSE = RuleImage(roi_front=(20,15,70,70), roi_back=(20,15,70,70), threshold=0.8, method="Template matching", file="./tasks/Restart/harvest/harvest_back_pet_house.png")
+	# 点击庭院阴阳师出现的姿度按钮 
+	I_HARVEST_ZIDU = RuleImage(roi_front=(785,475,135,135), roi_back=(785,475,135,135), threshold=0.8, method="Template matching", file="./tasks/Restart/harvest/harvest_zidu.png")
+
+
+	# Click Rule Assets
+	# 相同服务器多个角色选择界面,点击空白区域 确认登录 
+	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")
 
 
 	# Image Rule Assets
@@ -55,7 +64,7 @@ class RestartAssets:
 	# 庭院卷轴关闭 
 	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")
 	# description 
-	I_LOGIN_RED_CLOSE = RuleImage(roi_front=(1158,62,39,37), roi_back=(912,42,309,281), threshold=0.8, method="Template matching", file="./tasks/Restart/login/login_login_red_close.png")
+	I_LOGIN_RED_CLOSE = RuleImage(roi_front=(912,0,360,290), roi_back=(912,0,360,290), threshold=0.8, method="Template matching", file="./tasks/Restart/login/login_login_red_close.png")
 	# description 
 	I_LOGIN_YELLOW_CLOSE = RuleImage(roi_front=(29,17,46,44), roi_back=(0,0,94,86), threshold=0.8, method="Template matching", file="./tasks/Restart/login/login_login_yellow_close.png")
 	# 用于判断是否出现登录选区的 
@@ -66,6 +75,14 @@ class RestartAssets:
 	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")
 	# 下载插画 
 	I_LOGIN_LOAD_DOWN = RuleImage(roi_front=(711,450,153,58), roi_back=(711,450,153,58), threshold=0.8, method="Template matching", file="./tasks/Restart/login/login_login_load_down.png")
+	# 登录界面 弹出框 前往绑定 手机 
+	I_LOGIN_LOGIN_GOTO_BIND_PHONE = RuleImage(roi_front=(940,430,170,150), roi_back=(940,430,170,150), threshold=0.8, method="Template matching", file="./tasks/Restart/login/login_login_goto_bind_phone.png")
+	# 登录界面 弹出框 确定绑定手机 
+	I_LOGIN_LOGIN_ENSURE_BIND_PHONE = RuleImage(roi_front=(670,460,160,100), roi_back=(670,460,160,100), threshold=0.8, method="Template matching", file="./tasks/Restart/login/login_login_ensure_bind_phone.png")
+	# 登录界面 弹出框 取消绑定手机 
+	I_LOGIN_LOGIN_CANCEL_BIND_PHONE = RuleImage(roi_front=(450,460,160,100), roi_back=(450,460,160,100), threshold=0.8, method="Template matching", file="./tasks/Restart/login/login_login_cancel_bind_phone.png")
+	# 登录界面 弹出框 阴阳师精灵 
+	I_LOGIN_LOGIN_ONMYOJI_GENIE = RuleImage(roi_front=(80,110,280,120), roi_back=(80,110,280,120), threshold=0.8, method="Template matching", file="./tasks/Restart/login/login_login_onmyoji_genie.png")
 
 
 	# Ocr Rule Assets
@@ -76,6 +93,6 @@ class RestartAssets:
 	# 点击屏幕跳过 
 	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=(694,605,59,34), area=(516,75,662,585), mode="Single", method="Default", keyword="游戏", name="login_specific_serve")
+	O_LOGIN_SPECIFIC_SERVE = RuleOcr(roi=(110,120,350,600), area=(110,120,350,600), mode="Full", method="Default", keyword="", name="login_specific_serve")
 
 

+ 2 - 1
tasks/Restart/config.py

@@ -30,4 +30,5 @@ class Restart(ConfigBase):
     scheduler: RestartScheduler = Field(default_factory=RestartScheduler)
     tasks_config_reset: TasksReset = Field(default_factory=TasksReset)
     harvest_config: HarvestConfig = Field(default_factory=HarvestConfig)
-
+    # 同账号同服务器多个角色时,需要登录的角色名
+    character: str = Field(default="")

+ 18 - 0
tasks/Restart/harvest/image.json

@@ -160,5 +160,23 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "寮包"
+  },
+  {
+    "itemName": "harvest_back_pet_house",
+    "imageName": "harvest_back_pet_house.png",
+    "roiFront": "20,15,70,70",
+    "roiBack": "20,15,70,70",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "宠物小屋关闭按钮"
+  },
+  {
+    "itemName": "harvest_zidu",
+    "imageName": "harvest_zidu.png",
+    "roiFront": "785,475,135,135",
+    "roiBack": "785,475,135,135",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "点击庭院阴阳师出现的姿度按钮"
   }
 ]

+ 80 - 31
tasks/Restart/login.py

@@ -1,6 +1,8 @@
 # This Python file uses the following encoding: utf-8
 # @author runhey
 # github https://github.com/runhey
+import time
+
 from tasks.Restart.config_scheduler import Scheduler
 from module.logger import logger
 from module.base.timer import Timer
@@ -11,6 +13,13 @@ from module.exception import TaskEnd, RequestHumanTakeover, GameTooManyClickErro
 
 
 class LoginHandler(BaseTask, RestartAssets):
+    character: str
+
+    def __init__(self, *wargs, **kwargs):
+        super().__init__(*wargs, **kwargs)
+        self.character = self.config.restart.character
+        self.O_LOGIN_SPECIFIC_SERVE.keyword = self.character
+        # self.specific_usr = kwargs['config'].
 
     def _app_handle_login(self) -> bool:
         """
@@ -53,7 +62,6 @@ class LoginHandler(BaseTask, RestartAssets):
             #     logger.error('Network error')
             #     raise RequestHumanTakeover('Network error')
 
-
             # 跳过观看视频
             # if self.ocr_appear_click(self.O_LOGIN_SKIP_1, interval=1):
             #     continue
@@ -73,19 +81,39 @@ 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_then_click(self.I_LOGIN_LOGIN_GOTO_BIND_PHONE):
+                while 1:
+                    self.screenshot()
+                    if self.appear_then_click(self.I_LOGIN_LOGIN_CANCEL_BIND_PHONE):
+                        logger.info("Close bind phone")
+                        break
+                continue
+            # 关闭各种邀请弹窗(主要时结界卡寄养邀请)
+            from tasks.Component.GeneralInvite.assets import GeneralInviteAssets as gia
+            if self.appear_then_click(gia.I_I_REJECT, interval=0.8):
+                logger.info("reject invites")
+                continue
+            # 关闭阴阳师精灵提示
+            if self.appear_then_click(self.I_LOGIN_LOGIN_ONMYOJI_GENIE):
+                logger.info("click onmyoji genie")
+                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):
+            if self.appear(self.I_LOGIN_SPECIFIC_SERVE, interval=0.6) \
+                    and self.ocr_appear_click(self.O_LOGIN_SPECIFIC_SERVE, interval=0.6):
+                self.ui_click_until_disappear(self.C_LOGIN_ENSURE_LOGIN_CHARACTER_IN_SAME_SVR,
+                                              stop=self.I_LOGIN_SPECIFIC_SERVE, interval=2)
                 logger.info('login specific user')
                 continue
             # 点击’进入游戏‘
             if not self.appear(self.I_LOGIN_8):
                 continue
-            if self.ocr_appear_click(self.O_LOGIN_ENTER_GAME, interval=2.5):
+            if self.ocr_appear_click(self.O_LOGIN_ENTER_GAME, interval=3):
+                self.wait_until_appear(self.I_LOGIN_SPECIFIC_SERVE, False, wait_time=2)
                 continue
 
         return login_success
 
-
     def app_handle_login(self) -> bool:
         for _ in range(2):
             self.device.stuck_record_clear()
@@ -105,15 +133,13 @@ class LoginHandler(BaseTask, RestartAssets):
         logger.critical('Onmyoji server may be under maintenance, or you may lost network connection')
         raise RequestHumanTakeover
 
-
-
     def harvest(self):
         """
         获得奖励
         :return: 如果没有发现任何奖励后退出
         """
         logger.hr('Harvest')
-        timer_harvest = Timer(3)  # 如果连续3秒没有发现任何奖励,退出
+        timer_harvest = Timer(5)  # 如果连续3秒没有发现任何奖励,退出
         while 1:
             self.screenshot()
 
@@ -129,6 +155,25 @@ class LoginHandler(BaseTask, RestartAssets):
             if self.appear_then_click(self.I_HARVEST_CHAT_CLOSE, interval=1):
                 timer_harvest.reset()
                 continue
+            # 偶尔会进入其他页面
+            # 左上角的黄色关闭
+            if self.appear_then_click(self.I_LOGIN_YELLOW_CLOSE, interval=0.6):
+                timer_harvest.reset()
+                logger.info('Close yellow close')
+                continue
+                # 关闭宠物小屋
+            if self.appear_then_click(self.I_HARVEST_BACK_PET_HOUSE, interval=0.6):
+                timer_harvest.reset()
+                logger.info('Close yellow close')
+                continue
+                # 关闭姿度出现的蒙版
+            if self.appear(self.I_HARVEST_ZIDU, interval=1):
+                timer_harvest.reset()
+                self.I_HARVEST_ZIDU.roi_front[0] -= 200
+                self.I_HARVEST_ZIDU.roi_front[1] -= 200
+                if self.click(self.I_HARVEST_ZIDU, interval=2):
+                    logger.info('Close zidu')
+                continue
 
             # 勾玉
             if self.appear_then_click(self.I_HARVEST_JADE, interval=1.5):
@@ -140,6 +185,7 @@ class LoginHandler(BaseTask, RestartAssets):
                 continue
             # 某些活动的特殊签到,有空看到就删掉
             if self.appear_then_click(self.I_HARVEST_SIGN_3, interval=0.7):
+                timer_harvest.reset()
                 continue
             if self.appear_then_click(self.I_HARVEST_SIGN_4, interval=1):
                 timer_harvest.reset()
@@ -155,29 +201,30 @@ class LoginHandler(BaseTask, RestartAssets):
             # 判断是否勾选了收取邮件(不收取邮件可以查看每日收获)
             if self.config.restart.harvest_config.enable_mail:
 
-                if self.appear_then_click(self.I_HARVEST_MAIL, interval=1.2):
+                if self.appear_then_click(self.I_HARVEST_MAIL, interval=3):
                     timer_harvest.reset()
-                    continue
-                if self.appear(self.I_HARVEST_MAIL_TITLE, interval=0.2):
-                    while 1:
-                        self.screenshot()
-                        if self.appear_then_click(self.I_HARVEST_MAIL_ALL, interval=2):
-                            timer_harvest.reset()
-                            pass
-                        if self.appear_then_click(self.I_HARVEST_MAIL_CONFIRM, interval=1):
-                            continue
-
-                        # 如果一直出现收取全部,那就说明还在进行中
-                        if self.appear(self.I_HARVEST_MAIL_ALL):
-                            pass
-                        # 如果没有出现 ‘收取全部’ 也没有出现 ‘还未读的邮件’ 那就可以退出了
-                        if not self.appear(self.I_HARVEST_MAIL_ALL) and not self.appear(self.I_HARVEST_MAIL_OPEN):
-                            logger.info('Mail has been harvested')
-                            logger.info('Exit mail')
-                            break
-                        if self.appear_then_click(self.I_HARVEST_MAIL_OPEN, interval=1):
-                            timer_harvest.reset()
-                            continue
+                    self.wait_until_appear(self.I_HARVEST_MAIL_TITLE, wait_time=2)
+                    if self.appear(self.I_HARVEST_MAIL_TITLE, interval=2.5):
+                        while 1:
+                            self.screenshot()
+                            if self.appear_then_click(self.I_HARVEST_MAIL_ALL, interval=2):
+                                timer_harvest.reset()
+                                pass
+                            if self.appear_then_click(self.I_HARVEST_MAIL_CONFIRM, interval=1):
+                                continue
+
+                            # 如果一直出现收取全部,那就说明还在进行中
+                            if self.appear(self.I_HARVEST_MAIL_ALL):
+                                pass
+                            # 如果没有出现 ‘收取全部’ 也没有出现 ‘还未读的邮件’ 那就可以退出了
+                            if not self.appear(self.I_HARVEST_MAIL_ALL) and not self.appear(self.I_HARVEST_MAIL_OPEN):
+                                logger.info('Mail has been harvested')
+                                logger.info('Exit mail')
+                                break
+                            if self.appear_then_click(self.I_HARVEST_MAIL_OPEN, interval=1):
+                                timer_harvest.reset()
+                                continue
+                        continue
             # 体力
             if self.appear_then_click(self.I_HARVEST_AP, interval=1, threshold=0.7):
                 timer_harvest.reset()
@@ -198,9 +245,8 @@ class LoginHandler(BaseTask, RestartAssets):
                 self.ui_click_until_disappear(click=self.I_HARVEST_SOUL_3)
                 timer_harvest.reset()
 
-
             # 红色的关闭
-            if self.appear_then_click(self.I_UI_BACK_RED, interval=2.3):
+            if self.appear_then_click(self.I_UI_BACK_RED, interval=4):
                 timer_harvest.reset()
                 continue
 
@@ -212,3 +258,6 @@ class LoginHandler(BaseTask, RestartAssets):
                     logger.info('No more reward')
                     return
 
+    def set_specific_usr(self, character: str):
+        self.character = character
+        self.O_LOGIN_SPECIFIC_SERVE.keyword = character

+ 38 - 2
tasks/Restart/login/image.json

@@ -20,8 +20,8 @@
   {
     "itemName": "login_red_close",
     "imageName": "login_login_red_close.png",
-    "roiFront": "1158,62,39,37",
-    "roiBack": "912,42,309,281",
+    "roiFront": "912,0,360,290",
+    "roiBack": "912,0,360,290",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "description"
@@ -70,5 +70,41 @@
     "method": "Template matching",
     "threshold": 0.8,
     "description": "下载插画"
+  },
+  {
+    "itemName": "login_login_goto_bind_phone",
+    "imageName": "login_login_goto_bind_phone.png",
+    "roiFront": "940,430,170,150",
+    "roiBack": "940,430,170,150",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "登录界面 弹出框 前往绑定 手机"
+  },
+  {
+    "itemName": "login_login_ensure_bind_phone",
+    "imageName": "login_login_ensure_bind_phone.png",
+    "roiFront": "670,460,160,100",
+    "roiBack": "670,460,160,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "登录界面 弹出框 确定绑定手机"
+  },
+  {
+    "itemName": "login_login_cancel_bind_phone",
+    "imageName": "login_login_cancel_bind_phone.png",
+    "roiFront": "450,460,160,100",
+    "roiBack": "450,460,160,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "登录界面 弹出框 取消绑定手机"
+  },
+  {
+    "itemName": "login_login_onmyoji_genie",
+    "imageName": "login_login_onmyoji_genie.png",
+    "roiFront": "80,110,280,120",
+    "roiBack": "80,110,280,120",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "登录界面 弹出框 阴阳师精灵"
   }
 ]

+ 4 - 4
tasks/Restart/login/ocr.json

@@ -28,11 +28,11 @@
   },
   {
     "itemName": "login_specific_serve",
-    "roiFront": "694,605,59,34",
-    "roiBack": "516,75,662,585",
-    "mode": "Single",
+    "roiFront": "110,120,350,600",
+    "roiBack": "110,120,350,600",
+    "mode": "Full",
     "method": "Default",
-    "keyword": "游戏",
+    "keyword": "",
     "description": "登录指定角色,默认第一个"
   }
 ]