From f9c25961bb14954ba5133ef784604c84ac93abbe Mon Sep 17 00:00:00 2001 From: dragonheart107 <153553566+dragonheart107@users.noreply.github.com> Date: Fri, 17 Oct 2025 20:25:24 +0200 Subject: [PATCH] Fix: EN commission + mission reward (#5230) * Revert "Tmp: [EN] Temp fix for bugged UI" This reverts commit c06773e586004c30c969ade48457630234bb566f. * Fix: EN post maintenance UI bugs * duplicate removal --- assets/cn/ui/COMMISSION_CHECK_ENTMP.png | Bin 6671 -> 0 bytes assets/cn/ui/MISSION_CHECK_ENTMP.png | Bin 5027 -> 0 bytes assets/en/commission/COMMISSION_ADVICE.png | Bin 10015 -> 13398 bytes assets/en/commission/COMMISSION_START.png | Bin 7025 -> 10315 bytes assets/en/ui/MISSION_CHECK.png | Bin 6346 -> 14565 bytes module/commission/assets.py | 4 ++-- module/commission/project_data.py | 4 ++-- module/ui/assets.py | 4 +--- module/ui/ui.py | 10 +--------- 9 files changed, 6 insertions(+), 16 deletions(-) delete mode 100644 assets/cn/ui/COMMISSION_CHECK_ENTMP.png delete mode 100644 assets/cn/ui/MISSION_CHECK_ENTMP.png diff --git a/assets/cn/ui/COMMISSION_CHECK_ENTMP.png b/assets/cn/ui/COMMISSION_CHECK_ENTMP.png deleted file mode 100644 index 1a718c6ba55ca354b4b0a382c5e9f94fb8b6c157..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6671 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 Uk1;6fe;?>^#`|>nscZND11U$CTL1t6 diff --git a/assets/cn/ui/MISSION_CHECK_ENTMP.png b/assets/cn/ui/MISSION_CHECK_ENTMP.png deleted file mode 100644 index 34cd18d6b467e27d07bd5934d3b622f2393aeca0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5027 zcmeIz>pvT476rFt-(w} zRpPQ}nih!`L0qCJhES~#giu97La0kpBFUQFe_`LP^X7S8{?7OFobx=q>~m4=sQys^ z0H6l?$-^H2P~N{DdiUj_{o@CdOJ4v0n$aMSb3davt6cbRMvK@ZABs-%SFT|YjpJ~G zln&_2@~>1?9+f{eJ*9lYew4iI-ezf$=HdM$ z|D)QgI#!ad!L>YcL?Eo?D*lN~Nf6*Iiq8xqDO&~*5o!sNEEeZ-lV_o7V&iM6%e)TR zTa!3!{CH)mEOD&IMER&8rH!!n@R}`5OqW3v`&b(Y9eo z^_A*^hrn^?#AYK`$&6xgW`;$!om}RpZ-loDjpn&fNY2Q{t3|)U3wE7vJfW;Ts_1`2 zzCnOR)i{Ap_I>w{|E5d(rL!L&IZh?CMso#5O5{3vihiJQd9!yo?)z`5H6IKN>gDi* zm03hWZA*M2e=fk>H^B@^$G+{ti0IhKk;xt2iYr%UbEY+HmRRdq)UU_seJpnESf2`v z3Go|#Sy@TafpR3wK&X{=Zw7F6X{i~_+HI0746B!@k2JiXVJ8Q!G)*UMd~=?v&V>!Rgd;+y3gdv>*}cUS#9l>h)Yv8_*MmdFdL z;MqWzi(Q*2FKBlq)C@nZTNPkw@i9@0kYj|{vUhN3r179ABm#LeMZR~8Aa7Hqr$=)N8gNynQs30>LP;@4FJ6EE7kj;0nN|MP$F?LJ_;T= zaF9^{dF8_oxMv2|ttfWes`(}bEo+)FmmhDV?3#p8_0N+69?iVl}&n1duI&Z@m>2~s|pfFe^&nL^soAEi9L0i z=6yb8#*gZX!UcMR=N$hG_d;HNG=Ds1NobTizg0mqsvfWTlSdS<33s!Pl%nS7PI!Bh z3#lW6JB zAgjN5kv1R*;~d)}GcP{-PQ1(lq;KecY9z6_I>_R&*P;aNbMX)JwEbsP_GQF<_wUX} zs;HajwTU^T4iqfOOSq+N8R^bQOh(?^Q@~R<7G9XhqZB;&W3IFZ{xJq!BV743-|ddQ zCt09slAG4fAZ4^{6ZCrTjQpXU(u0f=*|1wj*g6;*&%h9#(t;B^E5txmObfbl@aJ3g zO6^!=al#->y<3tYdV?ZeMk(N6uvYpD_kjKH;j8;QuV<#WMcM{@n;`p0S>^-M%|yxD zx4~9&cL>`qs`!mUj*rENlWMQG-kuu~ZwvV$*s*l8>`1qb^?;s-UEQ>e<_MWHH;*# zl+c8M*iRbN7Kwa#C>l{qX3v$U!Mt<)PU`C$Uc&iX>F*B}X*!R14V@$jg)= zPh?2(*eS&`Vru)hI_(Tu)YpYoJ+Cal_?G4nD~&$n=@$hVL3F@hVeMX}LI8_Ys=H7#|c3CM8IV%O*2^t^|LcA{wnd2K7AyD5n=>DIc+BRZvQmbdO^ z4%A0FB_}lO2{l696Ze+h{jkQIx*F3QC0Cklw#>!vR)1S~_tw;0Scz14QQyrKS8DK_ z!NsCx?R+V8fnW@}Q$MR`s9SdG4q8_Q(e_DX=YEeGq&wueKvutMrNKUdezI`LJym6Y z-JaUhSkI~r>)bApYN)D}fbgiTm7=t{LF%}xZ&I=fz9ZMCH+v_!WmmE`qxTe)5Bol_ zF3Y8L*GK#mHp)$GkDU0ka zO%+kdCbPj5EkPI?_dJN1WPHXpsj=hU8zsc5Kwvz?ClVlJBew)Wq~evd4^s9-chz^q z^rx=!-NH%a%eBw)r&m=gk83V6k*wh|Y2=mt89%54fdhd9fdhd9fdhd9fdhg6BY}HY Z_H;Z+QuTx>T<%|OgFJmas6YNQ{ohOq266xZ diff --git a/assets/en/commission/COMMISSION_ADVICE.png b/assets/en/commission/COMMISSION_ADVICE.png index b9dc992cfbd8b0d6420f5f760d58d899ed491492..2934cc6c4f1b29e3f723e4a83a46aecad1528caf 100644 GIT binary patch literal 13398 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 literal 10015 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 literal 7025 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 diff --git a/assets/en/ui/MISSION_CHECK.png b/assets/en/ui/MISSION_CHECK.png index a9b1bebece8b293503ebf9b8c8837b739f783973..fe575df7da0d059462545e6c5883d0534602c2e6 100644 GIT binary patch literal 14565 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 literal 6346 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 diff --git a/module/commission/assets.py b/module/commission/assets.py index 703630296..830a4c61a 100644 --- a/module/commission/assets.py +++ b/module/commission/assets.py @@ -4,11 +4,11 @@ from module.base.template import Template # This file was automatically generated by dev_tools/button_extract.py. # Don't modify it manually. -COMMISSION_ADVICE = Button(area={'cn': (871, 322, 999, 383), 'en': (871, 328, 1000, 379), 'jp': (872, 344, 993, 373), 'tw': (869, 325, 999, 388)}, color={'cn': (230, 177, 116), 'en': (231, 178, 117), 'jp': (224, 179, 119), 'tw': (231, 180, 120)}, button={'cn': (871, 322, 999, 383), 'en': (871, 328, 1000, 379), 'jp': (870, 335, 1000, 399), 'tw': (869, 325, 999, 388)}, file={'cn': './assets/cn/commission/COMMISSION_ADVICE.png', 'en': './assets/en/commission/COMMISSION_ADVICE.png', 'jp': './assets/jp/commission/COMMISSION_ADVICE.png', 'tw': './assets/tw/commission/COMMISSION_ADVICE.png'}) +COMMISSION_ADVICE = Button(area={'cn': (871, 322, 999, 383), 'en': (871, 328, 998, 362), 'jp': (872, 344, 993, 373), 'tw': (869, 325, 999, 388)}, color={'cn': (230, 177, 116), 'en': (225, 181, 121), 'jp': (224, 179, 119), 'tw': (231, 180, 120)}, button={'cn': (871, 322, 999, 383), 'en': (871, 328, 998, 362), 'jp': (870, 335, 1000, 399), 'tw': (869, 325, 999, 388)}, file={'cn': './assets/cn/commission/COMMISSION_ADVICE.png', 'en': './assets/en/commission/COMMISSION_ADVICE.png', 'jp': './assets/jp/commission/COMMISSION_ADVICE.png', 'tw': './assets/tw/commission/COMMISSION_ADVICE.png'}) COMMISSION_DAILY = Button(area={'cn': (35, 132, 67, 186), 'en': (30, 126, 75, 188), 'jp': (17, 168, 82, 185), 'tw': (35, 132, 67, 186)}, color={'cn': (208, 172, 118), 'en': (170, 132, 92), 'jp': (148, 115, 76), 'tw': (208, 171, 119)}, button={'cn': (35, 132, 67, 186), 'en': (30, 126, 75, 188), 'jp': (17, 168, 82, 185), 'tw': (35, 132, 67, 186)}, file={'cn': './assets/cn/commission/COMMISSION_DAILY.png', 'en': './assets/en/commission/COMMISSION_DAILY.png', 'jp': './assets/jp/commission/COMMISSION_DAILY.png', 'tw': './assets/tw/commission/COMMISSION_DAILY.png'}) COMMISSION_HAS_PENDING = Button(area={'cn': (320, 288, 380, 338), 'en': (320, 288, 380, 338), 'jp': (320, 288, 380, 338), 'tw': (320, 288, 380, 338)}, color={'cn': (121, 113, 152), 'en': (121, 113, 152), 'jp': (121, 113, 152), 'tw': (121, 113, 152)}, button={'cn': (320, 288, 380, 338), 'en': (320, 288, 380, 338), 'jp': (320, 288, 380, 338), 'tw': (320, 288, 380, 338)}, file={'cn': './assets/cn/commission/COMMISSION_HAS_PENDING.png', 'en': './assets/en/commission/COMMISSION_HAS_PENDING.png', 'jp': './assets/jp/commission/COMMISSION_HAS_PENDING.png', 'tw': './assets/tw/commission/COMMISSION_HAS_PENDING.png'}) COMMISSION_SCROLL_AREA = Button(area={'cn': (1254, 77, 1261, 676), 'en': (1254, 77, 1261, 676), 'jp': (1254, 77, 1261, 676), 'tw': (1254, 77, 1261, 676)}, color={'cn': (213, 183, 66), 'en': (213, 183, 66), 'jp': (213, 183, 66), 'tw': (213, 183, 66)}, button={'cn': (1254, 77, 1261, 676), 'en': (1254, 77, 1261, 676), 'jp': (1254, 77, 1261, 676), 'tw': (1254, 77, 1261, 676)}, file={'cn': './assets/cn/commission/COMMISSION_SCROLL_AREA.png', 'en': './assets/en/commission/COMMISSION_SCROLL_AREA.png', 'jp': './assets/jp/commission/COMMISSION_SCROLL_AREA.png', 'tw': './assets/tw/commission/COMMISSION_SCROLL_AREA.png'}) -COMMISSION_START = Button(area={'cn': (1028, 322, 1156, 383), 'en': (1066, 342, 1117, 358), 'jp': (1033, 340, 1153, 376), 'tw': (1027, 326, 1157, 389)}, color={'cn': (229, 175, 113), 'en': (236, 197, 150), 'jp': (231, 184, 121), 'tw': (231, 180, 120)}, button={'cn': (1028, 322, 1156, 383), 'en': (1066, 342, 1117, 358), 'jp': (1033, 340, 1153, 376), 'tw': (1027, 326, 1157, 389)}, file={'cn': './assets/cn/commission/COMMISSION_START.png', 'en': './assets/en/commission/COMMISSION_START.png', 'jp': './assets/jp/commission/COMMISSION_START.png', 'tw': './assets/tw/commission/COMMISSION_START.png'}) +COMMISSION_START = Button(area={'cn': (1028, 322, 1156, 383), 'en': (1053, 333, 1134, 361), 'jp': (1033, 340, 1153, 376), 'tw': (1027, 326, 1157, 389)}, color={'cn': (229, 175, 113), 'en': (237, 199, 149), 'jp': (231, 184, 121), 'tw': (231, 180, 120)}, button={'cn': (1028, 322, 1156, 383), 'en': (1053, 333, 1134, 361), 'jp': (1033, 340, 1153, 376), 'tw': (1027, 326, 1157, 389)}, file={'cn': './assets/cn/commission/COMMISSION_START.png', 'en': './assets/en/commission/COMMISSION_START.png', 'jp': './assets/jp/commission/COMMISSION_START.png', 'tw': './assets/tw/commission/COMMISSION_START.png'}) COMMISSION_URGENT = Button(area={'cn': (35, 231, 68, 281), 'en': (28, 221, 76, 283), 'jp': (34, 266, 68, 279), 'tw': (35, 229, 69, 280)}, color={'cn': (215, 188, 124), 'en': (169, 138, 95), 'jp': (216, 190, 111), 'tw': (213, 186, 123)}, button={'cn': (35, 231, 68, 281), 'en': (28, 221, 76, 283), 'jp': (34, 266, 68, 279), 'tw': (35, 229, 69, 280)}, file={'cn': './assets/cn/commission/COMMISSION_URGENT.png', 'en': './assets/en/commission/COMMISSION_URGENT.png', 'jp': './assets/jp/commission/COMMISSION_URGENT.png', 'tw': './assets/tw/commission/COMMISSION_URGENT.png'}) EXP_INFO_S_REWARD = Button(area={'cn': (498, 140, 557, 154), 'en': (1138, 40, 1266, 145), 'jp': (498, 140, 557, 154), 'tw': (498, 140, 557, 154)}, color={'cn': (233, 241, 127), 'en': (89, 115, 159), 'jp': (233, 241, 127), 'tw': (233, 241, 127)}, button={'cn': (498, 140, 557, 154), 'en': (1138, 40, 1266, 145), 'jp': (498, 140, 557, 154), 'tw': (498, 140, 557, 154)}, file={'cn': './assets/cn/commission/EXP_INFO_S_REWARD.png', 'en': './assets/en/commission/EXP_INFO_S_REWARD.png', 'jp': './assets/jp/commission/EXP_INFO_S_REWARD.png', 'tw': './assets/tw/commission/EXP_INFO_S_REWARD.png'}) REWARD_1 = Button(area={'cn': (383, 285, 503, 297), 'en': (403, 274, 504, 290), 'jp': (432, 273, 476, 294), 'tw': (383, 285, 503, 297)}, color={'cn': (238, 168, 81), 'en': (241, 198, 145), 'jp': (241, 188, 122), 'tw': (238, 168, 81)}, button={'cn': (383, 285, 503, 297), 'en': (392, 262, 515, 303), 'jp': (393, 262, 514, 303), 'tw': (383, 285, 503, 297)}, file={'cn': './assets/cn/commission/REWARD_1.png', 'en': './assets/en/commission/REWARD_1.png', 'jp': './assets/jp/commission/REWARD_1.png', 'tw': './assets/tw/commission/REWARD_1.png'}) diff --git a/module/commission/project_data.py b/module/commission/project_data.py index f3d987a23..a2fa9da19 100644 --- a/module/commission/project_data.py +++ b/module/commission/project_data.py @@ -18,8 +18,8 @@ dictionary_cn = { # major_comm needs to be after extra_cube, # because `Fleet Cargo Transport` is `extra_cube` and `Cargo Transport I` is major_comm dictionary_en = { - 'daily_resource': ['DAILY RESOURCE EXTRACTION'], - 'daily_chip': ['AWAKENING TACTICAL RESEARCH'], + 'daily_resource': ['AILY RESOURCE EXTRACTION'], + 'daily_chip': ['AKENING TACTICAL RESEARCH'], 'extra_drill': ['SAILING', 'BUOY', 'FRONTIER', 'COASTAL', 'SALING'], 'extra_part': ['VEIN', 'FOREST'], 'extra_cube': ['FLEET ESCORT EXERCISE', 'FLEET EXERCISE', 'FLEET CARGO TRANSPORT', 'FLEET COMBAT EXERCISE'], diff --git a/module/ui/assets.py b/module/ui/assets.py index 29c535989..1a4fcb4e6 100644 --- a/module/ui/assets.py +++ b/module/ui/assets.py @@ -25,7 +25,6 @@ CAMPAIGN_MENU_GOTO_WAR_ARCHIVES = Button(area={'cn': (210, 586, 310, 638), 'en': CAMPAIGN_MENU_NO_EVENT = Button(area={'cn': (681, 204, 831, 233), 'en': (616, 206, 897, 233), 'jp': (575, 209, 940, 235), 'tw': (681, 204, 831, 233)}, color={'cn': (65, 75, 84), 'en': (57, 67, 77), 'jp': (49, 60, 70), 'tw': (65, 75, 84)}, button={'cn': (681, 204, 831, 233), 'en': (616, 206, 897, 233), 'jp': (575, 209, 940, 235), 'tw': (681, 204, 831, 233)}, file={'cn': './assets/cn/ui/CAMPAIGN_MENU_NO_EVENT.png', 'en': './assets/en/ui/CAMPAIGN_MENU_NO_EVENT.png', 'jp': './assets/jp/ui/CAMPAIGN_MENU_NO_EVENT.png', 'tw': './assets/cn/ui/CAMPAIGN_MENU_NO_EVENT.png'}) CHANNEL_CHECK = Button(area={'cn': (785, 661, 824, 699), 'en': (785, 661, 824, 699), 'jp': (785, 661, 824, 699), 'tw': (785, 661, 824, 699)}, color={'cn': (88, 90, 89), 'en': (88, 90, 89), 'jp': (88, 90, 89), 'tw': (88, 90, 89)}, button={'cn': (785, 661, 824, 699), 'en': (785, 661, 824, 699), 'jp': (785, 661, 824, 699), 'tw': (785, 661, 824, 699)}, file={'cn': './assets/cn/ui/CHANNEL_CHECK.png', 'en': './assets/cn/ui/CHANNEL_CHECK.png', 'jp': './assets/cn/ui/CHANNEL_CHECK.png', 'tw': './assets/cn/ui/CHANNEL_CHECK.png'}) COMMISSION_CHECK = Button(area={'cn': (122, 16, 175, 39), 'en': (120, 14, 301, 41), 'jp': (121, 14, 176, 39), 'tw': (121, 14, 176, 41)}, color={'cn': (157, 173, 210), 'en': (98, 112, 150), 'jp': (159, 175, 211), 'tw': (141, 155, 193)}, button={'cn': (122, 16, 175, 39), 'en': (120, 14, 301, 41), 'jp': (121, 14, 176, 39), 'tw': (121, 14, 176, 41)}, file={'cn': './assets/cn/ui/COMMISSION_CHECK.png', 'en': './assets/en/ui/COMMISSION_CHECK.png', 'jp': './assets/jp/ui/COMMISSION_CHECK.png', 'tw': './assets/tw/ui/COMMISSION_CHECK.png'}) -COMMISSION_CHECK_ENTMP = Button(area={'cn': (115, 15, 181, 39), 'en': (115, 15, 181, 39), 'jp': (115, 15, 181, 39), 'tw': (115, 15, 181, 39)}, color={'cn': (108, 120, 162), 'en': (108, 120, 162), 'jp': (108, 120, 162), 'tw': (108, 120, 162)}, button={'cn': (115, 15, 181, 39), 'en': (115, 15, 181, 39), 'jp': (115, 15, 181, 39), 'tw': (115, 15, 181, 39)}, file={'cn': './assets/cn/ui/COMMISSION_CHECK_ENTMP.png', 'en': './assets/cn/ui/COMMISSION_CHECK_ENTMP.png', 'jp': './assets/cn/ui/COMMISSION_CHECK_ENTMP.png', 'tw': './assets/cn/ui/COMMISSION_CHECK_ENTMP.png'}) DAILY_CHECK = Button(area={'cn': (23, 656, 67, 698), 'en': (23, 656, 67, 698), 'jp': (23, 656, 67, 698), 'tw': (23, 656, 67, 698)}, color={'cn': (84, 139, 210), 'en': (84, 139, 210), 'jp': (84, 139, 210), 'tw': (84, 139, 210)}, button={'cn': (23, 656, 67, 698), 'en': (23, 656, 67, 698), 'jp': (23, 656, 67, 698), 'tw': (23, 656, 67, 698)}, file={'cn': './assets/cn/ui/DAILY_CHECK.png', 'en': './assets/en/ui/DAILY_CHECK.png', 'jp': './assets/jp/ui/DAILY_CHECK.png', 'tw': './assets/tw/ui/DAILY_CHECK.png'}) DORMMENU_CHECK = Button(area={'cn': (261, 487, 334, 587), 'en': (261, 487, 334, 587), 'jp': (261, 487, 334, 587), 'tw': (261, 487, 334, 587)}, color={'cn': (181, 172, 178), 'en': (181, 172, 178), 'jp': (181, 172, 178), 'tw': (181, 172, 178)}, button={'cn': (261, 487, 334, 587), 'en': (261, 487, 334, 587), 'jp': (261, 487, 334, 587), 'tw': (261, 487, 334, 587)}, file={'cn': './assets/cn/ui/DORMMENU_CHECK.png', 'en': './assets/en/ui/DORMMENU_CHECK.png', 'jp': './assets/jp/ui/DORMMENU_CHECK.png', 'tw': './assets/tw/ui/DORMMENU_CHECK.png'}) DORMMENU_GOTO_ACADEMY = Button(area={'cn': (261, 487, 334, 587), 'en': (261, 487, 334, 587), 'jp': (261, 487, 334, 587), 'tw': (261, 487, 334, 587)}, color={'cn': (181, 172, 178), 'en': (181, 172, 178), 'jp': (181, 172, 178), 'tw': (181, 172, 178)}, button={'cn': (261, 487, 334, 587), 'en': (261, 487, 334, 587), 'jp': (261, 487, 334, 587), 'tw': (261, 487, 334, 587)}, file={'cn': './assets/cn/ui/DORMMENU_GOTO_ACADEMY.png', 'en': './assets/en/ui/DORMMENU_GOTO_ACADEMY.png', 'jp': './assets/jp/ui/DORMMENU_GOTO_ACADEMY.png', 'tw': './assets/tw/ui/DORMMENU_GOTO_ACADEMY.png'}) @@ -66,8 +65,7 @@ MEOWFFICER_CHECK = Button(area={'cn': (142, 16, 212, 38), 'en': (142, 18, 213, 3 MEOWFFICER_GOTO_DORMMENU = Button(area={'cn': (24, 7, 49, 45), 'en': (24, 7, 49, 45), 'jp': (15, 4, 61, 49), 'tw': (24, 7, 49, 45)}, color={'cn': (248, 222, 158), 'en': (248, 222, 158), 'jp': (241, 233, 201), 'tw': (248, 222, 158)}, button={'cn': (24, 7, 49, 45), 'en': (24, 7, 49, 45), 'jp': (15, 4, 61, 49), 'tw': (24, 7, 49, 45)}, file={'cn': './assets/cn/ui/MEOWFFICER_GOTO_DORMMENU.png', 'en': './assets/en/ui/MEOWFFICER_GOTO_DORMMENU.png', 'jp': './assets/jp/ui/MEOWFFICER_GOTO_DORMMENU.png', 'tw': './assets/tw/ui/MEOWFFICER_GOTO_DORMMENU.png'}) MEOWFFICER_INFO = Button(area={'cn': (1090, 603, 1241, 650), 'en': (1106, 616, 1227, 638), 'jp': (1089, 608, 1240, 647), 'tw': (1124, 610, 1207, 647)}, color={'cn': (243, 214, 92), 'en': (212, 182, 77), 'jp': (247, 218, 92), 'tw': (229, 200, 87)}, button={'cn': (1090, 603, 1241, 650), 'en': (1106, 616, 1227, 638), 'jp': (1089, 608, 1240, 647), 'tw': (1124, 610, 1207, 647)}, file={'cn': './assets/cn/ui/MEOWFFICER_INFO.png', 'en': './assets/en/ui/MEOWFFICER_INFO.png', 'jp': './assets/jp/ui/MEOWFFICER_INFO.png', 'tw': './assets/tw/ui/MEOWFFICER_INFO.png'}) META_CHECK = Button(area={'cn': (120, 14, 209, 35), 'en': (148, 13, 265, 36), 'jp': (125, 11, 235, 39), 'tw': (120, 14, 209, 35)}, color={'cn': (159, 143, 144), 'en': (170, 156, 156), 'jp': (124, 105, 106), 'tw': (159, 143, 144)}, button={'cn': (120, 14, 209, 35), 'en': (148, 13, 265, 36), 'jp': (125, 11, 235, 39), 'tw': (120, 14, 209, 35)}, file={'cn': './assets/cn/ui/META_CHECK.png', 'en': './assets/en/ui/META_CHECK.png', 'jp': './assets/jp/ui/META_CHECK.png', 'tw': './assets/tw/ui/META_CHECK.png'}) -MISSION_CHECK = Button(area={'cn': (120, 15, 173, 40), 'en': (123, 18, 221, 37), 'jp': (120, 14, 173, 40), 'tw': (119, 12, 176, 42)}, color={'cn': (141, 156, 194), 'en': (104, 117, 158), 'jp': (150, 165, 202), 'tw': (125, 139, 178)}, button={'cn': (120, 15, 173, 40), 'en': (123, 18, 221, 37), 'jp': (120, 14, 173, 40), 'tw': (119, 12, 176, 42)}, file={'cn': './assets/cn/ui/MISSION_CHECK.png', 'en': './assets/en/ui/MISSION_CHECK.png', 'jp': './assets/jp/ui/MISSION_CHECK.png', 'tw': './assets/tw/ui/MISSION_CHECK.png'}) -MISSION_CHECK_ENTMP = Button(area={'cn': (113, 20, 172, 33), 'en': (113, 20, 172, 33), 'jp': (113, 20, 172, 33), 'tw': (113, 20, 172, 33)}, color={'cn': (111, 124, 166), 'en': (111, 124, 166), 'jp': (111, 124, 166), 'tw': (111, 124, 166)}, button={'cn': (113, 20, 172, 33), 'en': (113, 20, 172, 33), 'jp': (113, 20, 172, 33), 'tw': (113, 20, 172, 33)}, file={'cn': './assets/cn/ui/MISSION_CHECK_ENTMP.png', 'en': './assets/cn/ui/MISSION_CHECK_ENTMP.png', 'jp': './assets/cn/ui/MISSION_CHECK_ENTMP.png', 'tw': './assets/cn/ui/MISSION_CHECK_ENTMP.png'}) +MISSION_CHECK = Button(area={'cn': (120, 15, 173, 40), 'en': (120, 15, 260, 41), 'jp': (120, 14, 173, 40), 'tw': (119, 12, 176, 42)}, color={'cn': (141, 156, 194), 'en': (111, 124, 165), 'jp': (150, 165, 202), 'tw': (125, 139, 178)}, button={'cn': (120, 15, 173, 40), 'en': (120, 15, 260, 41), 'jp': (120, 14, 173, 40), 'tw': (119, 12, 176, 42)}, file={'cn': './assets/cn/ui/MISSION_CHECK.png', 'en': './assets/en/ui/MISSION_CHECK.png', 'jp': './assets/jp/ui/MISSION_CHECK.png', 'tw': './assets/tw/ui/MISSION_CHECK.png'}) MUNITIONS_CHECK = Button(area={'cn': (60, 361, 104, 395), 'en': (60, 361, 104, 395), 'jp': (59, 371, 126, 397), 'tw': (11, 374, 131, 402)}, color={'cn': (115, 191, 235), 'en': (111, 189, 234), 'jp': (134, 194, 227), 'tw': (101, 200, 255)}, button={'cn': (60, 361, 104, 395), 'en': (60, 361, 104, 395), 'jp': (59, 371, 126, 397), 'tw': (11, 374, 131, 402)}, file={'cn': './assets/cn/ui/MUNITIONS_CHECK.png', 'en': './assets/en/ui/MUNITIONS_CHECK.png', 'jp': './assets/jp/ui/MUNITIONS_CHECK.png', 'tw': './assets/tw/ui/MUNITIONS_CHECK.png'}) OS_CHECK = Button(area={'cn': (613, 17, 627, 34), 'en': (613, 17, 627, 34), 'jp': (613, 17, 627, 34), 'tw': (613, 17, 627, 34)}, color={'cn': (58, 117, 146), 'en': (58, 117, 146), 'jp': (58, 117, 146), 'tw': (58, 117, 146)}, button={'cn': (613, 17, 627, 34), 'en': (613, 17, 627, 34), 'jp': (613, 17, 627, 34), 'tw': (613, 17, 627, 34)}, file={'cn': './assets/cn/ui/OS_CHECK.png', 'en': './assets/en/ui/OS_CHECK.png', 'jp': './assets/jp/ui/OS_CHECK.png', 'tw': './assets/tw/ui/OS_CHECK.png'}) PLAYER_CHECK = Button(area={'cn': (28, 668, 139, 688), 'en': (11, 649, 157, 705), 'jp': (26, 668, 139, 689), 'tw': (28, 668, 139, 688)}, color={'cn': (237, 204, 127), 'en': (197, 156, 97), 'jp': (237, 205, 128), 'tw': (237, 204, 127)}, button={'cn': (28, 668, 139, 688), 'en': (11, 649, 157, 705), 'jp': (26, 668, 139, 689), 'tw': (28, 668, 139, 688)}, file={'cn': './assets/cn/ui/PLAYER_CHECK.png', 'en': './assets/en/ui/PLAYER_CHECK.png', 'jp': './assets/jp/ui/PLAYER_CHECK.png', 'tw': './assets/tw/ui/PLAYER_CHECK.png'}) diff --git a/module/ui/ui.py b/module/ui/ui.py index 24cfb8204..8393e8b3f 100644 --- a/module/ui/ui.py +++ b/module/ui/ui.py @@ -19,8 +19,7 @@ from module.ocr.ocr import Ocr from module.os_handler.assets import (AUTO_SEARCH_REWARD, EXCHANGE_CHECK, RESET_FLEET_PREPARATION, RESET_TICKET_POPUP) from module.raid.assets import * from module.ui.assets import * -from module.ui.page import Page, page_campaign, page_event, page_main, page_main_white, page_sp, page_commission, \ - page_mission +from module.ui.page import Page, page_campaign, page_event, page_main, page_main_white, page_sp from module.ui_white.assets import * @@ -40,13 +39,6 @@ class UI(InfoHandler): if self.appear(page_main.check_button, offset=(5, 5), interval=interval): return True return False - # 2025.10.16 Temp fix for bugged UI - if page == page_commission: - if self.appear(COMMISSION_CHECK_ENTMP, offset=offset, interval=interval): - return True - if page == page_mission: - if self.appear(MISSION_CHECK_ENTMP, offset=offset, interval=interval): - return True return self.appear(page.check_button, offset=offset, interval=interval) def is_in_main(self, offset=(30, 30), interval=0):