Explorar o código

Add code to close unknown pages at start

runhey %!s(int64=3) %!d(string=hai) anos
pai
achega
5c2fc6dd78

+ 96 - 0
module/config/scheduler.py

@@ -0,0 +1,96 @@
+# This Python file uses the following encoding: utf-8
+# @author runhey
+# github https://github.com/runhey
+import datetime
+import operator
+
+from cached_property import cached_property
+
+from module.base.filter import Filter
+
+from module.config.config_manual import ConfigManual
+from module.logger import logger
+
+from tasks.Script.config_optimization import ScheduleRule
+
+
+class TaskScheduler:
+    filter = Filter(regex=r"(.*)", attr=["command"])
+    filter.load(ConfigManual.SCHEDULER_PRIORITY)
+
+    @staticmethod
+    def schedule(rule: ScheduleRule, pending: list["Function"]) -> list["Function"]:
+        """
+        执行 任务的调度
+        :param rule:
+        :param pending:
+        :return:
+        """
+        if isinstance(rule, ScheduleRule) is False:
+            logger.error(f"Invalid rule: {rule}")
+            return pending
+        if isinstance(pending, list) is False:
+            logger.error(f"Invalid pending: {pending}")
+            return pending
+
+        # 第一种
+        if rule == ScheduleRule.FILTER:
+            pending_task = TaskScheduler.filter.apply(pending)
+            return pending_task
+
+        # 第二种
+        if rule == ScheduleRule.FIFO:
+            pending_task = TaskScheduler.fifo(pending)
+            return pending_task
+
+        # 第三种
+        if rule == ScheduleRule.PRIORITY:
+            pending_task = TaskScheduler.priority(pending)
+            return pending_task
+
+    @staticmethod
+    def fifo(pending: list["Function"]) -> list["Function"]:
+        """
+        先来后到,(按照任务的先后顺序进行调度)
+        :param pending:
+        :return:
+        """
+        tasks_pending = sorted(pending, key=operator.attrgetter("next_run"))
+        for task in tasks_pending:
+            # 永远保证 Restart 任务在第一个
+            if task.command == 'Restart':
+                tasks_pending.remove(task)
+                tasks_pending.insert(0, task)
+                break
+        return tasks_pending
+
+    @staticmethod
+    def priority(pending: list["Function"]) -> list["Function"]:
+        """
+        基于优先级,同一个优先级的任务按照先来后到的顺序进行调度,优先级高的任务先调度
+        :param pending:
+        :return:
+        """
+        # 1. 按照优先级进行分组
+        sorted(pending, key=operator.attrgetter("priority"))
+        groups = {}
+        for task in pending:
+            if groups.get(task.priority) is None:
+                groups[task.priority] = []
+            groups[task.priority].append(task)
+        # 2. 对每一组进行先来后到的排序
+        for priority, tasks in groups.items():
+            groups[priority] = TaskScheduler.fifo(tasks)
+
+        # 3.按照顺序合并所有的任务
+        tasks_pending = []
+        for priority in sorted(groups.keys()):
+            tasks_pending.extend(groups[priority])
+
+        return tasks_pending
+
+
+# 测试代码
+if __name__ == '__main__':
+    pass
+

+ 2 - 2
module/device/method/window.py

@@ -144,8 +144,8 @@ class Window(Handle):
         # print(f"我点击的x:{x}, y:{y}")
         # print(f"我点击的x:{x}, y:{y}")
         emulator_type = len(self.control_handle_list)
         emulator_type = len(self.control_handle_list)
         if emulator_type == 2:  # mumu模拟器
         if emulator_type == 2:  # mumu模拟器
-            # SendMessage(self.control_handle_list[0], WM_ACTIVATE, WA_ACTIVE, 0)  # 激活窗口
-            SendMessage(self.control_handle_list[1], WM_ACTIVATE, WA_ACTIVE, 0)  # 激活窗口
+            SendMessage(self.control_handle_list[0], WM_ACTIVATE, WA_ACTIVE, 0)  # 激活窗口
+            # SendMessage(self.control_handle_list[1], WM_ACTIVATE, WA_ACTIVE, 0)  # 激活窗口
             SendMessage(self.control_handle_list[0], WM_LBUTTONDOWN, 0, MAKELONG(x, y+self.mumu_head_height))  # 模拟鼠标按下 先是父窗口 上面的框高度是57
             SendMessage(self.control_handle_list[0], WM_LBUTTONDOWN, 0, MAKELONG(x, y+self.mumu_head_height))  # 模拟鼠标按下 先是父窗口 上面的框高度是57
             time.sleep((random.randint(100, 200)) / 1000.0)  # 点击弹起改为随机,时间100ms-200ms
             time.sleep((random.randint(100, 200)) / 1000.0)  # 点击弹起改为随机,时间100ms-200ms
             SendMessage(self.control_handle_list[1], WM_LBUTTONUP, 0, MAKELONG(x, y))  # 模拟鼠标弹起 后是子窗口
             SendMessage(self.control_handle_list[1], WM_LBUTTONUP, 0, MAKELONG(x, y))  # 模拟鼠标弹起 后是子窗口

