From f36ae75ed3ebb64aff7189451185fbc1f207675a Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Fri, 1 May 2026 04:09:53 +0800 Subject: [PATCH] Fix: Switch ui from other DOA events to event_20250424_cn --- assets/cn/campaign/EVENT_20250424_PT_ICON.png | Bin 0 -> 4356 bytes campaign/event_20250424_cn/campaign_base.py | 13 ++++++++++++- module/campaign/assets.py | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 assets/cn/campaign/EVENT_20250424_PT_ICON.png diff --git a/assets/cn/campaign/EVENT_20250424_PT_ICON.png b/assets/cn/campaign/EVENT_20250424_PT_ICON.png new file mode 100644 index 0000000000000000000000000000000000000000..b3216268a495008aa2a2a035b8fff1ef57e91414 GIT binary patch literal 4356 zcmeIz`#%$U9{})Ghun3OazC}FDLc8OnVjTvD(^E}V_8=mI}pI^S;-@c#E`}6s{z8U|7J1Q$^C;$Ke zW!Oc#D*%9u^t$`K+-~V{UiZ>20AL>#W(Re%YdhuUcJean| zVv6miOJ1f6P&!@y8RpUR=MUv9c!Mx*I%LTzN!(>sB?~Q$|K+;Yy{RO(p9II0G+-vC zka~%2ge1WgD007fPtHXwVd{P5&V`V^-*Sdj4 z?ZXj_te8ox^-Mid7?DV{i3y&~3dXLHsk#{5ya!%6CjBY(OE6YsIKMiT1FQh-0RX&* z88+q$qpK9w|m%bpkRxWYhcB=7s*LaYjRqdHYuu#zSY( z$xWPKDIyL zR;$E%CWN}(gm2-4=0+R>eXJJ|DXZ&#xQz%;F^oC@t9!Kx2Kqnzeu4a8}pKwi%TX-C_Yd)hR7fy{W8lttYL_ zzuQQcBX5BEHEo7mo_BJ?EP}rLG0?yRy~L+OMy)IxF`T;oJ&#$!5DB^LK%Xhmd?52t z9UL?eLeB@PpCp{$&a9`tiJJO-6Vm}j{zCuch|=jnn!mqB2_6_5qg<;=@F%+-T?)Hg zb{yL^|F$W0kUyzz=hEa`02jEjutV7XIdsTr*gyU*6Mn>5=JR({hZ4usC3vcv@DF{ zN_@kj`4P;OZ}s40@f@?aZ|FmCE*pi7Bags_8sF5XeXHH|Vz&|i5Lu@_jfu~Cz9ACF zR-H95TV;gU2o0N+=bBpnG;!GBzJE?g57#QWvt6Xm)idjw7qjLp*SZc6YIc3gaAM`9?# z;AC$Bw;~@1YcMgSMm}46BL4RjWd3~AgP=8a*1|f9{?d>~mjqBuvD^`Sm2V;rF<9R+ z_b0D?!P5v=Lp(9F9ztUKtt*p-uZEK(s$;V90Dz~7jQPCQxfT(Ru48jM2=7-N!{!o{ ze4;L#voyQ4=$U__&06z*Nlc8%I_(t?jT7jTM9`ZGY(G5}_8|1ePcuEI4okne7j{-_ z)4~hCq2t+8L@sT`*({0T&Qb0zhrFn|QZc%iN|iO!wQUE1Sq6}5TYOF8%Il!)T*X?k zY}eiqQGz_?q4vQq0YTfkV70x3)&sH&uZQ0>UE_tG1(i9#X#?yxoao3a-bss2d$ zu>B1RXQVW4;7UVg!a!D6=O0Fcf*8u1hI+83@U97OYru4n*7z1UXpr-^f9A{kUbT_X zG1#&mIP>ZII4SB*>xdBexTQ*~9H>e)doK E3oqVuHUIzs literal 0 HcmV?d00001 diff --git a/campaign/event_20250424_cn/campaign_base.py b/campaign/event_20250424_cn/campaign_base.py index 29a2760cb..c7a4d7a78 100644 --- a/campaign/event_20250424_cn/campaign_base.py +++ b/campaign/event_20250424_cn/campaign_base.py @@ -1,5 +1,7 @@ +from module.campaign.assets import EVENT_20250424_PT_ICON from module.campaign.campaign_base import CampaignBase as CampaignBase_ -from module.ui.page import page_event +from module.logger import logger +from module.ui.page import page_campaign_menu, page_event class CampaignBase(CampaignBase_): @@ -8,3 +10,12 @@ class CampaignBase(CampaignBase_): if self.ui_page_appear(page_event): return False return super().handle_exp_info() + + def ui_goto_event(self): + if self.appear(EVENT_20250424_PT_ICON, offset=(20, 20)) and self.ui_page_appear(page_event): + logger.info('Already at EVENT_20250424') + return True + self.ui_ensure(page_campaign_menu) + if self.is_event_entrance_available(): + self.ui_goto(page_event) + return True diff --git a/module/campaign/assets.py b/module/campaign/assets.py index 22bf8f0e1..886e10bb6 100644 --- a/module/campaign/assets.py +++ b/module/campaign/assets.py @@ -19,6 +19,7 @@ EVENT_20201126_PT_ICON = Button(area={'cn': (1108, 102, 1133, 127), 'en': (1108, EVENT_20221124_ENTRANCE = Button(area={'cn': (1037, 162, 1077, 195), 'en': (1037, 162, 1077, 195), 'jp': (1037, 162, 1077, 195), 'tw': (1037, 162, 1077, 195)}, color={'cn': (207, 168, 148), 'en': (207, 168, 148), 'jp': (207, 168, 148), 'tw': (207, 168, 148)}, button={'cn': (1037, 162, 1077, 195), 'en': (1037, 162, 1077, 195), 'jp': (1037, 162, 1077, 195), 'tw': (1037, 162, 1077, 195)}, file={'cn': './assets/cn/campaign/EVENT_20221124_ENTRANCE.png', 'en': './assets/cn/campaign/EVENT_20221124_ENTRANCE.png', 'jp': './assets/cn/campaign/EVENT_20221124_ENTRANCE.png', 'tw': './assets/cn/campaign/EVENT_20221124_ENTRANCE.png'}) EVENT_20221124_PT_ICON = Button(area={'cn': (1106, 109, 1135, 130), 'en': (1071, 109, 1101, 129), 'jp': (1106, 109, 1135, 130), 'tw': (1106, 109, 1135, 130)}, color={'cn': (151, 116, 139), 'en': (152, 115, 138), 'jp': (151, 116, 139), 'tw': (151, 116, 139)}, button={'cn': (1106, 109, 1135, 130), 'en': (1071, 109, 1101, 129), 'jp': (1106, 109, 1135, 130), 'tw': (1106, 109, 1135, 130)}, file={'cn': './assets/cn/campaign/EVENT_20221124_PT_ICON.png', 'en': './assets/en/campaign/EVENT_20221124_PT_ICON.png', 'jp': './assets/cn/campaign/EVENT_20221124_PT_ICON.png', 'tw': './assets/cn/campaign/EVENT_20221124_PT_ICON.png'}) EVENT_20230817_STORY = Button(area={'cn': (610, 320, 670, 380), 'en': (610, 320, 670, 380), 'jp': (610, 320, 670, 380), 'tw': (610, 320, 670, 380)}, color={'cn': (183, 180, 190), 'en': (183, 180, 190), 'jp': (183, 180, 190), 'tw': (183, 180, 190)}, button={'cn': (610, 320, 670, 380), 'en': (610, 320, 670, 380), 'jp': (610, 320, 670, 380), 'tw': (610, 320, 670, 380)}, file={'cn': './assets/cn/campaign/EVENT_20230817_STORY.png', 'en': './assets/en/campaign/EVENT_20230817_STORY.png', 'jp': './assets/jp/campaign/EVENT_20230817_STORY.png', 'tw': './assets/tw/campaign/EVENT_20230817_STORY.png'}) +EVENT_20250424_PT_ICON = Button(area={'cn': (1109, 109, 1133, 131), 'en': (1109, 109, 1133, 131), 'jp': (1109, 109, 1133, 131), 'tw': (1109, 109, 1133, 131)}, color={'cn': (182, 173, 150), 'en': (182, 173, 150), 'jp': (182, 173, 150), 'tw': (182, 173, 150)}, button={'cn': (1109, 109, 1133, 131), 'en': (1109, 109, 1133, 131), 'jp': (1109, 109, 1133, 131), 'tw': (1109, 109, 1133, 131)}, file={'cn': './assets/cn/campaign/EVENT_20250424_PT_ICON.png', 'en': './assets/cn/campaign/EVENT_20250424_PT_ICON.png', 'jp': './assets/cn/campaign/EVENT_20250424_PT_ICON.png', 'tw': './assets/cn/campaign/EVENT_20250424_PT_ICON.png'}) EVENT_20250724_PT_ICON = Button(area={'cn': (1102, 106, 1139, 121), 'en': (1067, 108, 1104, 123), 'jp': (1102, 106, 1139, 121), 'tw': (1102, 106, 1139, 121)}, color={'cn': (95, 103, 93), 'en': (97, 101, 94), 'jp': (95, 103, 93), 'tw': (95, 103, 93)}, button={'cn': (1102, 106, 1139, 121), 'en': (1067, 108, 1104, 123), 'jp': (1102, 106, 1139, 121), 'tw': (1102, 106, 1139, 121)}, file={'cn': './assets/cn/campaign/EVENT_20250724_PT_ICON.png', 'en': './assets/en/campaign/EVENT_20250724_PT_ICON.png', 'jp': './assets/cn/campaign/EVENT_20250724_PT_ICON.png', 'tw': './assets/cn/campaign/EVENT_20250724_PT_ICON.png'}) EVENT_20260417_DETAIL = Button(area={'cn': (618, 251, 658, 290), 'en': (618, 251, 658, 290), 'jp': (618, 251, 658, 290), 'tw': (618, 251, 658, 290)}, color={'cn': (221, 188, 185), 'en': (221, 188, 185), 'jp': (221, 188, 185), 'tw': (221, 188, 185)}, button={'cn': (618, 251, 658, 290), 'en': (618, 251, 658, 290), 'jp': (618, 251, 658, 290), 'tw': (618, 251, 658, 290)}, file={'cn': './assets/cn/campaign/EVENT_20260417_DETAIL.png', 'en': './assets/cn/campaign/EVENT_20260417_DETAIL.png', 'jp': './assets/cn/campaign/EVENT_20260417_DETAIL.png', 'tw': './assets/cn/campaign/EVENT_20260417_DETAIL.png'}) EVENT_20260417_DETAIL_CHECK = Button(area={'cn': (439, 216, 535, 293), 'en': (439, 216, 535, 293), 'jp': (439, 216, 535, 293), 'tw': (439, 216, 535, 293)}, color={'cn': (187, 160, 173), 'en': (187, 160, 173), 'jp': (187, 160, 173), 'tw': (187, 160, 173)}, button={'cn': (439, 216, 535, 293), 'en': (439, 216, 535, 293), 'jp': (439, 216, 535, 293), 'tw': (439, 216, 535, 293)}, file={'cn': './assets/cn/campaign/EVENT_20260417_DETAIL_CHECK.png', 'en': './assets/cn/campaign/EVENT_20260417_DETAIL_CHECK.png', 'jp': './assets/cn/campaign/EVENT_20260417_DETAIL_CHECK.png', 'tw': './assets/cn/campaign/EVENT_20260417_DETAIL_CHECK.png'})