mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-03-12 00:28:20 +08:00
Fix: _guild_triggered not working in non-continuous campaign
- Opt: Comments in logistics_mission to avoid mis-understandings
This commit is contained in:
@@ -176,9 +176,9 @@ class CampaignRun(Reward):
|
||||
self.campaign.fleet_checked_reset()
|
||||
if self.handle_reward():
|
||||
self.campaign.fleet_checked_reset()
|
||||
if self.campaign._guild_triggered:
|
||||
if self.config.GUILD_POPUP_TRIGGERED:
|
||||
self.handle_guild()
|
||||
self.campaign._guild_triggered = False
|
||||
self.config.GUILD_POPUP_TRIGGERED = False
|
||||
self.campaign.fleet_checked_reset()
|
||||
|
||||
# End
|
||||
|
||||
@@ -20,7 +20,6 @@ class Combat(Level, HPBalancer, EnemySearchingHandler, Retirement, SubmarineCall
|
||||
_automation_set_timer = Timer(1)
|
||||
_emotion: Emotion
|
||||
battle_status_click_interval = 0
|
||||
_guild_triggered = False
|
||||
|
||||
@property
|
||||
def emotion(self):
|
||||
@@ -345,7 +344,7 @@ class Combat(Level, HPBalancer, EnemySearchingHandler, Retirement, SubmarineCall
|
||||
if self.handle_story_skip():
|
||||
continue
|
||||
if self.handle_guild_popup_cancel():
|
||||
self._guild_triggered = True
|
||||
self.config.GUILD_POPUP_TRIGGERED = True
|
||||
continue
|
||||
|
||||
# End
|
||||
|
||||
@@ -431,8 +431,12 @@ class AzurLaneConfig:
|
||||
|
||||
ENABLE_DATA_KEY_COLLECT = True
|
||||
|
||||
"""
|
||||
module.guild
|
||||
"""
|
||||
ENABLE_GUILD_LOGISTICS = False
|
||||
ENABLE_GUILD_OPERATIONS = False
|
||||
GUILD_POPUP_TRIGGERED = False
|
||||
GUILD_INTERVAL = '40, 60' # str, such as '20', '10, 40'.
|
||||
GUILD_LOGISTICS_ITEM_ORDER_STRING = 't1 > t2 > t3 > oxycola > coolant > coins > oil > merit'
|
||||
GUILD_LOGISTICS_PLATE_T1_ORDER_STRING = 'torpedo > antiair > plane > gun > general'
|
||||
|
||||
@@ -123,7 +123,7 @@ class GuildLogistics(GuildBase):
|
||||
logger.info('Guild mission button inactive')
|
||||
return False
|
||||
elif self.image_color_count(GUILD_MISSION, color=(255, 255, 255), threshold=180, count=50):
|
||||
# white pixels less than 50
|
||||
# white pixels less than 50, but has blue-white pixels
|
||||
logger.info('Guild mission button active')
|
||||
return True
|
||||
else:
|
||||
|
||||
Reference in New Issue
Block a user