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

merge alas

Browse Source
This commit is contained in:
SevCrane
2024-06-05 23:57:58 +08:00
parent 3cb29a9a37
commit abfbbe5064
146 changed files with 0 additions and 13646 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1622,7 +1622,6 @@
"cassin_or_downes"
]
},
<<<<<<< HEAD
"ALLowLowVanguardLevel": {
"type": "checkbox",
"value": true
@@ -1640,8 +1639,6 @@
"type": "checkbox",
"value": true
},
=======
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
"CommissionLimit": {
"type": "checkbox",
"value": true
@@ -2847,7 +2844,6 @@
}
}
},
<<<<<<< HEAD
"Event3": {
"Scheduler": {
"Enable": {
@@ -3296,8 +3292,6 @@
}
}
},
=======
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
"Raid": {
"Scheduler": {
"Enable": {
@@ -7894,7 +7888,6 @@
}
},
"Exercise": {
<<<<<<< HEAD
"DelayUntilHoursBeforeNextUpdate": {
"type": "select",
"value": 12,
@@ -7907,8 +7900,6 @@
12
]
},
=======
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
"OpponentChooseMode": {
"type": "select",
"value": "max_exp",
@@ -8853,7 +8844,6 @@
4
]
},
<<<<<<< HEAD
"FleetMode": {
"type": "select",
"value": "combat_auto",
@@ -8864,8 +8854,6 @@
"hide_in_bottom_left"
]
},
=======
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
"Submarine": {
"type": "checkbox",
"value": false
@@ -9039,7 +9027,6 @@
4
]
},
<<<<<<< HEAD
"FleetMode": {
"type": "select",
"value": "combat_auto",
@@ -9050,8 +9037,6 @@
"hide_in_bottom_left"
]
},
=======
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
"Submarine": {
"type": "checkbox",
"value": false
@@ -9119,7 +9104,6 @@
4
]
},
<<<<<<< HEAD
"FleetMode": {
"type": "select",
"value": "combat_auto",
@@ -9130,8 +9114,6 @@
"hide_in_bottom_left"
]
},
=======
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
"Submarine": {
"type": "checkbox",
"value": false
@@ -9250,7 +9232,6 @@
4
]
},
<<<<<<< HEAD
"FleetMode": {
"type": "select",
"value": "combat_auto",
@@ -9261,8 +9242,6 @@
"hide_in_bottom_left"
]
},
=======
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
"Submarine": {
"type": "checkbox",
"value": false
@@ -9325,7 +9304,6 @@
"value": "Fleet-4 > CallSubmarine > Fleet-2 > Fleet-3 > Fleet-1"
}
},
<<<<<<< HEAD
"OpsiFleet": {
"Fleet": {
"type": "select",
@@ -9354,8 +9332,6 @@
"display": "hide"
}
},
=======
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
"Storage": {
"Storage": {
"type": "storage",
@@ -9502,7 +9478,6 @@
4
]
},
<<<<<<< HEAD
"FleetMode": {
"type": "select",
"value": "combat_auto",
@@ -9513,8 +9488,6 @@
"hide_in_bottom_left"
]
},
=======
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
"Submarine": {
"type": "checkbox",
"value": false
@@ -9587,7 +9560,6 @@
4
]
},
<<<<<<< HEAD
"FleetMode": {
"type": "select",
"value": "combat_auto",
@@ -9598,8 +9570,6 @@
"hide_in_bottom_left"
]
},
=======
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
"Submarine": {
"type": "checkbox",
"value": false,
@@ -9752,7 +9722,6 @@
"value": true
}
},
<<<<<<< HEAD
"GGHandler": {
"Enabled": {
"type": "checkbox",
@@ -10033,8 +10002,6 @@
"validate": "datetime"
}
},
=======
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
"Storage": {
"Storage": {
"type": "storage",