From 4c8ecff04671bd06fd5bdbac2637b4ff75fc4411 Mon Sep 17 00:00:00 2001 From: guoh064 <50830808+guoh064@users.noreply.github.com> Date: Tue, 29 Jul 2025 01:43:50 +0900 Subject: [PATCH] Add: ui_goto_event for event 20221124 cn and event 20250724 cn --- assets/cn/campaign/EVENT_20221124_ENTRANCE.png | Bin 0 -> 6533 bytes assets/cn/campaign/EVENT_20221124_PT_ICON.png | Bin 0 -> 4673 bytes assets/cn/campaign/EVENT_20250724_PT_ICON.png | Bin 0 -> 4481 bytes campaign/event_20221124_cn/campaign_base.py | 14 +++++++++++++- campaign/event_20250724_cn/campaign_base.py | 13 ++++++++++++- module/campaign/assets.py | 3 +++ module/commission/commission.py | 2 +- 7 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 assets/cn/campaign/EVENT_20221124_ENTRANCE.png create mode 100644 assets/cn/campaign/EVENT_20221124_PT_ICON.png create mode 100644 assets/cn/campaign/EVENT_20250724_PT_ICON.png diff --git a/assets/cn/campaign/EVENT_20221124_ENTRANCE.png b/assets/cn/campaign/EVENT_20221124_ENTRANCE.png new file mode 100644 index 0000000000000000000000000000000000000000..526d2dc796c93291a9e0a2687b2722c9f7e70e64 GIT binary patch literal 6533 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
7HhM9cZkjg&C zp3BqF-sp1k{Ep|-w$vEH$;F<`CZ$7X zM8)2s;0+O1PNykY5y42Z7aqde>G1k|s-E^(VX1@o(=zsm_7%j=AJv!hg}@gAUkH35 k@P)t^0{`y_z{}GlSgaNi zTdF^a4r$-gD2bQ)RO3c~R=+ToTdijaPPkMA5t4 z$>TL-&pYoozAJ=(bZxVW=vxs2riqm#94NiAdW3SuJSQSw6ofAc3id^C0rB>xg6N)XiFRatc>Xeo*j2_L+!{^?9JnL$gFPG7=iF2>3CYl1< zt}{qh(FX-%%2OJo(*sI$NH#NaPbSHhA(_3y8QB8Uk$pSUs;#(!m)8oA!h&=#6 zdk?W>0)x7RiAj4rU|~+0><+ zR=gE@jBoXc2aWDc4J#Akz-m;>mUp)LbCY;{1WBwZ{=uy{@YG?0%59Ohn8+ftfyk}c zw!z9g*MMqH%EAT|JrrsUih7``6lp|ar=K~1V)YDwoK5(xAY_&mn`VS7`@NadH%YyT zeo2RrUs#)7tH}X@PY)UXV4+fH{#2ILA*jdB>y9BYtC^c>4P272+U{AKlm@cDUO7fR zYxm#OjyDhRX3B;|laPy$gfTHCN|IXUwf~y8@gjD%`?Cbe@q6PvW6r3xWON4A`A3TC zS;-M2gGB#GnQ_Yb4KldOwDmMN@m&tW=K6OABdS?mtOL-sS(;5|HC5Noez@79%ZtGU zzSZNE3sU2;@(HsLEIcgizK}yF=U?FZArSs_KI0iy@j7Ev{9u@HvUYaMiM7C?#WN9@6>PId3_FQ06p;DeV#H;k>fwme_7mk-Q`4eW6`6hU=5`P zs96yzg0#-V3BV57pP0B>GTzzu1NdhdPbx%dnkds@LT3PsuXdY08^<3 zQw2k5M+gBcUJG&A;-@-VkM3I-wThf66Y*R^o|e4hkM5N-;ioKvA2*u>b_e-b`pi^5 z$E*7<*oLVcQqoQ@jBM4z%hME#b4=ZV;Djh{vz70hI#1_P1bn4Wn?m32@U*morP>(2 zm)T$uvaC|bAGtIpiitu=1K;{v&Shg79#of)juG7&#?qoHs%^)62^HUi$II5jP&G_g zTGz6C@IeCuoXl0B$OK(QH@0MS`dX&7A}a1yME@|eZPTIgIC=%5_082q0yipho%Dy; z*ydA6$UJ?$0u9`IGTIg7*7mkA7>7we5wPKf3qhQ}t+4>TP=?vN2XX{)E!nSn=Gn0ySdQIkl-VB!obmqNx`nl7`a$kf<}Nc(`yT64$8R=HFHF+9B%V{4`d}m3M32X7 zU9;#yJU&_xdafDyvfADoewREOah|!H-r&zpku82cV=UcBGvs{?-D{()v(?pNVL#Gf zzoE<_5Lz)i1|Q?`?;$T-Y-F7r&Q^vhS_ z*0-QJ=KYQN`HyRr9l>!w{^uPsd$E;mSK(Zq>w0JT{mKwfyY*ty>c@>QYd9S4+o(Vl zMm`zG7WG>)pk^?qDhG)Du>7-NHjSR3fOF+7r3M+&{QUfy8s?ICW>K-Ej08W F{{}gUM*08% literal 0 HcmV?d00001 diff --git a/assets/cn/campaign/EVENT_20250724_PT_ICON.png b/assets/cn/campaign/EVENT_20250724_PT_ICON.png new file mode 100644 index 0000000000000000000000000000000000000000..b715b3ef227e8f8361ab51ad6af261fb529fbccb GIT binary patch literal 4481 zcmeH{`#%%Y-J1l4M_IQjBgsaJKHsXby3-w9pvtH{J4L2g-_%h zeq0a|AD>k#nPUx#j&C>!kSlVVw*WMnWlZ99p9e zICEk6uO=!#uxY)un!|z*5+yBk!EIWqnR@0gAF@PI4Vv3~sW^JlET@tNi;r9!U8rxf zwPLxj1lE0J;&ujZw{}^w$cCVm?xo{h?$!nxHucg&ayPEM#V zjyzT1S!U-b{o;uoyp%(6jP&K)Q_@3EJ^h1fVpgDfRI@+rh~?KIrw$bW;My3!G{SuE z$@zlZFV{`)br@&j;d0#Qk{Yt0Twj@hdDbzh60mep`+~*WK8C42?3#pRM-O{V*~CY0@AJVdfed1$;usaV*nsXn;h60 zBWz^cFg6xh{4E}hW5-t>9bS^GyE@!43a5>Oi$>OG!)zTlN2d*`w|;6lP`H=A5hHS| zb-2qXY)|_ER-=7)#>s&oqs!KWh zKuIy)eTP`o&sAzR$(o+@`&VR`JYKkVkKUTV!_)SCe0^(7;@l4EIAy%(Ib%ca*cd9P z8u9pU=r+IMK{gI%-Oh{u?3?$9{fgafih%a6BlHUVeK|J}xm)AcfV`+z_?Ul6??I-^CJiJf16?)uI)+upa3ZCawjn?^4?S`S04Kb z0C?7qi355&xZ@O>cIwjyV8j{Jc zh#h&g??A^^|&2gMVPsNY~KxeHOU`C24h2Oj^u48oSLTrq{LbFo#ie)x98 z-NHkjxz?79&E>+KMZ1o>;xL4lhiV;uBq$mV_R18>~e%H!ZMT0 zlc_0(ebuY2d^M7miPpe33c1Q-)slB5_J%{w&D>3w7mbstAI($5-9(<=Xwp&lW&%o` z@%S++4Y8``l<+@i*F*Iv<$+`(@%)!}J1{<4gfYh3uIN*4q6cQ2EOWnR{P@S!36ih^ zX#Sh%eB$LC0PNhWojL%({p;Q9;O{y$XZFYE%~6v#SGav_R905waoJ{5gfJt6mw_wY zNWLxH7)eB>hXA=74<@;3Hn?@tnRgi)^0gDG#Sbpg4vuKf-(PDKvGjM7wYw|= zjkR#pu;H~U7k_JB<@{KFXT_de!(9CKG=#p{!A93(bl=CaAbQG6#vA#bzY+?$gs@OB zzpLv>ar9FY;j@2oaY83MxP zU1A`1bZ+I(-^1GiW$m>I;EM;K^3Cj`-9d_UpAC|{7zrbgjOLEUOq7PSFe8SaX_xHl zNV6_tls`sIjToyDg=N@Mdq1dXJvWRNRqee{%l!Pb!hL7;IqxaaOW~Wh%$a3{aLUJn zv^^sSo|?6Y>x6L03@^&KjbAs;d_9dPT@4khlSDyKvVZ7s&Owr8oYEcuAZAw$q3;&L zYdMGJke_cje179k2}Jt!7W&+aM*})_9;d+Yf$xLhRhaZMB|^els`Y%mHdrl@9_M25 zW1@G%Xzb=>8hxTsP!PeyN;h?F>wHt9;I362L0@J&?Zw5tOaYA~EF!g%d0tdYEAdg6 zU>)T65qJo1o8o6DwO%cEs$XEI@MqhDl&Z}rm@fNS2`j&sij^(Cr;A_o2`CQDiCtr9 zCS;JAGP^oN*Ou7eSBqyY&%VBTL%X*a3-grn>-ejt|}#abw^ zw~5<5?I*ZiNwH7_Br8a91fHE{Ev!C*A_KL;G4x>HbgzAC!_L~~ft$tfNWYXZ*~{o8 z7zFAQrR;|r^5SPvns8i^x4K+ZId`G5P8`;+?6!D z()?i#uWs7)O()el3|hn}!m(9b1hxol5!fQIMPQ4-7J>ghfi;p$y=+R?7OHwW?uT1f Mq{oRmr=Zk-0Gr6doB#j- literal 0 HcmV?d00001 diff --git a/campaign/event_20221124_cn/campaign_base.py b/campaign/event_20221124_cn/campaign_base.py index 5589ae80c..92b1def61 100644 --- a/campaign/event_20221124_cn/campaign_base.py +++ b/campaign/event_20221124_cn/campaign_base.py @@ -1,9 +1,11 @@ +from module.campaign.assets import EVENT_20221124_ENTRANCE, EVENT_20221124_PT_ICON from module.campaign.campaign_base import CampaignBase as CampaignBase_ from module.combat.assets import GET_ITEMS_1_RYZA -from module.handler.fast_forward import AUTO_SEARCH from module.handler.assets import MYSTERY_ITEM +from module.handler.fast_forward import AUTO_SEARCH from module.logger import logger from module.map.map_grids import SelectedGrids +from module.ui.page import page_campaign_menu, page_event class CampaignBase(CampaignBase_): @@ -12,6 +14,16 @@ class CampaignBase(CampaignBase_): 'TH1 > TH2 > TH3 > TH4 > TH5', ] + def ui_goto_event(self): + if self.appear(EVENT_20221124_PT_ICON, offset=(20, 20)) and self.ui_page_appear(page_event): + logger.info('Already at EVENT_20221124') + return True + self.ui_ensure(page_campaign_menu) + self.ui_click(EVENT_20221124_ENTRANCE, + check_button=EVENT_20221124_PT_ICON, + appear_button=EVENT_20221124_ENTRANCE) + return True + def campaign_set_chapter_event(self, chapter, mode='normal'): if chapter.startswith('t'): self.ui_goto_event() diff --git a/campaign/event_20250724_cn/campaign_base.py b/campaign/event_20250724_cn/campaign_base.py index b106f69db..8e4972b8d 100644 --- a/campaign/event_20250724_cn/campaign_base.py +++ b/campaign/event_20250724_cn/campaign_base.py @@ -1,10 +1,21 @@ +from module.campaign.assets import EVENT_20250724_PT_ICON from module.campaign.campaign_base import CampaignBase as CampaignBase_ from module.combat.assets import ALCHEMIST_MATERIAL_CONFIRM from module.handler.fast_forward import AUTO_SEARCH -from module.template.assets import TEMPLATE_STAGE_HALF_PERCENT, TEMPLATE_STAGE_CLEAR_20240725 +from module.logger import logger +from module.template.assets import TEMPLATE_STAGE_CLEAR_20240725, TEMPLATE_STAGE_HALF_PERCENT +from module.ui.page import page_campaign_menu, page_event class CampaignBaseT(CampaignBase_): + def ui_goto_event(self): + if self.appear(EVENT_20250724_PT_ICON, offset=(20, 20)) and self.ui_page_appear(page_event): + logger.info('Already at EVENT_20250724') + return True + self.ui_ensure(page_campaign_menu) + self.ui_goto(page_event) + return True + def campaign_extract_name_image(self, image): if self.config.SERVER == 'en': # EN has small stage name diff --git a/module/campaign/assets.py b/module/campaign/assets.py index 97088d89c..34eb18cb5 100644 --- a/module/campaign/assets.py +++ b/module/campaign/assets.py @@ -11,7 +11,10 @@ CHAPTER_20241219_SP = Button(area={'cn': (17, 372, 34, 388), 'en': (17, 372, 34, CHAPTER_NEXT = Button(area={'cn': (1216, 362, 1232, 388), 'en': (1216, 362, 1232, 388), 'jp': (1216, 362, 1232, 388), 'tw': (1216, 362, 1232, 388)}, color={'cn': (121, 150, 198), 'en': (121, 150, 198), 'jp': (121, 150, 198), 'tw': (121, 150, 198)}, button={'cn': (1216, 362, 1232, 388), 'en': (1216, 362, 1232, 388), 'jp': (1216, 362, 1232, 388), 'tw': (1216, 362, 1232, 388)}, file={'cn': './assets/cn/campaign/CHAPTER_NEXT.png', 'en': './assets/en/campaign/CHAPTER_NEXT.png', 'jp': './assets/jp/campaign/CHAPTER_NEXT.png', 'tw': './assets/tw/campaign/CHAPTER_NEXT.png'}) CHAPTER_PREV = Button(area={'cn': (42, 360, 58, 387), 'en': (42, 360, 58, 387), 'jp': (42, 360, 58, 387), 'tw': (42, 360, 58, 387)}, color={'cn': (105, 133, 169), 'en': (105, 133, 169), 'jp': (105, 133, 169), 'tw': (105, 133, 169)}, button={'cn': (42, 360, 58, 387), 'en': (42, 360, 58, 387), 'jp': (42, 360, 58, 387), 'tw': (42, 360, 58, 387)}, file={'cn': './assets/cn/campaign/CHAPTER_PREV.png', 'en': './assets/en/campaign/CHAPTER_PREV.png', 'jp': './assets/jp/campaign/CHAPTER_PREV.png', 'tw': './assets/tw/campaign/CHAPTER_PREV.png'}) COMMISSION_NOTICE_AT_CAMPAIGN = Button(area={'cn': (1077, 637, 1083, 643), 'en': (1077, 637, 1083, 643), 'jp': (1077, 637, 1083, 643), 'tw': (1077, 637, 1083, 643)}, color={'cn': (172, 72, 49), 'en': (172, 72, 49), 'jp': (172, 72, 49), 'tw': (172, 72, 49)}, button={'cn': (1077, 637, 1083, 643), 'en': (1077, 637, 1083, 643), 'jp': (1077, 637, 1083, 643), 'tw': (1077, 637, 1083, 643)}, file={'cn': './assets/cn/campaign/COMMISSION_NOTICE_AT_CAMPAIGN.png', 'en': './assets/en/campaign/COMMISSION_NOTICE_AT_CAMPAIGN.png', 'jp': './assets/jp/campaign/COMMISSION_NOTICE_AT_CAMPAIGN.png', 'tw': './assets/tw/campaign/COMMISSION_NOTICE_AT_CAMPAIGN.png'}) +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': (1106, 109, 1135, 130), 'jp': (1106, 109, 1135, 130), 'tw': (1106, 109, 1135, 130)}, color={'cn': (151, 116, 139), 'en': (151, 116, 139), 'jp': (151, 116, 139), 'tw': (151, 116, 139)}, button={'cn': (1106, 109, 1135, 130), 'en': (1106, 109, 1135, 130), 'jp': (1106, 109, 1135, 130), 'tw': (1106, 109, 1135, 130)}, file={'cn': './assets/cn/campaign/EVENT_20221124_PT_ICON.png', 'en': './assets/cn/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_20250724_PT_ICON = Button(area={'cn': (1102, 106, 1139, 121), 'en': (1102, 106, 1139, 121), 'jp': (1102, 106, 1139, 121), 'tw': (1102, 106, 1139, 121)}, color={'cn': (95, 103, 93), 'en': (95, 103, 93), 'jp': (95, 103, 93), 'tw': (95, 103, 93)}, button={'cn': (1102, 106, 1139, 121), 'en': (1102, 106, 1139, 121), 'jp': (1102, 106, 1139, 121), 'tw': (1102, 106, 1139, 121)}, file={'cn': './assets/cn/campaign/EVENT_20250724_PT_ICON.png', 'en': './assets/cn/campaign/EVENT_20250724_PT_ICON.png', 'jp': './assets/cn/campaign/EVENT_20250724_PT_ICON.png', 'tw': './assets/cn/campaign/EVENT_20250724_PT_ICON.png'}) OCR_COIN = Button(area={'cn': (815, 23, 922, 51), 'en': (815, 23, 922, 51), 'jp': (815, 23, 922, 51), 'tw': (815, 23, 922, 51)}, color={'cn': (61, 61, 73), 'en': (61, 61, 73), 'jp': (61, 61, 73), 'tw': (61, 61, 73)}, button={'cn': (815, 23, 922, 51), 'en': (815, 23, 922, 51), 'jp': (815, 23, 922, 51), 'tw': (815, 23, 922, 51)}, file={'cn': './assets/cn/campaign/OCR_COIN.png', 'en': './assets/en/campaign/OCR_COIN.png', 'jp': './assets/jp/campaign/OCR_COIN.png', 'tw': './assets/tw/campaign/OCR_COIN.png'}) OCR_EVENT_PT = Button(area={'cn': (1196, 109, 1280, 131), 'en': (1190, 109, 1280, 129), 'jp': (1196, 109, 1280, 131), 'tw': (1196, 109, 1280, 131)}, color={'cn': (121, 110, 59), 'en': (88, 78, 51), 'jp': (121, 110, 59), 'tw': (121, 110, 59)}, button={'cn': (1196, 109, 1280, 131), 'en': (1190, 109, 1280, 129), 'jp': (1196, 109, 1280, 131), 'tw': (1196, 109, 1280, 131)}, file={'cn': './assets/cn/campaign/OCR_EVENT_PT.png', 'en': './assets/en/campaign/OCR_EVENT_PT.png', 'jp': './assets/jp/campaign/OCR_EVENT_PT.png', 'tw': './assets/tw/campaign/OCR_EVENT_PT.png'}) OCR_OIL = Button(area={'cn': (614, 23, 714, 51), 'en': (614, 23, 714, 51), 'jp': (614, 23, 714, 51), 'tw': (614, 23, 714, 51)}, color={'cn': (64, 65, 79), 'en': (64, 65, 79), 'jp': (64, 65, 79), 'tw': (64, 65, 79)}, button={'cn': (614, 23, 714, 51), 'en': (614, 23, 714, 51), 'jp': (614, 23, 714, 51), 'tw': (614, 23, 714, 51)}, file={'cn': './assets/cn/campaign/OCR_OIL.png', 'en': './assets/en/campaign/OCR_OIL.png', 'jp': './assets/jp/campaign/OCR_OIL.png', 'tw': './assets/tw/campaign/OCR_OIL.png'}) diff --git a/module/commission/commission.py b/module/commission/commission.py index 552dfa682..a837bb736 100644 --- a/module/commission/commission.py +++ b/module/commission/commission.py @@ -157,7 +157,7 @@ class RewardCommission(UI, InfoHandler): # Add shortest no_shortest = run.delete(SelectedGrids(['shortest'])) if no_shortest.count + running_count < self.max_commission: - if no_shortest.count < run.count: + if daily.count: logger.info('Not enough commissions to run, add shortest daily commissions') COMMISSION_FILTER.load(SHORTEST_FILTER) shortest = COMMISSION_FILTER.apply(daily[::-1], func=self._commission_check)