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

Fix: merge LmeSzinc/dev into branch, resolve conflicts

Browse Source
This commit is contained in:
nEEtdo0d
2022-11-29 15:04:47 -05:00
parent b625b23717 90223d84e1
commit bc3376e191
113 changed files with 2254 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,6 +57,7 @@
"cn_android-19",
"cn_android-20",
"cn_android-21",
"cn_android-22",
"cn_ios-0",
"cn_ios-1",
"cn_ios-2",
@@ -1516,6 +1517,8 @@
"value": "campaign_main",
"option": [
"campaign_main",
"event_20221124_cn",
"event_20210325_cn",
"event_20201229_cn",
"event_20211111_cn",
"event_20210121_cn",
@@ -1541,7 +1544,6 @@
"event_20220224_cn",
"event_20210225_cn",
"event_20220210_cn",
"event_20201229_cn",
"event_20211229_cn",
"event_20211125_cn",
"event_20211028_tw",
@@ -1555,7 +1557,6 @@
"event_20210527_tw",
"event_20210429_tw",
"event_20210415_tw",
"event_20210325_cn",
"event_20210225_tw",
"event_20201126_cn",
"event_20200312_cn",
@@ -1570,10 +1571,10 @@
"event_20200326_cn",
"event_20200227_cn"
],
"cn": "event_20201229_cn",
"en": "event_20201229_cn",
"jp": "event_20201229_cn",
"tw": "event_20201229_cn"
"cn": "event_20221124_cn",
"en": "event_20221124_cn",
"jp": "event_20221124_cn",
"tw": "event_20210325_cn"
},
"Mode": {
"type": "select",
@@ -1937,6 +1938,8 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20221124_cn",
"event_20210325_cn",
"event_20201229_cn",
"event_20211111_cn",
"event_20210121_cn",
@@ -1975,7 +1978,6 @@
"event_20210527_tw",
"event_20210429_tw",
"event_20210415_tw",
"event_20210325_cn",
"event_20210225_tw",
"event_20201126_cn",
"event_20200312_cn",
@@ -1991,10 +1993,10 @@
"event_20200227_cn"
],
"display": "disabled",
"cn": "event_20201229_cn",
"en": "event_20201229_cn",
"jp": "event_20201229_cn",
"tw": "event_20201229_cn"
"cn": "event_20221124_cn",
"en": "event_20221124_cn",
"jp": "event_20221124_cn",
"tw": "event_20210325_cn"
},
"Mode": {
"type": "select",
@@ -2357,6 +2359,8 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20221124_cn",
"event_20210325_cn",
"event_20201229_cn",
"event_20211111_cn",
"event_20210121_cn",
@@ -2395,7 +2399,6 @@
"event_20210527_tw",
"event_20210429_tw",
"event_20210415_tw",
"event_20210325_cn",
"event_20210225_tw",
"event_20201126_cn",
"event_20200312_cn",
@@ -2411,10 +2414,10 @@
"event_20200227_cn"
],
"display": "disabled",
"cn": "event_20201229_cn",
"en": "event_20201229_cn",
"jp": "event_20201229_cn",
"tw": "event_20211111_cn"
"cn": "event_20221124_cn",
"en": "event_20221124_cn",
"jp": "event_20221124_cn",
"tw": "event_20210325_cn"
},
"Mode": {
"type": "select",
@@ -2788,6 +2791,8 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20221124_cn",
"event_20210325_cn",
"event_20201229_cn",
"event_20211111_cn",
"event_20210121_cn",
@@ -2813,7 +2818,6 @@
"event_20220224_cn",
"event_20210225_cn",
"event_20220210_cn",
"event_20201229_cn",
"event_20211229_cn",
"event_20211125_cn",
"event_20211028_tw",
@@ -2827,7 +2831,6 @@
"event_20210527_tw",
"event_20210429_tw",
"event_20210415_tw",
"event_20210325_cn",
"event_20210225_tw",
"event_20201126_cn",
"event_20200312_cn",
@@ -2843,10 +2846,10 @@
"event_20200227_cn"
],
"display": "disabled",
"cn": "event_20201229_cn",
"en": "event_20201229_cn",
"jp": "event_20201229_cn",
"tw": "event_20201229_cn"
"cn": "event_20221124_cn",
"en": "event_20221124_cn",
"jp": "event_20221124_cn",
"tw": "event_20210325_cn"
},
"Mode": {
"type": "select",
@@ -3226,6 +3229,8 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20221124_cn",
"event_20210325_cn",
"event_20201229_cn",
"event_20211111_cn",
"event_20210121_cn",
@@ -3251,7 +3256,6 @@
"event_20220224_cn",
"event_20210225_cn",
"event_20220210_cn",
"event_20201229_cn",
"event_20211229_cn",
"event_20211125_cn",
"event_20211028_tw",
@@ -3265,7 +3269,6 @@
"event_20210527_tw",
"event_20210429_tw",
"event_20210415_tw",
"event_20210325_cn",
"event_20210225_tw",
"event_20201126_cn",
"event_20200312_cn",
@@ -3281,10 +3284,10 @@
"event_20200227_cn"
],
"display": "disabled",
"cn": "event_20201229_cn",
"en": "event_20201229_cn",
"jp": "event_20201229_cn",
"tw": "event_20211111_cn"
"cn": "event_20221124_cn",
"en": "event_20221124_cn",
"jp": "event_20221124_cn",
"tw": "event_20210325_cn"
},
"Mode": {
"type": "select",
@@ -3664,6 +3667,8 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20221124_cn",
"event_20210325_cn",
"event_20201229_cn",
"event_20211111_cn",
"event_20210121_cn",
@@ -3689,7 +3694,6 @@
"event_20220224_cn",
"event_20210225_cn",
"event_20220210_cn",
"event_20201229_cn",
"event_20211229_cn",
"event_20211125_cn",
"event_20211028_tw",
@@ -3703,7 +3707,6 @@
"event_20210527_tw",
"event_20210429_tw",
"event_20210415_tw",
"event_20210325_cn",
"event_20210225_tw",
"event_20201126_cn",
"event_20200312_cn",
@@ -3719,10 +3722,10 @@
"event_20200227_cn"
],
"display": "disabled",
"cn": "event_20201229_cn",
"en": "event_20201229_cn",
"jp": "event_20201229_cn",
"tw": "event_20201229_cn"
"cn": "event_20221124_cn",
"en": "event_20221124_cn",
"jp": "event_20221124_cn",
"tw": "event_20210325_cn"
},
"Mode": {
"type": "select",
@@ -4102,6 +4105,8 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20221124_cn",
"event_20210325_cn",
"event_20201229_cn",
"event_20211111_cn",
"event_20210121_cn",
@@ -4127,7 +4132,6 @@
"event_20220224_cn",
"event_20210225_cn",
"event_20220210_cn",
"event_20201229_cn",
"event_20211229_cn",
"event_20211125_cn",
"event_20211028_tw",
@@ -4141,7 +4145,6 @@
"event_20210527_tw",
"event_20210429_tw",
"event_20210415_tw",
"event_20210325_cn",
"event_20210225_tw",
"event_20201126_cn",
"event_20200312_cn",
@@ -4157,10 +4160,10 @@
"event_20200227_cn"
],
"display": "disabled",
"cn": "event_20201229_cn",
"en": "event_20201229_cn",
"jp": "event_20201229_cn",
"tw": "event_20201229_cn"
"cn": "event_20221124_cn",
"en": "event_20221124_cn",
"jp": "event_20221124_cn",
"tw": "event_20210325_cn"
},
"Mode": {
"type": "select",
@@ -4530,6 +4533,8 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20221124_cn",
"event_20210325_cn",
"event_20201229_cn",
"event_20211111_cn",
"event_20210121_cn",
@@ -4555,7 +4560,6 @@
"event_20220224_cn",
"event_20210225_cn",
"event_20220210_cn",
"event_20201229_cn",
"event_20211229_cn",
"event_20211125_cn",
"event_20211028_tw",
@@ -4569,7 +4573,6 @@
"event_20210527_tw",
"event_20210429_tw",
"event_20210415_tw",
"event_20210325_cn",
"event_20210225_tw",
"event_20201126_cn",
"event_20200312_cn",
@@ -4585,10 +4588,10 @@
"event_20200227_cn"
],
"display": "disabled",
"cn": "event_20201229_cn",
"en": "event_20201229_cn",
"jp": "event_20201229_cn",
"tw": "event_20211111_cn"
"cn": "event_20221124_cn",
"en": "event_20221124_cn",
"jp": "event_20221124_cn",
"tw": "event_20210325_cn"
},
"Mode": {
"type": "select",
@@ -7811,7 +7814,7 @@
},
"ServerUpdate": {
"type": "input",
"value": "00:00",
"value": "00:00, 12:00",
"display": "hide"
}
},
@@ -7963,7 +7966,7 @@
"OpsiMeowfficerFarming": {
"ActionPointPreserve": {
"type": "input",
"value": 500
"value": 1000
},
"HazardLevel": {
"type": "select",
@@ -7998,6 +8001,71 @@
}
}
},
"OpsiHazard1Leveling": {
"Scheduler": {
"Enable": {
"type": "checkbox",
"value": false
},
"NextRun": {
"type": "datetime",
"value": "2020-01-01 00:00:00",
"validate": "datetime"
},
"Command": {
"type": "input",
"value": "OpsiHazard1Leveling",
"display": "hide"
},
"SuccessInterval": {
"type": "input",
"value": 30,
"display": "hide"
},
"FailureInterval": {
"type": "input",
"value": 60,
"display": "hide"
},
"ServerUpdate": {
"type": "input",
"value": "00:00",
"display": "hide"
}
},
"OpsiHazard1Leveling": {
"StrategySearch": {
"type": "checkbox",
"value": true
},
"TargetZone": {
"type": "select",
"value": 0,
"option": [
0,
44,
22
]
}
},
"OpsiFleet": {
"Fleet": {
"type": "select",
"value": 1,
"option": [
1,
2,
3,
4
]
},
"Submarine": {
"type": "checkbox",
"value": false,
"display": "hide"
}
}
},
"Daemon": {
"Daemon": {
"EnterMap": {