|
@@ -1100,6 +1100,10 @@ class BattleWait(BaseTask, GeneralBattleAssets):
|
|
|
print('=' * 64)
|
|
print('=' * 64)
|
|
|
time.sleep(0.6)
|
|
time.sleep(0.6)
|
|
|
|
|
|
|
|
|
|
+ def refresh_long_time(self) -> None:
|
|
|
|
|
+ self.device.stuck_record_add('BATTLE_STATUS_S')
|
|
|
|
|
+ self.device.click_record_clear()
|
|
|
|
|
+
|
|
|
# ------------------------------------------------------------------------------------------------------------------
|
|
# ------------------------------------------------------------------------------------------------------------------
|
|
|
# build in
|
|
# build in
|
|
|
# ------------------------------------------------------------------------------------------------------------------
|
|
# ------------------------------------------------------------------------------------------------------------------
|
|
@@ -1107,8 +1111,7 @@ class BattleWait(BaseTask, GeneralBattleAssets):
|
|
|
self.C_REWARD_1.name = 'C_REWARD'
|
|
self.C_REWARD_1.name = 'C_REWARD'
|
|
|
self.C_REWARD_2.name = 'C_REWARD'
|
|
self.C_REWARD_2.name = 'C_REWARD'
|
|
|
self.C_REWARD_3.name = 'C_REWARD'
|
|
self.C_REWARD_3.name = 'C_REWARD'
|
|
|
- self.device.stuck_record_add('BATTLE_STATUS_S')
|
|
|
|
|
- self.device.click_record_clear()
|
|
|
|
|
|
|
+ self.refresh_long_time()
|
|
|
logger.info('Start battle process')
|
|
logger.info('Start battle process')
|
|
|
return HookSignal.DONE
|
|
return HookSignal.DONE
|
|
|
|
|
|
|
@@ -1248,6 +1251,7 @@ class BattleWait(BaseTask, GeneralBattleAssets):
|
|
|
if pri_options.lock_team or self.is_in_real_battle(False):
|
|
if pri_options.lock_team or self.is_in_real_battle(False):
|
|
|
logger.info('Prepare stage finish')
|
|
logger.info('Prepare stage finish')
|
|
|
state.done = True
|
|
state.done = True
|
|
|
|
|
+ self.refresh_long_time()
|
|
|
return runtime.hook_enabled_update(
|
|
return runtime.hook_enabled_update(
|
|
|
enable=('green', 'red', 'echo'),
|
|
enable=('green', 'red', 'echo'),
|
|
|
disable=('prepare', 'preset'),
|
|
disable=('prepare', 'preset'),
|
|
@@ -1290,7 +1294,6 @@ class BattleWait(BaseTask, GeneralBattleAssets):
|
|
|
return HookSignal.CONTINUE
|
|
return HookSignal.CONTINUE
|
|
|
if not pri_options.preset_enable or state.done:
|
|
if not pri_options.preset_enable or state.done:
|
|
|
return HookSignal.CONTINUE
|
|
return HookSignal.CONTINUE
|
|
|
-
|
|
|
|
|
logger.info("Preset is enable")
|
|
logger.info("Preset is enable")
|
|
|
# 点击预设按钮
|
|
# 点击预设按钮
|
|
|
while 1:
|
|
while 1:
|
|
@@ -1478,6 +1481,7 @@ class BattleWait(BaseTask, GeneralBattleAssets):
|
|
|
# 点击绿标
|
|
# 点击绿标
|
|
|
self.device.click(x, y)
|
|
self.device.click(x, y)
|
|
|
state.done = True
|
|
state.done = True
|
|
|
|
|
+ self.refresh_long_time()
|
|
|
return runtime.hook_enabled_update(
|
|
return runtime.hook_enabled_update(
|
|
|
enable=(),
|
|
enable=(),
|
|
|
disable=('green',),
|
|
disable=('green',),
|
|
@@ -1521,8 +1525,8 @@ class BattleWait(BaseTask, GeneralBattleAssets):
|
|
|
# custom
|
|
# custom
|
|
|
# ------------------------------------------------------------------------------------------------------------------
|
|
# ------------------------------------------------------------------------------------------------------------------
|
|
|
def _bw_success_soul(self, pub: PublicContext, pri: PrivateContext) -> HookSignal:
|
|
def _bw_success_soul(self, pub: PublicContext, pri: PrivateContext) -> HookSignal:
|
|
|
- state = pri.per_battle
|
|
|
|
|
- options = pri.options
|
|
|
|
|
|
|
+ state: PerBattleSuccess = pri.per_battle
|
|
|
|
|
+ options: OptionSuccessDefault = pri.options
|
|
|
if not isinstance(state, PerBattleSuccess) or not isinstance(options, OptionSuccessDefault):
|
|
if not isinstance(state, PerBattleSuccess) or not isinstance(options, OptionSuccessDefault):
|
|
|
raise TypeError("battle wait option 'success' must be an OptionSuccessDefault")
|
|
raise TypeError("battle wait option 'success' must be an OptionSuccessDefault")
|
|
|
if state.click_stage_1 is None:
|
|
if state.click_stage_1 is None:
|
|
@@ -1565,7 +1569,7 @@ class BattleWait(BaseTask, GeneralBattleAssets):
|
|
|
return HookSignal.CONTINUE
|
|
return HookSignal.CONTINUE
|
|
|
|
|
|
|
|
@cached_property
|
|
@cached_property
|
|
|
- def exclude_click_activity(self, areas: list[str] = None) -> RuleClickExclude:
|
|
|
|
|
|
|
+ def exclude_click_activity(self) -> RuleClickExclude:
|
|
|
inputs = []
|
|
inputs = []
|
|
|
for area in ['C_END_MESSAGE_RIGHT_TOP', 'C_END_ACTIVITY_REWARD']:
|
|
for area in ['C_END_MESSAGE_RIGHT_TOP', 'C_END_ACTIVITY_REWARD']:
|
|
|
click = getattr(self, area, None)
|
|
click = getattr(self, area, None)
|