1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-22 12:53:43 +08:00

Add: Raid and Raid daily

- Increase interval of login_confirm
This commit is contained in:
LmeSzinc
2020-06-24 17:10:57 +08:00
parent 434379edec
commit 1150041049
29 changed files with 379 additions and 8 deletions

View File

@@ -46,6 +46,8 @@ def main(ini_name=''):
event_folder = [dic_eng_to_chi.get(f, f) for f in event_folder][::-1]
event_latest = dic_eng_to_chi.get(event_latest, event_latest)
raid_latest = '复刻特别演习埃塞克斯级'
saved_config = {}
for opt, option in config.items():
for key, value in option.items():
@@ -259,6 +261,7 @@ def main(ini_name=''):
daily.add_argument('--打困难', default=default('--打困难'), help='若当天有记录, 则跳过', choices=['', ''])
daily.add_argument('--打演习', default=default('--打演习'), help='若在刷新后有记录, 则跳过', choices=['', ''])
daily.add_argument('--打活动图每日三倍PT', default=default('--打活动图每日三倍PT'), help='若当天有记录, 则跳过', choices=['', ''])
daily.add_argument('--打共斗每日15次', default=default('--打共斗每日15次'), help='若当天有记录, 则跳过', choices=['', ''])
# 每日设置
daily_task = daily_parser.add_argument_group('每日设置', '不支持潜艇每日')
@@ -287,6 +290,13 @@ def main(ini_name=''):
event_bonus = daily_parser.add_argument_group('活动设置', '')
event_bonus.add_argument('--活动名称ab', default=event_latest, choices=event_folder, help='例如 event_20200326_cn')
# 共斗每日设置
raid_bonus = daily_parser.add_argument_group('共斗设置', '')
raid_bonus.add_argument('--共斗每日名称', default=raid_latest, choices=[raid_latest], help='')
raid_bonus.add_argument('--共斗困难', default=default('--共斗困难'), choices=['', ''], help='')
raid_bonus.add_argument('--共斗普通', default=default('--共斗普通'), choices=['', ''], help='')
raid_bonus.add_argument('--共斗简单', default=default('--共斗简单'), choices=['', ''], help='')
# # ==========每日活动图三倍PT==========
# event_ab_parser = subs.add_parser('每日活动图三倍PT')
# event_name = event_ab_parser.add_argument_group('选择活动', '')
@@ -316,6 +326,13 @@ def main(ini_name=''):
help='例如 sp3')
event.add_argument('--活动名称', default=event_latest, choices=event_folder, help='例如 event_20200312_cn')
# ==========共斗活动==========
raid_parser = subs.add_parser('共斗活动')
raid = raid_parser.add_argument_group('选择共斗', '')
raid.add_argument('--共斗名称', default=raid_latest, choices=[raid_latest], help='')
raid.add_argument('--共斗难度', default=default('--共斗难度'), choices=['困难', '普通', '简单'], help='')
raid.add_argument('--共斗使用挑战券', default=default('--共斗使用挑战券'), choices=['', ''], help='')
# ==========半自动==========
semi_parser = subs.add_parser('半自动辅助点击')
semi = semi_parser.add_argument_group('半自动模式', '手动选敌, 自动结算, 用于出击未适配的图')

View File

