|
@@ -424,6 +424,7 @@ class BattleWait(BaseTask, GeneralBattleAssets):
|
|
|
if self.appear(self.I_FALSE, threshold=0.8):
|
|
if self.appear(self.I_FALSE, threshold=0.8):
|
|
|
logger.warning('False battle')
|
|
logger.warning('False battle')
|
|
|
self.ui_click_until_disappear(self.I_FALSE)
|
|
self.ui_click_until_disappear(self.I_FALSE)
|
|
|
|
|
+ bw_ctx.success = False
|
|
|
bw_ctx.completion = True
|
|
bw_ctx.completion = True
|
|
|
return HookSignal.CONTINUE
|
|
return HookSignal.CONTINUE
|
|
|
return HookSignal.CONTINUE
|
|
return HookSignal.CONTINUE
|
|
@@ -609,7 +610,7 @@ class BattleWait(BaseTask, GeneralBattleAssets):
|
|
|
for handler in handlers:
|
|
for handler in handlers:
|
|
|
result = handler(bw_ctx)
|
|
result = handler(bw_ctx)
|
|
|
if handler.__name__.startswith('_bw_completion') and result == HookSignal.DONE:
|
|
if handler.__name__.startswith('_bw_completion') and result == HookSignal.DONE:
|
|
|
- return True
|
|
|
|
|
|
|
+ return bw_ctx.success
|
|
|
if result == HookSignal.CONTINUE:
|
|
if result == HookSignal.CONTINUE:
|
|
|
continue
|
|
continue
|
|
|
|
|
|
|
@@ -644,4 +645,3 @@ if __name__ == '__main__':
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|