sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-12 00:28:20 +08:00
Code Activity

Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript

Browse Source
This commit is contained in:
SevCrane
2024-06-05 23:53:03 +08:00
parent 5e482958f6 24aa3e00bd
commit 3cb29a9a37
179 changed files with 17873 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
module/os/map.py
View File

@@ -384,7 +384,13 @@ class OSMap(OSFleet, Map, GlobeCamera, StrategicSearchHandler):
# Restart the game manually rather
# than through 'task_call'
# Ongoing task is uninterrupted
<<<<<<< HEAD
self.device.app_restart()
=======
self.device.app_stop()
self.device.app_start()
LoginHandler(self.config, self.device).handle_app_login()
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
self.ui_ensure(page_os)
if repair:
@@ -403,7 +409,11 @@ class OSMap(OSFleet, Map, GlobeCamera, StrategicSearchHandler):
remain = get_os_reset_remain()
if remain <= 0:
if self.config.is_task_enabled('OpsiCrossMonth'):
<<<<<<< HEAD
logger.info('Just less than 1 day to OpSi reset, OpsiCrossMonth is enabled, '
=======
logger.info('Just less than 1 day to OpSi reset, OpsiCrossMonth is enabled'
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
'set OpsiMeowfficerFarming.ActionPointPreserve to 300 temporarily')
return 300
else:

4
module/os/operation_siren.py
View File

@@ -250,10 +250,14 @@ class OperationSiren(OSMap):
OpsiFleet_Fleet=self.config.cross_get('OpsiMeowfficerFarming.OpsiFleet.Fleet'),
OpsiFleet_Submarine=False,
OpsiMeowfficerFarming_ActionPointPreserve=0,
<<<<<<< HEAD
OpsiMeowfficerFarming_HazardLevel=
self.config.cross_get('OpsiMeowfficerFarming'
'.OpsiMeowfficerFarming'
'.HazardLevel'),
=======
OpsiMeowfficerFarming_HazardLevel=3,
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
OpsiMeowfficerFarming_TargetZone=0,
)
while 1: