sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-12 15:36:59 +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",
"Fleet2Mode": "combat_auto",
"Fleet2Step": 2,
"FleetOrder": "fleet1_mob_fleet2_boss",
"AutoSearchFleetOrder": "fleet1_mob_fleet2_boss"
"FleetOrder": "fleet1_mob_fleet2_boss"
},
"Submarine": {
"Fleet": 0,
@@ -163,8 +162,7 @@
"Fleet2Formation": "double_line",
"Fleet2Mode": "combat_auto",
"Fleet2Step": 2,
"FleetOrder": "fleet1_mob_fleet2_boss",
"AutoSearchFleetOrder": "fleet1_mob_fleet2_boss"
"FleetOrder": "fleet1_mob_fleet2_boss"
},
"Submarine": {
"Fleet": 0,
@@ -236,8 +234,7 @@
"Fleet2Formation": "double_line",
"Fleet2Mode": "combat_auto",
"Fleet2Step": 2,
"FleetOrder": "fleet1_mob_fleet2_boss",
"AutoSearchFleetOrder": "fleet1_mob_fleet2_boss"
"FleetOrder": "fleet1_mob_fleet2_boss"
},
"Submarine": {
"Fleet": 0,
@@ -317,8 +314,7 @@
"Fleet2Formation": "double_line",
"Fleet2Mode": "combat_auto",
"Fleet2Step": 2,
"FleetOrder": "fleet1_mob_fleet2_boss",
"AutoSearchFleetOrder": "fleet1_mob_fleet2_boss"
"FleetOrder": "fleet1_mob_fleet2_boss"
},
"Emotion": {
"CalculateEmotion": true,
@@ -380,8 +376,7 @@
"Fleet2Formation": "double_line",
"Fleet2Mode": "combat_auto",
"Fleet2Step": 2,
"FleetOrder": "fleet1_mob_fleet2_boss",
"AutoSearchFleetOrder": "fleet1_mob_fleet2_boss"
"FleetOrder": "fleet1_mob_fleet2_boss"
},
"Submarine": {
"Fleet": 0,
@@ -453,8 +448,7 @@
"Fleet2Formation": "double_line",
"Fleet2Mode": "combat_auto",
"Fleet2Step": 2,
"FleetOrder": "fleet1_mob_fleet2_boss",
"AutoSearchFleetOrder": "fleet1_mob_fleet2_boss"
"FleetOrder": "fleet1_mob_fleet2_boss"
},
"Submarine": {
"Fleet": 0,
@@ -530,8 +524,7 @@
"Fleet2Formation": "double_line",
"Fleet2Mode": "combat_auto",
"Fleet2Step": 2,
"FleetOrder": "fleet1_mob_fleet2_boss",
"AutoSearchFleetOrder": "fleet1_mob_fleet2_boss"
"FleetOrder": "fleet1_mob_fleet2_boss"
},
"Submarine": {
"Fleet": 0,
@@ -604,8 +597,7 @@
"Fleet2Formation": "double_line",
"Fleet2Mode": "combat_auto",
"Fleet2Step": 2,
"FleetOrder": "fleet1_mob_fleet2_boss",
"AutoSearchFleetOrder": "fleet1_mob_fleet2_boss"
"FleetOrder": "fleet1_mob_fleet2_boss"
},
"Submarine": {
"Fleet": 0,
@@ -674,8 +666,7 @@
"Fleet2Formation": "double_line",
"Fleet2Mode": "combat_auto",
"Fleet2Step": 2,
"FleetOrder": "fleet1_mob_fleet2_boss",
"AutoSearchFleetOrder": "fleet1_mob_fleet2_boss"
"FleetOrder": "fleet1_mob_fleet2_boss"
},
"Submarine": {
"Fleet": 0,
@@ -1164,8 +1155,7 @@
"Fleet2Formation": "double_line",
"Fleet2Mode": "combat_auto",
"Fleet2Step": 2,
"FleetOrder": "fleet1_mob_fleet2_boss",
"AutoSearchFleetOrder": "fleet1_all_fleet2_standby"
"FleetOrder": "fleet1_mob_fleet2_boss"
},
"Submarine": {
"Fleet": 0,
@@ -1234,8 +1224,7 @@
"Fleet2Formation": "double_line",
"Fleet2Mode": "combat_auto",
"Fleet2Step": 2,
"FleetOrder": "fleet1_mob_fleet2_boss",
"AutoSearchFleetOrder": "fleet1_mob_fleet2_boss"
"FleetOrder": "fleet1_mob_fleet2_boss"
},
"Submarine": {
"Fleet": 0,