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

refactor(AreaBoss): Simplify config by merging Attack_60 into reward_floor enum #1705

neptine 3 месяцев назад
Родитель
Сommit
730fc5e8e9
3 измененных файлов с 52 добавлено и 37 удалено
  1. 2 3
      config/template.json
  2. 4 5
      tasks/AreaBoss/config_boss.py
  3. 46 29
      tasks/AreaBoss/script_task.py

+ 2 - 3
config/template.json

@@ -100,9 +100,8 @@
     "boss": {
       "boss_number": 3,
       "boss_reward": false,
-      "reward_floor": "一星",
-      "use_collect": false,
-      "Attack_60": false
+      "reward_floor": "不更改",
+      "use_collect": false
     },
     "general_battle": {
       "lock_team_enable": false,

+ 4 - 5
tasks/AreaBoss/config_boss.py

@@ -6,9 +6,11 @@ from datetime import datetime, time
 from pydantic import BaseModel, ValidationError, validator, Field
 
 class AreaBossFloor(str, Enum):
+    DEFAULT = '不更改'
     ONE = '一星'
     TEN = '十星'
-    DEFAULT = '不更改'
+    NORMAL_LV1 = '普通-1级'
+    NORMAL_LV60 = '普通-60级'
 
 class Boss(BaseModel):
     boss_number: int = Field(title='Boss Number',
@@ -19,9 +21,6 @@ class Boss(BaseModel):
     # 是否查找当日悬赏鬼王
     boss_reward: bool = Field(default=False, description='boss_reward_help')
     # 悬赏默认打较简单的一星鬼王,若想要更高悬赏奖励可自行更改为十星或不更改(保留已勾选DEBUFF)
-    reward_floor: AreaBossFloor = Field(default=AreaBossFloor.ONE, description='reward_floor_help')
+    reward_floor: AreaBossFloor = Field(default=AreaBossFloor.DEFAULT, description='reward_floor_help')
     # 是否使用收藏的
     use_collect: bool = Field(default=False, description='use_collect_help')
-
-    # 没有开启极是否拉到60级进行攻打
-    Attack_60: bool = Field(default=False, description='没有开启极是否拉到60级进行攻打')

+ 46 - 29
tasks/AreaBoss/script_task.py

@@ -60,14 +60,14 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
             self.switch_to_famous()
 
         if con.boss_number - boss_fought == 3:
-            self.boss_fight(self.I_BATTLE_1, ultra=True)
-            self.boss_fight(self.I_BATTLE_2, ultra=True)
-            self.boss_fight(self.I_BATTLE_3, ultra=True)
+            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:
-            self.boss_fight(self.I_BATTLE_1, ultra=True)
-            self.boss_fight(self.I_BATTLE_2, ultra=True)
+            self.boss_fight(self.I_BATTLE_1)
+            self.boss_fight(self.I_BATTLE_2)
         elif con.boss_number - boss_fought == 1:
-            self.boss_fight(self.I_BATTLE_1, ultra=True)
+            self.boss_fight(self.I_BATTLE_1)
         # 退出
         self.go_back()
         self.set_next_run(task='AreaBoss', success=True, finish=False)
@@ -126,14 +126,12 @@ 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, fileter_open: bool = True) -> bool:
+    def boss_fight(self, battle: RuleImage, fileter_open: bool = True) -> bool:
         """
             完成挑战一个鬼王的全流程
             从打开筛选界面开始 到关闭鬼王详情界面结束
         @param battle: 挑战按钮,鬼王头像也可,只要点击能进入详情界面
         @type battle:
-        @param ultra: 是否需要切换到极地鬼
-        @type ultra:
         @return:    True        挑战成功
                     False       挑战失败
         @rtype:
@@ -146,22 +144,29 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
             return False
 
         # 如果已经打过该BOSS,直接跳过不打了
-        if self.is_group_ranked():
-            logger.warning("There is no boss could be challenged")
-            self.ui_click_until_disappear(self.I_AB_CLOSE_RED, interval=3)
-            return True
-
-        # 设置极模式
-        if ultra and self.setup_ultra():
-            pass
-        # 普通模式下的60级
-        elif self.config.area_boss.boss.Attack_60:
+        # if self.is_group_ranked():
+        #     logger.warning("There is no boss could be challenged")
+        #     self.ui_click_until_disappear(self.I_AB_CLOSE_RED, interval=3)
+        #     return True
+
+        # 根据 reward_floor 决定模式
+        if reward_floor in (AreaBossFloor.ONE, AreaBossFloor.TEN):
+            # 极模式分支
+            if self.setup_ultra(reward_floor):
+                pass
+        elif reward_floor == AreaBossFloor.NORMAL_LV60:
+            # 普通模式-拉到60级
+            self.setup_normal()
             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
+        elif reward_floor == AreaBossFloor.NORMAL_LV1:
+            # 普通模式-保持1级
+            self.setup_normal()
+        # DEFAULT: 不更改,直接打
 
         result = True
         if not self.start_fight():
@@ -169,7 +174,7 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
             logger.warning("Area Boss Fight Failed ")
         self.wait_until_appear(self.I_AB_CLOSE_RED)
         self.ui_click_until_disappear(self.I_AB_CLOSE_RED, interval=1)
-        return result
+        # return result
 
     def start_fight(self) -> bool:
         while 1:
@@ -181,7 +186,7 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
 
         return self.run_general_battle(self.config.area_boss.general_battle)
 
-    def setup_ultra(self) -> bool:
+    def setup_ultra(self, floor: AreaBossFloor = AreaBossFloor.ONE) -> bool:
         # 确定进入鬼王界面
         self.wait_until_appear(self.I_AB_CLOSE_RED)
         # 尝试切换
@@ -192,15 +197,27 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
             else:
                 logger.warning("Cannot switch difficulty")
                 return False
-        # 调整悬赏层数
-        reward_floor = self.config.area_boss.boss.reward_floor
-        match reward_floor:
+        # 调整极地鬼层数
+        match 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")
+        return True
+
+    def setup_normal(self) -> bool:
+        """
+        确保当前为普通地鬼模式
+        :return: True 成功(已处于普通模式),False 失败
+        """
+        self.wait_until_appear(self.I_AB_CLOSE_RED)
+        if self.get_difficulty():
+            # 当前是极地鬼,需要切回普通
+            if self.appear(self.I_AB_DIFFICULTY_JI):
+                self.switch_difficulty(False)
+            else:
+                logger.warning("Cannot switch to normal difficulty")
+                return False
         return True
 
     def switch_to_level_60(self):
@@ -280,7 +297,7 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
             return False
         # 不需要打开筛选界面说明直接找到了目标boss, 直接挑战
         if not need_open_filter:
-            return self.boss_fight(photo, True, fileter_open=False)
+            return self.boss_fight(photo, fileter_open=False)
         # 滑动到最顶层
         logger.info("Swipe to top")
         for i in range(random.randint(1, 3)):
@@ -290,7 +307,7 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
             self.open_filter()
             name = self.get_bossName(PHOTO)
             if self.check_common_chars(str(name), boss_name):
-                return self.boss_fight(PHOTO, True, fileter_open=False)
+                return self.boss_fight(PHOTO, fileter_open=False)
             self.ui_click_until_disappear(self.I_AB_CLOSE_RED)
         # 倒数一和二
         for i in range(random.randint(1, 3)):
@@ -299,7 +316,7 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
             self.open_filter()
             name = self.get_bossName(PHOTO)
             if self.check_common_chars(str(name), boss_name):
-                return self.boss_fight(PHOTO, True, fileter_open=False)
+                return self.boss_fight(PHOTO, fileter_open=False)
             self.ui_click_until_disappear(self.I_AB_CLOSE_RED)
         self.ui_click_until_disappear(self.I_AB_CLOSE_RED)