@@ -46,6 +46,8 @@ def main(ini_name=''):
event_folder = [dic_eng_to_true_eng.get(f, f) for f in event_folder][::-1]
event_latest = dic_eng_to_true_eng.get(event_latest, event_latest)
raid_latest = 'Air_Raid_Drills_with_Essex'
saved_config = {}
for opt, option in config.items():
for key, value in option.items():
@@ -260,6 +262,7 @@ def main(ini_name=''):
daily.add_argument('--enable_hard_campaign', default=default('--enable_hard_campaign'), help='If there are records on the day, skip', choices=['yes', 'no'])
daily.add_argument('--enable_exercise', default=default('--enable_exercise'), help='If there is a record after refreshing, skip', choices=['yes', 'no'])
daily.add_argument('--enable_event_ab', default=default('--enable_event_ab'), help='If there is a record after refreshing, skip', choices=['yes', 'no'])
daily.add_argument('--enable_raid_daily', default=default('--enable_raid_daily'), help='If there is a record after refreshing, skip', choices=['yes', 'no'])
# 每日设置
daily_task = daily_parser.add_argument_group('Daily settings', 'Does not support submarine daily')
@@ -288,6 +291,13 @@ def main(ini_name=''):
event_bonus = daily_parser.add_argument_group('Event Daily Bonus', 'bonus for first clear each day')
event_bonus.add_argument('--event_name_ab', default=event_latest, choices=event_folder, help='There a dropdown menu with many options')
# Raid daily
raid_bonus = daily_parser.add_argument_group('Raid settings', '')
raid_bonus.add_argument('--raid_daily_name', default=raid_latest, choices=[raid_latest], help='')
raid_bonus.add_argument('--raid_hard', default=default('--raid_hard'), choices=['yes', 'no'], help='')
raid_bonus.add_argument('--raid_normal', default=default('--raid_normal'), choices=['yes', 'no'], help='')
raid_bonus.add_argument('--raid_easy', default=default('--raid_easy'), choices=['yes', 'no'], help='')
# ==========event_daily_ab==========
# event_ab_parser = subs.add_parser('event_daily_bonus')
# event_name = event_ab_parser.add_argument_group('Choose an event', 'bonus for first clear each day')
@@ -317,6 +327,13 @@ def main(ini_name=''):
help='E.g sp3')
event.add_argument('--event_name', default=event_latest, choices=event_folder, help='There a dropdown menu with many options')
# ==========Raid==========
raid_parser = subs.add_parser('raid')
raid = raid_parser.add_argument_group('Choose a raid', '')
raid.add_argument('--raid_name', default=raid_latest, choices=[raid_latest], help='')
raid.add_argument('--raid_mode', default=default('--raid_mode'), choices=['hard', 'normal', 'easy'], help='')
raid.add_argument('--raid_use_ticket', default=default('--raid_use_ticket'), choices=['yes', 'no'], help='')
# ==========半自动==========
semi_parser = subs.add_parser('semi_auto')
semi = semi_parser.add_argument_group('Semi-automatic mode', 'Manual selection of enemies, automatic settlement, used to attack unsuited pictures')

View File

@@ -45,6 +45,8 @@ def main(ini_name=''):
event_folder = [dic_eng_to_true_eng.get(f, f) for f in event_folder][::-1]
event_latest = dic_eng_to_true_eng.get(event_latest, event_latest)
raid_latest = 'Air_Raid_Drills_with_Essex'
saved_config = {}
for opt, option in config.items():
for key, value in option.items():
@@ -259,6 +261,7 @@ def main(ini_name=''):
daily.add_argument('--enable_hard_campaign', default=default('--enable_hard_campaign'), help='If there are records on the day, skip', choices=['yes', 'no'])
daily.add_argument('--enable_exercise', default=default('--enable_exercise'), help='If there is a record after refreshing, skip', choices=['yes', 'no'])
daily.add_argument('--enable_event_ab', default=default('--enable_event_ab'), help='If there is a record after refreshing, skip', choices=['yes', 'no'])
daily.add_argument('--enable_raid_daily', default=default('--enable_raid_daily'), help='If there is a record after refreshing, skip', choices=['yes', 'no'])
# 每日设置
daily_task = daily_parser.add_argument_group('Daily settings', 'Does not support submarine daily')
@@ -287,6 +290,13 @@ def main(ini_name=''):
event_bonus = daily_parser.add_argument_group('Event Daily Bonus', 'bonus for first clear each day')
event_bonus.add_argument('--event_name_ab', default=event_latest, choices=event_folder, help='There a dropdown menu with many options')
# Raid daily
raid_bonus = daily_parser.add_argument_group('Raid settings', '')
raid_bonus.add_argument('--raid_daily_name', default=raid_latest, choices=[raid_latest], help='')
raid_bonus.add_argument('--raid_hard', default=default('--raid_hard'), choices=['yes', 'no'], help='')
raid_bonus.add_argument('--raid_normal', default=default('--raid_normal'), choices=['yes', 'no'], help='')
raid_bonus.add_argument('--raid_easy', default=default('--raid_easy'), choices=['yes', 'no'], help='')
# ==========event_daily_ab==========
# event_ab_parser = subs.add_parser('event_daily_bonus')
# event_name = event_ab_parser.add_argument_group('Choose an event', 'bonus for first clear each day')
@@ -316,6 +326,13 @@ def main(ini_name=''):
help='E.g sp3')
event.add_argument('--event_name', default=event_latest, choices=event_folder, help='There a dropdown menu with many options')
# ==========Raid==========
raid_parser = subs.add_parser('raid')
raid = raid_parser.add_argument_group('Choose a raid', '')
raid.add_argument('--raid_name', default=raid_latest, choices=[raid_latest], help='')
raid.add_argument('--raid_mode', default=default('--raid_mode'), choices=['hard', 'normal', 'easy'], help='')
raid.add_argument('--raid_use_ticket', default=default('--raid_use_ticket'), choices=['yes', 'no'], help='')
# ==========半自动==========
semi_parser = subs.add_parser('semi_auto')
semi = semi_parser.add_argument_group('Semi-automatic mode', 'Manual selection of enemies, automatic settlement, used to attack unsuited pictures')