+ 6 - 3
tasks/Component/GeneralBuff/general_buff.py

@@ -48,7 +48,7 @@ class GeneralBuff(BaseTask, GeneralBuffAssets):
         :param cls:
         :param cls:
         :param image:
         :param image:
         :param buff:
         :param buff:
-        :return:
+        :return:  如果没有就返回None
         """
         """
         area = buff.ocr(image)
         area = buff.ocr(image)
         if area == tuple([0, 0, 0, 0]):
         if area == tuple([0, 0, 0, 0]):
@@ -169,6 +169,9 @@ class GeneralBuff(BaseTask, GeneralBuffAssets):
         while 1:
         while 1:
             self.screenshot()
             self.screenshot()
             area = self.get_area(self.device.image, self.O_EXP_100)
             area = self.get_area(self.device.image, self.O_EXP_100)
+            if not area:
+                logger.warning('No gold 100 buff')
+                continue
             self.set_switch_area(area)
             self.set_switch_area(area)
 
 
             if not self.appear(self.I_OPEN_YELLOW) and not self.appear(self.I_CLOSE_RED):
             if not self.appear(self.I_OPEN_YELLOW) and not self.appear(self.I_CLOSE_RED):
@@ -222,10 +225,10 @@ class GeneralBuff(BaseTask, GeneralBuffAssets):
         logger.info('Awake buff')
         logger.info('Awake buff')
         self.screenshot()
         self.screenshot()
         area = self.get_area_image(self.device.image, self.I_AWAKE)
         area = self.get_area_image(self.device.image, self.I_AWAKE)
-        self.set_switch_area(area)
         if not area:
         if not area:
             logger.warning('No awake buff')
             logger.warning('No awake buff')
             return None
             return None
+        self.set_switch_area(area)
         if is_open:
         if is_open:
             while 1:
             while 1:
                 self.screenshot()
                 self.screenshot()
@@ -250,10 +253,10 @@ class GeneralBuff(BaseTask, GeneralBuffAssets):
         logger.info('Soul buff')
         logger.info('Soul buff')
         self.screenshot()
         self.screenshot()
         area = self.get_area_image(self.device.image, self.I_SOUL)
         area = self.get_area_image(self.device.image, self.I_SOUL)
-        self.set_switch_area(area)
         if not area:
         if not area:
             logger.warning('No soul buff')
             logger.warning('No soul buff')
             return None
             return None
+        self.set_switch_area(area)
         if is_open:
         if is_open:
             while 1:
             while 1:
                 self.screenshot()
                 self.screenshot()

+ 9 - 2
tasks/GameUi/game_ui.py

@@ -26,7 +26,10 @@ class GameUi(BaseTask, GameUiAssets):
                 # 庭院里面的
                 # 庭院里面的
                 page_shikigami_records, page_onmyodo, page_friends, page_daily, page_mall, page_guild, page_team, page_collection
                 page_shikigami_records, page_onmyodo, page_friends, page_daily, page_mall, page_guild, page_team, page_collection
                 ]
                 ]
-
+    ui_close = [GameUiAssets.I_BACK_BLUE, GameUiAssets.I_BACK_YOLLOW, GameUiAssets.I_BACK_Y, GameUiAssets.I_BACK_MALL,
+                GameUiAssets.I_BACK_FRIENDS, GameUiAssets.I_BACK_DAILY, GameUiAssets.I_BACK_BL,
+                GameUiAssets.I_BONDLING_GOTO_EXPLORATION, GameUiAssets.I_REALM_RAID_GOTO_EXPLORATION, GameUiAssets.I_SIX_GATES_GOTO_EXPLORATION, GameUiAssets.page_summon_goto_main
+                ]
     def home_explore(self) -> bool:
     def home_explore(self) -> bool:
         """
         """
         使用ocr识别到探索按钮并点击
         使用ocr识别到探索按钮并点击
@@ -116,7 +119,11 @@ class GameUi(BaseTask, GameUiAssets):
                     logger.attr("UI", page.name)
                     logger.attr("UI", page.name)
                     self.ui_current = page
                     self.ui_current = page
                     return page
                     return page
-
+            # Try to close unknown page
+            for close in self.ui_close:
+                if self.appear_then_click(self.I_FORM_TEAM, interval=1):
+                    logger.info('Trying to switch to supported page')
+                    timeout = Timer(10, count=20).start()
             # Unknown page but able to handle
             # Unknown page but able to handle
             # logger.info("Unknown ui page")
             # logger.info("Unknown ui page")
             # if self.appear_then_click(GOTO_MAIN, offset=(30, 30), interval=2) or self.ui_additional():
             # if self.appear_then_click(GOTO_MAIN, offset=(30, 30), interval=2) or self.ui_additional():

