|
@@ -60,14 +60,14 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
|
|
|
self.switch_to_famous()
|
|
self.switch_to_famous()
|
|
|
|
|
|
|
|
if con.boss_number - boss_fought == 3:
|
|
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:
|
|
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:
|
|
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.go_back()
|
|
|
self.set_next_run(task='AreaBoss', success=True, finish=False)
|
|
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.wait_until_appear(self.I_AB_CLOSE_RED)
|
|
|
self.ui_click(self.I_AB_CLOSE_RED, self.I_FILTER)
|
|
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: 挑战按钮,鬼王头像也可,只要点击能进入详情界面
|
|
@param battle: 挑战按钮,鬼王头像也可,只要点击能进入详情界面
|
|
|
@type battle:
|
|
@type battle:
|
|
|
- @param ultra: 是否需要切换到极地鬼
|
|
|
|
|
- @type ultra:
|
|
|
|
|
@return: True 挑战成功
|
|
@return: True 挑战成功
|
|
|
False 挑战失败
|
|
False 挑战失败
|
|
|
@rtype:
|
|
@rtype:
|
|
@@ -146,22 +144,29 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
|
|
|
return False
|
|
return False
|
|
|
|
|
|
|
|
# 如果已经打过该BOSS,直接跳过不打了
|
|
# 如果已经打过该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()
|
|
self.switch_to_level_60()
|
|
|
if not self.start_fight():
|
|
if not self.start_fight():
|
|
|
logger.warning("you are so weakness!")
|
|
logger.warning("you are so weakness!")
|
|
|
self.wait_until_appear(self.I_AB_CLOSE_RED)
|
|
self.wait_until_appear(self.I_AB_CLOSE_RED)
|
|
|
self.ui_click_until_disappear(self.I_AB_CLOSE_RED, interval=3)
|
|
self.ui_click_until_disappear(self.I_AB_CLOSE_RED, interval=3)
|
|
|
return False
|
|
return False
|
|
|
|
|
+ elif reward_floor == AreaBossFloor.NORMAL_LV1:
|
|
|
|
|
+ # 普通模式-保持1级
|
|
|
|
|
+ self.setup_normal()
|
|
|
|
|
+ # DEFAULT: 不更改,直接打
|
|
|
|
|
|
|
|
result = True
|
|
result = True
|
|
|
if not self.start_fight():
|
|
if not self.start_fight():
|
|
@@ -169,7 +174,7 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
|
|
|
logger.warning("Area Boss Fight Failed ")
|
|
logger.warning("Area Boss Fight Failed ")
|
|
|
self.wait_until_appear(self.I_AB_CLOSE_RED)
|
|
self.wait_until_appear(self.I_AB_CLOSE_RED)
|
|
|
self.ui_click_until_disappear(self.I_AB_CLOSE_RED, interval=1)
|
|
self.ui_click_until_disappear(self.I_AB_CLOSE_RED, interval=1)
|
|
|
- return result
|
|
|
|
|
|
|
+ # return result
|
|
|
|
|
|
|
|
def start_fight(self) -> bool:
|
|
def start_fight(self) -> bool:
|
|
|
while 1:
|
|
while 1:
|
|
@@ -181,7 +186,7 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
|
|
|
|
|
|
|
|
return self.run_general_battle(self.config.area_boss.general_battle)
|
|
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)
|
|
self.wait_until_appear(self.I_AB_CLOSE_RED)
|
|
|
# 尝试切换
|
|
# 尝试切换
|
|
@@ -192,15 +197,27 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
|
|
|
else:
|
|
else:
|
|
|
logger.warning("Cannot switch difficulty")
|
|
logger.warning("Cannot switch difficulty")
|
|
|
return False
|
|
return False
|
|
|
- # 调整悬赏层数
|
|
|
|
|
- reward_floor = self.config.area_boss.boss.reward_floor
|
|
|
|
|
- match reward_floor:
|
|
|
|
|
|
|
+ # 调整极地鬼层数
|
|
|
|
|
+ match floor:
|
|
|
case AreaBossFloor.ONE:
|
|
case AreaBossFloor.ONE:
|
|
|
self.switch_to_floor_1()
|
|
self.switch_to_floor_1()
|
|
|
case AreaBossFloor.TEN:
|
|
case AreaBossFloor.TEN:
|
|
|
self.switch_to_floor_10()
|
|
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
|
|
return True
|
|
|
|
|
|
|
|
def switch_to_level_60(self):
|
|
def switch_to_level_60(self):
|
|
@@ -280,7 +297,7 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
|
|
|
return False
|
|
return False
|
|
|
# 不需要打开筛选界面说明直接找到了目标boss, 直接挑战
|
|
# 不需要打开筛选界面说明直接找到了目标boss, 直接挑战
|
|
|
if not need_open_filter:
|
|
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")
|
|
logger.info("Swipe to top")
|
|
|
for i in range(random.randint(1, 3)):
|
|
for i in range(random.randint(1, 3)):
|
|
@@ -290,7 +307,7 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
|
|
|
self.open_filter()
|
|
self.open_filter()
|
|
|
name = self.get_bossName(PHOTO)
|
|
name = self.get_bossName(PHOTO)
|
|
|
if self.check_common_chars(str(name), boss_name):
|
|
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)
|
|
|
# 倒数一和二
|
|
# 倒数一和二
|
|
|
for i in range(random.randint(1, 3)):
|
|
for i in range(random.randint(1, 3)):
|
|
@@ -299,7 +316,7 @@ class ScriptTask(GeneralBattle, GameUi, SwitchSoul, AreaBossAssets):
|
|
|
self.open_filter()
|
|
self.open_filter()
|
|
|
name = self.get_bossName(PHOTO)
|
|
name = self.get_bossName(PHOTO)
|
|
|
if self.check_common_chars(str(name), boss_name):
|
|
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)
|
|
|
self.ui_click_until_disappear(self.I_AB_CLOSE_RED)
|
|
self.ui_click_until_disappear(self.I_AB_CLOSE_RED)
|
|
|
|
|
|