mirror of
https://github.com/LmeSzinc/AzurLaneAutoScript.git
synced 2025-01-08 12:47:32 +08:00
Revert "Merge pull request #838 from yanyihui/yyhbranch"
This commit is contained in:
parent
71a2736643
commit
1eaecf49b3
20
alas.py
20
alas.py
@ -77,14 +77,7 @@ class AzurLaneAutoScript:
|
||||
except Exception as e:
|
||||
logger.exception(e)
|
||||
self.save_error_log()
|
||||
if self.config.Error_HandleError:
|
||||
self.config.Scheduler_Enable = False
|
||||
logger.warning(f'Try restarting, {self.config.Emulator_PackageName} will be restarted in 10 seconds')
|
||||
self.config.task_call('Restart')
|
||||
self.device.sleep(10)
|
||||
return False
|
||||
else:
|
||||
exit(1)
|
||||
exit(1)
|
||||
|
||||
def save_error_log(self):
|
||||
"""
|
||||
@ -361,15 +354,8 @@ class AzurLaneAutoScript:
|
||||
"Please read the help text of the options.")
|
||||
logger.critical("Possible reason #2: There is a problem with this task. "
|
||||
"Please contact developers or try to fix it yourself.")
|
||||
if self.config.Error_HandleError:
|
||||
self.config.Scheduler_Enable = False
|
||||
logger.warning(f'Try restarting, {self.config.Emulator_PackageName} will be restarted in 10 seconds')
|
||||
self.config.task_call('Restart')
|
||||
self.device.sleep(10)
|
||||
continue
|
||||
else:
|
||||
logger.critical('Request human takeover')
|
||||
exit(1)
|
||||
logger.critical('Request human takeover')
|
||||
exit(1)
|
||||
|
||||
if success:
|
||||
del self.__dict__['config']
|
||||
|
@ -296,7 +296,7 @@
|
||||
},
|
||||
"HandleError": {
|
||||
"name": "Enable Exception Handling",
|
||||
"help": "Handles select exceptions, will retreat if in battle\nIn some tasks, will disable the error task and try restarting"
|
||||
"help": "Handles select exceptions, will retreat if in battle"
|
||||
},
|
||||
"SaveError": {
|
||||
"name": "Record Exception",
|
||||
|
@ -296,7 +296,7 @@
|
||||
},
|
||||
"HandleError": {
|
||||
"name": "启用异常处理",
|
||||
"help": "处理部分异常,运行出错时撤退\n部分任务中,会将出错的任务移出列表,并重启游戏"
|
||||
"help": "处理部分异常,运行出错时撤退"
|
||||
},
|
||||
"SaveError": {
|
||||
"name": "出错时,保存 Log 和截图",
|
||||
|
@ -296,7 +296,7 @@
|
||||
},
|
||||
"HandleError": {
|
||||
"name": "啟用異常處理",
|
||||
"help": "處理部分異常,執行出錯時撤退\n部分任務中,會將出錯的任務移出列表,並重啟遊戲"
|
||||
"help": "處理部分異常,執行出錯時撤退"
|
||||
},
|
||||
"SaveError": {
|
||||
"name": "出錯時,保存 Log 和截圖",
|
||||
|
Loading…
Reference in New Issue
Block a user