View File

@@ -203,6 +203,18 @@ class AzurLaneConfig:
OPPONENT_CHALLENGE_TRIAL = 1
EXERCISE_FLEET_EQUIPMENT = [1, 1, 1, 1, 1, 1]
"""
module.raid
"""
RAID_NAME = ''
RAID_MODE = 'hard' # hard, normal, easy
RAID_USE_TICKET = False
ENABLE_RAID_DAILY = False
RAID_DAILY_NAME = ''
RAID_HARD = True
RAID_NORMAL = True
RAID_EASY = True
"""
error_log
"""
@@ -529,6 +541,12 @@ class AzurLaneConfig:
# option = config['Event_daily_ab']
self.ENABLE_EVENT_NAME_AB = to_bool(option['enable_event_ab'])
self.EVENT_NAME_AB = option['event_name_ab']
# Raid daily
self.ENABLE_RAID_DAILY = to_bool(option['enable_raid_daily'])
self.RAID_DAILY_NAME = option['raid_daily_name']
self.RAID_HARD = to_bool(option['raid_hard'])
self.RAID_NORMAL = to_bool(option['raid_normal'])
self.RAID_EASY = to_bool(option['raid_easy'])
# Event
option = config['Event']
@@ -538,6 +556,12 @@ class AzurLaneConfig:
else:
self.CAMPAIGN_EVENT = option['event_stage']
# Raid
option = config['Raid']
self.RAID_NAME = option['raid_name']
self.RAID_MODE = option['raid_mode']
self.RAID_USE_TICKET = to_bool(option['raid_use_ticket'])
# Event_daily_ab
# option = config['Event_daily_ab']
# self.EVENT_NAME_AB = option['event_name_ab']

View File

