sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-21 02:05:35 +08:00
Code Activity

Fix: merge conflict

Browse Source
This commit is contained in:
SarContDeli
2022-04-23 15:45:29 +08:00
parent 9f47f247de
commit a039436809
3 changed files with 11 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
config/template.json
View File

@@ -90,8 +90,7 @@
"Fleet2Formation": "double_line", "Fleet2Formation": "double_line",
"Fleet2Mode": "combat_auto", "Fleet2Mode": "combat_auto",
"Fleet2Step": 2, "Fleet2Step": 2,
"FleetOrder": "fleet1_mob_fleet2_boss", "FleetOrder": "fleet1_mob_fleet2_boss"
"AutoSearchFleetOrder": "fleet1_mob_fleet2_boss"
}, },
"Submarine": { "Submarine": {
"Fleet": 0, "Fleet": 0,
@@ -163,8 +162,7 @@
"Fleet2Formation": "double_line", "Fleet2Formation": "double_line",
"Fleet2Mode": "combat_auto", "Fleet2Mode": "combat_auto",
"Fleet2Step": 2, "Fleet2Step": 2,
"FleetOrder": "fleet1_mob_fleet2_boss", "FleetOrder": "fleet1_mob_fleet2_boss"
"AutoSearchFleetOrder": "fleet1_mob_fleet2_boss"
}, },
"Submarine": { "Submarine": {
"Fleet": 0, "Fleet": 0,
@@ -236,8 +234,7 @@
"Fleet2Formation": "double_line", "Fleet2Formation": "double_line",
"Fleet2Mode": "combat_auto", "Fleet2Mode": "combat_auto",
"Fleet2Step": 2, "Fleet2Step": 2,
"FleetOrder": "fleet1_mob_fleet2_boss", "FleetOrder": "fleet1_mob_fleet2_boss"
"AutoSearchFleetOrder": "fleet1_mob_fleet2_boss"
}, },
"Submarine": { "Submarine": {
"Fleet": 0, "Fleet": 0,
@@ -317,8 +314,7 @@
"Fleet2Formation": "double_line", "Fleet2Formation": "double_line",
"Fleet2Mode": "combat_auto", "Fleet2Mode": "combat_auto",
"Fleet2Step": 2, "Fleet2Step": 2,
"FleetOrder": "fleet1_mob_fleet2_boss", "FleetOrder": "fleet1_mob_fleet2_boss"
"AutoSearchFleetOrder": "fleet1_mob_fleet2_boss"
}, },
"Emotion": { "Emotion": {
"CalculateEmotion": true, "CalculateEmotion": true,
@@ -380,8 +376,7 @@
"Fleet2Formation": "double_line", "Fleet2Formation": "double_line",
"Fleet2Mode": "combat_auto", "Fleet2Mode": "combat_auto",
"Fleet2Step": 2, "Fleet2Step": 2,
"FleetOrder": "fleet1_mob_fleet2_boss", "FleetOrder": "fleet1_mob_fleet2_boss"
"AutoSearchFleetOrder": "fleet1_mob_fleet2_boss"
}, },
"Submarine": { "Submarine": {
"Fleet": 0, "Fleet": 0,
@@ -453,8 +448,7 @@
"Fleet2Formation": "double_line", "Fleet2Formation": "double_line",
"Fleet2Mode": "combat_auto", "Fleet2Mode": "combat_auto",
"Fleet2Step": 2, "Fleet2Step": 2,
"FleetOrder": "fleet1_mob_fleet2_boss", "FleetOrder": "fleet1_mob_fleet2_boss"
"AutoSearchFleetOrder": "fleet1_mob_fleet2_boss"
}, },
"Submarine": { "Submarine": {
"Fleet": 0, "Fleet": 0,
@@ -530,8 +524,7 @@
"Fleet2Formation": "double_line", "Fleet2Formation": "double_line",
"Fleet2Mode": "combat_auto", "Fleet2Mode": "combat_auto",
"Fleet2Step": 2, "Fleet2Step": 2,
"FleetOrder": "fleet1_mob_fleet2_boss", "FleetOrder": "fleet1_mob_fleet2_boss"
"AutoSearchFleetOrder": "fleet1_mob_fleet2_boss"
}, },
"Submarine": { "Submarine": {
"Fleet": 0, "Fleet": 0,
@@ -604,8 +597,7 @@
"Fleet2Formation": "double_line", "Fleet2Formation": "double_line",
"Fleet2Mode": "combat_auto", "Fleet2Mode": "combat_auto",
"Fleet2Step": 2, "Fleet2Step": 2,
"FleetOrder": "fleet1_mob_fleet2_boss", "FleetOrder": "fleet1_mob_fleet2_boss"
"AutoSearchFleetOrder": "fleet1_mob_fleet2_boss"
}, },
"Submarine": { "Submarine": {
"Fleet": 0, "Fleet": 0,
@@ -674,8 +666,7 @@
"Fleet2Formation": "double_line", "Fleet2Formation": "double_line",
"Fleet2Mode": "combat_auto", "Fleet2Mode": "combat_auto",
"Fleet2Step": 2, "Fleet2Step": 2,
"FleetOrder": "fleet1_mob_fleet2_boss", "FleetOrder": "fleet1_mob_fleet2_boss"
"AutoSearchFleetOrder": "fleet1_mob_fleet2_boss"
}, },
"Submarine": { "Submarine": {
"Fleet": 0, "Fleet": 0,
@@ -1164,8 +1155,7 @@
"Fleet2Formation": "double_line", "Fleet2Formation": "double_line",
"Fleet2Mode": "combat_auto", "Fleet2Mode": "combat_auto",
"Fleet2Step": 2, "Fleet2Step": 2,
"FleetOrder": "fleet1_mob_fleet2_boss", "FleetOrder": "fleet1_mob_fleet2_boss"
"AutoSearchFleetOrder": "fleet1_all_fleet2_standby"
}, },
"Submarine": { "Submarine": {
"Fleet": 0, "Fleet": 0,
@@ -1234,8 +1224,7 @@
"Fleet2Formation": "double_line", "Fleet2Formation": "double_line",
"Fleet2Mode": "combat_auto", "Fleet2Mode": "combat_auto",
"Fleet2Step": 2, "Fleet2Step": 2,
"FleetOrder": "fleet1_mob_fleet2_boss", "FleetOrder": "fleet1_mob_fleet2_boss"
"AutoSearchFleetOrder": "fleet1_mob_fleet2_boss"
}, },
"Submarine": { "Submarine": {
"Fleet": 0, "Fleet": 0,

110
module/config/argument/args.json
View File

@@ -407,16 +407,6 @@
"fleet1_all_fleet2_standby", "fleet1_all_fleet2_standby",
"fleet1_standby_fleet2_all" "fleet1_standby_fleet2_all"
] ]
},
"AutoSearchFleetOrder": {
"type": "select",
"value": "fleet1_mob_fleet2_boss",
"option": [
"fleet1_mob_fleet2_boss",
"fleet1_boss_fleet2_mob",
"fleet1_all_fleet2_standby",
"fleet1_standby_fleet2_all"
]
} }
}, },
"Submarine": { "Submarine": {
@@ -773,16 +763,6 @@
"fleet1_all_fleet2_standby", "fleet1_all_fleet2_standby",
"fleet1_standby_fleet2_all" "fleet1_standby_fleet2_all"
] ]
},
"AutoSearchFleetOrder": {
"type": "select",
"value": "fleet1_mob_fleet2_boss",
"option": [
"fleet1_mob_fleet2_boss",
"fleet1_boss_fleet2_mob",
"fleet1_all_fleet2_standby",
"fleet1_standby_fleet2_all"
]
} }
}, },
"Submarine": { "Submarine": {
@@ -1139,16 +1119,6 @@
"fleet1_all_fleet2_standby", "fleet1_all_fleet2_standby",
"fleet1_standby_fleet2_all" "fleet1_standby_fleet2_all"
] ]
},
"AutoSearchFleetOrder": {
"type": "select",
"value": "fleet1_mob_fleet2_boss",
"option": [
"fleet1_mob_fleet2_boss",
"fleet1_boss_fleet2_mob",
"fleet1_all_fleet2_standby",
"fleet1_standby_fleet2_all"
]
} }
}, },
"Submarine": { "Submarine": {
@@ -1589,16 +1559,6 @@
"fleet1_all_fleet2_standby", "fleet1_all_fleet2_standby",
"fleet1_standby_fleet2_all" "fleet1_standby_fleet2_all"
] ]
},
"AutoSearchFleetOrder": {
"type": "select",
"value": "fleet1_mob_fleet2_boss",
"option": [
"fleet1_mob_fleet2_boss",
"fleet1_boss_fleet2_mob",
"fleet1_all_fleet2_standby",
"fleet1_standby_fleet2_all"
]
} }
}, },
"Emotion": { "Emotion": {
@@ -1945,16 +1905,6 @@
"fleet1_all_fleet2_standby", "fleet1_all_fleet2_standby",
"fleet1_standby_fleet2_all" "fleet1_standby_fleet2_all"
] ]
},
"AutoSearchFleetOrder": {
"type": "select",
"value": "fleet1_mob_fleet2_boss",
"option": [
"fleet1_mob_fleet2_boss",
"fleet1_boss_fleet2_mob",
"fleet1_all_fleet2_standby",
"fleet1_standby_fleet2_all"
]
} }
}, },
"Submarine": { "Submarine": {
@@ -2361,16 +2311,6 @@
"fleet1_all_fleet2_standby", "fleet1_all_fleet2_standby",
"fleet1_standby_fleet2_all" "fleet1_standby_fleet2_all"
] ]
},
"AutoSearchFleetOrder": {
"type": "select",
"value": "fleet1_mob_fleet2_boss",
"option": [
"fleet1_mob_fleet2_boss",
"fleet1_boss_fleet2_mob",
"fleet1_all_fleet2_standby",
"fleet1_standby_fleet2_all"
]
} }
}, },
"Submarine": { "Submarine": {
@@ -2787,16 +2727,6 @@
"fleet1_all_fleet2_standby", "fleet1_all_fleet2_standby",
"fleet1_standby_fleet2_all" "fleet1_standby_fleet2_all"
] ]
},
"AutoSearchFleetOrder": {
"type": "select",
"value": "fleet1_mob_fleet2_boss",
"option": [
"fleet1_mob_fleet2_boss",
"fleet1_boss_fleet2_mob",
"fleet1_all_fleet2_standby",
"fleet1_standby_fleet2_all"
]
} }
}, },
"Submarine": { "Submarine": {
@@ -3202,16 +3132,6 @@
"fleet1_all_fleet2_standby", "fleet1_all_fleet2_standby",
"fleet1_standby_fleet2_all" "fleet1_standby_fleet2_all"
] ]
},
"AutoSearchFleetOrder": {
"type": "select",
"value": "fleet1_mob_fleet2_boss",
"option": [
"fleet1_mob_fleet2_boss",
"fleet1_boss_fleet2_mob",
"fleet1_all_fleet2_standby",
"fleet1_standby_fleet2_all"
]
} }
}, },
"Submarine": { "Submarine": {
@@ -3607,16 +3527,6 @@
"fleet1_all_fleet2_standby", "fleet1_all_fleet2_standby",
"fleet1_standby_fleet2_all" "fleet1_standby_fleet2_all"
] ]
},
"AutoSearchFleetOrder": {
"type": "select",
"value": "fleet1_mob_fleet2_boss",
"option": [
"fleet1_mob_fleet2_boss",
"fleet1_boss_fleet2_mob",
"fleet1_all_fleet2_standby",
"fleet1_standby_fleet2_all"
]
} }
}, },
"Submarine": { "Submarine": {
@@ -5510,16 +5420,6 @@
"fleet1_all_fleet2_standby", "fleet1_all_fleet2_standby",
"fleet1_standby_fleet2_all" "fleet1_standby_fleet2_all"
] ]
},
"AutoSearchFleetOrder": {
"type": "disable",
"value": "fleet1_all_fleet2_standby",
"option": [
"fleet1_mob_fleet2_boss",
"fleet1_boss_fleet2_mob",
"fleet1_all_fleet2_standby",
"fleet1_standby_fleet2_all"
]
} }
}, },
"Submarine": { "Submarine": {
@@ -5881,16 +5781,6 @@
"fleet1_all_fleet2_standby", "fleet1_all_fleet2_standby",
"fleet1_standby_fleet2_all" "fleet1_standby_fleet2_all"
] ]
},
"AutoSearchFleetOrder": {
"type": "select",
"value": "fleet1_mob_fleet2_boss",
"option": [
"fleet1_mob_fleet2_boss",
"fleet1_boss_fleet2_mob",
"fleet1_all_fleet2_standby",
"fleet1_standby_fleet2_all"
]
} }
}, },
"Submarine": { "Submarine": {

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

@@ -244,8 +244,6 @@ Sos:
StageIncrease: false StageIncrease: false
GetNewShip: false GetNewShip: false
ReachLevel: 0 ReachLevel: 0
Fleet:
AutoSearchFleetOrder: fleet1_all_fleet2_standby
Submarine: Submarine:
AutoSearchMode: sub_standby AutoSearchMode: sub_standby
WarArchives: WarArchives: