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

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

# 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
15 changed files with 904 additions and 722 deletions

View File

@@ -54,16 +54,12 @@
"name": "Main",
"help": ""
},
"C72MysteryFarming": {
"name": "7-2 Mystery Farming",
"Main2": {
"name": "Main-2",
"help": ""
},
"C122MediumLeveling": {
"name": "12-2 Leveling",
"help": ""
},
"C124LargeLeveling": {
"name": "12-4 Leveling",
"Main3": {
"name": "Main-3",
"help": ""
},
"GemsFarming": {
@@ -78,6 +74,10 @@
"name": "Event",
"help": ""
},
"Event2": {
"name": "Event-2",
"help": ""
},
"EventAb": {
"name": "Event AB",
"help": ""