Просмотр исходного кода

feat(AreaBoss): Dynamically determine challenge count from reputation OCR

neptine 3 месяцев назад
Родитель
Сommit
4fd619de80

+ 2 - 0
tasks/AreaBoss/assets.py

@@ -116,5 +116,7 @@ class AreaBossAssets:
 	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")
+	# 声望值 
+	O_AB_REPUTATION = RuleOcr(roi=(1180,61,82,32), area=(1180,61,82,32), mode="Digit", method="Default", keyword="", name="ab_reputation")
 
 

+ 5 - 5
tasks/AreaBoss/config_boss.py

@@ -13,11 +13,11 @@ class AreaBossFloor(str, Enum):
     NORMAL_LV60 = '普通-60级'
 
 class Boss(BaseModel):
-    boss_number: int = Field(title='Boss Number',
-                             default=3,
-                             description='默认为3 可选[1-3], 当你设置为三时默认你拥有全部的挑战资格,会挑战热门的前三个,\n'
-                                         '如果不是请将你可以挑战的boss进行收藏',
-                             ge=1, le=3)
+    # boss_number: int = Field(title='Boss Number',
+    #                          default=3,
+    #                          description='默认为3 可选[1-3], 当你设置为三时默认你拥有全部的挑战资格,会挑战热门的前三个,\n'
+    #                                      '如果不是请将你可以挑战的boss进行收藏',
+    #                          ge=1, le=3)
     # 是否查找当日悬赏鬼王
     boss_reward: bool = Field(default=False, description='boss_reward_help')
     # 悬赏默认打较简单的一星鬼王,若想要更高悬赏奖励可自行更改为十星或不更改(保留已勾选DEBUFF)

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

@@ -52,5 +52,14 @@
     "method": "Default",
     "keyword": "",
     "description": "地鬼名字"
+  },
+  {
+    "itemName": "ab_reputation",
+    "roiFront": "1180,61,82,32",
+    "roiBack": "1180,61,82,32",
+    "mode": "Digit",
+    "method": "Default",
+    "keyword": "",
+    "description": "声望值"
   }
 ]

+ 22 - 3
tasks/AreaBoss/script_task.py

@@ -23,6 +23,22 @@ from typing import List
 
 class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
 
+    def _get_dynamic_boss_count(self) -> int:
+        """
+        从地域鬼王主界面 OCR 声望值,动态决定可挑战次数
+        < 2000 → 1次, 2000~5999 → 2次, ≥ 6000 → 3次
+        :return: 可挑战鬼王数量 (1/2/3)
+        """
+        self.screenshot()
+        rep = self.O_AB_REPUTATION.ocr_digit(self.device.image)
+        logger.info(f"Area boss reputation: {rep}")
+        if rep >= 10000:
+            return 3
+        elif rep >= 2000:
+            return 2
+        else:
+            return 1
+
     def run(self) -> bool:
         """
         运行脚本
@@ -59,14 +75,17 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
         else:
             self.switch_to_famous()
 
-        if con.boss_number - boss_fought == 3:
+        # 动态获取可挑战次数
+        dynamic_count = self._get_dynamic_boss_count()
+        available = dynamic_count - boss_fought
+        if available >= 3:
             self.boss_fight(self.I_BATTLE_1)
             self.boss_fight(self.I_BATTLE_2)
             self.boss_fight(self.I_BATTLE_3)
-        elif con.boss_number - boss_fought == 2:
+        elif available == 2:
             self.boss_fight(self.I_BATTLE_1)
             self.boss_fight(self.I_BATTLE_2)
-        elif con.boss_number - boss_fought == 1:
+        elif available == 1:
             self.boss_fight(self.I_BATTLE_1)
         # 退出
         self.go_back()