sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-12 08:38: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

4
module/combat/auto_search_combat.py
View File

@@ -98,7 +98,11 @@ class AutoSearchCombat(MapOperation, Combat, CampaignStatus):
This will set auto_search_oil_limit_triggered.
"""
if not checked:
<<<<<<< HEAD
oil = self.get_oil()
=======
oil = self._get_oil()
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
if oil == 0:
logger.warning('Oil not found')
else: