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

Merge branch 'master' into app

Browse Source
This commit is contained in:
LmeSzinc
2021-09-08 21:42:58 +08:00
parent a067af68da dc95add1f5
commit ca2314c236
4 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/reward/reward.py
View File

@@ -403,7 +403,7 @@ class Reward(RewardCommission, RewardTacticalClass, RewardResearch, RewardDorm,
def reward_backup_daily_reward_settings(self):
"""
Method to avoid event_daily_ab calls reward, and reward calls event_daily_ab itself again.
Method to avoid event_daily_ab and sos calls reward, and reward calls event_daily_ab or daily_sos itself again.
"""
self._daily_reward_setting_backup = self.config.cover(
ENABLE_DAILY_REWARD=False,

4
module/sos/sos.py
View File

@@ -175,6 +175,9 @@ class CampaignSos(CampaignRun, CampaignBase):
logger.info(f'No SOS signal, End SOS signal search')
return True
# avoid sos calls daily_sos and causes error.
self.reward_backup_daily_reward_settings()
fleet_1 = self.config.SOS_FLEET_1
fleet_2 = self.config.SOS_FLEET_2
submarine = self.config.SOS_SUBMARINE
@@ -201,6 +204,7 @@ class CampaignSos(CampaignRun, CampaignBase):
break
backup.recover()
self.reward_recover_daily_reward_settings()
return True
def record_executed_since(self):