sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-05-14 01:02:36 +08:00
Code Activity

Merge pull request #358 from nEEtdo0d/my_neet

Browse Source 
Fix: guild_logistics and handle_mystery for os_clear_map
This commit is contained in:
Kyo
2021-02-17 15:19:40 -03:00
committed by GitHub
parent 989ab1280c f46b9c549f
commit 7a0e0be16d
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
module/guild/logistics.py
View File

@@ -268,6 +268,7 @@ class GuildLogistics(GuildBase):
logger.hr('Guild logistics') logger.hr('Guild logistics')
confirm_timer = Timer(1.5, count=3).start() confirm_timer = Timer(1.5, count=3).start()
exchange_interval = Timer(1.5, count=3) exchange_interval = Timer(1.5, count=3)
click_interval = Timer(0.5, count=1)
supply_checked = False supply_checked = False
mission_checked = False mission_checked = False
exchange_checked = False exchange_checked = False
@@ -298,14 +299,18 @@ class GuildLogistics(GuildBase):
if self._is_in_guild_logistics(): if self._is_in_guild_logistics():
# Supply # Supply
if not supply_checked and self._guild_logistics_supply_available(): if not supply_checked and self._guild_logistics_supply_available():
self.device.click(GUILD_SUPPLY) if click_interval.reached():
self.device.click(GUILD_SUPPLY)
click_interval.reset()
confirm_timer.reset() confirm_timer.reset()
continue continue
else: else:
supply_checked = True supply_checked = True
# Mission # Mission
if not mission_checked and self._guild_logistics_mission_available(): if not mission_checked and self._guild_logistics_mission_available():
self.device.click(GUILD_MISSION) if click_interval.reached():
self.device.click(GUILD_MISSION)
click_interval.reset()
confirm_timer.reset() confirm_timer.reset()
continue continue
else: else:

3
module/os/fleet.py
View File

@@ -66,7 +66,8 @@ class OSFleet(OSCamera, Combat, Fleet, OSAsh):
return sight return sight
def handle_mystery(self, button=None): def handle_mystery(self, button=None):
return False # Treat map events as mystery, may walk into unexpected object on path
return self.handle_map_event()
def handle_ambush(self): def handle_ambush(self):
# Treat map events as ambush, to trigger walk retrying # Treat map events as ambush, to trigger walk retrying