Selaa lähdekoodia

perf[AreaBoss]: 地鬼悬赏更改检测逻辑 添加是否开启极选项

GanSer 1 vuosi sitten
vanhempi
sitoutus
2ef48a82f0

+ 2 - 0
tasks/AreaBoss/assets.py

@@ -114,5 +114,7 @@ class AreaBossAssets:
 	O_AB_COLLECTING = RuleOcr(roi=(1190,580,50,120), area=(1190,580,50,120), mode="Single", method="Default", keyword="收藏", name="ab_collecting")
 	# 挑战人数 
 	O_AB_NUM_OF_CHALLENGE = RuleOcr(roi=(270,630,150,36), area=(270,630,150,36), mode="Digit", method="Default", keyword="", name="ab_num_of_challenge")
+	# 地鬼名字 
+	O_AB_BOSS_NAME = RuleOcr(roi=(114,36,248,69), area=(114,36,248,69), mode="Full", method="Default", keyword="", name="ab_boss_name")
 
 

+ 3 - 0
tasks/AreaBoss/config_boss.py

@@ -22,3 +22,6 @@ class Boss(BaseModel):
     reward_floor: AreaBossFloor = Field(default=AreaBossFloor.ONE, description='reward_floor_help')
     # 是否使用收藏的
     use_collect: bool = Field(default=False, description='use_collect_help')
+
+    # 没有开启极是否拉到60级进行攻打
+    Attack_60: bool = Field(default=False, description='没有开启极是否拉到60级进行攻打')

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

@@ -43,5 +43,14 @@
     "method": "Default",
     "keyword": "",
     "description": "挑战人数"
+  },
+  {
+    "itemName": "ab_boss_name",
+    "roiFront": "114,36,248,69",
+    "roiBack": "114,36,248,69",
+    "mode": "Full",
+    "method": "Default",
+    "keyword": "",
+    "description": "地鬼名字"
   }
 ]

+ 108 - 29
tasks/AreaBoss/script_task.py

@@ -6,6 +6,7 @@ import time
 import cv2
 import numpy as np
 import random
+import re
 from tasks.base_task import BaseTask
 from tasks.Component.GeneralBattle.general_battle import GeneralBattle
 from tasks.GameUi.game_ui import GameUi
@@ -48,8 +49,8 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
         # 已挑战鬼王数量
         boss_fought = 0
         if con.boss_reward:
-            self.fight_reward_boss()
-            boss_fought += 1
+            if self.fight_reward_boss(): #挑战成功则加一
+                boss_fought += 1
 
         self.open_filter()
         # 切换到对应集合(热门/收藏)
@@ -67,7 +68,6 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
             self.boss_fight(self.I_BATTLE_2)
         elif con.boss_number - boss_fought == 1:
             self.boss_fight(self.I_BATTLE_1)
-
         # 退出
         self.go_back()
         self.set_next_run(task='AreaBoss', success=True, finish=False)
@@ -126,7 +126,7 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
         self.wait_until_appear(self.I_AB_CLOSE_RED)
         self.ui_click(self.I_AB_CLOSE_RED, self.I_FILTER)
 
-    def boss_fight(self, battle: RuleImage, ultra: bool = False) -> bool:
+    def boss_fight(self, battle: RuleImage, ultra: bool = False, fileter_open: bool = True) -> bool:
         """
             完成挑战一个鬼王的全流程
             从打开筛选界面开始 到关闭鬼王详情界面结束
@@ -139,9 +139,8 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
         @rtype:
         """
         reward_floor = self.config.area_boss.boss.reward_floor
-        if not self.appear(self.I_AB_FILTER_OPENED):
+        if fileter_open and not self.appear(self.I_AB_FILTER_OPENED):
             self.open_filter()
-
         # 如果打不开鬼王详情界面,直接退出
         if not self.open_boss_detail(battle, 3):
             return False
@@ -154,15 +153,19 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
         if ultra:
             if not self.get_difficulty():
                 # 判断是否能切换到极地鬼
-                if not self.appear(self.I_AB_DIFFICULTY_NORMAL):
+                if not self.appear(self.I_AB_DIFFICULTY_NORMAL) and self.config.area_boss.boss.Attack_60:
                     self.switch_to_level_60()
                     if not self.start_fight():
                         logger.warning("you are so weakness!")
                         self.wait_until_appear(self.I_AB_CLOSE_RED)
                         self.ui_click_until_disappear(self.I_AB_CLOSE_RED, interval=3)
                         return False
+                else:
+                    self.ui_click_until_disappear(self.I_AB_CLOSE_RED, interval=3)
+                    return False
                 # 切换到 极地鬼
-                self.switch_difficulty(True)
+            self.switch_difficulty(True)
+
             # 调整悬赏层数
             match reward_floor:
                 case AreaBossFloor.ONE: self.switch_to_floor_1()
@@ -185,7 +188,7 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
                 break
 
         return self.run_general_battle(self.config.area_boss.general_battle)
-
+    
     def switch_to_level_60(self):
         while 1:
             self.screenshot()
@@ -255,27 +258,36 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
             self.wait_until_appear(self.I_AB_JI_FLOOR_TEN, False, 1)
 
     def fight_reward_boss(self):
-        index = self.get_hot_in_reward()
-        self.open_filter()
-        # 滑动到最顶层
-        if index < 3:
+        BOSS_REWARD_PHOTO1 = [self.C_AB_BOSS_REWARD_PHOTO_1, self.C_AB_BOSS_REWARD_PHOTO_2, self.C_AB_BOSS_REWARD_PHOTO_3]
+        BOSS_REWARD_PHOTO2 = [self.C_AB_BOSS_REWARD_PHOTO_MINUS_2, self.C_AB_BOSS_REWARD_PHOTO_MINUS_1]
+        filter_statue, bossName = self.get_hot_in_reward() # 获取挑战人数最多的Boss的名字
+        if bossName == "direct_attack":
+            return self.boss_fight(self.I_BATTLE_1, True, fileter_open=False)
+        else:
+            if not filter_statue:
+                self.open_filter()
+            # 滑动到最顶层
             logger.info("Swipe to top")
             for i in range(random.randint(1, 3)):
                 self.swipe(self.S_AB_FILTER_DOWN)
-        #
-        if index == 0:
-            return self.boss_fight(self.C_AB_BOSS_REWARD_PHOTO_1, True)
-        elif index == 1:
-            return self.boss_fight(self.C_AB_BOSS_REWARD_PHOTO_2, True)
-        elif index == 2:
-            return self.boss_fight(self.C_AB_BOSS_REWARD_PHOTO_3, True)
-        # 保证滑动到最底部
-        for i in range(random.randint(1, 3)):
-            self.swipe(self.S_AB_FILTER_UP)
-        if index == 3:
-            return self.boss_fight(self.C_AB_BOSS_REWARD_PHOTO_MINUS_2, True)
-        elif index == 4:
-            return self.boss_fight(self.C_AB_BOSS_REWARD_PHOTO_MINUS_1, True)
+
+            for PHOTO in BOSS_REWARD_PHOTO1:
+                name = self.get_bossName(PHOTO)
+                if self.check_common_chars(str(name), bossName):
+                    return self.boss_fight(PHOTO, True, fileter_open=False)
+                else:
+                    self.ui_click_until_disappear(self.I_AB_CLOSE_RED)
+                    self.open_filter()
+            # 倒数一和二
+            for i in range(random.randint(1, 3)):
+                self.swipe(self.S_AB_FILTER_UP)
+            for PHOTO in BOSS_REWARD_PHOTO2:
+                name = self.get_bossName(PHOTO)
+                if self.check_common_chars(str(name), bossName):
+                    return self.boss_fight(PHOTO, True, fileter_open=False)
+                else:
+                    self.ui_click_until_disappear(self.I_AB_CLOSE_RED)
+                    self.open_filter()
 
     def get_hot_in_reward(self):
         """
@@ -285,17 +297,41 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
         """
         self.switch_to_reward()
         lst = []
+        boosName = []
+        filter_open_flag = False
         num = self.get_num_challenge(self.C_AB_BOSS_REWARD_PHOTO_1)
+        #如果num为0则不在进行nameOcr
+        if num:
+            if num > 12000:
+                return filter_open_flag, str("direct_attack")
+            name = self.get_bossName(self.C_AB_BOSS_REWARD_PHOTO_1)
+        else:
+            name = "声望不够"
         lst.append(num)
+        boosName.append(name)
         self.ui_click_until_disappear(self.I_AB_CLOSE_RED)
         #
         self.open_filter()
         num = self.get_num_challenge(self.C_AB_BOSS_REWARD_PHOTO_2)
