|
|
@@ -73,7 +73,7 @@ class GeneralBattle(GeneralBuff, GeneralBattleAssets):
|
|
|
continue
|
|
|
continue
|
|
|
# 未知界面, 既不是准备界面也不是战斗界面
|
|
|
- logger.info('Wait for preparation page')
|
|
|
+ # logger.info('Wait for preparation page') # 这玩意刷屏
|
|
|
sleep(random.uniform(0.4, 0.8))
|
|
|
return False
|
|
|
|
|
|
@@ -218,10 +218,11 @@ class GeneralBattle(GeneralBuff, GeneralBattleAssets):
|
|
|
if not self.appear(self.I_FALSE, threshold=0.6):
|
|
|
return False
|
|
|
# 最后保证能点击 获得奖励
|
|
|
- if not self.wait_until_appear(self.I_REWARD):
|
|
|
- # 有些的战斗没有下面的奖励,所以直接返回
|
|
|
- logger.info("There is no reward, Exit battle")
|
|
|
- return win
|
|
|
+ if not self.wait_until_appear(self.I_REWARD, wait_time=10):
|
|
|
+ if not self.appear(self.I_STATISTICS):
|
|
|
+ # 有些的战斗没有下面的奖励,所以直接返回
|
|
|
+ logger.info("There is no reward, Exit battle")
|
|
|
+ return win
|
|
|
logger.info("Get reward")
|
|
|
while 1:
|
|
|
self.screenshot()
|
|
|
@@ -237,6 +238,8 @@ class GeneralBattle(GeneralBuff, GeneralBattleAssets):
|
|
|
# self.appear_then_click(self.I_REWARD_SOUL_6, action=action_click, interval=1.5)
|
|
|
):
|
|
|
continue
|
|
|
+ if self._hook_special_reward():
|
|
|
+ continue
|
|
|
if (not self.appear(self.I_REWARD) and
|
|
|
not self.appear(self.I_REWARD_GOLD) # and
|
|
|
# not self.appear(self.I_REWARD_STATISTICS) and
|
|
|
@@ -250,6 +253,12 @@ class GeneralBattle(GeneralBuff, GeneralBattleAssets):
|
|
|
|
|
|
return win
|
|
|
|
|
|
+ def _hook_special_reward(self) -> bool:
|
|
|
+ """
|
|
|
+ For overwrite https://github.com/runhey/OnmyojiAutoScript/issues/1580
|
|
|
+ """
|
|
|
+ return False
|
|
|
+
|
|
|
def green_mark(self, enable: bool = False, mark_mode: GreenMarkType = GreenMarkType.GREEN_MAIN):
|
|
|
"""
|
|
|
绿标, 如果不使能就直接返回
|