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

Merge branch 'master' into dev

This commit is contained in:
LmeSzinc
2022-02-25 23:38:54 +08:00
100 changed files with 2670 additions and 871 deletions

View File

@@ -1708,6 +1708,8 @@
"value": "campaign_main",
"option": [
"campaign_main",
"event_20220224_cn",
"event_20210225_cn",
"event_20220210_cn",
"event_20201229_cn",
"event_20211229_cn",
@@ -1734,7 +1736,6 @@
"event_20210415_tw",
"event_20210325_cn",
"event_20210225_tw",
"event_20210225_cn",
"event_20210121_cn",
"event_20201126_cn",
"event_20200312_cn",
@@ -1751,10 +1752,10 @@
"event_20200326_cn",
"event_20200227_cn"
],
"cn": "event_20220210_cn",
"en": "event_20220210_cn",
"jp": "event_20220210_cn",
"tw": "event_20201229_cn"
"cn": "event_20220224_cn",
"en": "event_20220224_cn",
"jp": "event_20220224_cn",
"tw": "event_20210225_cn"
},
"Mode": {
"type": "disable",
@@ -2059,6 +2060,8 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20220224_cn",
"event_20210225_cn",
"event_20220210_cn",
"event_20201229_cn",
"event_20211229_cn",
@@ -2085,7 +2088,6 @@
"event_20210415_tw",
"event_20210325_cn",
"event_20210225_tw",
"event_20210225_cn",
"event_20210121_cn",
"event_20201126_cn",
"event_20200312_cn",
@@ -2102,10 +2104,10 @@
"event_20200326_cn",
"event_20200227_cn"
],
"cn": "event_20220210_cn",
"en": "event_20220210_cn",
"jp": "event_20220210_cn",
"tw": "event_20201229_cn"
"cn": "event_20220224_cn",
"en": "event_20220224_cn",
"jp": "event_20220224_cn",
"tw": "event_20210225_cn"
},
"Mode": {
"type": "disable",
@@ -2480,6 +2482,8 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20220224_cn",
"event_20210225_cn",
"event_20220210_cn",
"event_20201229_cn",
"event_20211229_cn",
@@ -2506,7 +2510,6 @@
"event_20210415_tw",
"event_20210325_cn",
"event_20210225_tw",
"event_20210225_cn",
"event_20210121_cn",
"event_20201126_cn",
"event_20200312_cn",
@@ -2523,10 +2526,10 @@
"event_20200326_cn",
"event_20200227_cn"
],
"cn": "event_20220210_cn",
"en": "event_20220210_cn",
"jp": "event_20220210_cn",
"tw": "event_20201229_cn"
"cn": "event_20220224_cn",
"en": "event_20220224_cn",
"jp": "event_20220224_cn",
"tw": "event_20210225_cn"
},
"Mode": {
"type": "disable",
@@ -2890,6 +2893,8 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20220224_cn",
"event_20210225_cn",
"event_20220210_cn",
"event_20201229_cn",
"event_20211229_cn",
@@ -2916,7 +2921,6 @@
"event_20210415_tw",
"event_20210325_cn",
"event_20210225_tw",
"event_20210225_cn",
"event_20210121_cn",
"event_20201126_cn",
"event_20200312_cn",
@@ -2933,10 +2937,10 @@
"event_20200326_cn",
"event_20200227_cn"
],
"cn": "event_20220210_cn",
"en": "event_20220210_cn",
"jp": "event_20220210_cn",
"tw": "event_20201229_cn"
"cn": "event_20220224_cn",
"en": "event_20220224_cn",
"jp": "event_20220224_cn",
"tw": "event_20210225_cn"
},
"Mode": {
"type": "disable",
@@ -3290,6 +3294,8 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20220224_cn",
"event_20210225_cn",
"event_20220210_cn",
"event_20201229_cn",
"event_20211229_cn",
@@ -3316,7 +3322,6 @@
"event_20210415_tw",
"event_20210325_cn",
"event_20210225_tw",
"event_20210225_cn",
"event_20210121_cn",
"event_20201126_cn",
"event_20200312_cn",
@@ -3333,10 +3338,10 @@
"event_20200326_cn",
"event_20200227_cn"
],
"cn": "event_20220210_cn",
"en": "event_20220210_cn",
"jp": "event_20220210_cn",
"tw": "event_20201229_cn"
"cn": "event_20220224_cn",
"en": "event_20220224_cn",
"jp": "event_20220224_cn",
"tw": "event_20210225_cn"
},
"Mode": {
"type": "disable",
@@ -6303,12 +6308,11 @@
"type": "select",
"value": 5,
"option": [
1,
2,
3,
4,
5,
6
6,
10
]
},
"TargetZone": {

View File

@@ -475,7 +475,7 @@ OpsiMeowfficerFarming:
ActionPointPreserve: 500
HazardLevel:
value: 5
option: [1, 2, 3, 4, 5, 6]
option: [3, 4, 5, 6, 10]
TargetZone:
value: 0

View File

@@ -342,7 +342,7 @@ class GeneratedConfig:
# Group `OpsiMeowfficerFarming`
OpsiMeowfficerFarming_ActionPointPreserve = 500
OpsiMeowfficerFarming_HazardLevel = 5 # 1, 2, 3, 4, 5, 6
OpsiMeowfficerFarming_HazardLevel = 5 # 3, 4, 5, 6, 10
OpsiMeowfficerFarming_TargetZone = 0
# Group `Daemon`

View File

@@ -89,6 +89,7 @@ class ManualConfig:
MAP_HAS_MAZE = False # event_20210422_cn adds maze and maze walls move every 3 rounds.
MAP_HAS_FORTRESS = False # event_2021917_cn, clear fortress to remove roadblock to boss.
MAP_HAS_MISSILE_ATTACK = False # event_202111229_cn, missile attack covers the feature area of sirens.
MAP_HAS_BOUNCING_ENEMY = False # event_20220224_cn, enemy is bouncing in a fixed route.
MAP_FOCUS_ENEMY_AFTER_BATTLE = False # Operation siren
MAP_ENEMY_TEMPLATE = ['Light', 'Main', 'Carrier', 'Treasure']
MAP_SIREN_TEMPLATE = ['DD', 'CL', 'CA', 'BB', 'CV']
@@ -156,7 +157,7 @@ class ManualConfig:
HOMO_RECTANGLE_THRESHOLD = 10
HOMO_EDGE_DETECT = True
HOMO_EDGE_HOUGHLINES_THRESHOLD = 120
HOMO_EDGE_HOUGHLINES_THRESHOLD = 140
HOMO_EDGE_COLOR_RANGE = (0, 24)
# ((x, y), [upper-left, upper-right, bottom-left, bottom-right])
HOMO_STORAGE = None

View File

@@ -455,6 +455,8 @@
"name": "Event Name",
"help": "Automatically selects to the latest event",
"campaign_main": "campaign_main",
"event_20220224_cn": "Abyssal Refrain",
"event_20210225_cn": "Khorovod of Dawns Rime",
"event_20220210_cn": "Northern Overture Rerun",
"raid_20220127": "Mystery Investigation",
"event_20201229_cn": "Inverted Orthant",
@@ -483,7 +485,6 @@
"event_20210415_tw": "復刻圍剿施佩伯爵",
"event_20210325_cn": "Ashen Simulacrum Rerun",
"event_20210225_tw": "北境序曲",
"event_20210225_cn": "Khorovod of Dawns Rime",
"event_20210121_cn": "Empyreal Tragicomedy Rerun",
"event_20201126_cn": "Vacation Lane",
"event_20200312_cn": "The Solomon Ranger Rerun",
@@ -1780,12 +1781,11 @@
"HazardLevel": {
"name": "Target Zone Hazard Level",
"help": "Recommend 3 or 5 as these have higher meowfficer ratio to AP cost",
"1": "1",
"2": "2",
"3": "3",
"4": "4",
"5": "5",
"6": "6"
"6": "6",
"10": "Center Zones"
},
"TargetZone": {
"name": "Target Zone ID",

View File

@@ -455,6 +455,8 @@
"name": "Campaign.Event.name",
"help": "Campaign.Event.help",
"campaign_main": "campaign_main",
"event_20220224_cn": "鳴動せし星霜の淵",
"event_20210225_cn": "暁射す氷華の嵐",
"event_20220210_cn": "凍絶の北海(復刻)",
"raid_20220127": "秘密事件調査",
"event_20201229_cn": "虚畳なりし限象",
@@ -483,7 +485,6 @@
"event_20210415_tw": "復刻圍剿施佩伯爵",
"event_20210325_cn": "開かれし紺碧の砂箱(復刻)",
"event_20210225_tw": "北境序曲",
"event_20210225_cn": "暁射す氷華の嵐",
"event_20210121_cn": "悲歎せし焔海の詩(復刻)",
"event_20201126_cn": "バケーションレーン",
"event_20200312_cn": "南洋に靡く硝煙(復刻)",
@@ -1780,12 +1781,11 @@
"HazardLevel": {
"name": "OpsiMeowfficerFarming.HazardLevel.name",
"help": "OpsiMeowfficerFarming.HazardLevel.help",
"1": "1",
"2": "2",
"3": "3",
"4": "4",
"5": "5",
"6": "6"
"6": "6",
"10": "10"
},
"TargetZone": {
"name": "OpsiMeowfficerFarming.TargetZone.name",

View File

@@ -455,6 +455,8 @@
"name": "活动名称",
"help": "自动选择至最新的活动",
"campaign_main": "主线图",
"event_20220224_cn": "深度回音",
"event_20210225_cn": "破晓冰华",
"event_20220210_cn": "复刻北境序曲",
"raid_20220127": "演习神秘事件调查",
"event_20201229_cn": "负象限作战",
@@ -483,7 +485,6 @@
"event_20210415_tw": "復刻圍剿施佩伯爵",
"event_20210325_cn": "复刻箱庭疗法",
"event_20210225_tw": "北境序曲",
"event_20210225_cn": "破晓冰华",
"event_20210121_cn": "复刻神圣的悲喜剧",
"event_20201126_cn": "假日航线",
"event_20200312_cn": "复刻斯图尔特的硝烟",
@@ -1780,12 +1781,11 @@
"HazardLevel": {
"name": "侵蚀等级",
"help": "按顺时针出击特定侵蚀等级的海域\n建议选 5 或 3有更高的 猫点/行动力 比",
"1": "1",
"2": "2",
"3": "3",
"4": "4",
"5": "5",
"6": "6"
"6": "6",
"10": "中心海域"
},
"TargetZone": {
"name": "指定海域",

View File

@@ -455,6 +455,8 @@
"name": "活動名稱",
"help": "自動選擇至最新的活動圖",
"campaign_main": "主線圖",
"event_20220224_cn": "Abyssal Refrain",
"event_20210225_cn": "破曉冰華",
"event_20220210_cn": "Northern Overture Rerun",
"raid_20220127": "Mystery Investigation",
"event_20201229_cn": "負象限作戰",
@@ -483,7 +485,6 @@
"event_20210415_tw": "復刻圍剿施佩伯爵",
"event_20210325_cn": "Ashen Simulacrum Rerun",
"event_20210225_tw": "北境序曲",
"event_20210225_cn": "Khorovod of Dawns Rime",
"event_20210121_cn": "Empyreal Tragicomedy Rerun",
"event_20201126_cn": "Vacation Lane",
"event_20200312_cn": "斯圖爾特的硝煙",
@@ -1780,12 +1781,11 @@
"HazardLevel": {
"name": "侵蝕等級",
"help": "按順時針出擊特定侵蝕等級的海域\n建議選 5 或 3 ,有更高的 貓點/行動力 比",
"1": "1",
"2": "2",
"3": "3",
"4": "4",
"5": "5",
"6": "6"
"6": "6",
"10": "中心海域"
},
"TargetZone": {
"name": "指定海域",