1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-09 13:59:02 +08:00

Compare commits

..

4 Commits

Author SHA1 Message Date
sui-feng-cb
7e6b87bee8 Add: [CN] Spring Auction Adventure (raid_20260212) 2026-02-12 16:44:24 +08:00
LmeSzinc
7118c30fea Upd: [EN] TEMPLATE_REVELATIONS_OF_DUST 2026-02-09 23:40:21 +08:00
LmeSzinc
7d9e77e4fd Upd: Battle UI Ancient 2026-02-09 23:31:47 +08:00
ArecaSapling
5a32d9444c
Merge pull request #5500 from sui-feng-cb/event_update
Fix: raid_20240328 ex
2026-02-09 23:23:20 +08:00
54 changed files with 107 additions and 71 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.6 KiB

View File

@ -280,3 +280,4 @@ To add a new event, add a new row in here, and run `python -m module.config.conf
| 20260122 | event 20220526 cn | Pledge of the Radiant Court | - | - | - | 泠誓光庭 |
| 20260129 | coalition 20260122 | Light & Shadow Fashion Shoot! | - | - | - | 光影風尚-拍攝進行時 |
| 20260205 | raid 20240328 | From Zero to Hero | 复刻从零开始的魔王讨伐之旅 | From Zero to Hero Rerun | ゼロから頑張る魔王討伐(復刻) | - |
| 20260212 | raid 20260212 | Spring Auction Adventure | 春宴怀玉香满庭 | Spring Auction Adventure | 新春玉逸品会 | - |

View File

@ -124,6 +124,8 @@ class Combat(Level, HPBalancer, Retirement, SubmarineCall, CombatAuto, CombatMan
return PAUSE_ShadowPuppetry
if PAUSE_MaidCafe.match_template_color(self.device.image, offset=(10, 10)):
return PAUSE_MaidCafe
if PAUSE_Ancient.match_template_color(self.device.image, offset=(10, 10)):
return PAUSE_Ancient
return False
def handle_combat_quit(self, offset=(20, 20), interval=3):

View File

@ -5,6 +5,7 @@ from module.base.template import Template
# Don't modify it manually.
PAUSE = Button(area={'cn': (1158, 40, 1199, 58), 'en': (1155, 38, 1216, 51), 'jp': (1232, 36, 1240, 60), 'tw': (1217, 36, 1225, 59)}, color={'cn': (189, 190, 202), 'en': (164, 169, 181), 'jp': (244, 241, 246), 'tw': (247, 243, 247)}, button={'cn': (1157, 34, 1241, 61), 'en': (1136, 26, 1270, 63), 'jp': (1141, 38, 1220, 57), 'tw': (1157, 34, 1241, 61)}, file={'cn': './assets/cn/combat_ui/PAUSE.png', 'en': './assets/en/combat_ui/PAUSE.png', 'jp': './assets/jp/combat_ui/PAUSE.png', 'tw': './assets/tw/combat_ui/PAUSE.png'})
PAUSE_Ancient = Button(area={'cn': (1228, 36, 1245, 55), 'en': (1228, 36, 1245, 55), 'jp': (1228, 36, 1245, 55), 'tw': (1228, 36, 1245, 55)}, color={'cn': (172, 161, 144), 'en': (172, 161, 144), 'jp': (172, 161, 144), 'tw': (172, 161, 144)}, button={'cn': (1228, 36, 1245, 55), 'en': (1228, 36, 1245, 55), 'jp': (1228, 36, 1245, 55), 'tw': (1228, 36, 1245, 55)}, file={'cn': './assets/cn/combat_ui/PAUSE_Ancient.png', 'en': './assets/cn/combat_ui/PAUSE_Ancient.png', 'jp': './assets/cn/combat_ui/PAUSE_Ancient.png', 'tw': './assets/cn/combat_ui/PAUSE_Ancient.png'})
PAUSE_Christmas = Button(area={'cn': (1234, 35, 1250, 56), 'en': (1234, 35, 1250, 56), 'jp': (1234, 35, 1250, 56), 'tw': (1234, 35, 1250, 56)}, color={'cn': (158, 181, 210), 'en': (158, 181, 210), 'jp': (158, 181, 210), 'tw': (158, 181, 210)}, button={'cn': (1234, 35, 1250, 56), 'en': (1234, 35, 1250, 56), 'jp': (1234, 35, 1250, 56), 'tw': (1234, 35, 1250, 56)}, file={'cn': './assets/cn/combat_ui/PAUSE_Christmas.png', 'en': './assets/cn/combat_ui/PAUSE_Christmas.png', 'jp': './assets/cn/combat_ui/PAUSE_Christmas.png', 'tw': './assets/cn/combat_ui/PAUSE_Christmas.png'})
PAUSE_Cyber = Button(area={'cn': (1231, 32, 1253, 59), 'en': (1231, 32, 1253, 59), 'jp': (1231, 32, 1253, 59), 'tw': (1231, 32, 1253, 59)}, color={'cn': (40, 140, 157), 'en': (40, 140, 157), 'jp': (40, 140, 157), 'tw': (40, 140, 157)}, button={'cn': (1231, 32, 1253, 59), 'en': (1231, 32, 1253, 59), 'jp': (1231, 32, 1253, 59), 'tw': (1231, 32, 1253, 59)}, file={'cn': './assets/cn/combat_ui/PAUSE_Cyber.png', 'en': './assets/cn/combat_ui/PAUSE_Cyber.png', 'jp': './assets/cn/combat_ui/PAUSE_Cyber.png', 'tw': './assets/cn/combat_ui/PAUSE_Cyber.png'})
PAUSE_DOUBLE_CHECK = Button(area={'cn': (1226, 35, 1231, 60), 'en': (1226, 35, 1231, 61), 'jp': (1226, 35, 1230, 60), 'tw': (1226, 35, 1231, 60)}, color={'cn': (96, 104, 136), 'en': (83, 98, 118), 'jp': (97, 102, 120), 'tw': (96, 104, 136)}, button={'cn': (1226, 35, 1231, 60), 'en': (1226, 35, 1231, 61), 'jp': (1226, 35, 1230, 60), 'tw': (1226, 35, 1231, 60)}, file={'cn': './assets/cn/combat_ui/PAUSE_DOUBLE_CHECK.png', 'en': './assets/en/combat_ui/PAUSE_DOUBLE_CHECK.png', 'jp': './assets/jp/combat_ui/PAUSE_DOUBLE_CHECK.png', 'tw': './assets/tw/combat_ui/PAUSE_DOUBLE_CHECK.png'})

View File

@ -2722,24 +2722,24 @@
"type": "state",
"value": "campaign_main",
"option": [
"raid_20240328",
"raid_20250116"
"raid_20250116",
"raid_20260212"
],
"option_cn": [
"raid_20240328"
"raid_20260212"
],
"option_en": [
"raid_20240328"
"raid_20260212"
],
"option_jp": [
"raid_20240328"
"raid_20260212"
],
"option_tw": [
"raid_20250116"
],
"option_bold": [
"raid_20240328",
"raid_20250116"
"raid_20250116",
"raid_20260212"
]
},
"Mode": {
@ -6082,24 +6082,24 @@
"type": "state",
"value": "campaign_main",
"option": [
"raid_20240328",
"raid_20250116"
"raid_20250116",
"raid_20260212"
],
"option_cn": [
"raid_20240328"
"raid_20260212"
],
"option_en": [
"raid_20240328"
"raid_20260212"
],
"option_jp": [
"raid_20240328"
"raid_20260212"
],
"option_tw": [
"raid_20250116"
],
"option_bold": [
"raid_20240328",
"raid_20250116"
"raid_20250116",
"raid_20260212"
]
},
"Mode": {

View File

@ -23,11 +23,11 @@
"page": "setting",
"tasks": [
"EventGeneral",
"Coalition",
"Event",
"Event2",
"Raid",
"Hospital",
"Coalition",
"MaritimeEscort",
"WarArchives"
]
@ -36,13 +36,13 @@
"menu": "collapse",
"page": "setting",
"tasks": [
"CoalitionSp",
"EventA",
"EventB",
"EventC",
"EventD",
"EventSp",
"RaidDaily"
"RaidDaily",
"CoalitionSp"
]
},
"Reward": {

View File

@ -71,12 +71,6 @@ Event:
EventGeneral:
- EventGeneral
- TaskBalancer
Coalition:
- Scheduler
- Campaign
- Coalition
- StopCondition
- Emotion
Event:
- Scheduler
- Campaign
@ -106,6 +100,12 @@ Event:
- Hospital
- StopCondition
- Emotion
Coalition:
- Scheduler
- Campaign
- Coalition
- StopCondition
- Emotion
MaritimeEscort:
- Scheduler
- MaritimeEscort
@ -126,12 +126,6 @@ EventDaily:
menu: 'collapse'
page: 'setting'
tasks:
CoalitionSp:
- Scheduler
- Campaign
- Coalition
- StopCondition
- Emotion
EventA:
- Scheduler
- EventDaily
@ -187,6 +181,12 @@ EventDaily:
- Campaign
- StopCondition
- Emotion
CoalitionSp:
- Scheduler
- Campaign
- Coalition
- StopCondition
- Emotion
# ==================== Reward ====================

View File

@ -66,10 +66,6 @@
"name": "Event General",
"help": ""
},
"Coalition": {
"name": "Light & Shadow Fashion Shoot",
"help": ""
},
"Event": {
"name": "Event",
"help": ""
@ -86,6 +82,10 @@
"name": "Valley Hospital",
"help": ""
},
"Coalition": {
"name": "Light & Shadow Fashion Shoot",
"help": ""
},
"MaritimeEscort": {
"name": "Maritime Escort",
"help": ""
@ -94,10 +94,6 @@
"name": "War Archives",
"help": "Due to the lack of maintenance of war archives, continuous clear may not work normally, if Alas runs abnormally, Please manually finish clearing and use auto search"
},
"CoalitionSp": {
"name": "Light & Shadow Fashion Shoot SP",
"help": ""
},
"EventA": {
"name": "Event Daily A",
"help": ""
@ -122,6 +118,10 @@
"name": "Raid Daily",
"help": ""
},
"CoalitionSp": {
"name": "Light & Shadow Fashion Shoot SP",
"help": ""
},
"Commission": {
"name": "Commission",
"help": ""
@ -775,6 +775,7 @@
"raid_20240130": "Spring Festive Fiasco",
"raid_20240328": "From Zero to Hero Rerun",
"raid_20250116": "Spring Fashion Festa",
"raid_20260212": "Spring Auction Adventure",
"war_archives_20180607_cn": "archives Ink Stained Steel Sakura",
"war_archives_20180726_cn": "archives Iris of Light and Dark",
"war_archives_20181020_en": "archives Strive Wish and Strategize",

View File

@ -66,10 +66,6 @@
"name": "イベント共通設定",
"help": ""
},
"Coalition": {
"name": "特集写真-撮影進行中",
"help": ""
},
"Event": {
"name": "イベント海域",
"help": ""
@ -86,6 +82,10 @@
"name": "病院探訪",
"help": ""
},
"Coalition": {
"name": "特集写真-撮影進行中",
"help": ""
},
"MaritimeEscort": {
"name": "Maritime Escort",
"help": ""
@ -94,10 +94,6 @@
"name": "作戦履歴",
"help": ""
},
"CoalitionSp": {
"name": "特集写真-撮影進行中SP",
"help": ""
},
"EventA": {
"name": "毎日イベント海域A",
"help": ""
@ -122,6 +118,10 @@
"name": "Raid Daily",
"help": ""
},
"CoalitionSp": {
"name": "特集写真-撮影進行中SP",
"help": ""
},
"Commission": {
"name": "委託",
"help": ""
@ -775,6 +775,7 @@
"raid_20240130": "新春宴会狂騒曲",
"raid_20240328": "ゼロから頑張る魔王討伐(復刻)",
"raid_20250116": "新春華裳協奏曲",
"raid_20260212": "新春玉逸品会",
"war_archives_20180607_cn": "檔案 墨染まりし鋼の桜",
"war_archives_20180726_cn": "檔案 光と影のアイリス",
"war_archives_20181020_en": "檔案 努力希望と計画",

View File

@ -66,10 +66,6 @@
"name": "活动通用设置",
"help": ""
},
"Coalition": {
"name": "光影风尚-拍摄进行时",
"help": ""
},
"Event": {
"name": "活动图",
"help": ""
@ -86,6 +82,10 @@
"name": "深谷来信",
"help": ""
},
"Coalition": {
"name": "光影风尚-拍摄进行时",
"help": ""
},
"MaritimeEscort": {
"name": "商船护航",
"help": ""
@ -94,10 +94,6 @@
"name": "作战档案",
"help": "由于作战档案缺少维护开荒功能不一定能正常使用如果发现Alas运行异常请手动完成开荒后使用自律寻敌功能"
},
"CoalitionSp": {
"name": "光影风尚-拍摄进行时SP",
"help": ""
},
"EventA": {
"name": "活动每日A图",
"help": ""
@ -122,6 +118,10 @@
"name": "共斗活动每日",
"help": ""
},
"CoalitionSp": {
"name": "光影风尚-拍摄进行时SP",
"help": ""
},
"Commission": {
"name": "委托",
"help": ""
@ -775,6 +775,7 @@
"raid_20240130": "寰昌宇定家事忙",
"raid_20240328": "复刻从零开始的魔王讨伐之旅",
"raid_20250116": "华裳巧展喜事长",
"raid_20260212": "春宴怀玉香满庭",
"war_archives_20180607_cn": "档案 墨染的钢铁之花",
"war_archives_20180726_cn": "档案 光与影的鸢尾之华",
"war_archives_20181020_en": "档案 努力希望和计划",

View File

@ -66,10 +66,6 @@
"name": "活動通用",
"help": ""
},
"Coalition": {
"name": "光影風尚-拍攝進行時",
"help": ""
},
"Event": {
"name": "活動圖",
"help": ""
@ -86,6 +82,10 @@
"name": "深谷来信",
"help": ""
},
"Coalition": {
"name": "光影風尚-拍攝進行時",
"help": ""
},
"MaritimeEscort": {
"name": "商船護航",
"help": ""
@ -94,10 +94,6 @@
"name": "作戰檔案",
"help": "由於作戰檔案缺少維護開荒功能不一定能正常使用如果發現Alas運行異常請手動完成開荒後使用自律尋敵功能"
},
"CoalitionSp": {
"name": "光影風尚-拍攝進行時SP",
"help": ""
},
"EventA": {
"name": "活動每日A圖",
"help": ""
@ -122,6 +118,10 @@
"name": "共鬥活動每日",
"help": ""
},
"CoalitionSp": {
"name": "光影風尚-拍攝進行時SP",
"help": ""
},
"Commission": {
"name": "委託",
"help": ""
@ -775,6 +775,7 @@
"raid_20240130": "寰昌宇定家事忙",
"raid_20240328": "從零開始的魔王討伐之旅",
"raid_20250116": "華裳巧展喜事長",
"raid_20260212": "Spring Auction Adventure",
"war_archives_20180607_cn": "檔案 墨染的鋼鐵之花",
"war_archives_20180726_cn": "檔案 光與影的鳶尾之華",
"war_archives_20181020_en": "檔案 努力希望和計劃",

View File

@ -76,6 +76,7 @@ class HpDaemon(ModuleBase):
PAUSE_Ninja,
PAUSE_ShadowPuppetry,
PAUSE_MaidCafe,
PAUSE_Ancient,
]:
self.attacker_hp = self._calculate_hp(image, area=ATTACKER_HP_AREA_New.area, reverse=True)
self.defender_hp = self._calculate_hp(image, area=DEFENDER_HP_AREA_New.area, reverse=True)

View File

@ -17,6 +17,15 @@ BRISTOL_OCR_REMAIN_NORMAL = Button(area={'cn': (1089, 414, 1148, 432), 'en': (10
BRISTOL_RAID_EASY = Button(area={'cn': (1151, 490, 1203, 528), 'en': (1155, 504, 1197, 524), 'jp': (1152, 491, 1203, 528), 'tw': (1151, 490, 1204, 519)}, color={'cn': (141, 164, 177), 'en': (145, 167, 177), 'jp': (126, 151, 166), 'tw': (117, 142, 159)}, button={'cn': (1151, 490, 1203, 528), 'en': (1155, 504, 1197, 524), 'jp': (1152, 491, 1203, 528), 'tw': (1151, 490, 1204, 519)}, file={'cn': './assets/cn/raid/BRISTOL_RAID_EASY.png', 'en': './assets/en/raid/BRISTOL_RAID_EASY.png', 'jp': './assets/jp/raid/BRISTOL_RAID_EASY.png', 'tw': './assets/tw/raid/BRISTOL_RAID_EASY.png'})
BRISTOL_RAID_HARD = Button(area={'cn': (1167, 246, 1220, 285), 'en': (1156, 259, 1231, 278), 'jp': (1159, 250, 1229, 285), 'tw': (1170, 249, 1217, 275)}, color={'cn': (136, 160, 173), 'en': (133, 156, 168), 'jp': (145, 168, 181), 'tw': (100, 126, 145)}, button={'cn': (1167, 246, 1220, 285), 'en': (1156, 259, 1231, 278), 'jp': (1159, 250, 1229, 285), 'tw': (1170, 249, 1217, 275)}, file={'cn': './assets/cn/raid/BRISTOL_RAID_HARD.png', 'en': './assets/en/raid/BRISTOL_RAID_HARD.png', 'jp': './assets/jp/raid/BRISTOL_RAID_HARD.png', 'tw': './assets/tw/raid/BRISTOL_RAID_HARD.png'})
BRISTOL_RAID_NORMAL = Button(area={'cn': (1098, 367, 1150, 404), 'en': (1089, 380, 1158, 396), 'jp': (1099, 368, 1149, 404), 'tw': (1097, 367, 1151, 393)}, color={'cn': (129, 152, 165), 'en': (131, 153, 164), 'jp': (119, 146, 163), 'tw': (121, 144, 159)}, button={'cn': (1098, 367, 1150, 404), 'en': (1089, 380, 1158, 396), 'jp': (1099, 368, 1149, 404), 'tw': (1097, 367, 1151, 393)}, file={'cn': './assets/cn/raid/BRISTOL_RAID_NORMAL.png', 'en': './assets/en/raid/BRISTOL_RAID_NORMAL.png', 'jp': './assets/jp/raid/BRISTOL_RAID_NORMAL.png', 'tw': './assets/tw/raid/BRISTOL_RAID_NORMAL.png'})
CHANGWU_OCR_PT = Button(area={'cn': (1174, 603, 1280, 632), 'en': (1174, 603, 1280, 632), 'jp': (1174, 603, 1280, 632), 'tw': (1174, 603, 1280, 632)}, color={'cn': (183, 118, 101), 'en': (183, 118, 101), 'jp': (183, 118, 101), 'tw': (183, 118, 101)}, button={'cn': (1174, 603, 1280, 632), 'en': (1174, 603, 1280, 632), 'jp': (1174, 603, 1280, 632), 'tw': (1174, 603, 1280, 632)}, file={'cn': './assets/cn/raid/CHANGWU_OCR_PT.png', 'en': './assets/en/raid/CHANGWU_OCR_PT.png', 'jp': './assets/jp/raid/CHANGWU_OCR_PT.png', 'tw': './assets/tw/raid/CHANGWU_OCR_PT.png'})
CHANGWU_OCR_REMAIN_EASY = Button(area={'cn': (1057, 565, 1116, 585), 'en': (1057, 565, 1116, 585), 'jp': (1057, 565, 1116, 585), 'tw': (1057, 565, 1116, 585)}, color={'cn': (96, 83, 81), 'en': (96, 83, 81), 'jp': (96, 83, 81), 'tw': (96, 83, 81)}, button={'cn': (1057, 565, 1116, 585), 'en': (1057, 565, 1116, 585), 'jp': (1057, 565, 1116, 585), 'tw': (1057, 565, 1116, 585)}, file={'cn': './assets/cn/raid/CHANGWU_OCR_REMAIN_EASY.png', 'en': './assets/en/raid/CHANGWU_OCR_REMAIN_EASY.png', 'jp': './assets/jp/raid/CHANGWU_OCR_REMAIN_EASY.png', 'tw': './assets/tw/raid/CHANGWU_OCR_REMAIN_EASY.png'})
CHANGWU_OCR_REMAIN_EX = Button(area={'cn': (1138, 26, 1185, 49), 'en': (1138, 26, 1185, 49), 'jp': (1138, 26, 1185, 49), 'tw': (1138, 26, 1185, 49)}, color={'cn': (213, 128, 103), 'en': (213, 128, 103), 'jp': (213, 128, 103), 'tw': (213, 128, 103)}, button={'cn': (1138, 26, 1185, 49), 'en': (1138, 26, 1185, 49), 'jp': (1138, 26, 1185, 49), 'tw': (1138, 26, 1185, 49)}, file={'cn': './assets/cn/raid/CHANGWU_OCR_REMAIN_EX.png', 'en': './assets/en/raid/CHANGWU_OCR_REMAIN_EX.png', 'jp': './assets/jp/raid/CHANGWU_OCR_REMAIN_EX.png', 'tw': './assets/tw/raid/CHANGWU_OCR_REMAIN_EX.png'})
CHANGWU_OCR_REMAIN_HARD = Button(area={'cn': (1169, 409, 1229, 429), 'en': (1169, 409, 1229, 429), 'jp': (1169, 409, 1229, 429), 'tw': (1169, 409, 1229, 429)}, color={'cn': (100, 86, 82), 'en': (100, 86, 82), 'jp': (100, 86, 82), 'tw': (100, 86, 82)}, button={'cn': (1169, 409, 1229, 429), 'en': (1169, 409, 1229, 429), 'jp': (1169, 409, 1229, 429), 'tw': (1169, 409, 1229, 429)}, file={'cn': './assets/cn/raid/CHANGWU_OCR_REMAIN_HARD.png', 'en': './assets/en/raid/CHANGWU_OCR_REMAIN_HARD.png', 'jp': './assets/jp/raid/CHANGWU_OCR_REMAIN_HARD.png', 'tw': './assets/tw/raid/CHANGWU_OCR_REMAIN_HARD.png'})
CHANGWU_OCR_REMAIN_NORMAL = Button(area={'cn': (1112, 487, 1170, 506), 'en': (1112, 487, 1170, 506), 'jp': (1112, 487, 1170, 506), 'tw': (1112, 487, 1170, 506)}, color={'cn': (100, 87, 84), 'en': (100, 87, 84), 'jp': (100, 87, 84), 'tw': (100, 87, 84)}, button={'cn': (1112, 487, 1170, 506), 'en': (1112, 487, 1170, 506), 'jp': (1112, 487, 1170, 506), 'tw': (1112, 487, 1170, 506)}, file={'cn': './assets/cn/raid/CHANGWU_OCR_REMAIN_NORMAL.png', 'en': './assets/en/raid/CHANGWU_OCR_REMAIN_NORMAL.png', 'jp': './assets/jp/raid/CHANGWU_OCR_REMAIN_NORMAL.png', 'tw': './assets/tw/raid/CHANGWU_OCR_REMAIN_NORMAL.png'})
CHANGWU_RAID_EASY = Button(area={'cn': (976, 559, 1032, 590), 'en': (976, 559, 1032, 590), 'jp': (976, 559, 1032, 590), 'tw': (976, 559, 1032, 590)}, color={'cn': (144, 130, 122), 'en': (144, 130, 122), 'jp': (144, 130, 122), 'tw': (144, 130, 122)}, button={'cn': (976, 559, 1032, 590), 'en': (976, 559, 1032, 590), 'jp': (976, 559, 1032, 590), 'tw': (976, 559, 1032, 590)}, file={'cn': './assets/cn/raid/CHANGWU_RAID_EASY.png', 'en': './assets/en/raid/CHANGWU_RAID_EASY.png', 'jp': './assets/jp/raid/CHANGWU_RAID_EASY.png', 'tw': './assets/tw/raid/CHANGWU_RAID_EASY.png'})
CHANGWU_RAID_EX = Button(area={'cn': (1135, 296, 1209, 331), 'en': (1135, 296, 1209, 331), 'jp': (1135, 296, 1209, 331), 'tw': (1135, 296, 1209, 331)}, color={'cn': (151, 138, 125), 'en': (151, 138, 125), 'jp': (151, 138, 125), 'tw': (151, 138, 125)}, button={'cn': (1135, 296, 1209, 331), 'en': (1135, 296, 1209, 331), 'jp': (1135, 296, 1209, 331), 'tw': (1135, 296, 1209, 331)}, file={'cn': './assets/cn/raid/CHANGWU_RAID_EX.png', 'en': './assets/en/raid/CHANGWU_RAID_EX.png', 'jp': './assets/jp/raid/CHANGWU_RAID_EX.png', 'tw': './assets/tw/raid/CHANGWU_RAID_EX.png'})
CHANGWU_RAID_HARD = Button(area={'cn': (1087, 403, 1146, 433), 'en': (1087, 403, 1146, 433), 'jp': (1087, 403, 1146, 433), 'tw': (1087, 403, 1146, 433)}, color={'cn': (154, 139, 130), 'en': (154, 139, 130), 'jp': (154, 139, 130), 'tw': (154, 139, 130)}, button={'cn': (1087, 403, 1146, 433), 'en': (1087, 403, 1146, 433), 'jp': (1087, 403, 1146, 433), 'tw': (1087, 403, 1146, 433)}, file={'cn': './assets/cn/raid/CHANGWU_RAID_HARD.png', 'en': './assets/en/raid/CHANGWU_RAID_HARD.png', 'jp': './assets/jp/raid/CHANGWU_RAID_HARD.png', 'tw': './assets/tw/raid/CHANGWU_RAID_HARD.png'})
CHANGWU_RAID_NORMAL = Button(area={'cn': (1032, 480, 1091, 511), 'en': (1032, 480, 1091, 511), 'jp': (1032, 480, 1091, 511), 'tw': (1032, 480, 1091, 511)}, color={'cn': (144, 130, 122), 'en': (144, 130, 122), 'jp': (144, 130, 122), 'tw': (144, 130, 122)}, button={'cn': (1032, 480, 1091, 511), 'en': (1032, 480, 1091, 511), 'jp': (1032, 480, 1091, 511), 'tw': (1032, 480, 1091, 511)}, file={'cn': './assets/cn/raid/CHANGWU_RAID_NORMAL.png', 'en': './assets/en/raid/CHANGWU_RAID_NORMAL.png', 'jp': './assets/jp/raid/CHANGWU_RAID_NORMAL.png', 'tw': './assets/tw/raid/CHANGWU_RAID_NORMAL.png'})
CHIENWU_OCR_PT = Button(area={'cn': (1166, 604, 1279, 632), 'en': (1166, 604, 1279, 632), 'jp': (1166, 604, 1279, 632), 'tw': (1166, 604, 1279, 632)}, color={'cn': (126, 40, 47), 'en': (126, 40, 47), 'jp': (126, 40, 47), 'tw': (126, 40, 47)}, button={'cn': (1166, 604, 1279, 632), 'en': (1166, 604, 1279, 632), 'jp': (1166, 604, 1279, 632), 'tw': (1166, 604, 1279, 632)}, file={'cn': './assets/cn/raid/CHIENWU_OCR_PT.png', 'en': './assets/cn/raid/CHIENWU_OCR_PT.png', 'jp': './assets/cn/raid/CHIENWU_OCR_PT.png', 'tw': './assets/cn/raid/CHIENWU_OCR_PT.png'})
CHIENWU_OCR_REMAIN_EASY = Button(area={'cn': (1111, 528, 1163, 549), 'en': (1111, 528, 1163, 549), 'jp': (1111, 528, 1163, 549), 'tw': (1111, 528, 1163, 549)}, color={'cn': (174, 153, 133), 'en': (174, 153, 133), 'jp': (174, 153, 133), 'tw': (174, 153, 133)}, button={'cn': (1111, 528, 1163, 549), 'en': (1111, 528, 1163, 549), 'jp': (1111, 528, 1163, 549), 'tw': (1111, 528, 1163, 549)}, file={'cn': './assets/cn/raid/CHIENWU_OCR_REMAIN_EASY.png', 'en': './assets/cn/raid/CHIENWU_OCR_REMAIN_EASY.png', 'jp': './assets/cn/raid/CHIENWU_OCR_REMAIN_EASY.png', 'tw': './assets/cn/raid/CHIENWU_OCR_REMAIN_EASY.png'})
CHIENWU_OCR_REMAIN_EX = Button(area={'cn': (1086, 16, 1152, 44), 'en': (1086, 16, 1152, 44), 'jp': (1086, 16, 1152, 44), 'tw': (1086, 16, 1152, 44)}, color={'cn': (90, 39, 34), 'en': (90, 39, 34), 'jp': (90, 39, 34), 'tw': (90, 39, 34)}, button={'cn': (1086, 16, 1152, 44), 'en': (1086, 16, 1152, 44), 'jp': (1086, 16, 1152, 44), 'tw': (1086, 16, 1152, 44)}, file={'cn': './assets/cn/raid/CHIENWU_OCR_REMAIN_EX.png', 'en': './assets/cn/raid/CHIENWU_OCR_REMAIN_EX.png', 'jp': './assets/cn/raid/CHIENWU_OCR_REMAIN_EX.png', 'tw': './assets/cn/raid/CHIENWU_OCR_REMAIN_EX.png'})

View File

@ -82,6 +82,8 @@ def raid_name_shorten(name):
return "RPG"
elif name == 'raid_20250116':
return 'CHIENWU'
elif name == 'raid_20260212':
return 'CHANGWU'
else:
raise ScriptError(f'Unknown raid name: {name}')
@ -157,6 +159,11 @@ def raid_ocr(raid, mode):
return Digit(button, letter=(247, 223, 222), threshold=128)
else:
return DigitCounter(button, letter=(0, 0, 0), threshold=128)
elif raid == 'CHANGWU':
if mode == 'ex':
return Digit(button, letter=(255, 239, 215), threshold=128)
else:
return DigitCounter(button, letter=(154, 148, 133), threshold=128)
def pt_ocr(raid):
@ -186,6 +193,8 @@ def pt_ocr(raid):
return HuanChangPtOcr(button, letter=(23, 20, 6), threshold=128)
elif raid == 'CHIENWU':
return Digit(button, letter=(255, 231, 231), threshold=128)
elif raid == 'CHANGWU':
return Digit(button, letter=(255, 239, 215), threshold=128)
class Raid(MapOperation, RaidCombat, CampaignEvent):
@ -195,7 +204,10 @@ class Raid(MapOperation, RaidCombat, CampaignEvent):
Game devs are too asshole to drop oil display for UI design
https://github.com/LmeSzinc/AzurLaneAutoScript/issues/5214
"""
if self.config.Campaign_Event == 'raid_20240328':
if self.config.Campaign_Event in [
'raid_20240328',
'raid_20260212',
]:
return False
return True

View File

@ -215,10 +215,16 @@ page_main.link(button=MAIN_GOTO_EVENT_LIST, destination=page_event_list)
page_main_white.link(button=MAIN_GOTO_EVENT_LIST_WHITE, destination=page_event_list)
# Raid
# before
# page_raid = Page(RAID_CHECK)
# page_raid.link(button=GOTO_MAIN, destination=page_main)
# page_main.link(button=MAIN_GOTO_RAID, destination=page_raid)
# page_main_white.link(button=MAIN_GOTO_RAID_WHITE, destination=page_raid)
# after 2026.02.12
page_raid = Page(RAID_CHECK)
page_raid.link(button=GOTO_MAIN, destination=page_main)
page_main.link(button=MAIN_GOTO_RAID, destination=page_raid)
page_main_white.link(button=MAIN_GOTO_RAID_WHITE, destination=page_raid)
page_raid.link(button=BACK_ARROW, destination=page_campaign_menu)
page_campaign_menu.link(button=CAMPAIGN_MENU_GOTO_EVENT, destination=page_raid)
# Dock
page_dock = Page(DOCK_CHECK)

View File

@ -551,8 +551,8 @@ class UI(InfoHandler):
return True
# RPG event (raid_20240328)
if self.appear_then_click(RPG_STATUS_POPUP, offset=(30, 30), interval=3):
return True
# if self.appear_then_click(RPG_STATUS_POPUP, offset=(30, 30), interval=3):
# return True
# Hospital event (20250327)
# if self.appear_then_click(HOSIPITAL_CLUE_CHECK, offset=(20, 20), interval=2):
# return True
@ -560,10 +560,10 @@ class UI(InfoHandler):
# return True
# Neon city (coalition_20250626)
# FASHION (coalition_20260122) reuse NEONCITY
if self.appear(NEONCITY_FLEET_PREPARATION, offset=(20, 20), interval=3):
logger.info(f'{NEONCITY_FLEET_PREPARATION} -> {NEONCITY_PREPARATION_EXIT}')
self.device.click(NEONCITY_PREPARATION_EXIT)
return True
# if self.appear(NEONCITY_FLEET_PREPARATION, offset=(20, 20), interval=3):
# logger.info(f'{NEONCITY_FLEET_PREPARATION} -> {NEONCITY_PREPARATION_EXIT}')
# self.device.click(NEONCITY_PREPARATION_EXIT)
# return True
# DATE A LANE (coalition_20251120)
# if self.appear_then_click(DAL_DIFFICULTY_EXIT, offset=(20, 20), interval=3):
# return True

View File

@ -30,7 +30,7 @@ TEMPLATE_NORTHERN_OVERTURE = Template(file={'cn': './assets/cn/war_archives/TEMP
TEMPLATE_PARALLEL_SUPERIMPOSITION = Template(file={'cn': './assets/cn/war_archives/TEMPLATE_PARALLEL_SUPERIMPOSITION.png', 'en': './assets/cn/war_archives/TEMPLATE_PARALLEL_SUPERIMPOSITION.png', 'jp': './assets/cn/war_archives/TEMPLATE_PARALLEL_SUPERIMPOSITION.png', 'tw': './assets/cn/war_archives/TEMPLATE_PARALLEL_SUPERIMPOSITION.png'})
TEMPLATE_PLEDGE_OF_THE_RADIANT_COURT = Template(file={'cn': './assets/cn/war_archives/TEMPLATE_PLEDGE_OF_THE_RADIANT_COURT.png', 'en': './assets/cn/war_archives/TEMPLATE_PLEDGE_OF_THE_RADIANT_COURT.png', 'jp': './assets/cn/war_archives/TEMPLATE_PLEDGE_OF_THE_RADIANT_COURT.png', 'tw': './assets/cn/war_archives/TEMPLATE_PLEDGE_OF_THE_RADIANT_COURT.png'})
TEMPLATE_PRELUDE_UNDER_THE_MOON = Template(file={'cn': './assets/cn/war_archives/TEMPLATE_PRELUDE_UNDER_THE_MOON.png', 'en': './assets/cn/war_archives/TEMPLATE_PRELUDE_UNDER_THE_MOON.png', 'jp': './assets/cn/war_archives/TEMPLATE_PRELUDE_UNDER_THE_MOON.png', 'tw': './assets/cn/war_archives/TEMPLATE_PRELUDE_UNDER_THE_MOON.png'})
TEMPLATE_REVELATIONS_OF_DUST = Template(file={'cn': './assets/cn/war_archives/TEMPLATE_REVELATIONS_OF_DUST.png', 'en': './assets/cn/war_archives/TEMPLATE_REVELATIONS_OF_DUST.png', 'jp': './assets/cn/war_archives/TEMPLATE_REVELATIONS_OF_DUST.png', 'tw': './assets/cn/war_archives/TEMPLATE_REVELATIONS_OF_DUST.png'})
TEMPLATE_REVELATIONS_OF_DUST = Template(file={'cn': './assets/cn/war_archives/TEMPLATE_REVELATIONS_OF_DUST.png', 'en': './assets/en/war_archives/TEMPLATE_REVELATIONS_OF_DUST.png', 'jp': './assets/cn/war_archives/TEMPLATE_REVELATIONS_OF_DUST.png', 'tw': './assets/cn/war_archives/TEMPLATE_REVELATIONS_OF_DUST.png'})
TEMPLATE_RONDO_AT_RAINBOWS_END = Template(file={'cn': './assets/cn/war_archives/TEMPLATE_RONDO_AT_RAINBOWS_END.png', 'en': './assets/en/war_archives/TEMPLATE_RONDO_AT_RAINBOWS_END.png', 'jp': './assets/cn/war_archives/TEMPLATE_RONDO_AT_RAINBOWS_END.png', 'tw': './assets/cn/war_archives/TEMPLATE_RONDO_AT_RAINBOWS_END.png'})
TEMPLATE_SCHERZO_OF_IRON_AND_BLOOD = Template(file={'cn': './assets/cn/war_archives/TEMPLATE_SCHERZO_OF_IRON_AND_BLOOD.png', 'en': './assets/en/war_archives/TEMPLATE_SCHERZO_OF_IRON_AND_BLOOD.png', 'jp': './assets/cn/war_archives/TEMPLATE_SCHERZO_OF_IRON_AND_BLOOD.png', 'tw': './assets/cn/war_archives/TEMPLATE_SCHERZO_OF_IRON_AND_BLOOD.png'})
TEMPLATE_SKYBOUND_ORATORIO = Template(file={'cn': './assets/cn/war_archives/TEMPLATE_SKYBOUND_ORATORIO.png', 'en': './assets/en/war_archives/TEMPLATE_SKYBOUND_ORATORIO.png', 'jp': './assets/cn/war_archives/TEMPLATE_SKYBOUND_ORATORIO.png', 'tw': './assets/cn/war_archives/TEMPLATE_SKYBOUND_ORATORIO.png'})