1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-11 20:58:19 +08:00

Merge branch 'master' into dev

# Conflicts:
#	module/config/argparser.py
#	module/config/argparser_en.py
#	module/config/argparser_jp.py
This commit is contained in:
LmeSzinc
2020-08-19 00:19:42 +08:00
8 changed files with 1590 additions and 1280 deletions

View File

@@ -199,6 +199,7 @@ dic_true_eng_to_eng = {
'non_s3_enemy_enter_tolerance': 'non_s3_enemy_enter_tolerance',
'non_s3_enemy_withdraw_tolerance': 'non_s3_enemy_withdraw_tolerance',
'ammo_pick_up_124': 'ammo_pick_up_124',
'default_serial': 'default_serial',
# Option
'yes': 'yes',
@@ -455,6 +456,7 @@ dic_chi_to_eng = {
'非大型敌人进图忍耐': 'non_s3_enemy_enter_tolerance',
'非大型敌人撤退忍耐': 'non_s3_enemy_withdraw_tolerance',
'拣弹药124': 'ammo_pick_up_124',
'default_serial': 'default_serial',
# Option
'': 'yes',