qiyonghan 2 лет назад
Родитель
Сommit
7b97f4daa5

BIN
tasks/HeroTest/as/as_bcmj.png


BIN
tasks/HeroTest/as/as_bcmj__defalut_attribute.png


BIN
tasks/HeroTest/as/as_bcmj_battle.png


BIN
tasks/HeroTest/as/as_bcmj_bless.png


BIN
tasks/HeroTest/as/as_bcmj_lock.png


BIN
tasks/HeroTest/as/as_bcmj_property_add_critical.png


BIN
tasks/HeroTest/as/as_bcmj_skill_add1.png


BIN
tasks/HeroTest/as/as_bcmj_skill_add2.png


BIN
tasks/HeroTest/as/as_bcmj_skill_add_confirm.png


BIN
tasks/HeroTest/as/as_bcmj_unlock.png


BIN
tasks/HeroTest/as/as_bcmj_win.png


+ 99 - 0
tasks/HeroTest/as/image.json

@@ -70,5 +70,104 @@
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "description"
     "description": "description"
+  },
+  {
+    "itemName": "bcmj",
+    "imageName": "as_bcmj.png",
+    "roiFront": "1086,350,45,131",
+    "roiBack": "1086,350,45,131",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "兵藏秘境"
+  },
+  {
+    "itemName": "bcmj_lock",
+    "imageName": "as_bcmj_lock.png",
+    "roiFront": "901,159.5,36,26",
+    "roiBack": "901,650,36,38",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "兵藏秘境阵容锁"
+  },
+  {
+    "itemName": "bcmj_battle",
+    "imageName": "as_bcmj_battle.png",
+    "roiFront": "1131,598,92,50",
+    "roiBack": "1131,598,92,50",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "兵藏秘境挑战"
+  },
+  {
+    "itemName": "bcmj_win",
+    "imageName": "as_bcmj_win.png",
+    "roiFront": "431,141,100,100",
+    "roiBack": "431,141,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "兵藏秘境胜利"
+  },
+  {
+    "itemName": "bcmj_skill_add1",
+    "imageName": "as_bcmj_skill_add1.png",
+    "roiFront": "109,361,90,32",
+    "roiBack": "103,359,1076,37",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "兵藏秘境选择八华斩"
+  },
+  {
+    "itemName": "bcmj_skill_add2",
+    "imageName": "as_bcmj_skill_add2.png",
+    "roiFront": "728,359,61,32",
+    "roiBack": "106,356,1068,38",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "技能选择 无畏"
+  },
+  {
+    "itemName": "bcmj_skill_add_confirm",
+    "imageName": "as_bcmj_skill_add_confirm.png",
+    "roiFront": "608,633,64,36",
+    "roiBack": "608,633,64,36",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "技能祝福确定"
+  },
+  {
+    "itemName": "bcmj_property_add_critical",
+    "imageName": "as_bcmj_property_add_critical.png",
+    "roiFront": "704,359,115,34",
+    "roiBack": "120,356,1038,39",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "兵藏秘境的暴击伤害属性奖励"
+  },
+  {
+    "itemName": "bcmj_bless",
+    "imageName": "as_bcmj_bless.png",
+    "roiFront": "261,159,21,20",
+    "roiBack": "256,156,939,27",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "兵藏秘境默认祝福"
+  },
+  {
+    "itemName": "bcmj__defalut_attribute",
+    "imageName": "as_bcmj__defalut_attribute.png",
+    "roiFront": "1168,159,21,22",
+    "roiBack": "255,155,944,31",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "默认属性"
+  },
+  {
+    "itemName": "bcmj_unlock",
+    "imageName": "as_bcmj_unlock.png",
+    "roiFront": "906,652,22,30",
+    "roiBack": "906,652,22,30",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "兵藏秘境的阵容未锁"
   }
   }
 ]
 ]

+ 18 - 0
tasks/HeroTest/as/ocr.json

@@ -7,5 +7,23 @@
     "method": "Default",
     "method": "Default",
     "keyword": "",
     "keyword": "",
     "description": "投喂的体力"
     "description": "投喂的体力"
