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

Merge remote-tracking branch 'origin/dev' into fleetorder

Browse Source 
# Conflicts:
#	config/template.json
#	module/config/argument/args.json
#	module/config/argument/override.yaml
This commit is contained in:
SarContDeli
2022-04-23 15:42:40 +08:00
parent dc30d835ea d30da01a10
commit 9f47f247de
15 changed files with 904 additions and 722 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/config/argument/argument.yaml
View File

@@ -65,7 +65,7 @@ Retirement:
# ==================== Farm ====================
Campaign:
Name: 7-2
Name: 12-4
Event:
value: campaign_main
option: [campaign_main]