From 83f167ccc149d12f52579eaf73c4766e09b16fc4 Mon Sep 17 00:00:00 2001 From: sui-feng-cb <2518179942@qq.com> Date: Thu, 25 Dec 2025 10:01:13 +0800 Subject: [PATCH 1/6] Upd: [EN] USE_DATA_KEY_NOTIFIED asset --- assets/en/handler/USE_DATA_KEY_NOTIFIED.png | Bin 2824 -> 2957 bytes module/handler/assets.py | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/en/handler/USE_DATA_KEY_NOTIFIED.png b/assets/en/handler/USE_DATA_KEY_NOTIFIED.png index 1e33718203a4c4d8d530c1df75790afd9e7e7ffc..203efb0824358750eb66fab70790157a6f8e7f49 100644 GIT binary patch delta 323 zcmeAW>lL4%Y{DJl>EaktaqI0}!@ffX0uC1wpDJB{z);<3YjJ(S6DiFYg+;7Fs%;k* z_~XVQ`oyF>l@0jqD7JJPa!D?(Og|m(R|8!|1@k%%FKSlT-g( z-Rm!w3>*mz3fX^;oxZu=`T&@--RSoENU*A%(iYRw4t=%-2`4MezxD3nrFSU|0tXlz zyq+Egiz=l4UH9|T&F~9gowa}e`Iqm0o^_AAfq{+TTiE`OGv0kWe|3*I$OUiQV}I2v zmp3p1^&glgUGeA1TR8?61BMA_eu!^4^@FbRsgspDWOI%77^~zFW6s*4pAyU8s6VX^G-tIP`PRc%~=W-)lW`njxgN@xNA DpKC7P diff --git a/module/handler/assets.py b/module/handler/assets.py index 84de27a0e..63b8de7d1 100644 --- a/module/handler/assets.py +++ b/module/handler/assets.py @@ -100,5 +100,5 @@ SUBMARINE_VIEW_ON = Button(area={'cn': (1140, 435, 1170, 468), 'en': (1140, 435, TEMPLATE_MANJUU = Template(file={'cn': './assets/cn/handler/TEMPLATE_MANJUU.png', 'en': './assets/cn/handler/TEMPLATE_MANJUU.png', 'jp': './assets/cn/handler/TEMPLATE_MANJUU.png', 'tw': './assets/cn/handler/TEMPLATE_MANJUU.png'}) USER_AGREEMENT_CONFIRM = Button(area={'cn': (709, 526, 742, 542), 'en': (709, 526, 742, 542), 'jp': (709, 526, 742, 542), 'tw': (709, 526, 742, 542)}, color={'cn': (151, 216, 243), 'en': (151, 216, 243), 'jp': (151, 216, 243), 'tw': (151, 216, 243)}, button={'cn': (709, 526, 742, 542), 'en': (709, 526, 742, 542), 'jp': (709, 526, 742, 542), 'tw': (709, 526, 742, 542)}, file={'cn': './assets/cn/handler/USER_AGREEMENT_CONFIRM.png', 'en': './assets/en/handler/USER_AGREEMENT_CONFIRM.png', 'jp': './assets/jp/handler/USER_AGREEMENT_CONFIRM.png', 'tw': './assets/tw/handler/USER_AGREEMENT_CONFIRM.png'}) USE_DATA_KEY = Button(area={'cn': (688, 316, 781, 338), 'en': (759, 323, 889, 342), 'jp': (627, 300, 743, 321), 'tw': (688, 316, 782, 338)}, color={'cn': (165, 154, 99), 'en': (170, 160, 94), 'jp': (127, 128, 116), 'tw': (159, 150, 97)}, button={'cn': (688, 316, 781, 338), 'en': (759, 323, 889, 342), 'jp': (627, 300, 743, 321), 'tw': (688, 316, 782, 338)}, file={'cn': './assets/cn/handler/USE_DATA_KEY.png', 'en': './assets/en/handler/USE_DATA_KEY.png', 'jp': './assets/jp/handler/USE_DATA_KEY.png', 'tw': './assets/tw/handler/USE_DATA_KEY.png'}) -USE_DATA_KEY_NOTIFIED = Button(area={'cn': (690, 185, 713, 207), 'en': (820, 440, 837, 456), 'jp': (604, 183, 631, 209), 'tw': (782, 440, 799, 456)}, color={'cn': (34, 49, 75), 'en': (33, 40, 41), 'jp': (28, 43, 65), 'tw': (34, 40, 48)}, button={'cn': (690, 185, 713, 207), 'en': (820, 440, 837, 456), 'jp': (604, 183, 631, 209), 'tw': (782, 440, 799, 456)}, file={'cn': './assets/cn/handler/USE_DATA_KEY_NOTIFIED.png', 'en': './assets/en/handler/USE_DATA_KEY_NOTIFIED.png', 'jp': './assets/jp/handler/USE_DATA_KEY_NOTIFIED.png', 'tw': './assets/tw/handler/USE_DATA_KEY_NOTIFIED.png'}) +USE_DATA_KEY_NOTIFIED = Button(area={'cn': (690, 185, 713, 207), 'en': (740, 191, 757, 207), 'jp': (604, 183, 631, 209), 'tw': (782, 440, 799, 456)}, color={'cn': (34, 49, 75), 'en': (33, 48, 74), 'jp': (28, 43, 65), 'tw': (34, 40, 48)}, button={'cn': (690, 185, 713, 207), 'en': (740, 191, 757, 207), 'jp': (604, 183, 631, 209), 'tw': (782, 440, 799, 456)}, file={'cn': './assets/cn/handler/USE_DATA_KEY_NOTIFIED.png', 'en': './assets/en/handler/USE_DATA_KEY_NOTIFIED.png', 'jp': './assets/jp/handler/USE_DATA_KEY_NOTIFIED.png', 'tw': './assets/tw/handler/USE_DATA_KEY_NOTIFIED.png'}) VOTE_CANCEL = Button(area={'cn': (404, 483, 576, 539), 'en': (413, 489, 566, 532), 'jp': (407, 483, 577, 538), 'tw': (404, 483, 576, 539)}, color={'cn': (167, 169, 171), 'en': (169, 170, 172), 'jp': (163, 164, 166), 'tw': (167, 169, 171)}, button={'cn': (404, 483, 576, 539), 'en': (413, 489, 566, 532), 'jp': (407, 483, 577, 538), 'tw': (404, 483, 576, 539)}, file={'cn': './assets/cn/handler/VOTE_CANCEL.png', 'en': './assets/en/handler/VOTE_CANCEL.png', 'jp': './assets/jp/handler/VOTE_CANCEL.png', 'tw': './assets/cn/handler/VOTE_CANCEL.png'}) From 14c70afe6595c616b9b290392f9cd39cbf5c145b Mon Sep 17 00:00:00 2001 From: sui-feng-cb <2518179942@qq.com> Date: Thu, 25 Dec 2025 10:10:13 +0800 Subject: [PATCH 2/6] Add: war_archives_20221222_cn --- .../TEMPLATE_PARALLEL_SUPERIMPOSITION.png | Bin 0 -> 6399 bytes campaign/Readme.md | 1 + campaign/war_archives_20221222_cn/a1.py | 95 +++++++++++++++++ campaign/war_archives_20221222_cn/a2.py | 76 ++++++++++++++ campaign/war_archives_20221222_cn/a3.py | 79 ++++++++++++++ campaign/war_archives_20221222_cn/b1.py | 96 ++++++++++++++++++ campaign/war_archives_20221222_cn/b2.py | 84 +++++++++++++++ campaign/war_archives_20221222_cn/b3.py | 87 ++++++++++++++++ campaign/war_archives_20221222_cn/c1.py | 94 +++++++++++++++++ campaign/war_archives_20221222_cn/c2.py | 76 ++++++++++++++ campaign/war_archives_20221222_cn/c3.py | 80 +++++++++++++++ .../war_archives_20221222_cn/campaign_base.py | 14 +++ campaign/war_archives_20221222_cn/d1.py | 95 +++++++++++++++++ campaign/war_archives_20221222_cn/d2.py | 93 +++++++++++++++++ campaign/war_archives_20221222_cn/d3.py | 96 ++++++++++++++++++ config/template.json | 2 +- module/config/argument/args.json | 5 + module/config/i18n/en-US.json | 1 + module/config/i18n/ja-JP.json | 1 + module/config/i18n/zh-CN.json | 1 + module/config/i18n/zh-TW.json | 1 + module/war_archives/assets.py | 1 + module/war_archives/dictionary.py | 1 + 23 files changed, 1078 insertions(+), 1 deletion(-) create mode 100644 assets/cn/war_archives/TEMPLATE_PARALLEL_SUPERIMPOSITION.png create mode 100644 campaign/war_archives_20221222_cn/a1.py create mode 100644 campaign/war_archives_20221222_cn/a2.py create mode 100644 campaign/war_archives_20221222_cn/a3.py create mode 100644 campaign/war_archives_20221222_cn/b1.py create mode 100644 campaign/war_archives_20221222_cn/b2.py create mode 100644 campaign/war_archives_20221222_cn/b3.py create mode 100644 campaign/war_archives_20221222_cn/c1.py create mode 100644 campaign/war_archives_20221222_cn/c2.py create mode 100644 campaign/war_archives_20221222_cn/c3.py create mode 100644 campaign/war_archives_20221222_cn/campaign_base.py create mode 100644 campaign/war_archives_20221222_cn/d1.py create mode 100644 campaign/war_archives_20221222_cn/d2.py create mode 100644 campaign/war_archives_20221222_cn/d3.py diff --git a/assets/cn/war_archives/TEMPLATE_PARALLEL_SUPERIMPOSITION.png b/assets/cn/war_archives/TEMPLATE_PARALLEL_SUPERIMPOSITION.png new file mode 100644 index 0000000000000000000000000000000000000000..77406c2fb1e6680918488a0e6c309470d8f26c24 GIT binary patch literal 6399 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 Date: Mon, 29 Dec 2025 19:12:44 +0800 Subject: [PATCH 3/6] Fix: Remove trailing "\/" in zone name (fixed #5417) --- module/os/map_operation.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/module/os/map_operation.py b/module/os/map_operation.py index 7a9fa8fd4..fb1a22441 100644 --- a/module/os/map_operation.py +++ b/module/os/map_operation.py @@ -47,6 +47,7 @@ class OSMapOperation(MapOrderHandler, MissionHandler, PortHandler, StorageHandle name = ocr.ocr(self.device.image) name = "".join(name.split()) name = name.lower() + name = name.strip('\\/-') if '-' in name: name = name.split('-')[0] if 'é' in name: # Méditerranée name maps @@ -79,6 +80,7 @@ class OSMapOperation(MapOrderHandler, MissionHandler, PortHandler, StorageHandle # For JP only ocr = Ocr(MAP_NAME, lang='jp', letter=(157, 173, 192), threshold=127, name='OCR_OS_MAP_NAME') name = ocr.ocr(self.device.image) + name = name.strip('\\/-') self.is_zone_name_hidden = '安全' in name # Remove punctuations for char in '・': @@ -107,6 +109,7 @@ class OSMapOperation(MapOrderHandler, MissionHandler, PortHandler, StorageHandle # For TW only ocr = Ocr(MAP_NAME, lang='tw', letter=(198, 215, 239), threshold=127, name='OCR_OS_MAP_NAME') name = ocr.ocr(self.device.image) + name = name.strip('\\/-') self.is_zone_name_hidden = '安全' in name # Remove '塞壬要塞海域' if '塞' in name: @@ -120,6 +123,7 @@ class OSMapOperation(MapOrderHandler, MissionHandler, PortHandler, StorageHandle # For CN only ocr = Ocr(MAP_NAME, lang='cnocr', letter=(214, 231, 255), threshold=127, name='OCR_OS_MAP_NAME') name = ocr.ocr(self.device.image) + name = name.strip('\\/-') self.is_zone_name_hidden = '安全' in name if '-' in name: name = name.split('-')[0] From 8ce61ac2909ab9adcb99f068cc4d18ef54bf2735 Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Thu, 1 Jan 2026 23:16:13 +0800 Subject: [PATCH 4/6] Upd: [TW] Event A Note Through the Firmament --- campaign/Readme.md | 1 + module/config/argument/args.json | 32 ++++++++------------------------ module/config/i18n/zh-TW.json | 2 +- 3 files changed, 10 insertions(+), 25 deletions(-) diff --git a/campaign/Readme.md b/campaign/Readme.md index 2b8e78e61..a1176770a 100644 --- a/campaign/Readme.md +++ b/campaign/Readme.md @@ -273,3 +273,4 @@ To add a new event, add a new row in here, and run `python -m module.config.conf | 20251127 | coalition 20251120 | DATE A LANE | - | - | - | DATE A LANE | | 20251211 | event 20251023 cn | Tempesta and Islas de Libertád | - | - | - | 颶風與自由群島 | | 20251218 | event 20251218 cn | A Note Through the Firmament | 响彻于天穹之音 | A Note Through the Firmament | 天穹に響く音謡 | - | +| 20251231 | event 20251218 cn | A Note Through the Firmament | - | - | - | 響徹於天穹之音 | diff --git a/module/config/argument/args.json b/module/config/argument/args.json index 3597e2f9b..c20adc339 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -1634,7 +1634,6 @@ "type": "select", "value": "campaign_main", "option": [ - "event_20251023_cn", "event_20251218_cn" ], "display": "hide", @@ -1648,10 +1647,9 @@ "event_20251218_cn" ], "option_tw": [ - "event_20251023_cn" + "event_20251218_cn" ], "option_bold": [ - "event_20251023_cn", "event_20251218_cn" ] }, @@ -1915,7 +1913,6 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20251023_cn", "event_20251218_cn" ], "option_cn": [ @@ -1928,10 +1925,9 @@ "event_20251218_cn" ], "option_tw": [ - "event_20251023_cn" + "event_20251218_cn" ], "option_bold": [ - "event_20251023_cn", "event_20251218_cn" ] }, @@ -2310,7 +2306,6 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20251023_cn", "event_20251218_cn" ], "option_cn": [ @@ -2323,10 +2318,9 @@ "event_20251218_cn" ], "option_tw": [ - "event_20251023_cn" + "event_20251218_cn" ], "option_bold": [ - "event_20251023_cn", "event_20251218_cn" ] }, @@ -4036,7 +4030,6 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20251023_cn", "event_20251218_cn" ], "option_cn": [ @@ -4049,10 +4042,9 @@ "event_20251218_cn" ], "option_tw": [ - "event_20251023_cn" + "event_20251218_cn" ], "option_bold": [ - "event_20251023_cn", "event_20251218_cn" ] }, @@ -4448,7 +4440,6 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20251023_cn", "event_20251218_cn" ], "option_cn": [ @@ -4461,10 +4452,9 @@ "event_20251218_cn" ], "option_tw": [ - "event_20251023_cn" + "event_20251218_cn" ], "option_bold": [ - "event_20251023_cn", "event_20251218_cn" ] }, @@ -4860,7 +4850,6 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20251023_cn", "event_20251218_cn" ], "option_cn": [ @@ -4873,10 +4862,9 @@ "event_20251218_cn" ], "option_tw": [ - "event_20251023_cn" + "event_20251218_cn" ], "option_bold": [ - "event_20251023_cn", "event_20251218_cn" ] }, @@ -5272,7 +5260,6 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20251023_cn", "event_20251218_cn" ], "option_cn": [ @@ -5285,10 +5272,9 @@ "event_20251218_cn" ], "option_tw": [ - "event_20251023_cn" + "event_20251218_cn" ], "option_bold": [ - "event_20251023_cn", "event_20251218_cn" ] }, @@ -5674,7 +5660,6 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20251023_cn", "event_20251218_cn" ], "option_cn": [ @@ -5687,10 +5672,9 @@ "event_20251218_cn" ], "option_tw": [ - "event_20251023_cn" + "event_20251218_cn" ], "option_bold": [ - "event_20251023_cn", "event_20251218_cn" ] }, diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index 2eed7af8b..18cb5da49 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -763,7 +763,7 @@ "event_20250814_cn": "奇淵下的秘密", "event_20250912_cn": "起舞於天原之上", "event_20251023_cn": "颶風與自由群島", - "event_20251218_cn": "A Note Through the Firmament", + "event_20251218_cn": "響徹於天穹之音", "raid_20200624": "特別演習埃塞克斯級(復刻)", "raid_20210708": "復刻穿越彼方的水線", "raid_20220127": "演習神秘事件調查", From 99de5e0d3438fff41ec4cfded900b3c4a42efbb8 Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Thu, 1 Jan 2026 23:36:25 +0800 Subject: [PATCH 5/6] Upd: Battle UI MaidCafe --- assets/cn/combat_ui/PAUSE_MaidCafe.png | Bin 0 -> 2977 bytes assets/cn/combat_ui/QUIT_MaidCafe.png | Bin 0 -> 5479 bytes module/combat/combat.py | 6 ++++++ module/combat_ui/assets.py | 2 ++ module/exercise/hp_daemon.py | 3 ++- 5 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 assets/cn/combat_ui/PAUSE_MaidCafe.png create mode 100644 assets/cn/combat_ui/QUIT_MaidCafe.png diff --git a/assets/cn/combat_ui/PAUSE_MaidCafe.png b/assets/cn/combat_ui/PAUSE_MaidCafe.png new file mode 100644 index 0000000000000000000000000000000000000000..f51bdf9fb22caef3b7bbdb106ecb14d00ff5f125 GIT binary patch literal 2977 zcmeAS@N?(olHy`uVBq!ia0y~yUc53au8{F zC|Ni$ShVF4uNQwn#(CwVy&^HIZ5^^T<#dC@FGYlK&8%E;fBWp|XD3AdRZ-Cd8Zf}1 zKw&q?PhVaa+Po4=w+mV{_vfR>yI-tp<6~oBXsFw&dG=ZU@2A(F|Ek^iD&}0KQEl$5 zH2dnxD!sj{8=Ha7S5TO^TKE9agbf`OTVAz({s{aR;xX59v$dpL3)7Z-z!KCrYc|3dMDHv&Ml zFRmZ{dsolm^Za*b+^fE%Z;Z*mV+9l*1*0J_8UmvsFd71*Aut*OqaiRF0)sXLIJUDk WT3RvkU*vHCxzW?r&t;ucLK6UYpM)>~ literal 0 HcmV?d00001 diff --git a/assets/cn/combat_ui/QUIT_MaidCafe.png b/assets/cn/combat_ui/QUIT_MaidCafe.png new file mode 100644 index 0000000000000000000000000000000000000000..483934f282a1dfb286a4fab05b4ed6aaa550e6f0 GIT binary patch literal 5479 zcmeI0`#%%MGunlXrbPh`@myXa9JCZb7 z8f}bhmCKGWl}3xrb!K8N*@e-*zJ33K@6TWFUp}AT-tW)z{d&LOpT|4h%j49Bbz9c~ z0Dui=PCK0i0DfA&u6n)%B`!luh*o|GY(q)F_@8| zHK?;0-!;XPvi-Vo2Nga;2K{B5P@CTFEn*9X{73^*NlgPUFtKu#sn$h z73vORa5$X!U9RiaQQ(0{++6Rz9kdJY_}SJKnle_m;ntzqv9YoAP26EVFE>)YIFD&Y z#C1J!Z_P&J^e4Nf!MItbKr-&il`A2_I;>4Y9Y;egE2=|_XH%{R(hP1j6N>e#7Gb{F zAMek)s~@D1Ob8TAW)KY4)zw8p460%7{oF63H{f;Va-`K!29ue9#qK^wt=;7PE9rjF zegoh5cqO*7&iXv%o(I1argH= z#&vP-;QS5wI4snq^kaLw8#~+cq<8-&qLEe9TFH93(bgfWr3!V=v!EpDY^lYT2G!8* z%2%`FDwT>}a;h?@-p0meL0U!$s}>OK`@6c3ep-OlA=gb88v8Ya>EFM5-G5MIGb5UT zP#%&Ueszq&ElqF8hz+P%5~N0YdUh7Xu;){5R4&OF(+gywYODmm)#}q zid%?|bkpS)gzd>`O;2xKmN^Lxa%n~u_Z+z+G_l1`jLm*4g_@z1gwx_Sc@gTYY8ls_eqi#0Bg$3x8W9qFqq&6MPxQc z(w3d7OG2FHD5v@z;)a@ZObPmkX`i*VIXM}Hg-8i8O?E|BUQt;}##!^?2jS>eu@O<9f9^Zt}fha z$}y}$4b?yP-<#i`tZC|vF?~QLQ`7i7@s4LAN?Rg!KXER?b}RY-%b-vmYYPd|L^Mee z#a?$jDW_8>9)LHyDyJlkl-vG>&7LN*s8^+d;50j9cny_)(`MsQ^O8{3S$l%&G|t%@ z(fXHy&3>bQzvtP-O<&fNLhWAKqBN7L8qKt&CXDby>r?F2=j7)*i?dt93@w8LEkq(>d6Yh)Bx1uMPE!`r7eesof!L|R7`26T!!y* zw6(R9l$mo1MROV|D??Zp4=GB1egRqLNwJT|zZ5lEkUL0hhEicqzt*@AudVHxhqW8} zxICZE?lshPPSFKy2WYRBpZV-hqavH%gdpEBmM~zZ9c~ zZtLR`i;WaZvfGV)G#Pvwv>rF(Xw9EW)+8>6N&BRHKmODQltC4`*d-aiO;RA{Drh6Eu782% zm!D@vxz5)YK9Z0g*FC!wLHFt3Z}W00m;s`6hC`&Z07`#DQlhVKPm1fy5j-BR#;awb z2KC@6(;GK?dwbO#&_qi(3;T7HMkWhLoqK|7P)h{#n*R(a+&~Q{DLOtmx%4c}$HjXm z3oA{TeC8rXhlfk1r$v#ac`nXUtXX~slX>9XV@NM^36GD&&&^S5FPr5E=$LTa0lVnA z7w={#fZEfuJnF0yvoy2!_`Y4&}Ni6pE7{JPB75z;F>? zSm;p-$tcJ`G9u}I_X`Saug;FpFP$1z`Y2; z)zK!&`%WXMedUD;hmBIhni>X!Bs*VjFsuuhUfW^6YJfglv&)k7*pIeYb&>v~W5LaH zT0fjCLy79PID7x|lQz9)hGgDGy-%pQ{a!bl8gE&^4pSzQd?IUWJ_g*WuLg0TTFc2r_0G!hQTCDI| RUZny6XPiBpo;!y8`EPNA{e=Jk literal 0 HcmV?d00001 diff --git a/module/combat/combat.py b/module/combat/combat.py index ffeb42ca8..9ff52afbd 100644 --- a/module/combat/combat.py +++ b/module/combat/combat.py @@ -121,6 +121,8 @@ class Combat(Level, HPBalancer, Retirement, SubmarineCall, CombatAuto, CombatMan return PAUSE_Ninja if PAUSE_ShadowPuppetry.match_luma(self.device.image, offset=(10, 10)): return PAUSE_ShadowPuppetry + if PAUSE_MaidCafe.match_template_color(self.device.image, offset=(10, 10)): + return PAUSE_MaidCafe return False def handle_combat_quit(self, offset=(20, 20), interval=3): @@ -168,6 +170,10 @@ class Combat(Level, HPBalancer, Retirement, SubmarineCall, CombatAuto, CombatMan self.device.click(QUIT_Ninja) timer.reset() return True + if QUIT_MaidCafe.match_luma(self.device.image, offset=offset): + self.device.click(QUIT_MaidCafe) + timer.reset() + return True return False def ensure_combat_oil_loaded(self): diff --git a/module/combat_ui/assets.py b/module/combat_ui/assets.py index 109bc4519..f66c58ff1 100644 --- a/module/combat_ui/assets.py +++ b/module/combat_ui/assets.py @@ -11,6 +11,7 @@ PAUSE_DOUBLE_CHECK = Button(area={'cn': (1226, 35, 1231, 60), 'en': (1226, 35, 1 PAUSE_Devil = Button(area={'cn': (1233, 35, 1250, 57), 'en': (1233, 35, 1250, 57), 'jp': (1233, 35, 1250, 57), 'tw': (1233, 35, 1250, 57)}, color={'cn': (193, 98, 108), 'en': (193, 98, 108), 'jp': (193, 98, 108), 'tw': (193, 98, 108)}, button={'cn': (1233, 35, 1250, 57), 'en': (1233, 35, 1250, 57), 'jp': (1233, 35, 1250, 57), 'tw': (1233, 35, 1250, 57)}, file={'cn': './assets/cn/combat_ui/PAUSE_Devil.png', 'en': './assets/cn/combat_ui/PAUSE_Devil.png', 'jp': './assets/cn/combat_ui/PAUSE_Devil.png', 'tw': './assets/cn/combat_ui/PAUSE_Devil.png'}) PAUSE_HolyLight = Button(area={'cn': (1233, 35, 1250, 57), 'en': (1233, 35, 1250, 57), 'jp': (1233, 35, 1250, 57), 'tw': (1233, 35, 1250, 57)}, color={'cn': (54, 40, 27), 'en': (54, 40, 27), 'jp': (54, 40, 27), 'tw': (54, 40, 27)}, button={'cn': (1233, 35, 1250, 57), 'en': (1233, 35, 1250, 57), 'jp': (1233, 35, 1250, 57), 'tw': (1233, 35, 1250, 57)}, file={'cn': './assets/cn/combat_ui/PAUSE_HolyLight.png', 'en': './assets/cn/combat_ui/PAUSE_HolyLight.png', 'jp': './assets/cn/combat_ui/PAUSE_HolyLight.png', 'tw': './assets/cn/combat_ui/PAUSE_HolyLight.png'}) PAUSE_Iridescent_Fantasy = Button(area={'cn': (1232, 33, 1252, 57), 'en': (1232, 33, 1252, 57), 'jp': (1232, 33, 1252, 57), 'tw': (1232, 33, 1252, 57)}, color={'cn': (124, 139, 190), 'en': (124, 139, 190), 'jp': (124, 139, 190), 'tw': (124, 139, 190)}, button={'cn': (1232, 33, 1252, 57), 'en': (1232, 33, 1252, 57), 'jp': (1232, 33, 1252, 57), 'tw': (1232, 33, 1252, 57)}, file={'cn': './assets/cn/combat_ui/PAUSE_Iridescent_Fantasy.png', 'en': './assets/en/combat_ui/PAUSE_Iridescent_Fantasy.png', 'jp': './assets/jp/combat_ui/PAUSE_Iridescent_Fantasy.png', 'tw': './assets/tw/combat_ui/PAUSE_Iridescent_Fantasy.png'}) +PAUSE_MaidCafe = Button(area={'cn': (1230, 35, 1248, 54), 'en': (1230, 35, 1248, 54), 'jp': (1230, 35, 1248, 54), 'tw': (1230, 35, 1248, 54)}, color={'cn': (159, 145, 139), 'en': (159, 145, 139), 'jp': (159, 145, 139), 'tw': (159, 145, 139)}, button={'cn': (1230, 35, 1248, 54), 'en': (1230, 35, 1248, 54), 'jp': (1230, 35, 1248, 54), 'tw': (1230, 35, 1248, 54)}, file={'cn': './assets/cn/combat_ui/PAUSE_MaidCafe.png', 'en': './assets/cn/combat_ui/PAUSE_MaidCafe.png', 'jp': './assets/cn/combat_ui/PAUSE_MaidCafe.png', 'tw': './assets/cn/combat_ui/PAUSE_MaidCafe.png'}) PAUSE_Neon = Button(area={'cn': (1228, 32, 1250, 59), 'en': (1228, 32, 1250, 59), 'jp': (1228, 32, 1250, 59), 'tw': (1228, 32, 1250, 59)}, color={'cn': (106, 137, 80), 'en': (106, 137, 80), 'jp': (106, 137, 80), 'tw': (106, 137, 80)}, button={'cn': (1228, 32, 1250, 59), 'en': (1228, 32, 1250, 59), 'jp': (1228, 32, 1250, 59), 'tw': (1228, 32, 1250, 59)}, file={'cn': './assets/cn/combat_ui/PAUSE_Neon.png', 'en': './assets/cn/combat_ui/PAUSE_Neon.png', 'jp': './assets/cn/combat_ui/PAUSE_Neon.png', 'tw': './assets/cn/combat_ui/PAUSE_Neon.png'}) PAUSE_New = Button(area={'cn': (1231, 29, 1253, 56), 'en': (1231, 29, 1253, 56), 'jp': (1231, 29, 1253, 56), 'tw': (1231, 29, 1253, 56)}, color={'cn': (156, 158, 166), 'en': (156, 158, 166), 'jp': (156, 158, 166), 'tw': (156, 158, 166)}, button={'cn': (1231, 29, 1253, 56), 'en': (1231, 29, 1253, 56), 'jp': (1231, 29, 1253, 56), 'tw': (1231, 29, 1253, 56)}, file={'cn': './assets/cn/combat_ui/PAUSE_New.png', 'en': './assets/en/combat_ui/PAUSE_New.png', 'jp': './assets/jp/combat_ui/PAUSE_New.png', 'tw': './assets/tw/combat_ui/PAUSE_New.png'}) PAUSE_Ninja = Button(area={'cn': (1230, 37, 1246, 53), 'en': (1230, 37, 1246, 53), 'jp': (1230, 37, 1246, 53), 'tw': (1230, 37, 1246, 53)}, color={'cn': (135, 109, 92), 'en': (135, 109, 92), 'jp': (135, 109, 92), 'tw': (135, 109, 92)}, button={'cn': (1230, 37, 1246, 53), 'en': (1230, 37, 1246, 53), 'jp': (1230, 37, 1246, 53), 'tw': (1230, 37, 1246, 53)}, file={'cn': './assets/cn/combat_ui/PAUSE_Ninja.png', 'en': './assets/cn/combat_ui/PAUSE_Ninja.png', 'jp': './assets/cn/combat_ui/PAUSE_Ninja.png', 'tw': './assets/cn/combat_ui/PAUSE_Ninja.png'}) @@ -23,6 +24,7 @@ QUIT = Button(area={'cn': (420, 490, 593, 548), 'en': (473, 508, 567, 532), 'jp' QUIT_Christmas = Button(area={'cn': (400, 506, 477, 525), 'en': (410, 507, 469, 524), 'jp': (400, 506, 477, 525), 'tw': (400, 506, 477, 525)}, color={'cn': (195, 139, 166), 'en': (207, 166, 185), 'jp': (195, 139, 166), 'tw': (195, 139, 166)}, button={'cn': (400, 506, 477, 525), 'en': (410, 507, 469, 524), 'jp': (400, 506, 477, 525), 'tw': (400, 506, 477, 525)}, file={'cn': './assets/cn/combat_ui/QUIT_Christmas.png', 'en': './assets/en/combat_ui/QUIT_Christmas.png', 'jp': './assets/cn/combat_ui/QUIT_Christmas.png', 'tw': './assets/cn/combat_ui/QUIT_Christmas.png'}) QUIT_Cyber = Button(area={'cn': (393, 506, 470, 524), 'en': (393, 506, 470, 524), 'jp': (393, 506, 470, 524), 'tw': (393, 506, 470, 524)}, color={'cn': (255, 198, 190), 'en': (255, 198, 190), 'jp': (255, 198, 190), 'tw': (255, 198, 190)}, button={'cn': (393, 506, 470, 524), 'en': (393, 506, 470, 524), 'jp': (393, 506, 470, 524), 'tw': (393, 506, 470, 524)}, file={'cn': './assets/cn/combat_ui/QUIT_Cyber.png', 'en': './assets/cn/combat_ui/QUIT_Cyber.png', 'jp': './assets/cn/combat_ui/QUIT_Cyber.png', 'tw': './assets/tw/combat_ui/QUIT_Cyber.png'}) QUIT_Iridescent_Fantasy = Button(area={'cn': (391, 522, 464, 540), 'en': (402, 507, 460, 523), 'jp': (391, 522, 464, 540), 'tw': (391, 522, 464, 540)}, color={'cn': (121, 73, 79), 'en': (255, 174, 164), 'jp': (108, 60, 70), 'tw': (121, 73, 79)}, button={'cn': (391, 522, 464, 540), 'en': (402, 507, 460, 523), 'jp': (391, 522, 464, 540), 'tw': (391, 522, 464, 540)}, file={'cn': './assets/cn/combat_ui/QUIT_Iridescent_Fantasy.png', 'en': './assets/en/combat_ui/QUIT_Iridescent_Fantasy.png', 'jp': './assets/jp/combat_ui/QUIT_Iridescent_Fantasy.png', 'tw': './assets/cn/combat_ui/QUIT_Iridescent_Fantasy.png'}) +QUIT_MaidCafe = Button(area={'cn': (423, 549, 501, 568), 'en': (423, 549, 501, 568), 'jp': (423, 549, 501, 568), 'tw': (423, 549, 501, 568)}, color={'cn': (168, 142, 133), 'en': (168, 142, 133), 'jp': (168, 142, 133), 'tw': (168, 142, 133)}, button={'cn': (423, 549, 501, 568), 'en': (423, 549, 501, 568), 'jp': (423, 549, 501, 568), 'tw': (423, 549, 501, 568)}, file={'cn': './assets/cn/combat_ui/QUIT_MaidCafe.png', 'en': './assets/cn/combat_ui/QUIT_MaidCafe.png', 'jp': './assets/cn/combat_ui/QUIT_MaidCafe.png', 'tw': './assets/cn/combat_ui/QUIT_MaidCafe.png'}) QUIT_New = Button(area={'cn': (394, 506, 467, 524), 'en': (404, 506, 463, 523), 'jp': (394, 506, 467, 524), 'tw': (393, 505, 471, 524)}, color={'cn': (255, 180, 171), 'en': (255, 195, 187), 'jp': (255, 180, 171), 'tw': (255, 200, 193)}, button={'cn': (394, 506, 467, 524), 'en': (404, 506, 463, 523), 'jp': (394, 506, 467, 524), 'tw': (393, 505, 471, 524)}, file={'cn': './assets/cn/combat_ui/QUIT_New.png', 'en': './assets/en/combat_ui/QUIT_New.png', 'jp': './assets/cn/combat_ui/QUIT_New.png', 'tw': './assets/tw/combat_ui/QUIT_New.png'}) QUIT_Ninja = Button(area={'cn': (398, 509, 477, 528), 'en': (398, 509, 477, 528), 'jp': (398, 509, 477, 528), 'tw': (398, 509, 477, 528)}, color={'cn': (148, 138, 134), 'en': (148, 138, 134), 'jp': (148, 138, 134), 'tw': (148, 138, 134)}, button={'cn': (398, 509, 477, 528), 'en': (398, 509, 477, 528), 'jp': (398, 509, 477, 528), 'tw': (398, 509, 477, 528)}, file={'cn': './assets/cn/combat_ui/QUIT_Ninja.png', 'en': './assets/cn/combat_ui/QUIT_Ninja.png', 'jp': './assets/cn/combat_ui/QUIT_Ninja.png', 'tw': './assets/cn/combat_ui/QUIT_Ninja.png'}) QUIT_Nurse = Button(area={'cn': (400, 507, 477, 525), 'en': (400, 507, 477, 525), 'jp': (400, 507, 477, 525), 'tw': (400, 507, 477, 525)}, color={'cn': (254, 193, 170), 'en': (254, 193, 170), 'jp': (254, 193, 170), 'tw': (254, 193, 170)}, button={'cn': (400, 507, 477, 525), 'en': (400, 507, 477, 525), 'jp': (400, 507, 477, 525), 'tw': (400, 507, 477, 525)}, file={'cn': './assets/cn/combat_ui/QUIT_Nurse.png', 'en': './assets/cn/combat_ui/QUIT_Nurse.png', 'jp': './assets/cn/combat_ui/QUIT_Nurse.png', 'tw': './assets/cn/combat_ui/QUIT_Nurse.png'}) diff --git a/module/exercise/hp_daemon.py b/module/exercise/hp_daemon.py index 7dbe30bd9..e79bce505 100644 --- a/module/exercise/hp_daemon.py +++ b/module/exercise/hp_daemon.py @@ -74,7 +74,8 @@ class HpDaemon(ModuleBase): PAUSE_Seaside, PAUSE_Star, PAUSE_Ninja, - PAUSE_ShadowPuppetry + PAUSE_ShadowPuppetry, + PAUSE_MaidCafe, ]: 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) From ee6053a0475c9030cf054681615405e6e9f96058 Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Thu, 1 Jan 2026 23:44:59 +0800 Subject: [PATCH 6/6] Upd: add HOMO_STORAGE to all maps --- campaign/event_20251218_cn/a1.py | 1 + campaign/event_20251218_cn/b1.py | 1 + campaign/event_20251218_cn/c1.py | 1 + campaign/event_20251218_cn/d1.py | 1 + campaign/event_20251218_cn/sp.py | 1 + 5 files changed, 5 insertions(+) diff --git a/campaign/event_20251218_cn/a1.py b/campaign/event_20251218_cn/a1.py index 7e692435f..a017abcd1 100644 --- a/campaign/event_20251218_cn/a1.py +++ b/campaign/event_20251218_cn/a1.py @@ -73,6 +73,7 @@ class Config: 'distance': 50, 'wlen': 1000 } + HOMO_STORAGE = ((8, 6), [(137.405, 104.804), (1046.044, 104.804), (-12.171, 652.093), (1166.717, 652.093)]) HOMO_EDGE_COLOR_RANGE = (0, 17) MAP_WALK_USE_CURRENT_FLEET = True MAP_SWIPE_MULTIPLY = (1.232, 1.255) diff --git a/campaign/event_20251218_cn/b1.py b/campaign/event_20251218_cn/b1.py index 8216822be..b87ff6fa4 100644 --- a/campaign/event_20251218_cn/b1.py +++ b/campaign/event_20251218_cn/b1.py @@ -73,6 +73,7 @@ class Config: 'distance': 50, 'wlen': 1000 } + HOMO_STORAGE = ((8, 6), [(137.405, 104.804), (1046.044, 104.804), (-12.171, 652.093), (1166.717, 652.093)]) HOMO_EDGE_COLOR_RANGE = (0, 17) MAP_WALK_USE_CURRENT_FLEET = True MAP_SWIPE_MULTIPLY = (1.217, 1.240) diff --git a/campaign/event_20251218_cn/c1.py b/campaign/event_20251218_cn/c1.py index fd594847a..ae69348f5 100644 --- a/campaign/event_20251218_cn/c1.py +++ b/campaign/event_20251218_cn/c1.py @@ -73,6 +73,7 @@ class Config: 'distance': 50, 'wlen': 1000 } + HOMO_STORAGE = ((8, 6), [(137.405, 104.804), (1046.044, 104.804), (-12.171, 652.093), (1166.717, 652.093)]) HOMO_EDGE_COLOR_RANGE = (0, 17) MAP_WALK_USE_CURRENT_FLEET = True MAP_SWIPE_MULTIPLY = (1.232, 1.255) diff --git a/campaign/event_20251218_cn/d1.py b/campaign/event_20251218_cn/d1.py index cf99034b0..4fdd5db3d 100644 --- a/campaign/event_20251218_cn/d1.py +++ b/campaign/event_20251218_cn/d1.py @@ -74,6 +74,7 @@ class Config: 'distance': 50, 'wlen': 1000 } + HOMO_STORAGE = ((8, 6), [(137.405, 104.804), (1046.044, 104.804), (-12.171, 652.093), (1166.717, 652.093)]) HOMO_EDGE_COLOR_RANGE = (0, 17) MAP_WALK_USE_CURRENT_FLEET = True MAP_SWIPE_MULTIPLY = (1.217, 1.240) diff --git a/campaign/event_20251218_cn/sp.py b/campaign/event_20251218_cn/sp.py index f74e5236f..8cec53c7b 100644 --- a/campaign/event_20251218_cn/sp.py +++ b/campaign/event_20251218_cn/sp.py @@ -78,6 +78,7 @@ class Config: 'distance': 50, 'wlen': 1000 } + HOMO_STORAGE = ((8, 6), [(137.405, 104.804), (1046.044, 104.804), (-12.171, 652.093), (1166.717, 652.093)]) HOMO_EDGE_COLOR_RANGE = (0, 17) MAP_WALK_USE_CURRENT_FLEET = True MAP_SWIPE_MULTIPLY = (1.180, 1.202)