From dc33f42332d0fb9e8e1463e23e827ab9e94b426b Mon Sep 17 00:00:00 2001 From: W1NDes Date: Thu, 29 Jan 2026 21:14:07 +0800 Subject: [PATCH] =?UTF-8?q?Fix(coalition):=20=E4=BF=AE=E5=A4=8D=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=E5=90=88=E5=B9=B6=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../coalition/FASHION_FLEET_PREPARATION.png | Bin 8316 -> 0 bytes assets/cn/coalition/FASHION_UI_BACK.png | Bin 3510 -> 0 bytes assets/cn/coalition/FASHION_UI_HOME.png | Bin 4471 -> 0 bytes module/coalition/assets.py | 3 -- module/coalition/ui.py | 48 +++++++----------- 5 files changed, 19 insertions(+), 32 deletions(-) delete mode 100644 assets/cn/coalition/FASHION_FLEET_PREPARATION.png delete mode 100644 assets/cn/coalition/FASHION_UI_BACK.png delete mode 100644 assets/cn/coalition/FASHION_UI_HOME.png diff --git a/assets/cn/coalition/FASHION_FLEET_PREPARATION.png b/assets/cn/coalition/FASHION_FLEET_PREPARATION.png deleted file mode 100644 index cfdc24d139cab3d5a00ce8084b5413ad4258d0ae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8316 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 diff --git a/assets/cn/coalition/FASHION_UI_BACK.png b/assets/cn/coalition/FASHION_UI_BACK.png deleted file mode 100644 index b00d54443d96f56d2923706d96c770be6c762c19..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3510 zcmeAS@N?(olHy`uVBq!ia0y~yU3XqSB!F(&vi$PBE0^EpN?DiY2QFD?o&7-e z_V#@R1@UvQPM@~!&%S@hpQ%hq%~S;{opG8$uWQjv+o}1h?ybz*e*3+yOkLr}$^GZP z{BHj8a&7eM`L+L!p8a~;&`lc{oDQqIraim6IX&O&eq6p{Z}Y(f3mLt4)xVmJm*2Cj ztyy^c>}RDG1Boy4w>SQ6|7^dUVP9eL)g+)b7v_nTH(1X-cgShg-Mp;3!RqmLrH`)W z-rn}-we{|@w?6T+ebmB$(blk&=fRb|mw&v~ldJglRVGO2xg!5e1~vwU1Uu#( z8eQM-S=GJCSapAo-^}Qv^-|mUzHe^|=Da@D6zH;qK4y!S56?Q4&)S~TEK6Q9`+tc2 zlmnM#_*`Z8GH?Q2RLS?iCZ+!F%@^+^Ox`oq6@2;b$l(9koZC?N08qP)P^I_hzGIK| z_y03ne_F@y(=IQ2ML#DU=h)P%&%RU{o3J;Zwp#tV{T3)*Ze6&>SFq|A)y3cYojKzdN;4BiF5q+YU(`Yh{6fys;}(?)|;HFUoe?>&5;~efsQ?v436Fx2^Y_ z(!WWpsa|}Rd;0p&P|3x$AQ#=bdX4YHySuxWAFq4AdUKW0%r$HOSN?qU^gTe~DWM4f5^S_u diff --git a/assets/cn/coalition/FASHION_UI_HOME.png b/assets/cn/coalition/FASHION_UI_HOME.png deleted file mode 100644 index 77feba42db4079a06b7205813d4eab4f67d7b295..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4471 zcmeH{>t7Pc9>z(xo2{9(VQZwHE!XUZ+iF5d*`~(9ERW{F`z1?Jw8$GMfwYyjT4w5k zXB99b(^aVr7Qyhkh-NO}CGUu#7PW>Nh!C=Ju=6jRH|O(l-pst1ncp+t-!o6{KhMD} zEo?0S0DvXpA6@|fz*^JNtY?FnX*y}|vjzaLK7sK1AuwZ9IX+gfU9+b3V*_<3{~%vV z>0amMbw9$Z;b)6n=8uw07!!tWc3n);FTHJg`XG0DT zG@Wcla{b@6UnCuV4Pj6@mp=h_V3#i%wi|x|m>NA#v%|gvac^_ zd#kDDLO7uOeaF4~Prt#}l3fw11IP%hk%)T|Tz}9qg4!u(2cA(_N$mW%Fs4x3wC)V>t3`^3I#+Wk?fNxDkX76=5DscWf^&CSin>M!%<`o!XM5<8Eq$-+*$LHD|1CpQu|qKb8oB&JR@Ymv-Q z*@V3vhn z+Wwj>%aB`DrZg;$HFFcxId8g4z~L~AaoOA*+juw;X{_7?@B5vVBFyXk*MZFhoqT#a zO$&ZEf9%8w@bwk3hc?-O>(&mueDP2ob;8hdW33?hE1|zZzmreLzx_1gd9y|Lsj1}d zmo}31U~GFCFd@Io%w#zZdlRQP@Ioyk8IwFy@JivktCayEd~76I`+$}$4=vdnmJ2&Qj$;i=kSHS! zgYhZCg1E&_&V3NVn@o_K8v1e)S`ZY8@9H@@@noEjRgNAf$qWr_#pC2s4!b0BGpP8$eYJAs-B1l#`7}yu{krImDNkFoZSy5>rRCmD^M?7Zmqf^I>_#F)-fGD5aCLkcN}rY6~$h31=;gYd6F6!{u=z z+jt!C25?2%0tHrJRX{p+vEy#8-`<@e?tY~gP@_&c8G?>N{PBEMDjVG&bF>bMDE{Sd zV#uq5K%vFgpuJ>=L~dvZ#m|=-?-usiHT3=@w|-aV&>D{&5QC)3>D;v6VX(!r$X!w$ebWys3xj4Ds%uT|%*#8&iW} z50sYHaM@1Xsx4e{0Nv5sg|wW>KqgcsfMOGRTQj-TDRs*!fH?rrleh*ndIU_t-(xkF zHTwgzS)%8)(PxKtijcBhAh4FqU`xIbv$1wKM>E{IECJmCA?{#*PLR%N;cf|nKaS>v zA>4lH5Q1Jq(dp~1GtL)hHua)8r5ZdVa6b(;UW2UN>qoc!$??=?l>gBKcu0FHBLf*Q zXz{I76#ZWV#$C0u(A|N2hwIFo(cmeuv~;HGG=uIiaGJ4U@~TsU&9720uq{upQ9kvs z;BSj)6a41KBtZ~`Gd3~;5UXaz?3qxG=R%HWe}De~nsd#mu_F^`Q|0(gk*5b-p|Fbb zeKxakrS+%bokb4&w)f2+b%oY$6QIm8QfjjF3ztm4hE13<f$bAAYX7Y;J`oyR z{)B`@v-r!YwF6Qv<|*l*sq*SrC9q0hmB1>2RRXI7Rtc;U_&+3IAn75ZTw_4v{+~Qn Okw diff --git a/module/coalition/assets.py b/module/coalition/assets.py index 8fe47c59b..17239b660 100644 --- a/module/coalition/assets.py +++ b/module/coalition/assets.py @@ -42,7 +42,6 @@ EMPTY_VANGUARD = Button(area={'cn': (515, 237, 545, 267), 'en': (515, 237, 545, FASHION_COALITION_CHECK = Button(area={'cn': (102, 19, 177, 51), 'en': (118, 31, 183, 50), 'jp': (101, 18, 175, 51), 'tw': (102, 19, 177, 51)}, color={'cn': (109, 104, 89), 'en': (131, 124, 102), 'jp': (122, 116, 101), 'tw': (109, 104, 89)}, button={'cn': (102, 19, 177, 51), 'en': (118, 31, 183, 50), 'jp': (101, 18, 175, 51), 'tw': (102, 19, 177, 51)}, file={'cn': './assets/cn/coalition/FASHION_COALITION_CHECK.png', 'en': './assets/en/coalition/FASHION_COALITION_CHECK.png', 'jp': './assets/jp/coalition/FASHION_COALITION_CHECK.png', 'tw': './assets/cn/coalition/FASHION_COALITION_CHECK.png'}) FASHION_EASY = Button(area={'cn': (136, 223, 199, 263), 'en': (136, 223, 199, 263), 'jp': (136, 223, 199, 263), 'tw': (136, 223, 199, 263)}, color={'cn': (225, 199, 197), 'en': (225, 199, 197), 'jp': (225, 199, 197), 'tw': (225, 199, 197)}, button={'cn': (136, 223, 199, 263), 'en': (136, 223, 199, 263), 'jp': (136, 223, 199, 263), 'tw': (136, 223, 199, 263)}, file={'cn': './assets/cn/coalition/FASHION_EASY.png', 'en': './assets/cn/coalition/FASHION_EASY.png', 'jp': './assets/cn/coalition/FASHION_EASY.png', 'tw': './assets/cn/coalition/FASHION_EASY.png'}) FASHION_EX = Button(area={'cn': (844, 246, 923, 301), 'en': (844, 246, 923, 301), 'jp': (844, 246, 923, 301), 'tw': (844, 246, 923, 301)}, color={'cn': (140, 115, 114), 'en': (140, 115, 114), 'jp': (140, 115, 114), 'tw': (140, 115, 114)}, button={'cn': (844, 246, 923, 301), 'en': (844, 246, 923, 301), 'jp': (844, 246, 923, 301), 'tw': (844, 246, 923, 301)}, file={'cn': './assets/cn/coalition/FASHION_EX.png', 'en': './assets/cn/coalition/FASHION_EX.png', 'jp': './assets/cn/coalition/FASHION_EX.png', 'tw': './assets/cn/coalition/FASHION_EX.png'}) -FASHION_FLEET_PREPARATION = Button(area={'cn': (1021, 519, 1121, 545), 'en': (1021, 519, 1121, 545), 'jp': (1021, 519, 1121, 545), 'tw': (1021, 519, 1121, 545)}, color={'cn': (94, 129, 239), 'en': (94, 129, 239), 'jp': (94, 129, 239), 'tw': (94, 129, 239)}, button={'cn': (1021, 519, 1121, 545), 'en': (1021, 519, 1121, 545), 'jp': (1021, 519, 1121, 545), 'tw': (1021, 519, 1121, 545)}, file={'cn': './assets/cn/coalition/FASHION_FLEET_PREPARATION.png', 'en': './assets/cn/coalition/FASHION_FLEET_PREPARATION.png', 'jp': './assets/cn/coalition/FASHION_FLEET_PREPARATION.png', 'tw': './assets/cn/coalition/FASHION_FLEET_PREPARATION.png'}) FASHION_HARD = Button(area={'cn': (485, 167, 554, 215), 'en': (485, 167, 554, 215), 'jp': (485, 167, 554, 215), 'tw': (485, 167, 554, 215)}, color={'cn': (152, 136, 129), 'en': (152, 136, 129), 'jp': (152, 136, 129), 'tw': (152, 136, 129)}, button={'cn': (485, 167, 554, 215), 'en': (485, 167, 554, 215), 'jp': (485, 167, 554, 215), 'tw': (485, 167, 554, 215)}, file={'cn': './assets/cn/coalition/FASHION_HARD.png', 'en': './assets/cn/coalition/FASHION_HARD.png', 'jp': './assets/cn/coalition/FASHION_HARD.png', 'tw': './assets/cn/coalition/FASHION_HARD.png'}) FASHION_MODE_BATTLE = Button(area={'cn': (152, 635, 213, 669), 'en': (108, 644, 188, 668), 'jp': (150, 636, 215, 668), 'tw': (152, 635, 213, 669)}, color={'cn': (140, 133, 117), 'en': (150, 143, 128), 'jp': (144, 137, 119), 'tw': (140, 133, 117)}, button={'cn': (152, 635, 213, 669), 'en': (108, 644, 188, 668), 'jp': (150, 636, 215, 668), 'tw': (152, 635, 213, 669)}, file={'cn': './assets/cn/coalition/FASHION_MODE_BATTLE.png', 'en': './assets/en/coalition/FASHION_MODE_BATTLE.png', 'jp': './assets/jp/coalition/FASHION_MODE_BATTLE.png', 'tw': './assets/cn/coalition/FASHION_MODE_BATTLE.png'}) FASHION_MODE_STORY = Button(area={'cn': (154, 629, 220, 666), 'en': (117, 642, 195, 667), 'jp': (156, 629, 219, 665), 'tw': (154, 629, 220, 666)}, color={'cn': (141, 134, 116), 'en': (158, 148, 132), 'jp': (151, 143, 123), 'tw': (141, 134, 116)}, button={'cn': (154, 629, 220, 666), 'en': (117, 642, 195, 667), 'jp': (156, 629, 219, 665), 'tw': (154, 629, 220, 666)}, file={'cn': './assets/cn/coalition/FASHION_MODE_STORY.png', 'en': './assets/en/coalition/FASHION_MODE_STORY.png', 'jp': './assets/jp/coalition/FASHION_MODE_STORY.png', 'tw': './assets/cn/coalition/FASHION_MODE_STORY.png'}) @@ -51,8 +50,6 @@ FASHION_PT_OCR = Button(area={'cn': (881, 658, 937, 674), 'en': (881, 658, 937, FASHION_SP = Button(area={'cn': (704, 194, 762, 242), 'en': (704, 194, 762, 242), 'jp': (704, 194, 762, 242), 'tw': (704, 194, 762, 242)}, color={'cn': (146, 133, 135), 'en': (146, 133, 135), 'jp': (146, 133, 135), 'tw': (146, 133, 135)}, button={'cn': (704, 194, 762, 242), 'en': (704, 194, 762, 242), 'jp': (704, 194, 762, 242), 'tw': (704, 194, 762, 242)}, file={'cn': './assets/cn/coalition/FASHION_SP.png', 'en': './assets/cn/coalition/FASHION_SP.png', 'jp': './assets/cn/coalition/FASHION_SP.png', 'tw': './assets/cn/coalition/FASHION_SP.png'}) FASHION_SWITCH_MULTI = Button(area={'cn': (1075, 457, 1206, 485), 'en': (1076, 457, 1206, 485), 'jp': (1075, 457, 1206, 485), 'tw': (1075, 457, 1206, 485)}, color={'cn': (233, 183, 63), 'en': (201, 158, 54), 'jp': (227, 178, 61), 'tw': (233, 183, 63)}, button={'cn': (1075, 457, 1206, 485), 'en': (1076, 457, 1206, 485), 'jp': (1075, 457, 1206, 485), 'tw': (1075, 457, 1206, 485)}, file={'cn': './assets/cn/coalition/FASHION_SWITCH_MULTI.png', 'en': './assets/en/coalition/FASHION_SWITCH_MULTI.png', 'jp': './assets/jp/coalition/FASHION_SWITCH_MULTI.png', 'tw': './assets/cn/coalition/FASHION_SWITCH_MULTI.png'}) FASHION_SWITCH_SINGLE = Button(area={'cn': (929, 457, 1059, 485), 'en': (929, 457, 1059, 485), 'jp': (929, 457, 1059, 485), 'tw': (929, 457, 1059, 485)}, color={'cn': (230, 181, 62), 'en': (202, 159, 54), 'jp': (227, 178, 61), 'tw': (230, 181, 62)}, button={'cn': (929, 457, 1059, 485), 'en': (929, 457, 1059, 485), 'jp': (929, 457, 1059, 485), 'tw': (929, 457, 1059, 485)}, file={'cn': './assets/cn/coalition/FASHION_SWITCH_SINGLE.png', 'en': './assets/en/coalition/FASHION_SWITCH_SINGLE.png', 'jp': './assets/jp/coalition/FASHION_SWITCH_SINGLE.png', 'tw': './assets/cn/coalition/FASHION_SWITCH_SINGLE.png'}) -FASHION_UI_BACK = Button(area={'cn': (29, 28, 45, 45), 'en': (29, 28, 45, 45), 'jp': (29, 28, 45, 45), 'tw': (29, 28, 45, 45)}, color={'cn': (132, 125, 113), 'en': (132, 125, 113), 'jp': (132, 125, 113), 'tw': (132, 125, 113)}, button={'cn': (29, 28, 45, 45), 'en': (29, 28, 45, 45), 'jp': (29, 28, 45, 45), 'tw': (29, 28, 45, 45)}, file={'cn': './assets/cn/coalition/FASHION_UI_BACK.png', 'en': './assets/cn/coalition/FASHION_UI_BACK.png', 'jp': './assets/cn/coalition/FASHION_UI_BACK.png', 'tw': './assets/cn/coalition/FASHION_UI_BACK.png'}) -FASHION_UI_HOME = Button(area={'cn': (1210, 23, 1238, 47), 'en': (1210, 23, 1238, 47), 'jp': (1210, 23, 1238, 47), 'tw': (1210, 23, 1238, 47)}, color={'cn': (124, 120, 112), 'en': (124, 120, 112), 'jp': (124, 120, 112), 'tw': (124, 120, 112)}, button={'cn': (1210, 23, 1238, 47), 'en': (1210, 23, 1238, 47), 'jp': (1210, 23, 1238, 47), 'tw': (1210, 23, 1238, 47)}, file={'cn': './assets/cn/coalition/FASHION_UI_HOME.png', 'en': './assets/cn/coalition/FASHION_UI_HOME.png', 'jp': './assets/cn/coalition/FASHION_UI_HOME.png', 'tw': './assets/cn/coalition/FASHION_UI_HOME.png'}) FLEET_NOT_PREPARED = Button(area={'cn': (1008, 310, 1110, 334), 'en': (1008, 310, 1110, 334), 'jp': (936, 306, 1094, 340), 'tw': (1008, 310, 1110, 334)}, color={'cn': (106, 106, 112), 'en': (106, 106, 112), 'jp': (63, 62, 66), 'tw': (108, 107, 112)}, button={'cn': (1008, 310, 1110, 334), 'en': (1008, 310, 1110, 334), 'jp': (936, 306, 1094, 340), 'tw': (1008, 310, 1110, 334)}, file={'cn': './assets/cn/coalition/FLEET_NOT_PREPARED.png', 'en': './assets/cn/coalition/FLEET_NOT_PREPARED.png', 'jp': './assets/jp/coalition/FLEET_NOT_PREPARED.png', 'tw': './assets/tw/coalition/FLEET_NOT_PREPARED.png'}) FROSTFALL_COALITION_CHECK = Button(area={'cn': (118, 14, 227, 39), 'en': (118, 16, 221, 36), 'jp': (118, 14, 227, 39), 'tw': (118, 14, 227, 39)}, color={'cn': (145, 161, 200), 'en': (116, 130, 168), 'jp': (150, 166, 204), 'tw': (152, 168, 206)}, button={'cn': (118, 14, 227, 39), 'en': (118, 16, 221, 36), 'jp': (118, 14, 227, 39), 'tw': (118, 14, 227, 39)}, file={'cn': './assets/cn/coalition/FROSTFALL_COALITION_CHECK.png', 'en': './assets/en/coalition/FROSTFALL_COALITION_CHECK.png', 'jp': './assets/jp/coalition/FROSTFALL_COALITION_CHECK.png', 'tw': './assets/tw/coalition/FROSTFALL_COALITION_CHECK.png'}) FROSTFALL_EX = Button(area={'cn': (622, 372, 649, 384), 'en': (622, 372, 649, 384), 'jp': (622, 372, 649, 384), 'tw': (622, 372, 649, 384)}, color={'cn': (198, 152, 252), 'en': (198, 152, 252), 'jp': (198, 152, 252), 'tw': (182, 127, 252)}, button={'cn': (622, 372, 649, 384), 'en': (622, 372, 649, 384), 'jp': (622, 372, 649, 384), 'tw': (622, 372, 649, 384)}, file={'cn': './assets/cn/coalition/FROSTFALL_EX.png', 'en': './assets/en/coalition/FROSTFALL_EX.png', 'jp': './assets/jp/coalition/FROSTFALL_EX.png', 'tw': './assets/tw/coalition/FROSTFALL_EX.png'}) diff --git a/module/coalition/ui.py b/module/coalition/ui.py index fd184d37b..50ef64e24 100644 --- a/module/coalition/ui.py +++ b/module/coalition/ui.py @@ -393,15 +393,27 @@ class CoalitionUI(Combat): clicked = self.coalition_set_fleet(event, mode) if self.appear(FLEET_NOT_PREPARED, offset=(20, 20)): - logger.critical('FLEET_NOT_PREPARED') - logger.critical('Please prepare you fleets before running coalition battles') - raise RequestHumanTakeover + result = handle_fleet_recommend(stage) + if result == 'continue': + continue + elif result == False: + logger.critical('FLEET_NOT_PREPARED') + logger.critical('Please prepare you fleets before running coalition battles') + raise RequestHumanTakeover if self.appear(EMPTY_FLAGSHIP, offset=(20, 20)): - logger.critical('EMPTY_FLAGSHIP, Please prepare you fleets before running coalition battles') - raise RequestHumanTakeover + result = handle_fleet_recommend(stage) + if result == 'continue': + continue + elif result == False: + logger.critical('EMPTY_FLAGSHIP, Please prepare you fleets before running coalition battles') + raise RequestHumanTakeover if self.appear(EMPTY_VANGUARD, offset=(20, 20)): - logger.critical('EMPTY_VANGUARD, Please prepare you fleets before running coalition battles') - raise RequestHumanTakeover + result = handle_fleet_recommend(stage) + if result == 'continue': + continue + elif result == False: + logger.critical('EMPTY_VANGUARD, Please prepare you fleets before running coalition battles') + raise RequestHumanTakeover return clicked @@ -496,28 +508,6 @@ class CoalitionUI(Combat): return True else: return False - if self.appear(FLEET_NOT_PREPARED, offset=(20, 20)): - result = handle_fleet_recommend(stage) - if result == 'continue': - continue - elif result == False: - logger.critical('FLEET_NOT_PREPARED') - logger.critical('Please prepare you fleets before running coalition battles') - raise RequestHumanTakeover - if self.appear(EMPTY_FLAGSHIP, offset=(20, 20)): - result = handle_fleet_recommend(stage) - if result == 'continue': - continue - elif result == False: - logger.critical('EMPTY_FLAGSHIP, Please prepare you fleets before running coalition battles') - raise RequestHumanTakeover - if self.appear(EMPTY_VANGUARD, offset=(20, 20)): - result = handle_fleet_recommend(stage) - if result == 'continue': - continue - elif result == False: - logger.critical('EMPTY_VANGUARD, Please prepare you fleets before running coalition battles') - raise RequestHumanTakeover # End if self.appear(BATTLE_PREPARATION, offset=(20, 20)):