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

Merge pull request #513 from yEs1do/feat(AreaBoss_Floor)

地鬼悬赏可设置一星、十星与不变
huangrunheng 2 лет назад
Родитель
Сommit
fd09bf3278

+ 4 - 0
tasks/AreaBoss/assets.py

@@ -52,6 +52,8 @@ class AreaBossAssets:
 	S_AB_FILTER_DOWN = RuleSwipe(roi_front=(1130,230,10,10), roi_back=(920,680,10,10), mode="default", name="ab_filter_down")
 	# 极地鬼 层数列表 手指向下滑动  
 	S_AB_FLOOR_DOWN = RuleSwipe(roi_front=(390,260,10,10), roi_back=(450,500,10,10), mode="default", name="ab_floor_down")
+	# 极地鬼 层数列表 手指向上滑动  
+	S_AB_FLOOR_UP = RuleSwipe(roi_front=(450,500,10,10), roi_back=(390,260,10,10), mode="default", name="ab_floor_up")
 	# 普通地鬼 等级滑轨 手指向右滑动  
 	S_AB_LEVEL_RIGHT = RuleSwipe(roi_front=(0,0,10,10), roi_back=(570,270,10,10), mode="default", name="ab_level_right")
 
@@ -97,6 +99,8 @@ class AreaBossAssets:
 	I_AB_JI_FLOOR_LIST_CHECK = RuleImage(roi_front=(390,150,60,290), roi_back=(390,150,60,290), threshold=0.8, method="Template matching", file="./tasks/AreaBoss/res/ab_ji_floor_list_check.png")
 	# 极地鬼 一层 
 	I_AB_JI_FLOOR_ONE = RuleImage(roi_front=(390,150,60,290), roi_back=(390,150,60,290), threshold=0.8, method="Template matching", file="./tasks/AreaBoss/res/ab_ji_floor_one.png")
+	# 极地鬼 十层 
+	I_AB_JI_FLOOR_TEN = RuleImage(roi_front=(390,150,60,290), roi_back=(390,150,60,290), threshold=0.8, method="Template matching", file="./tasks/AreaBoss/res/ab_ji_floor_ten.png")
 	# 小组内未取得名次 
 	I_AB_GROUP_RANK_NONE = RuleImage(roi_front=(890,415,95,85), roi_back=(890,415,95,85), threshold=0.8, method="Template matching", file="./tasks/AreaBoss/res/ab_rank_none.png")
 

+ 6 - 0
tasks/AreaBoss/config_boss.py

@@ -5,6 +5,10 @@ from enum import Enum
 from datetime import datetime, time
 from pydantic import BaseModel, ValidationError, validator, Field
 
+class AreaBossFloor(str, Enum):
+    ONE = '一星'
+    TEN = '十星'
+    DEFAULT = '不更改'
 
 class Boss(BaseModel):
     boss_number: int = Field(title='Boss Number',
@@ -14,5 +18,7 @@ class Boss(BaseModel):
                              ge=1, le=3)
     # 是否查找当日悬赏鬼王
     boss_reward: bool = Field(default=False, description='boss_reward_help')
+    # 悬赏默认打较简单的一星鬼王,若想要更高悬赏奖励可自行更改为十星或不更改(保留已勾选DEBUFF)
+    reward_floor: AreaBossFloor = Field(default=AreaBossFloor.ONE, description='reward_floor_help')
     # 是否使用收藏的
     use_collect: bool = Field(default=False, description='use_collect_help')

BIN
tasks/AreaBoss/res/ab_ji_floor_ten.png


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

@@ -179,6 +179,15 @@
     "threshold": 0.8,
     "description": "极地鬼 一层"
   },
+  {
+    "itemName": "ab_ji_floor_ten",
+    "imageName": "ab_ji_floor_ten.png",
+    "roiFront": "390,150,60,290",
+    "roiBack": "390,150,60,290",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "极地鬼 十层"
+  },
   {
     "itemName": "ab_group_rank_none",
     "imageName": "ab_rank_none.png",

+ 27 - 6
tasks/AreaBoss/script_task.py

@@ -12,7 +12,7 @@ from tasks.GameUi.game_ui import GameUi
 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 tasks.AreaBoss.config_boss import AreaBossFloor
 from module.logger import logger
 from module.exception import TaskEnd
 from module.atom.image import RuleImage
@@ -45,7 +45,7 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
         self.ui_goto(page_area_boss)
 
         self.open_filter()
-        # 以挑战鬼王数量
+        # 已挑战鬼王数量
         boss_fought = 0
         if con.boss_reward:
             self.fight_reward_boss()
@@ -77,7 +77,7 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
 
     def go_back(self) -> None:
         """
-        返回, 要求这个时候是出现在  地狱鬼王的主界面
+        返回, 要求这个时候是出现在地域鬼王的主界面
         :return:
         """
         # 点击返回
@@ -120,7 +120,7 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
             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("地域鬼王第2只战斗失败")
         # 红色关闭
         logger.info("Script close red")
         self.wait_until_appear(self.I_AB_CLOSE_RED)
@@ -138,6 +138,7 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
                     False       挑战失败
         @rtype:
         """
+        reward_floor = self.config.area_boss.boss.reward_floor
         if not self.appear(self.I_AB_FILTER_OPENED):
             self.open_filter()
 
@@ -162,8 +163,11 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
                         return False
                 # 切换到 极地鬼
                 self.switch_difficulty(True)
-
-            self.switch_to_floor_1()
+            # 调整悬赏层数
+            match reward_floor:
+                case AreaBossFloor.ONE: self.switch_to_floor_1()
+                case AreaBossFloor.TEN: self.switch_to_floor_10()
+                case AreaBossFloor.DEFAULT: logger.info("Not change floor")
         result = True
         if not self.start_fight():
             result = False
@@ -230,11 +234,28 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
             self.screenshot()
             if self.appear(self.I_AB_JI_FLOOR_ONE):
                 self.click(self.I_AB_JI_FLOOR_ONE)
+                logger.info("switch to floor 1")
                 break
             self.swipe(self.S_AB_FLOOR_DOWN, interval=1)
             # 等待滑动动画
             self.wait_until_appear(self.I_AB_JI_FLOOR_ONE, False, 1)
 
+    def switch_to_floor_10(self):
+        """
+            更改层数为十层
+        """
+        # 打开选择列表
+        self.ui_click(self.C_AB_JI_FLOOR_SELECTED, self.I_AB_JI_FLOOR_LIST_CHECK, interval=3)
+        while 1:
+            self.screenshot()
+            if self.appear(self.I_AB_JI_FLOOR_TEN):
+                self.click(self.I_AB_JI_FLOOR_TEN)
+                logger.info("switch to floor 10")
+                break
+            self.swipe(self.S_AB_FLOOR_UP, interval=1)
+            # 等待滑动动画
+            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()

+ 7 - 0
tasks/AreaBoss/swipe.json

@@ -20,6 +20,13 @@
     "mode": "default",
     "description": "极地鬼 层数列表 手指向下滑动 "
   },
+  {
+    "itemName": "ab_floor_up",
+    "roiFront": "450,500,10,10",
+    "roiBack": "390,260,10,10",
+    "mode": "default",
+    "description": "极地鬼 层数列表 手指向上滑动 "
+  },
   {
     "itemName": "ab_level_right",
     "roiFront": "0,0,10,10",