runhey 3 лет назад
Родитель
Сommit
36ec9be37f

+ 14 - 1
tasks/AreaBoss/assets.py

@@ -27,7 +27,20 @@ class AreaBossAssets:
 	I_BATTLE_3 = RuleImage(roi_front=(1071,521,100,100), roi_back=(1071,521,100,100), threshold=0.8, method="Template matching", file="./tasks/AreaBoss/res/res_battle_3.png")
 	# 点击挑战 
 	I_FIRE = RuleImage(roi_front=(1108,492,100,100), roi_back=(1108,492,100,100), threshold=0.8, method="Template matching", file="./tasks/AreaBoss/res/res_fire.png")
-	# 红色的关闭 
+	# 跟buff冲突弃用 
 	I_CLOSE_RED = RuleImage(roi_front=(1190,24,37,38), roi_back=(1190,24,37,38), threshold=0.8, method="Template matching", file="./tasks/AreaBoss/res/res_close_red.png")
+	# 红色关闭 
+	I_AB_CLOSE_RED = RuleImage(roi_front=(1194,24,38,37), roi_back=(1194,24,38,37), threshold=0.8, method="Template matching", file="./tasks/AreaBoss/res/res_ab_close_red.png")
+
+
+	# Ocr Rule Assets
+	# 击杀最多 
+	O_AB_KILL_BEST = RuleOcr(roi=(942,123,157,52), area=(942,123,157,52), mode="Single", method="Default", keyword="击杀最多", name="ab_kill_best")
+	# 我的收藏 
+	O_AB_MY_COLLECT = RuleOcr(roi=(949,124,129,53), area=(949,124,129,53), mode="Single", method="Default", keyword="我的收藏", name="ab_my_collect")
+	# 热门 
+	O_AB_FAMOUS = RuleOcr(roi=(1188,181,78,82), area=(1188,181,78,82), mode="Single", method="Default", keyword="热门", name="ab_famous")
+	# 收藏 
+	O_AB_COLLECTING = RuleOcr(roi=(1163,522,88,100), area=(1163,522,88,100), mode="Single", method="Default", keyword="收藏", name="ab_collecting")
 
 

+ 4 - 1
tasks/AreaBoss/config.py

@@ -6,10 +6,13 @@ from pydantic import BaseModel, Field
 from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
 from tasks.Component.config_scheduler import Scheduler
 from tasks.Component.config_base import ConfigBase
+from tasks.Component.SwitchSoul.switch_soul_config import SwitchSoulConfig
 from tasks.AreaBoss.config_boss import Boss
 
 
 class AreaBoss(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)
-    general_battle: GeneralBattleConfig = Field(default_factory=GeneralBattleConfig)
     boss: Boss = Field(default_factory=Boss)
+    general_battle: GeneralBattleConfig = Field(default_factory=GeneralBattleConfig)
+    switch_soul: SwitchSoulConfig = Field(default_factory=SwitchSoulConfig)
+

+ 2 - 1
tasks/AreaBoss/config_boss.py

@@ -8,5 +8,6 @@ from pydantic import BaseModel, ValidationError, validator, Field
 class Boss(BaseModel):
     boss_number: int = Field(title='Boss Number',
                              default=3,
-                             description='默认为3 可选[1-3]',
+                             description='默认为3 可选[1-3], 当你设置为三时默认你拥有全部的挑战资格,会挑战热门的前三个,\n'
+                                         '如果不是请将你可以挑战的boss进行收藏',
                              ge=1, le=3)

+ 92 - 1
tasks/AreaBoss/res/image.json

