sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-23 21:25:57 +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

16
campaign/war_archives_20190620_en/sp2.py
View File

@@ -5,15 +5,17 @@ from module.logger import logger
from .sp1 import Config as ConfigBase from .sp1 import Config as ConfigBase
MAP = CampaignMap('SP2') MAP = CampaignMap('SP2')
MAP.shape = 'I5' MAP.shape = 'I7'
MAP.camera_data = ['D2', 'D3', 'F2', 'F3'] MAP.camera_data = ['D3', 'D4', 'F3', 'F4']
MAP.camera_data_spawn_point = ['D3', 'F3'] MAP.camera_data_spawn_point = ['D4', 'F4']
MAP.map_data = """ MAP.map_data = """
ME ME MB -- -- -- ME ME MB
ME -- -- ME MB ME -- -- ME
++ -- MB ++ ++ ++ -- ME MB ++ -- MB ++ ++ ++ -- ME MB
ME ME ME ME MB ME ME ME ++ ME ME ME ME MB ME ME ME ++
Me ++ ME ME ME ME ME -- Me Me ++ ME ME ME ME ME -- Me
-- -- Me ++ MB ++ Me ++ -- ME -- Me ++ MB ++ Me ++ ME
-- -- -- SP ++ SP -- -- -- -- ME -- SP ++ SP -- ME --
""" """
MAP.weight_data = """ MAP.weight_data = """
50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50
@@ -21,6 +23,8 @@ MAP.weight_data = """
50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
50 50 50 50 50 50 50 50 50
""" """
MAP.spawn_data = [ MAP.spawn_data = [
{'battle': 0, 'enemy': 4, 'mystery': 1}, {'battle': 0, 'enemy': 4, 'mystery': 1},
@@ -34,6 +38,8 @@ A2, B2, C2, D2, E2, F2, G2, H2, I2, \
A3, B3, C3, D3, E3, F3, G3, H3, I3, \ A3, B3, C3, D3, E3, F3, G3, H3, I3, \
A4, B4, C4, D4, E4, F4, G4, H4, I4, \ A4, B4, C4, D4, E4, F4, G4, H4, I4, \
A5, B5, C5, D5, E5, F5, G5, H5, I5, \ A5, B5, C5, D5, E5, F5, G5, H5, I5, \
A6, B6, C6, D6, E6, F6, G6, H6, I6, \
A7, B7, C7, D7, E7, F7, G7, H7, I7, \
= MAP.flatten() = MAP.flatten()

8
campaign/war_archives_20190620_en/sp3.py
View File

@@ -11,11 +11,11 @@ MAP.camera_data_spawn_point = ['F5', 'D5']
MAP.map_data = """ MAP.map_data = """
MB -- ME ++ ++ -- -- ++ MB MB -- ME ++ ++ -- -- ++ MB
-- ++ ME -- ME -- Me ME -- -- ++ ME -- ME -- Me ME --
ME -- Me -- ++ Me ++ ME MB ME ME ME -- ++ ME -- ME MB
-- Me -- ++ -- -- -- ++ ++ ME ME -- ++ ME -- -- ++ ++
++ -- ME -- ME ME -- ++ ++ ++ -- ME -- ME ME -- ++ ++
-- ME -- ME ++ ++ ME -- SP ME ME -- ME ++ ++ ME -- SP
MB ME ++ -- SP SP -- -- SP MB ME ++ ME -- ME -- -- SP
""" """
MAP.weight_data = """ MAP.weight_data = """
50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50 50

2
module/reward/reward.py
View File

@@ -403,7 +403,7 @@ class Reward(RewardCommission, RewardTacticalClass, RewardResearch, RewardDorm,
def reward_backup_daily_reward_settings(self): 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( self._daily_reward_setting_backup = self.config.cover(
ENABLE_DAILY_REWARD=False, 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') logger.info(f'No SOS signal, End SOS signal search')
return True return True
# avoid sos calls daily_sos and causes error.
self.reward_backup_daily_reward_settings()
fleet_1 = self.config.SOS_FLEET_1 fleet_1 = self.config.SOS_FLEET_1
fleet_2 = self.config.SOS_FLEET_2 fleet_2 = self.config.SOS_FLEET_2
submarine = self.config.SOS_SUBMARINE submarine = self.config.SOS_SUBMARINE
@@ -201,6 +204,7 @@ class CampaignSos(CampaignRun, CampaignBase):
break break
backup.recover() backup.recover()
self.reward_recover_daily_reward_settings()
return True return True
def record_executed_since(self): def record_executed_since(self):