+ 1 - 1
tasks/Orochi/script_task.py

@@ -149,7 +149,7 @@ class ScriptTask(GeneralBattle, GeneralInvite, GeneralBuff, GeneralRoom, GameUi,
             # 如果在探索界面或者是出现在组队界面, 那就是可能房间死了
             # 如果在探索界面或者是出现在组队界面, 那就是可能房间死了
             # 要结束任务
             # 要结束任务
             if self.appear(self.I_MATCHING) or self.appear(self.I_CHECK_EXPLORATION):
             if self.appear(self.I_MATCHING) or self.appear(self.I_CHECK_EXPLORATION):
-                break
+                continue
             if self.current_count >= self.limit_count:
             if self.current_count >= self.limit_count:
                 if self.is_in_room():
                 if self.is_in_room():
                     logger.info('Orochi count limit out')
                     logger.info('Orochi count limit out')

+ 5 - 1
tasks/Restart/assets.py

@@ -41,7 +41,9 @@ class RestartAssets:
 	# description 
 	# 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")
 	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")
 	# 用于判断是否出现登录选区的 
 	# 用于判断是否出现登录选区的 
-	I_LOGIN_8 = RuleImage(roi_front=(19,572,53,60), roi_back=(19,572,53,60), threshold=0.8, method="Template matching", file="./tasks/Restart/login/login_login_8.png")
+	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")
 
 
 
 
 	# Ocr Rule Assets
 	# Ocr Rule Assets
@@ -49,5 +51,7 @@ 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=(550,567,176,56), area=(558,574,154,49), mode="Single", method="Default", keyword="进入游戏", name="login_enter_game")
 	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")
 
 
 
 

+ 9 - 0
tasks/Restart/login.py

@@ -18,6 +18,7 @@ class LoginHandler(BaseTask, RestartAssets):
         :return:
         :return:
         """
         """
         logger.hr('App login')
         logger.hr('App login')
+        self.device.stuck_record_add('LOGIN_CHECK')
 
 
         confirm_timer = Timer(1.5, count=2).start()
         confirm_timer = Timer(1.5, count=2).start()
         orientation_timer = Timer(10)
         orientation_timer = Timer(10)
@@ -54,6 +55,14 @@ class LoginHandler(BaseTask, RestartAssets):
             #     logger.error('Network error')
             #     logger.error('Network error')
             #     raise RequestHumanTakeover('Network error')
             #     raise RequestHumanTakeover('Network error')
 
 
+
+            # 跳过观看视频
+            # if self.ocr_appear_click(self.O_LOGIN_SKIP_1, interval=1):
+            #     continue
+            # 不观看视频
+            if self.appear_then_click(self.I_WATCH_VIDEO_CANCEL, interval=0.6):
+                logger.info('Close video')
+                continue
             # 右上角的红色的关闭
             # 右上角的红色的关闭
             if self.appear_then_click(self.I_LOGIN_RED_CLOSE, interval=0.6):
             if self.appear_then_click(self.I_LOGIN_RED_CLOSE, interval=0.6):
                 logger.info('Close red close')
                 logger.info('Close red close')

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

@@ -38,10 +38,19 @@
   {
   {
     "itemName": "login_8",
     "itemName": "login_8",
     "imageName": "login_login_8.png",
     "imageName": "login_login_8.png",
-    "roiFront": "19,572,53,60",
-    "roiBack": "19,572,53,60",
+    "roiFront": "178,572,53,60",
+    "roiBack": "19,547,223,105",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "用于判断是否出现登录选区的"
     "description": "用于判断是否出现登录选区的"
+  },
+  {
+    "itemName": "watch_video_cancel",
+    "imageName": "login_watch_video_cancel.png",
+    "roiFront": "466,396,130,61",
+    "roiBack": "466,396,130,61",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "登录时候不观看CG视频"
   }
   }
 ]
 ]

BIN=BIN
tasks/Restart/login/login_watch_video_cancel.png


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

@@ -16,5 +16,14 @@
     "method": "Default",
     "method": "Default",
     "keyword": "进入游戏",
     "keyword": "进入游戏",
     "description": "Ocr-description"
     "description": "Ocr-description"
+  },
+  {
+    "itemName": "login_skip_1",
+    "roiFront": "1046,35,130,37",
+    "roiBack": "1046,35,130,37",
+    "mode": "Single",
+    "method": "Default",
+    "keyword": "点击屏幕跳过",
+    "description": "点击屏幕跳过"
   }
   }
 ]
 ]