@@ -1 +1,92 @@
-[{"itemName":"explore","imageName":"res_explore.png","roiFront":"758,122,66,77","roiBack":"339,104,836,120","method":"Template matching","threshold":0.8,"description":"探索图标"},{"itemName":"area_boss","imageName":"res_area_boss.png","roiFront":"639,636,65,68","roiBack":"606,619,145,100","method":"Template matching","threshold":0.8,"description":"地狱鬼王图标"},{"itemName":"back_blue","imageName":"res_back_blue.png","roiFront":"51,30,51,52","roiBack":"4,1,128,110","method":"Template matching","threshold":0.8,"description":"蓝色的返回"},{"itemName":"filter","imageName":"res_filter.png","roiFront":"1106,29,48,49","roiBack":"1106,29,48,49","method":"Template matching","threshold":0.8,"description":"右上边选中鬼王的"},{"itemName":"battle_1","imageName":"res_battle_1.png","roiFront":"1066,210,100,100","roiBack":"1066,210,100,100","method":"Template matching","threshold":0.8,"description":"选中第一个鬼王的"},{"itemName":"battle_2","imageName":"res_battle_2.png","roiFront":"1068,364,100,100","roiBack":"1068,364,100,100","method":"Template matching","threshold":0.8,"description":"选中第二个鬼王的"},{"itemName":"battle_3","imageName":"res_battle_3.png","roiFront":"1071,521,100,100","roiBack":"1071,521,100,100","method":"Template matching","threshold":0.8,"description":"选中第三个鬼王的"},{"itemName":"fire","imageName":"res_fire.png","roiFront":"1108,492,100,100","roiBack":"1108,492,100,100","method":"Template matching","threshold":0.8,"description":"点击挑战"},{"itemName":"close_red","imageName":"res_close_red.png","roiFront":"1190,24,37,38","roiBack":"1190,24,37,38","method":"Template matching","threshold":0.8,"description":"红色的关闭"}]
+[
+  {
+    "itemName": "explore",
+    "imageName": "res_explore.png",
+    "roiFront": "758,122,66,77",
+    "roiBack": "339,104,836,120",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "探索图标"
+  },
+  {
+    "itemName": "area_boss",
+    "imageName": "res_area_boss.png",
+    "roiFront": "639,636,65,68",
+    "roiBack": "606,619,145,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "地狱鬼王图标"
+  },
+  {
+    "itemName": "back_blue",
+    "imageName": "res_back_blue.png",
+    "roiFront": "51,30,51,52",
+    "roiBack": "4,1,128,110",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "蓝色的返回"
+  },
+  {
+    "itemName": "filter",
+    "imageName": "res_filter.png",
+    "roiFront": "1106,29,48,49",
+    "roiBack": "1106,29,48,49",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "右上边选中鬼王的"
+  },
+  {
+    "itemName": "battle_1",
+    "imageName": "res_battle_1.png",
+    "roiFront": "1066,210,100,100",
+    "roiBack": "1066,210,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "选中第一个鬼王的"
+  },
+  {
+    "itemName": "battle_2",
+    "imageName": "res_battle_2.png",
+    "roiFront": "1068,364,100,100",
+    "roiBack": "1068,364,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "选中第二个鬼王的"
+  },
+  {
+    "itemName": "battle_3",
+    "imageName": "res_battle_3.png",
+    "roiFront": "1071,521,100,100",
+    "roiBack": "1071,521,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "选中第三个鬼王的"
+  },
+  {
+    "itemName": "fire",
+    "imageName": "res_fire.png",
+    "roiFront": "1108,492,100,100",
+    "roiBack": "1108,492,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "点击挑战"
+  },
+  {
+    "itemName": "close_red",
+    "imageName": "res_close_red.png",
+    "roiFront": "1190,24,37,38",
+    "roiBack": "1190,24,37,38",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "跟buff冲突弃用"
+  },
+  {
+    "itemName": "ab_close_red",
+    "imageName": "res_ab_close_red.png",
+    "roiFront": "1194,24,38,37",
+    "roiBack": "1194,24,38,37",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "红色关闭"
+  }
+]

+ 38 - 0
tasks/AreaBoss/res/ocr.json

@@ -0,0 +1,38 @@
+[
+  {
+    "itemName": "ab_kill_best",
+    "roiFront": "942,123,157,52",
+    "roiBack": "942,123,157,52",
+    "mode": "Single",
+    "method": "Default",
+    "keyword": "击杀最多",
+    "description": "击杀最多"
+  },
+  {
+    "itemName": "ab_my_collect",
+    "roiFront": "949,124,129,53",
+    "roiBack": "949,124,129,53",
+    "mode": "Single",
+    "method": "Default",
+    "keyword": "我的收藏",
+    "description": "我的收藏"
+  },
+  {
+    "itemName": "ab_famous",
+    "roiFront": "1188,181,78,82",
+    "roiBack": "1188,181,78,82",
+    "mode": "Single",
+    "method": "Default",
+    "keyword": "热门",
+    "description": "热门"
+  },
+  {
+    "itemName": "ab_collecting",
+    "roiFront": "1163,522,88,100",
+    "roiBack": "1163,522,88,100",
+    "mode": "Single",
+    "method": "Default",
+    "keyword": "收藏",
+    "description": "收藏"
+  }
+]

BIN
tasks/AreaBoss/res/res_ab_close_red.png


+ 61 - 144
tasks/AreaBoss/script_task.py

@@ -6,13 +6,16 @@ import time
 from tasks.base_task import BaseTask
 from tasks.Component.GeneralBattle.general_battle import GeneralBattle
 from tasks.GameUi.game_ui import GameUi