@@ -21,7 +21,6 @@ dic_daily = {
'index_1': 1,
'index_2': 2,
'index_3': 3,
}
dic_true_eng_to_eng = {
# Function
@@ -32,6 +31,7 @@ dic_true_eng_to_eng = {
'event_daily_bonus': 'event_daily_ab',
'Main_campaign': 'main',
'event': 'event',
'raid': 'raid',
'semi_auto': 'semi_auto',
'c7-2_mystery_farming': 'c72_mystery_farming',
'c12-2_leveling': 'c122_leveling',
@@ -137,6 +137,7 @@ dic_true_eng_to_eng = {
'enable_hard_campaign': 'enable_hard_campaign',
'enable_exercise': 'enable_exercise',
'enable_event_ab': 'enable_event_ab',
'enable_raid_daily': 'enable_raid_daily',
'tactical_training': 'daily_mission_1',
'fierce_assault': 'daily_mission_2',
'escort_mission': 'daily_mission_4',
@@ -152,12 +153,19 @@ dic_true_eng_to_eng = {
'exercise_hp_threshold': 'exercise_hp_threshold',
'exercise_low_hp_confirm': 'exercise_low_hp_confirm',
'exercise_equipment': 'exercise_equipment',
'raid_daily_name': 'raid_daily_name',
'raid_hard': 'raid_hard',
'raid_normal': 'raid_normal',
'raid_easy': 'raid_easy',
'main_stage': 'main_stage',
'event_stage': 'event_stage',
'campaign_mode': 'campaign_mode',
'sp_stage': 'sp_stage',
'event_name': 'event_name',
'event_name_ab': 'event_name_ab',
'raid_name': 'raid_name',
'raid_mode': 'raid_mode',
'raid_use_ticket': 'raid_use_ticket',
'enable_semi_map_preparation': 'enable_semi_map_preparation',
'enable_semi_story_skip': 'enable_semi_story_skip',
'boss_fleet_step_on_a3': 'boss_fleet_step_on_a3',
@@ -210,11 +218,13 @@ dic_true_eng_to_eng = {
'good_opponent': 'good_opponent',
'normal': 'normal',
'hard': 'hard',
'easy': 'easy',
# Event
'Iris_of_Light_and_Dark': 'event_20200521_en',
'Skybound_Oratorio': 'event_20200611_en',
'Prelude_under_the_Moon': 'event_20200603_en'
'Prelude_under_the_Moon': 'event_20200603_en',
'Air_Raid_Drills_with_Essex': 'raid_20200624',
}
dic_eng_to_true_eng = {v: k for k, v in dic_true_eng_to_eng.items()}
@@ -228,6 +238,7 @@ dic_chi_to_eng = {
'每日活动图三倍PT': 'event_daily_ab',
'主线图': 'main',
'活动图': 'event',
'共斗活动': 'raid',
'半自动辅助点击': 'semi_auto',
'7-2三战拣垃圾': 'c72_mystery_farming',
'12-2打中型练级': 'c122_leveling',
@@ -333,6 +344,7 @@ dic_chi_to_eng = {
'打困难': 'enable_hard_campaign',
'打演习': 'enable_exercise',
'打活动图每日三倍PT': 'enable_event_ab',
'打共斗每日15次': 'enable_raid_daily',
'战术研修': 'daily_mission_1',
'斩首行动': 'daily_mission_2',
'商船护航': 'daily_mission_4',
@@ -348,12 +360,19 @@ dic_chi_to_eng = {
'演习SL阈值': 'exercise_hp_threshold',
'演习低血量确认时长': 'exercise_low_hp_confirm',
'演习快速换装': 'exercise_equipment',
'共斗每日名称': 'raid_daily_name',
'共斗困难': 'raid_hard',
'共斗普通': 'raid_normal',
'共斗简单': 'raid_easy',
'主线地图出击': 'main_stage',
'主线地图模式': 'campaign_mode',
'活动地图': 'event_stage',
'sp地图': 'sp_stage',
'活动名称': 'event_name',
'活动名称ab': 'event_name_ab',
'共斗名称': 'raid_name',
'共斗难度': 'raid_mode',
'共斗使用挑战券': 'raid_use_ticket',
'进图准备': 'enable_semi_map_preparation',
'跳过剧情': 'enable_semi_story_skip',
'BOSS队踩A3': 'boss_fleet_step_on_a3',
@@ -406,6 +425,7 @@ dic_chi_to_eng = {
'福利队': 'good_opponent',
'普通': 'normal',
'困难': 'hard',
'简单': 'easy',
# Event
'北境序曲': 'event_20200227_cn',
@@ -415,6 +435,7 @@ dic_chi_to_eng = {
'夜幕下的归途': 'event_20200507_cn',
'穹顶下的圣咏曲': 'event_20200521_cn',
'峡湾间的反击': 'event_20200603_cn',
'复刻特别演习埃塞克斯级': 'raid_20200624',
}
dic_eng_to_chi = {v: k for k, v in dic_chi_to_eng.items()}