Explorar o código

fix(scheduler): filter scheduler bug

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

+ 3 - 3
module/config/scheduler.py

@@ -15,8 +15,8 @@ from tasks.Script.config_optimization import ScheduleRule
 
 
 class TaskScheduler:
-    filter = Filter(regex=r"(.*)", attr=["command"]).load(ConfigManual.SCHEDULER_PRIORITY)
-
+    filter = Filter(regex=r"(.*)", attr=["command"])
+    filter.load(ConfigManual.SCHEDULER_PRIORITY)
 
     @staticmethod
     def schedule(rule: ScheduleRule, pending: list["Function"]) -> list["Function"]:
@@ -35,7 +35,7 @@ class TaskScheduler:
 
         # 第一种
         if rule == ScheduleRule.FILTER:
-            pending_task = filter.apply(pending)
+            pending_task = TaskScheduler.filter.apply(pending)
             return pending_task
 
         # 第二种

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

@@ -144,8 +144,8 @@ class Window(Handle):
         # print(f"我点击的x:{x}, y:{y}")
         emulator_type = len(self.control_handle_list)
         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
             time.sleep((random.randint(100, 200)) / 1000.0)  # 点击弹起改为随机,时间100ms-200ms
             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 image:
         :param buff:
-        :return:
+        :return:  如果没有就返回None
         """
         area = buff.ocr(image)
         if area == tuple([0, 0, 0, 0]):
@@ -169,6 +169,9 @@ class GeneralBuff(BaseTask, GeneralBuffAssets):
         while 1:
             self.screenshot()
             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)
 
             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')
         self.screenshot()
         area = self.get_area_image(self.device.image, self.I_AWAKE)
-        self.set_switch_area(area)
         if not area:
             logger.warning('No awake buff')
             return None
+        self.set_switch_area(area)
         if is_open:
             while 1:
                 self.screenshot()
@@ -250,10 +253,10 @@ class GeneralBuff(BaseTask, GeneralBuffAssets):
         logger.info('Soul buff')
         self.screenshot()
         area = self.get_area_image(self.device.image, self.I_SOUL)
-        self.set_switch_area(area)
         if not area:
             logger.warning('No soul buff')
             return None
+        self.set_switch_area(area)
         if is_open:
             while 1:
                 self.screenshot()

+ 5 - 1
tasks/Restart/assets.py

@@ -45,7 +45,9 @@ class RestartAssets:
 	# 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_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
@@ -53,5 +55,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")
 	# 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_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:
         """
         logger.hr('App login')
+        self.device.stuck_record_add('LOGIN_CHECK')
 
         confirm_timer = Timer(1.5, count=2).start()
         orientation_timer = Timer(10)
@@ -54,6 +55,14 @@ 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
+            # 不观看视频
+            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):
                 logger.info('Close red close')

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

@@ -38,10 +38,19 @@
   {
     "itemName": "login_8",
     "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",
     "threshold": 0.8,
     "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",
     "keyword": "进入游戏",
     "description": "Ocr-description"
+  },
+  {
+    "itemName": "login_skip_1",
+    "roiFront": "1046,35,130,37",
+    "roiBack": "1046,35,130,37",
+    "mode": "Single",
+    "method": "Default",
+    "keyword": "点击屏幕跳过",
+    "description": "点击屏幕跳过"
   }
 ]