fix: add missing run_task_or_default_general_battle function (#1884)
@@ -702,3 +702,17 @@ if __name__ == '__main__':
unselected_color = get_unselect_color(self.C_PRESET_TEAM_1, self.C_PRESET_TEAM_2, self.C_PRESET_TEAM_3,
size=color_size
)
+
+def run_task_or_default_general_battle(task) -> bool:
+ """
+ 超时或异常时接管战斗的兜底函数
+ https://github.com/runhey/OnmyojiAutoScript/issues/1884
+ try:
+ config = task.config.general_battle_config
+ except AttributeError:
+ # 某些任务(如 DemonEncounter)没有直接的 general_battle_config 字段
+ return False
+ gb = GeneralBattle(config=task.config, device=task.device)
+ return gb.run_general_battle(config=config)