From b23ff47c50eda54c158ddc80437d03b0ea28297b Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Wed, 1 Jan 2025 21:39:54 +0800 Subject: [PATCH] Fix: Expand search area of MISSION_WEEKLY_RED_DOT --- assets/cn/reward/MISSION_WEEKLY_RED_DOT.png | Bin 3238 -> 7352 bytes assets/en/reward/MISSION_WEEKLY_RED_DOT.png | Bin 3238 -> 0 bytes assets/jp/reward/MISSION_WEEKLY_RED_DOT.png | Bin 3238 -> 0 bytes assets/tw/reward/MISSION_WEEKLY_RED_DOT.png | Bin 3238 -> 0 bytes module/reward/assets.py | 2 +- module/reward/reward.py | 3 ++- 6 files changed, 3 insertions(+), 2 deletions(-) delete mode 100644 assets/en/reward/MISSION_WEEKLY_RED_DOT.png delete mode 100644 assets/jp/reward/MISSION_WEEKLY_RED_DOT.png delete mode 100644 assets/tw/reward/MISSION_WEEKLY_RED_DOT.png diff --git a/assets/cn/reward/MISSION_WEEKLY_RED_DOT.png b/assets/cn/reward/MISSION_WEEKLY_RED_DOT.png index 96c6e37a17ef2369d87be4b72bb24ffd114595d3..088ad23e04e6b4b605ac03414d4fb9cd37b101a2 100644 GIT binary patch delta 4803 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 b`3*DRB3iAt%SQ&g#Q+rLRprWL%s>7g#DRD* delta 597 zcmV-b0;>JEIi?wqBo78+OGiWi{{a60|De66laV18YXApyNliru

48-HAGZJcF) zfAw;4cu-$&nyMs8f8n<(byA;nxq0j8!K3YGFLVh20KfoL<1BmeV}ClSlajvqXC(Th zFI|irv=KdVsHQe0ES_0oMj)(?{(|b zB+2P2`YuCn-z?XDODSKHY;A5eZ{Fz=004ji80iY|?DgBycUc_)zOdD~`g`v8?)>4= jd|QjNK?~Ue7X$Vi?{9Mo7j#Hu00000NkvXXu0mjfn+pc^ diff --git a/assets/en/reward/MISSION_WEEKLY_RED_DOT.png b/assets/en/reward/MISSION_WEEKLY_RED_DOT.png deleted file mode 100644 index 96c6e37a17ef2369d87be4b72bb24ffd114595d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3238 zcmeAS@N?(olHy`uVBq!ia0y~yU|H(?D8gCb z5n0T@z%2~Ij105pNB{-dOFVsD*`IQ-F&MGU4n2B;fq}=^)5S5Q;?~={+W8`Z5^N8) zryTKVy5Z}^#F-|$O-1yIE+?0JbC%PgqYHm9F4*8v=OoJMA+yXg)zL&`ds~XutSwDX zdL$Ze=!!Vjrq4V6_GnGI-RF6?Re+X_g3%Bd4S~@R7!85Z5Eu;s>V-f|UhbUK`ueX$ zg%ttu`LkB3c-BAMu2mW|zhr0S>lX(XzfIRK;bdSqz!36Sr}|@Zz17OellJ{gSNXL> zKX&Sx>#^llKR?8E1Kq=MApFLbd1_D3AK$f3{qt|%Sp9GNo-A47AFdiY>-APKV7o$~ zVg0_(bI)&HeqMdHwC5?$>OI%9xPdwuD-254Ppf~O%C^tYdzt5?Wqy;Fygq$GogFC0 z_UzV-?(O>}fo&58HU@?UN6F7-_m4dWN=fv8T*q*I?{au|+Wlio^7ND0DdaI^xwyqZ~_?=r{ z_@nga(&^01Ab&VtQcdYW>o4&cCm7z0Ny+QciB3Y5u*JLO`!EO1$Ly@aF67OXZQWjQciR-TABf-S>BY o9$u`828Hh^7!85p7Xr-Rq~GTkbBULDq<}o<>FVdQ&MBb@094=v=>Px# diff --git a/assets/jp/reward/MISSION_WEEKLY_RED_DOT.png b/assets/jp/reward/MISSION_WEEKLY_RED_DOT.png deleted file mode 100644 index 96c6e37a17ef2369d87be4b72bb24ffd114595d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3238 zcmeAS@N?(olHy`uVBq!ia0y~yU|H(?D8gCb z5n0T@z%2~Ij105pNB{-dOFVsD*`IQ-F&MGU4n2B;fq}=^)5S5Q;?~={+W8`Z5^N8) zryTKVy5Z}^#F-|$O-1yIE+?0JbC%PgqYHm9F4*8v=OoJMA+yXg)zL&`ds~XutSwDX zdL$Ze=!!Vjrq4V6_GnGI-RF6?Re+X_g3%Bd4S~@R7!85Z5Eu;s>V-f|UhbUK`ueX$ zg%ttu`LkB3c-BAMu2mW|zhr0S>lX(XzfIRK;bdSqz!36Sr}|@Zz17OellJ{gSNXL> zKX&Sx>#^llKR?8E1Kq=MApFLbd1_D3AK$f3{qt|%Sp9GNo-A47AFdiY>-APKV7o$~ zVg0_(bI)&HeqMdHwC5?$>OI%9xPdwuD-254Ppf~O%C^tYdzt5?Wqy;Fygq$GogFC0 z_UzV-?(O>}fo&58HU@?UN6F7-_m4dWN=fv8T*q*I?{au|+Wlio^7ND0DdaI^xwyqZ~_?=r{ z_@nga(&^01Ab&VtQcdYW>o4&cCm7z0Ny+QciB3Y5u*JLO`!EO1$Ly@aF67OXZQWjQciR-TABf-S>BY o9$u`828Hh^7!85p7Xr-Rq~GTkbBULDq<}o<>FVdQ&MBb@094=v=>Px# diff --git a/assets/tw/reward/MISSION_WEEKLY_RED_DOT.png b/assets/tw/reward/MISSION_WEEKLY_RED_DOT.png deleted file mode 100644 index 96c6e37a17ef2369d87be4b72bb24ffd114595d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3238 zcmeAS@N?(olHy`uVBq!ia0y~yU|H(?D8gCb z5n0T@z%2~Ij105pNB{-dOFVsD*`IQ-F&MGU4n2B;fq}=^)5S5Q;?~={+W8`Z5^N8) zryTKVy5Z}^#F-|$O-1yIE+?0JbC%PgqYHm9F4*8v=OoJMA+yXg)zL&`ds~XutSwDX zdL$Ze=!!Vjrq4V6_GnGI-RF6?Re+X_g3%Bd4S~@R7!85Z5Eu;s>V-f|UhbUK`ueX$ zg%ttu`LkB3c-BAMu2mW|zhr0S>lX(XzfIRK;bdSqz!36Sr}|@Zz17OellJ{gSNXL> zKX&Sx>#^llKR?8E1Kq=MApFLbd1_D3AK$f3{qt|%Sp9GNo-A47AFdiY>-APKV7o$~ zVg0_(bI)&HeqMdHwC5?$>OI%9xPdwuD-254Ppf~O%C^tYdzt5?Wqy;Fygq$GogFC0 z_UzV-?(O>}fo&58HU@?UN6F7-_m4dWN=fv8T*q*I?{au|+Wlio^7ND0DdaI^xwyqZ~_?=r{ z_@nga(&^01Ab&VtQcdYW>o4&cCm7z0Ny+QciB3Y5u*JLO`!EO1$Ly@aF67OXZQWjQciR-TABf-S>BY o9$u`828Hh^7!85p7Xr-Rq~GTkbBULDq<}o<>FVdQ&MBb@094=v=>Px# diff --git a/module/reward/assets.py b/module/reward/assets.py index f903dfea4..88e802e8c 100644 --- a/module/reward/assets.py +++ b/module/reward/assets.py @@ -9,5 +9,5 @@ EXP = Button(area={'cn': (449, 31, 477, 49), 'en': (455, 51, 490, 71), 'jp': (44 MISSION_MULTI = Button(area={'cn': (1041, 8, 1101, 39), 'en': (1041, 8, 1101, 39), 'jp': (1041, 7, 1102, 36), 'tw': (1040, 6, 1102, 39)}, color={'cn': (226, 192, 142), 'en': (221, 179, 96), 'jp': (219, 178, 110), 'tw': (223, 184, 121)}, button={'cn': (1041, 8, 1101, 39), 'en': (1041, 8, 1101, 39), 'jp': (1041, 7, 1102, 36), 'tw': (1040, 6, 1102, 39)}, file={'cn': './assets/cn/reward/MISSION_MULTI.png', 'en': './assets/en/reward/MISSION_MULTI.png', 'jp': './assets/jp/reward/MISSION_MULTI.png', 'tw': './assets/tw/reward/MISSION_MULTI.png'}) MISSION_NOTICE = Button(area={'cn': (940, 670, 945, 681), 'en': (940, 670, 945, 681), 'jp': (940, 670, 945, 681), 'tw': (940, 670, 945, 681)}, color={'cn': (183, 83, 66), 'en': (183, 83, 66), 'jp': (183, 83, 66), 'tw': (183, 83, 66)}, button={'cn': (940, 670, 945, 681), 'en': (940, 670, 945, 681), 'jp': (940, 670, 945, 681), 'tw': (940, 670, 945, 681)}, file={'cn': './assets/cn/reward/MISSION_NOTICE.png', 'en': './assets/en/reward/MISSION_NOTICE.png', 'jp': './assets/jp/reward/MISSION_NOTICE.png', 'tw': './assets/tw/reward/MISSION_NOTICE.png'}) MISSION_SINGLE = Button(area={'cn': (1093, 118, 1179, 177), 'en': (1093, 118, 1179, 177), 'jp': (1102, 120, 1166, 149), 'tw': (1090, 115, 1181, 166)}, color={'cn': (115, 155, 218), 'en': (106, 147, 215), 'jp': (136, 176, 226), 'tw': (108, 149, 216)}, button={'cn': (1093, 118, 1179, 177), 'en': (1093, 118, 1179, 177), 'jp': (1102, 120, 1166, 149), 'tw': (1090, 115, 1181, 166)}, file={'cn': './assets/cn/reward/MISSION_SINGLE.png', 'en': './assets/en/reward/MISSION_SINGLE.png', 'jp': './assets/jp/reward/MISSION_SINGLE.png', 'tw': './assets/tw/reward/MISSION_SINGLE.png'}) -MISSION_WEEKLY_RED_DOT = Button(area={'cn': (82, 506, 96, 525), 'en': (82, 506, 96, 525), 'jp': (82, 506, 96, 525), 'tw': (82, 506, 96, 525)}, color={'cn': (209, 107, 89), 'en': (209, 107, 89), 'jp': (209, 107, 89), 'tw': (209, 107, 89)}, button={'cn': (82, 506, 96, 525), 'en': (82, 506, 96, 525), 'jp': (82, 506, 96, 525), 'tw': (82, 506, 96, 525)}, file={'cn': './assets/cn/reward/MISSION_WEEKLY_RED_DOT.png', 'en': './assets/en/reward/MISSION_WEEKLY_RED_DOT.png', 'jp': './assets/jp/reward/MISSION_WEEKLY_RED_DOT.png', 'tw': './assets/tw/reward/MISSION_WEEKLY_RED_DOT.png'}) +MISSION_WEEKLY_RED_DOT = Button(area={'cn': (25, 500, 103, 531), 'en': (25, 500, 103, 531), 'jp': (25, 500, 103, 531), 'tw': (25, 500, 103, 531)}, color={'cn': (74, 58, 62), 'en': (74, 58, 62), 'jp': (74, 58, 62), 'tw': (74, 58, 62)}, button={'cn': (25, 500, 103, 531), 'en': (25, 500, 103, 531), 'jp': (25, 500, 103, 531), 'tw': (25, 500, 103, 531)}, file={'cn': './assets/cn/reward/MISSION_WEEKLY_RED_DOT.png', 'en': './assets/cn/reward/MISSION_WEEKLY_RED_DOT.png', 'jp': './assets/cn/reward/MISSION_WEEKLY_RED_DOT.png', 'tw': './assets/cn/reward/MISSION_WEEKLY_RED_DOT.png'}) OIL = Button(area={'cn': (114, 65, 152, 78), 'en': (114, 59, 149, 79), 'jp': (114, 65, 152, 78), 'tw': (114, 65, 152, 78)}, color={'cn': (75, 77, 80), 'en': (70, 72, 72), 'jp': (75, 77, 80), 'tw': (75, 77, 80)}, button={'cn': (114, 65, 152, 78), 'en': (114, 59, 149, 79), 'jp': (114, 65, 152, 78), 'tw': (114, 65, 152, 78)}, file={'cn': './assets/cn/reward/OIL.png', 'en': './assets/en/reward/OIL.png', 'jp': './assets/jp/reward/OIL.png', 'tw': './assets/tw/reward/OIL.png'}) diff --git a/module/reward/reward.py b/module/reward/reward.py index 4d790ba4b..b340a991e 100644 --- a/module/reward/reward.py +++ b/module/reward/reward.py @@ -176,7 +176,8 @@ class Reward(UI): Returns: bool, if handled """ - if not self.appear(MISSION_WEEKLY_RED_DOT): + if not self.image_color_count(MISSION_WEEKLY_RED_DOT, color=(206, 81, 66), threshold=221, count=20): + logger.info('No MISSION_WEEKLY_RED_DOT') return False self.reward_side_navbar_ensure(upper=5)