+        if num:
+            if num > 12000:
+                return filter_open_flag, str("direct_attack")
+            name = self.get_bossName(self.C_AB_BOSS_REWARD_PHOTO_1)
+        else:
+            name = "声望不够"
+        boosName.append(name)
         lst.append(num)
         self.ui_click_until_disappear(self.I_AB_CLOSE_RED)
         #
         self.open_filter()
         num = self.get_num_challenge(self.C_AB_BOSS_REWARD_PHOTO_3)
+        if num:
+            if num > 12000:
+                return filter_open_flag, str("direct_attack")
+            name = self.get_bossName(self.C_AB_BOSS_REWARD_PHOTO_1)
+        else:
+            name = "声望不够"
+        boosName.append(name)
         lst.append(num)
         self.ui_click_until_disappear(self.I_AB_CLOSE_RED)
         #
@@ -304,6 +340,13 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
             self.swipe(self.S_AB_FILTER_UP)
         self.wait_until_appear(self.C_AB_BOSS_REWARD_PHOTO_MINUS_2, wait_time=1)
         num = self.get_num_challenge(self.C_AB_BOSS_REWARD_PHOTO_MINUS_2)
+        if num:
+            if num > 12000:
+                return filter_open_flag, str("direct_attack")
+            name = self.get_bossName(self.C_AB_BOSS_REWARD_PHOTO_1)
+        else:
+            name = "声望不够"
+        boosName.append(name)
         lst.append(num)
         self.ui_click_until_disappear(self.I_AB_CLOSE_RED)
         #
@@ -312,16 +355,25 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
             self.swipe(self.S_AB_FILTER_UP)
         self.wait_until_appear(self.C_AB_BOSS_REWARD_PHOTO_MINUS_1, wait_time=1)
         num = self.get_num_challenge(self.C_AB_BOSS_REWARD_PHOTO_MINUS_1)
+        if num:
+            if num > 12000:
+                return filter_open_flag, str("direct_attack")
+            name = self.get_bossName(self.C_AB_BOSS_REWARD_PHOTO_1)
+        else:
+            name = "声望不够"
+            filter_open_flag = True
+        boosName.append(name)
         lst.append(num)
         self.ui_click_until_disappear(self.I_AB_CLOSE_RED)
 
+
         index = 0
         num = 0
         for idx, val in enumerate(lst):
             if val > num:
                 index = idx
                 num = val
-        return index
+        return filter_open_flag, boosName[index]
 
     def get_num_challenge(self, click_area):
         """
@@ -337,6 +389,22 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
             return 0
         return self.O_AB_NUM_OF_CHALLENGE.ocr_digit(self.device.image)
 
+    def get_bossName(self, click_area):
+        """
+            获取鬼王名字
+        @param click_area: 鬼王相应的挑战按钮
+        @type click_area:
+        @return:
+        @rtype:
+        """
+        # 如果鬼王不可挑战(未解锁),限制3次尝试打开鬼王详情界面
+        if not self.open_boss_detail(click_area, 3):
+            logger.info("%s unavailable", str(click_area))
+            return 0
+        ocrName = self.O_AB_BOSS_NAME.detect_and_ocr(self.device.image)
+        bossName = re.sub(r"[\'\[\]]", "", str([result.ocr_text for result in ocrName]))
+        return bossName
+
     def open_boss_detail(self, battle: RuleImage, try_num: int = 3) -> bool:
         """
             打开鬼王详情界面
@@ -399,12 +467,23 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
                 self.click(self.C_AB_REWARD_BTN, 1.5)
                 continue
 
+    def check_common_chars(self, bossName, name):
+        # 将两个字符串转为集合,去除重复的字符
+        set_boss = set(bossName)
+        set_name = set(name)
+
+        # 计算交集,判断交集的元素个数
+        common_chars = set_boss & set_name  # & 是集合的交集运算符
 
+        if len(common_chars) >= 2:
+            return 1
+        else:
+            return 0  # 如果交集的字符少于2个,可以根据需要返回其他值
 if __name__ == '__main__':
     from module.config.config import Config
     from module.device.device import Device
 
-    c = Config('oas1')
+    c = Config('日常1')
     d = Device(c)
     t = ScriptTask(c, d)
     # time.sleep(3)