-from tasks.GameUi.page import page_area_boss
+from tasks.GameUi.page import page_area_boss, page_shikigami_records
+from tasks.Component.SwitchSoul.switch_soul import SwitchSoul
 from tasks.AreaBoss.assets import AreaBossAssets
+
 from module.logger import logger
 from module.exception import TaskEnd
+from module.atom.image import RuleImage
 
 
-class ScriptTask(GeneralBattle, GameUi, AreaBossAssets):
+class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
 
     def run(self) -> bool:
         """
@@ -21,176 +24,90 @@ class ScriptTask(GeneralBattle, GameUi, AreaBossAssets):
         """
         # 直接手动关闭这个锁定阵容的设置
         self.config.area_boss.general_battle.lock_team_enable = False
+        con = self.config.area_boss.boss
 
+        if self.config.area_boss.switch_soul.enable:
+            self.ui_get_current_page()
+            self.ui_goto(page_shikigami_records)
+            self.run_switch_soul(self.config.area_boss.switch_soul.switch_group_team)
         self.ui_get_current_page()
         self.ui_goto(page_area_boss)
 
-        # # 点击探索
-        # logger.info("Click explore")
-        # while 1:
-        #     self.screenshot()
-        #     if self.appear_then_click(self.I_EXPLORE, threshold=0.6, interval=2):
-        #         continue
-        #     if self.appear(self.I_AREA_BOSS, threshold=0.6):
-        #         break
-        #
-        # # 点击地狱鬼王
-        # logger.info("Click area boss")
-        # while 1:
-        #     self.screenshot()
-        #     if self.appear_then_click(self.I_AREA_BOSS, threshold=0.6, interval=2):
-        #         continue
-        #     if self.appear(self.I_FILTER, threshold=0.6):
-        #         break
+        if con.boss_number == 3:
+            self.boss(self.I_BATTLE_1)
+            self.boss(self.I_BATTLE_2)
+            self.boss(self.I_BATTLE_3)
+        elif con.boss_number == 2:
+            self.boss(self.I_BATTLE_1, collect=True)
+            self.boss(self.I_BATTLE_2, collect=True)
+        elif con.boss_number == 1:
+            self.boss(self.I_BATTLE_1, collect=True)
 
-        # 点击右上角的鬼王选择
-        logger.info("Click filter")
-        while 1:
-            self.screenshot()
-            if self.appear_then_click(self.I_FILTER, threshold=0.8, interval=2):
-                continue
-            if self.appear(self.I_BATTLE_1):
-                break
+        # 退出
+        self.go_back()
+        self.set_next_run(task='AreaBoss', success=True, finish=False)
 
-        # 点击第一个鬼王
-        logger.info("Click battle 1")
-        while 1:
-            self.screenshot()
-            if self.appear_then_click(self.I_BATTLE_1, threshold=0.8, interval=1):
-                continue
-            if self.appear(self.I_CLOSE_RED):
-                break
+        # 以抛出异常的形式结束
+        raise TaskEnd
 
-        # 点击挑战
-        logger.info("Script fire")
+    def go_back(self) -> None:
+        """
+        返回, 要求这个时候是出现在  地狱鬼王的主界面
+        :return:
+        """
+        # 点击返回
+        logger.info("Script back home")
         while 1:
             self.screenshot()
-            if self.appear_then_click(self.I_FIRE, interval=1):
+            if self.appear_then_click(self.I_BACK_BLUE, threshold=0.6, interval=2):
                 continue
-            if not self.appear(self.I_CLOSE_RED):  # 如果这个红色的关闭不见了才可以进行继续
+            if self.appear(self.I_EXPLORE, threshold=0.6):
                 break
-        logger.info("Script general battle")
-        if not self.run_general_battle(self.config.area_boss.general_battle):
-            logger.info("地狱鬼王第一只战斗失败")
 
-        # 红色关闭
-        logger.info("Script close red")
-        self.wait_until_appear(self.I_CLOSE_RED)
-        while 1:
-            self.screenshot()
-            if self.appear_then_click(self.I_CLOSE_RED, interval=1):
-                continue
-            if self.appear(self.I_FILTER):
-                break
-        # 只挑战一只, 退出
-        if self.config.area_boss.boss.boss_number == 1:
-            self.go_back()
-            self.set_next_run(task="AreaBoss", success=True, finish=False)
-            return True
+    def boss(self, battle: RuleImage, collect: bool=False):
+        def switch_collect():
+            while 1:
+                self.screenshot()
+                if self.ocr_appear(self.O_AB_MY_COLLECT):
+                    break
+                if self.ocr_appear_click(self.O_AB_COLLECTING, interval=1):
+                    continue
 
         # 点击右上角的鬼王选择
         logger.info("Script filter")
         while 1:
             self.screenshot()