+  },
+  {
+    "itemName": "art_war_card",
+    "roiFront": "735,25,77,31",
+    "roiBack": "735,25,77,31",
+    "mode": "DigitCounter",
+    "method": "Default",
+    "keyword": "",
+    "description": "兵藏秘境兵道帖"
+  },
+  {
+    "itemName": "art_war_card_plus",
+    "roiFront": "914,24,100,35",
+    "roiBack": "914,24,100,35",
+    "mode": "Single",
+    "method": "Default",
+    "keyword": "",
+    "description": "兵道帖机密"
   }
   }
 ]
 ]

+ 26 - 0
tasks/HeroTest/assets.py

@@ -27,10 +27,36 @@ class HeroTestAssets:
 	I_UNLOCK = RuleImage(roi_front=(817,648,33,31), roi_back=(817,648,33,31), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_unlock.png")
 	I_UNLOCK = RuleImage(roi_front=(817,648,33,31), roi_back=(817,648,33,31), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_unlock.png")
 	# description 
 	# description 
 	I_LOCK = RuleImage(roi_front=(816,644,36,38), roi_back=(816,644,36,38), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_lock.png")
 	I_LOCK = RuleImage(roi_front=(816,644,36,38), roi_back=(816,644,36,38), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_lock.png")
+	# 兵藏秘境 
+	I_BCMJ = RuleImage(roi_front=(1086,350,45,131), roi_back=(1086,350,45,131), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_bcmj.png")
+	# 兵藏秘境阵容锁 
+	I_BCMJ_LOCK = RuleImage(roi_front=(901,159.5,36,26), roi_back=(901,650,36,38), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_bcmj_lock.png")
+	# 兵藏秘境挑战 
+	I_BCMJ_BATTLE = RuleImage(roi_front=(1131,598,92,50), roi_back=(1131,598,92,50), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_bcmj_battle.png")
+	# 兵藏秘境胜利 
+	I_BCMJ_WIN = RuleImage(roi_front=(431,141,100,100), roi_back=(431,141,100,100), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_bcmj_win.png")
+	# 兵藏秘境选择八华斩 
+	I_BCMJ_SKILL_ADD1 = RuleImage(roi_front=(109,361,90,32), roi_back=(103,359,1076,37), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_bcmj_skill_add1.png")
+	# 技能选择 无畏 
+	I_BCMJ_SKILL_ADD2 = RuleImage(roi_front=(728,359,61,32), roi_back=(106,356,1068,38), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_bcmj_skill_add2.png")
+	# 技能祝福确定 
+	I_BCMJ_SKILL_ADD_CONFIRM = RuleImage(roi_front=(608,633,64,36), roi_back=(608,633,64,36), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_bcmj_skill_add_confirm.png")
+	# 兵藏秘境的暴击伤害属性奖励 
+	I_BCMJ_PROPERTY_ADD_CRITICAL = RuleImage(roi_front=(704,359,115,34), roi_back=(120,356,1038,39), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_bcmj_property_add_critical.png")
+	# 兵藏秘境默认祝福 
+	I_BCMJ_BLESS = RuleImage(roi_front=(261,159,21,20), roi_back=(256,156,939,27), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_bcmj_bless.png")
+	# 默认属性 
+	I_BCMJ__DEFALUT_ATTRIBUTE = RuleImage(roi_front=(1168,159,21,22), roi_back=(255,155,944,31), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_bcmj__defalut_attribute.png")
+	# 兵藏秘境的阵容未锁 
+	I_BCMJ_UNLOCK = RuleImage(roi_front=(906,652,22,30), roi_back=(906,652,22,30), threshold=0.8, method="Template matching", file="./tasks/HeroTest/as/as_bcmj_unlock.png")
 
 
 
 
 	# Ocr Rule Assets
 	# Ocr Rule Assets
 	# 投喂的体力 
 	# 投喂的体力 
 	O_REMAIN_AP = RuleOcr(roi=(1095,24,123,33), area=(1095,24,123,33), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
 	O_REMAIN_AP = RuleOcr(roi=(1095,24,123,33), area=(1095,24,123,33), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
+	# 兵藏秘境兵道帖 
+	O_ART_WAR_CARD = RuleOcr(roi=(735,25,77,31), area=(735,25,77,31), mode="DigitCounter", method="Default", keyword="", name="art_war_card")
+	# 兵道帖机密 
+	O_ART_WAR_CARD_PLUS = RuleOcr(roi=(914,24,100,35), area=(914,24,100,35), mode="Single", method="Default", keyword="", name="art_war_card_plus")
 
 
 
 

+ 4 - 1
tasks/HeroTest/config.py

@@ -18,7 +18,10 @@ class Layer(str, Enum):
 
 
 class HeroTestConfig(BaseModel):
 class HeroTestConfig(BaseModel):
     # 副本选择
     # 副本选择
-    layer: Layer = Field(default=Layer.YANWU, description="选择要打的关卡")
+    layer: Layer = Field(
+        default=Layer.YANWU,
+        description="选择要打的关卡,兵藏秘境默认不开经验加成。\n升级顺序八华斩->无畏 -> 暴击伤害 -> 默认祝福 -> 默认属性",
+    )
     # 限制时间
     # 限制时间
     limit_time: Time = Field(default=Time(minute=30), description="limit_time_help")
     limit_time: Time = Field(default=Time(minute=30), description="limit_time_help")
     # 限制次数
     # 限制次数

+ 133 - 55
tasks/HeroTest/script_task.py

@@ -15,9 +15,21 @@ from module.exception import TaskEnd
 
 
 class ScriptTask(GameUi, BaseActivity, HeroTestAssets):
 class ScriptTask(GameUi, BaseActivity, HeroTestAssets):
 
 
+    is_update = False
+    is_skill = False
+
     def run(self) -> None:
     def run(self) -> None:
 
 
         config = self.config.hero_test
         config = self.config.hero_test
+        global is_update
+        global is_skill
+        if config.herotest.layer.value == "鬼兵演武":
+            is_update = True
+            is_skill = False
+        if config.herotest.layer.value == "兵藏秘境":
+            is_skill = True
+            is_update = False
+
         self.limit_time: timedelta = config.herotest.limit_time
         self.limit_time: timedelta = config.herotest.limit_time
         if isinstance(self.limit_time, time):
         if isinstance(self.limit_time, time):
             self.limit_time = timedelta(
             self.limit_time = timedelta(
@@ -30,34 +42,42 @@ class ScriptTask(GameUi, BaseActivity, HeroTestAssets):
         self.ui_get_current_page()
         self.ui_get_current_page()
         self.ui_goto(page_main)
         self.ui_goto(page_main)
         self.home_main()
         self.home_main()
-
-        # # 2024-04-04 ---------------------start
-        # config.herotest.ap_mode = ApMode.AP_GAME
-        # # 2024-04-04 ---------------------end
-
         # 设定是否锁定阵容
         # 设定是否锁定阵容
-        if config.general_battle.lock_team_enable:
-            logger.info("Lock team")
-            while 1:
-                self.screenshot()
-                if self.appear_then_click(self.I_UNLOCK, interval=1):
-                    continue
-                if self.appear(self.I_LOCK):
-                    break
-        else:
-            logger.info("Unlock team")
-            while 1:
-                self.screenshot()
-                if self.appear_then_click(self.I_LOCK, interval=1):
-                    continue
-                if self.appear(self.I_UNLOCK):
-                    break
+        if is_update:
+            if config.general_battle.lock_team_enable:
+                logger.info("Lock team")
+                while 1:
+                    self.screenshot()
+                    if self.appear_then_click(self.I_UNLOCK, interval=1):
+                        continue
+                    if self.appear(self.I_LOCK):
+                        break
+            else:
+                logger.info("Unlock team")
+                while 1:
+                    self.screenshot()
+                    if self.appear_then_click(self.I_LOCK, interval=1):
+                        continue
+                    if self.appear(self.I_UNLOCK):
+                        break
+        elif is_skill:
+            if config.general_battle.lock_team_enable:
+                logger.info("Lock team")
+                while 1:
+                    self.screenshot()
+                    if self.appear_then_click(self.I_BCMJ_UNLOCK, interval=1):
+                        continue
+                    if self.appear(self.I_BCMJ_LOCK):
+                        break
+            else:
+                logger.info("Unlock team")
+                while 1:
+                    self.screenshot()
+                    if self.appear_then_click(self.I_BCMJ_LOCK, interval=1):
+                        continue
+                    if self.appear(self.I_BCMJ_UNLOCK):
+                        break
 
 
-        # 流程应该是 在页面处:
-        # 1. 判定计数是否超了,时间是否超了
-        # 2. 如果是消耗活动体力,判定活动体力是否足够 如果是消耗一般的体力,判定一般体力是否足够
-        # 3. 如果开启买体力,就买体力
-        # 4. 如果开启了切换到游戏体力,就切换
         while 1:
         while 1:
             # 1
             # 1
             if (
             if (
@@ -70,22 +90,32 @@ class ScriptTask(GameUi, BaseActivity, HeroTestAssets):
                 logger.info("Count out")
                 logger.info("Count out")
                 break
                 break
             # 2
             # 2
-            self.wait_until_appear(self.I_BATTLE)
+            if is_update:
+                self.wait_until_appear(self.I_BATTLE)
+            if is_skill:
+                self.wait_until_appear(self.I_BCMJ_BATTLE)
 
 
+            # 如果是兵藏秘境 看看是否有兵道帖
+            if is_skill:
+                if not self.check_art_war_card():
+                    logger.info("Art war card is enough")
+                    break
             # 点击战斗
             # 点击战斗
             logger.info("Click battle")
             logger.info("Click battle")
             while 1:
             while 1:
                 self.screenshot()
                 self.screenshot()
-                if self.appear_then_click(self.I_BATTLE, interval=2):
-                    self.device.stuck_record_clear()
-                    continue
-                if not self.appear(self.I_BATTLE):
-                    break
-
-                if self.appear_then_click(self.I_UI_CONFIRM_SAMLL, interval=1):
-                    continue
-                if self.appear_then_click(self.I_UI_CONFIRM, interval=1):
-                    continue
+                if is_update:
+                    if self.appear_then_click(self.I_BATTLE, interval=2):
+                        self.device.stuck_record_clear()
+                        continue
+                    if not self.appear(self.I_BATTLE):
+                        break
+                elif is_skill:
+                    if self.appear_then_click(self.I_BCMJ_BATTLE, interval=2):
+                        self.device.stuck_record_clear()
+                        continue
+                    if not self.appear(self.I_BCMJ_BATTLE):
+                        break
 
 
             if self.run_general_battle(config=config.general_battle):
             if self.run_general_battle(config=config.general_battle):
                 logger.info("General battle success")
                 logger.info("General battle success")
@@ -147,10 +177,36 @@ class ScriptTask(GameUi, BaseActivity, HeroTestAssets):
                 if not self.appear(self.I_FALSE, threshold=0.6):
                 if not self.appear(self.I_FALSE, threshold=0.6):
                     return False
                     return False
         # 最后保证能点击 获得奖励
         # 最后保证能点击 获得奖励
-        if not self.wait_until_appear(self.I_REWARD, wait_time=2):
+        if not self.wait_until_appear(self.I_REWARD, wait_time=2) and not is_skill:
             # 有些的战斗没有下面的奖励,所以直接返回
             # 有些的战斗没有下面的奖励,所以直接返回
             logger.info("There is no reward, Exit battle")
             logger.info("There is no reward, Exit battle")
             return win
             return win
+        else:
+            if self.wait_until_appear(self.I_BCMJ_SKILL_ADD_CONFIRM, wait_time=2):
+                while 1:
+                    self.screenshot()
+                    if self.appear_then_click(self.I_BCMJ_SKILL_ADD1, interval=1):
+                        logger.info("升级八华斩")
+                        break
+                    if self.appear_then_click(self.I_BCMJ_SKILL_ADD2, interval=1):
+                        logger.info("升级无畏")
+                        break
+                    if self.appear_then_click(
+                        self.I_BCMJ_PROPERTY_ADD_CRITICAL, interval=1
+                    ):
+                        logger.info("升级暴击伤害")
+                        break
+                    if self.appear_then_click(self.I_BCMJ_BLESS, interval=1):
+                        logger.info("默认升级祝福")
+                        break
+                    if self.appear_then_click(
+                        self.I_BCMJ__DEFALUT_ATTRIBUTE, interval=1
+                    ):
+                        logger.info("默认升级属性")
+                        break
+                if self.appear_then_click(self.I_BCMJ_SKILL_ADD_CONFIRM, interval=1):
+                    return win
+
         logger.info("Get reward")
         logger.info("Get reward")
         while 1:
         while 1:
             self.screenshot()
             self.screenshot()
@@ -169,30 +225,50 @@ class ScriptTask(GameUi, BaseActivity, HeroTestAssets):
 
 
         return win
         return win
 
 
+    def check_art_war_card(self):
+        self.screenshot()
+        cu, res, total = self.O_ART_WAR_CARD.ocr(image=self.device.image)
+        if cu >= 1:
+            logger.info("Art war card is enough")
+            return True
+        cu, res, total = self.O_ART_WAR_CARD_PLUS.ocr(image=self.device.image)
+        if cu >= 1:
+            logger.info("Art war card is not enough, but plus card is enough")
+            return True
+        return False
+
     def home_main(self) -> bool:
     def home_main(self) -> bool:
         """
         """
         从庭院到活动的爬塔界面
         从庭院到活动的爬塔界面
         :return:
         :return:
         """
         """
-        # 启动经验加成
-        self.open_buff()
-        self.exp_100(True)
-        self.exp_50(True)
-        self.close_buff()
         logger.hr("Enter HeroTest", 2)
         logger.hr("Enter HeroTest", 2)
+        global is_update
+        global is_skill
+        # 启动经验加成
+        if is_update:
+            self.open_buff()
+            self.exp_100(True)
+            self.exp_50(True)
+            self.close_buff()
         while 1:
         while 1:
             self.screenshot()
             self.screenshot()
-            if self.appear(self.I_BATTLE):
-                logger.info("发现了战斗按钮,进入活动界面成功")
-                break
-            # 2024-04-04 --------------start
+            if is_update:
+                if self.appear(self.I_BATTLE):
+                    break
+            if is_skill:
+                if self.appear(self.I_BCMJ_BATTLE):
+                    break
             if self.appear_then_click(self.I_ONE, interval=1):
             if self.appear_then_click(self.I_ONE, interval=1):
                 continue
                 continue
-            # 2024-04-04 --------------end
             if self.appear_then_click(self.I_TWO, interval=1):
             if self.appear_then_click(self.I_TWO, interval=1):
                 continue
                 continue
-            if self.appear_then_click(self.I_GBB, interval=1):
-                continue
+            if is_update:
+                if self.appear_then_click(self.I_GBB, interval=1):
+                    continue
+            if is_skill:
+                if self.appear_then_click(self.I_BCMJ, interval=1):
+                    continue
 
 
     def main_home(self) -> bool:
     def main_home(self) -> bool:
         """
         """
@@ -200,14 +276,16 @@ class ScriptTask(GameUi, BaseActivity, HeroTestAssets):
         :return:
         :return:
         """
         """
         logger.hr("Exit HeroTest", 2)
         logger.hr("Exit HeroTest", 2)
+        global is_update
         while 1:
         while 1:
             self.screenshot()
             self.screenshot()
             if self.appear(self.I_ONE):
             if self.appear(self.I_ONE):
-                # 关闭经验加成
-                self.open_buff()
-                self.exp_100(False)
-                self.exp_50(False)
-                self.close_buff()
+                if is_update:
+                    # 关闭经验加成
+                    self.open_buff()
+                    self.exp_100(False)
+                    self.exp_50(False)
+                    self.close_buff()
                 break
                 break
             if self.appear_then_click(self.I_UI_BACK_RED, interval=2):
             if self.appear_then_click(self.I_UI_BACK_RED, interval=2):
                 continue
                 continue