-            if self.appear_then_click(self.I_FILTER, threshold=0.8, interval=2):
-                continue
-            if self.appear(self.I_BATTLE_2):
+            if self.appear(self.I_BATTLE_1) or self.appear(self.I_BATTLE_2) or self.appear(self.I_BATTLE_3):
                 break
-
-        # 点击第2个鬼王
-        logger.info("Script area boss 2")
-        while 1:
-            self.screenshot()
-            if self.appear_then_click(self.I_BATTLE_2, threshold=0.8, interval=1):
+            if self.appear_then_click(self.I_FILTER, interval=2):
                 continue
-            if self.appear(self.I_CLOSE_RED):
-                break
 
+        if collect:
+            switch_collect()
+        # 点击第几个鬼王
+        logger.info(f'Script area boss {battle}')
+        self.ui_click(battle, self.I_AB_CLOSE_RED)
         # 点击挑战
         logger.info("Script fire ")
         while 1:
             self.screenshot()
             if self.appear_then_click(self.I_FIRE, interval=1):
                 continue
-            if not self.appear(self.I_CLOSE_RED):  # 如果这个红色的关闭不见了才可以进行继续
+            if not self.appear(self.I_AB_CLOSE_RED):  # 如果这个红色的关闭不见了才可以进行继续
                 break
-
         if not self.run_general_battle(self.config.area_boss.general_battle):
             logger.info("地狱鬼王第2只战斗失败")
-
         # 红色关闭
         logger.info("Script close red")
-        self.wait_until_appear(self.I_CLOSE_RED)
-        while 1:
-            self.screenshot()
-            if self.appear_then_click(self.I_CLOSE_RED, interval=1):
-                continue
-            if self.appear(self.I_FILTER):
-                break
-        # 只挑战2只, 退出
-        if self.config.area_boss.boss.boss_number == 2:
-            self.go_back()
-            self.set_next_run(task="AreaBoss", success=True, finish=False)
-            return True
-
-
-        #---------------------------------------------第三只
-        # 点击右上角的鬼王选择
-        logger.info("Script filter")
-        while 1:
-            self.screenshot()
-            if self.appear_then_click(self.I_FILTER, threshold=0.8, interval=2):
-                continue
-            if self.appear(self.I_BATTLE_3):
-                break
-        # 点击第3个鬼王
-        logger.info("Script area boss 3")
-        while 1:
-            self.screenshot()
-            if self.appear_then_click(self.I_BATTLE_3, threshold=0.8, interval=1):
-                continue
-            if self.appear(self.I_CLOSE_RED):
-                break
-        # 点击挑战
-        logger.info("Script fire ")
-        while 1:
-            self.screenshot()
-            if self.appear_then_click(self.I_FIRE, interval=1):
-                continue
-            if not self.appear(self.I_CLOSE_RED):  # 如果这个红色的关闭不见了才可以进行继续
-                break
-        if not self.run_general_battle(self.config.area_boss.general_battle):
-            logger.info("地狱鬼王第2只战斗失败")
-        # 红色关闭
-        logger.info("Script close red")
-        self.wait_until_appear(self.I_CLOSE_RED)
-        while 1:
-            self.screenshot()
-            if self.appear_then_click(self.I_CLOSE_RED, interval=1):
-                continue
-            if self.appear(self.I_FILTER):
-                break
-
-        # 退出
-        self.go_back()
-        self.set_next_run(task='AreaBoss', success=True, finish=False)
-
-        # 以抛出异常的形式结束
-        raise TaskEnd
-
-    def go_back(self) -> None:
-        """
-        返回, 要求这个时候是出现在  地狱鬼王的主界面
-        :return:
-        """
-        # 点击返回
-        logger.info("Script back home")
-        while 1:
-            self.screenshot()
-            if self.appear_then_click(self.I_BACK_BLUE, threshold=0.6, interval=2):
-                continue
-            if self.appear(self.I_EXPLORE, threshold=0.6):
-                break
-
-
-
+        self.wait_until_appear(self.I_AB_CLOSE_RED)
+        self.ui_click(self.I_AB_CLOSE_RED, self.I_FILTER)
+
+if __name__ == '__main__':
+    from module.config.config import Config
+    from module.device.device import Device
+    from memory_profiler import profile
+    c = Config('oas1')
+    d = Device(c)
+    t = ScriptTask(c, d)
+
+    t.run()