From 5291bc49972429762e62d840a3fe3dbae8fab699 Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Fri, 26 Jul 2024 00:50:40 +0800 Subject: [PATCH] Fix: Handle yet another CLEAR icon --- .../template/TEMPLATE_STAGE_CLEAR_20240725.png | Bin 0 -> 1535 bytes .../template/TEMPLATE_STAGE_CLEAR_20240725.png | Bin 0 -> 1535 bytes .../template/TEMPLATE_STAGE_CLEAR_20240725.png | Bin 0 -> 1535 bytes .../template/TEMPLATE_STAGE_CLEAR_20240725.png | Bin 0 -> 1535 bytes module/campaign/campaign_ocr.py | 12 ++++++++++++ module/template/assets.py | 1 + 6 files changed, 13 insertions(+) create mode 100644 assets/cn/template/TEMPLATE_STAGE_CLEAR_20240725.png create mode 100644 assets/en/template/TEMPLATE_STAGE_CLEAR_20240725.png create mode 100644 assets/jp/template/TEMPLATE_STAGE_CLEAR_20240725.png create mode 100644 assets/tw/template/TEMPLATE_STAGE_CLEAR_20240725.png diff --git a/assets/cn/template/TEMPLATE_STAGE_CLEAR_20240725.png b/assets/cn/template/TEMPLATE_STAGE_CLEAR_20240725.png new file mode 100644 index 0000000000000000000000000000000000000000..baaab8b0f257fbc7bc841d90696a7e25be4a651c GIT binary patch literal 1535 zcmVKLZ*U+lnSp_Ufq@}0xwybFAi#%#fq@|}KQEO51AM#2z{tSB zz;IdD(Z$J?fi%FHTu@ZPz`$^Tfq}s&CAB!2fq~%*0|P^Pc}YPD0|R3W0|SFdQg%TJ z0|R3L0|SFdc1Vyj0|R3V0|OIJNoqw20|NttbACZ(QD%BZiGrb}rKN&nN`6wRLU3hq zNosDff@fZGeo;YwQDRAI3IhWJ)D8v)1_oZ2{1OHC#LPSeLsL}-Dual~C?)grM$+xhxmf|p7B=;2nnnfbQ63e)F`Yd zd{`u1lvi}CSe!Vg_*RJ&Nny#OQWes=(obaO$cD-Z%AJ+(QSedZRlJ}yML9}EN#(Wb zR<%ZTKMh%px0?I3CTgeZSnCSuzS29QKi{CnFv`f%Skm~n$vxA{#r++CO)=?RdfInDbtjt*-0cR=O|sSme3TYk~JdpT)k*{8ss|57-*GH|SXK z`H)+o&%(Y$FhvSRDMcH{xWz`r<;Axo%ud{#bT;{UDpQ(Vx=lt@W>wa#>^(X6@|g0~ z3w#QTi)I%eE_qufQSMSvSUIoiZ1vw-y}J1NNe#yue>WSnq_@s%yWSz#>D|@deYlsQ z&%VEI!oG?BCp%7QoqA$A?~LG?vt~V-qcyi=-o6D~3&R#IUi@*X!?Fp>AFecB)w=rT zTHSR`>u+u}*wnH4!B(qnQ@4NE>AP#y9*(`~`;H$_KiGNb^%1|Ln~#g1s6F}QwD*}U z=VZ^fU-)z>?((Ut7T1>D5WU%Y>+7BLyEpIqJUH;k^zrJaiqB@g5PaG7n)yxL+n?`C zKYaRB@cG@>yl?M*RI+y?e7jKeZ#YO-C0$@o*K~#9!Y|_6^6LA>F@ekj7dby)5 z?a?0XgF-5CE6Io zV%l2zLwb0p9C#Fm21MdBzw!*v^KR%dpb!AUfvIB9or^y%k78nu8BhpB{~*1Z%T=r0 zUg|*H)FEv!D0Fa-uF=TIb#=l3u!J;Dg6$&nuhRO4mnm@CR&a{eA~GBPOH@a?22uz{ z*&;d6lN)0Q`f77&*L=kzv;7E+v5W=>f$Ygh l#N1e%@k;nl*L8$H0{~L;;&jc;b^8DS002ovPDHLkV1h(F*y{iQ literal 0 HcmV?d00001 diff --git a/assets/en/template/TEMPLATE_STAGE_CLEAR_20240725.png b/assets/en/template/TEMPLATE_STAGE_CLEAR_20240725.png new file mode 100644 index 0000000000000000000000000000000000000000..baaab8b0f257fbc7bc841d90696a7e25be4a651c GIT binary patch literal 1535 zcmVKLZ*U+lnSp_Ufq@}0xwybFAi#%#fq@|}KQEO51AM#2z{tSB zz;IdD(Z$J?fi%FHTu@ZPz`$^Tfq}s&CAB!2fq~%*0|P^Pc}YPD0|R3W0|SFdQg%TJ z0|R3L0|SFdc1Vyj0|R3V0|OIJNoqw20|NttbACZ(QD%BZiGrb}rKN&nN`6wRLU3hq zNosDff@fZGeo;YwQDRAI3IhWJ)D8v)1_oZ2{1OHC#LPSeLsL}-Dual~C?)grM$+xhxmf|p7B=;2nnnfbQ63e)F`Yd zd{`u1lvi}CSe!Vg_*RJ&Nny#OQWes=(obaO$cD-Z%AJ+(QSedZRlJ}yML9}EN#(Wb zR<%ZTKMh%px0?I3CTgeZSnCSuzS29QKi{CnFv`f%Skm~n$vxA{#r++CO)=?RdfInDbtjt*-0cR=O|sSme3TYk~JdpT)k*{8ss|57-*GH|SXK z`H)+o&%(Y$FhvSRDMcH{xWz`r<;Axo%ud{#bT;{UDpQ(Vx=lt@W>wa#>^(X6@|g0~ z3w#QTi)I%eE_qufQSMSvSUIoiZ1vw-y}J1NNe#yue>WSnq_@s%yWSz#>D|@deYlsQ z&%VEI!oG?BCp%7QoqA$A?~LG?vt~V-qcyi=-o6D~3&R#IUi@*X!?Fp>AFecB)w=rT zTHSR`>u+u}*wnH4!B(qnQ@4NE>AP#y9*(`~`;H$_KiGNb^%1|Ln~#g1s6F}QwD*}U z=VZ^fU-)z>?((Ut7T1>D5WU%Y>+7BLyEpIqJUH;k^zrJaiqB@g5PaG7n)yxL+n?`C zKYaRB@cG@>yl?M*RI+y?e7jKeZ#YO-C0$@o*K~#9!Y|_6^6LA>F@ekj7dby)5 z?a?0XgF-5CE6Io zV%l2zLwb0p9C#Fm21MdBzw!*v^KR%dpb!AUfvIB9or^y%k78nu8BhpB{~*1Z%T=r0 zUg|*H)FEv!D0Fa-uF=TIb#=l3u!J;Dg6$&nuhRO4mnm@CR&a{eA~GBPOH@a?22uz{ z*&;d6lN)0Q`f77&*L=kzv;7E+v5W=>f$Ygh l#N1e%@k;nl*L8$H0{~L;;&jc;b^8DS002ovPDHLkV1h(F*y{iQ literal 0 HcmV?d00001 diff --git a/assets/jp/template/TEMPLATE_STAGE_CLEAR_20240725.png b/assets/jp/template/TEMPLATE_STAGE_CLEAR_20240725.png new file mode 100644 index 0000000000000000000000000000000000000000..baaab8b0f257fbc7bc841d90696a7e25be4a651c GIT binary patch literal 1535 zcmVKLZ*U+lnSp_Ufq@}0xwybFAi#%#fq@|}KQEO51AM#2z{tSB zz;IdD(Z$J?fi%FHTu@ZPz`$^Tfq}s&CAB!2fq~%*0|P^Pc}YPD0|R3W0|SFdQg%TJ z0|R3L0|SFdc1Vyj0|R3V0|OIJNoqw20|NttbACZ(QD%BZiGrb}rKN&nN`6wRLU3hq zNosDff@fZGeo;YwQDRAI3IhWJ)D8v)1_oZ2{1OHC#LPSeLsL}-Dual~C?)grM$+xhxmf|p7B=;2nnnfbQ63e)F`Yd zd{`u1lvi}CSe!Vg_*RJ&Nny#OQWes=(obaO$cD-Z%AJ+(QSedZRlJ}yML9}EN#(Wb zR<%ZTKMh%px0?I3CTgeZSnCSuzS29QKi{CnFv`f%Skm~n$vxA{#r++CO)=?RdfInDbtjt*-0cR=O|sSme3TYk~JdpT)k*{8ss|57-*GH|SXK z`H)+o&%(Y$FhvSRDMcH{xWz`r<;Axo%ud{#bT;{UDpQ(Vx=lt@W>wa#>^(X6@|g0~ z3w#QTi)I%eE_qufQSMSvSUIoiZ1vw-y}J1NNe#yue>WSnq_@s%yWSz#>D|@deYlsQ z&%VEI!oG?BCp%7QoqA$A?~LG?vt~V-qcyi=-o6D~3&R#IUi@*X!?Fp>AFecB)w=rT zTHSR`>u+u}*wnH4!B(qnQ@4NE>AP#y9*(`~`;H$_KiGNb^%1|Ln~#g1s6F}QwD*}U z=VZ^fU-)z>?((Ut7T1>D5WU%Y>+7BLyEpIqJUH;k^zrJaiqB@g5PaG7n)yxL+n?`C zKYaRB@cG@>yl?M*RI+y?e7jKeZ#YO-C0$@o*K~#9!Y|_6^6LA>F@ekj7dby)5 z?a?0XgF-5CE6Io zV%l2zLwb0p9C#Fm21MdBzw!*v^KR%dpb!AUfvIB9or^y%k78nu8BhpB{~*1Z%T=r0 zUg|*H)FEv!D0Fa-uF=TIb#=l3u!J;Dg6$&nuhRO4mnm@CR&a{eA~GBPOH@a?22uz{ z*&;d6lN)0Q`f77&*L=kzv;7E+v5W=>f$Ygh l#N1e%@k;nl*L8$H0{~L;;&jc;b^8DS002ovPDHLkV1h(F*y{iQ literal 0 HcmV?d00001 diff --git a/assets/tw/template/TEMPLATE_STAGE_CLEAR_20240725.png b/assets/tw/template/TEMPLATE_STAGE_CLEAR_20240725.png new file mode 100644 index 0000000000000000000000000000000000000000..baaab8b0f257fbc7bc841d90696a7e25be4a651c GIT binary patch literal 1535 zcmVKLZ*U+lnSp_Ufq@}0xwybFAi#%#fq@|}KQEO51AM#2z{tSB zz;IdD(Z$J?fi%FHTu@ZPz`$^Tfq}s&CAB!2fq~%*0|P^Pc}YPD0|R3W0|SFdQg%TJ z0|R3L0|SFdc1Vyj0|R3V0|OIJNoqw20|NttbACZ(QD%BZiGrb}rKN&nN`6wRLU3hq zNosDff@fZGeo;YwQDRAI3IhWJ)D8v)1_oZ2{1OHC#LPSeLsL}-Dual~C?)grM$+xhxmf|p7B=;2nnnfbQ63e)F`Yd zd{`u1lvi}CSe!Vg_*RJ&Nny#OQWes=(obaO$cD-Z%AJ+(QSedZRlJ}yML9}EN#(Wb zR<%ZTKMh%px0?I3CTgeZSnCSuzS29QKi{CnFv`f%Skm~n$vxA{#r++CO)=?RdfInDbtjt*-0cR=O|sSme3TYk~JdpT)k*{8ss|57-*GH|SXK z`H)+o&%(Y$FhvSRDMcH{xWz`r<;Axo%ud{#bT;{UDpQ(Vx=lt@W>wa#>^(X6@|g0~ z3w#QTi)I%eE_qufQSMSvSUIoiZ1vw-y}J1NNe#yue>WSnq_@s%yWSz#>D|@deYlsQ z&%VEI!oG?BCp%7QoqA$A?~LG?vt~V-qcyi=-o6D~3&R#IUi@*X!?Fp>AFecB)w=rT zTHSR`>u+u}*wnH4!B(qnQ@4NE>AP#y9*(`~`;H$_KiGNb^%1|Ln~#g1s6F}QwD*}U z=VZ^fU-)z>?((Ut7T1>D5WU%Y>+7BLyEpIqJUH;k^zrJaiqB@g5PaG7n)yxL+n?`C zKYaRB@cG@>yl?M*RI+y?e7jKeZ#YO-C0$@o*K~#9!Y|_6^6LA>F@ekj7dby)5 z?a?0XgF-5CE6Io zV%l2zLwb0p9C#Fm21MdBzw!*v^KR%dpb!AUfvIB9or^y%k78nu8BhpB{~*1Z%T=r0 zUg|*H)FEv!D0Fa-uF=TIb#=l3u!J;Dg6$&nuhRO4mnm@CR&a{eA~GBPOH@a?22uz{ z*&;d6lN)0Q`f77&*L=kzv;7E+v5W=>f$Ygh l#N1e%@k;nl*L8$H0{~L;;&jc;b^8DS002ovPDHLkV1h(F*y{iQ literal 0 HcmV?d00001 diff --git a/module/campaign/campaign_ocr.py b/module/campaign/campaign_ocr.py index 8f19efc6df..d0ed29e41a 100644 --- a/module/campaign/campaign_ocr.py +++ b/module/campaign/campaign_ocr.py @@ -165,6 +165,12 @@ def campaign_extract_name_image(self, image): similarity=0.6, name_offset=(52, 0), name_size=(60, 22) ) + if '20240725' in self.config.STAGE_ENTRANCE: + digits += self.campaign_match_multi( + TEMPLATE_STAGE_CLEAR_20240725, + image, self._stage_image_gray, + name_offset=(73, -4), name_size=(60, 22) + ) return digits @@ -233,6 +239,12 @@ def campaign_extract_name_image(self, image): similarity=0.6, name_offset=(52, 0), name_size=(60, 22) ) + if '20240725' in self.config.STAGE_ENTRANCE: + digits += self.campaign_match_multi( + TEMPLATE_STAGE_CLEAR_20240725, + image, self._stage_image_gray, + name_offset=(73, -4), name_size=(60, 22) + ) return digits diff --git a/module/template/assets.py b/module/template/assets.py index 6a85bb2e05..b973660f10 100644 --- a/module/template/assets.py +++ b/module/template/assets.py @@ -224,6 +224,7 @@ TEMPLATE_STAGE_BLUE_CLEAR = Template(file={'cn': './assets/cn/template/TEMPLATE_STAGE_BLUE_CLEAR.png', 'en': './assets/en/template/TEMPLATE_STAGE_BLUE_CLEAR.png', 'jp': './assets/jp/template/TEMPLATE_STAGE_BLUE_CLEAR.png', 'tw': './assets/tw/template/TEMPLATE_STAGE_BLUE_CLEAR.png'}) TEMPLATE_STAGE_BLUE_PERCENT = Template(file={'cn': './assets/cn/template/TEMPLATE_STAGE_BLUE_PERCENT.png', 'en': './assets/en/template/TEMPLATE_STAGE_BLUE_PERCENT.png', 'jp': './assets/jp/template/TEMPLATE_STAGE_BLUE_PERCENT.png', 'tw': './assets/tw/template/TEMPLATE_STAGE_BLUE_PERCENT.png'}) TEMPLATE_STAGE_CLEAR = Template(file={'cn': './assets/cn/template/TEMPLATE_STAGE_CLEAR.png', 'en': './assets/en/template/TEMPLATE_STAGE_CLEAR.png', 'jp': './assets/jp/template/TEMPLATE_STAGE_CLEAR.png', 'tw': './assets/tw/template/TEMPLATE_STAGE_CLEAR.png'}) +TEMPLATE_STAGE_CLEAR_20240725 = Template(file={'cn': './assets/cn/template/TEMPLATE_STAGE_CLEAR_20240725.png', 'en': './assets/en/template/TEMPLATE_STAGE_CLEAR_20240725.png', 'jp': './assets/jp/template/TEMPLATE_STAGE_CLEAR_20240725.png', 'tw': './assets/tw/template/TEMPLATE_STAGE_CLEAR_20240725.png'}) TEMPLATE_STAGE_CLEAR_SMALL = Template(file={'cn': './assets/cn/template/TEMPLATE_STAGE_CLEAR_SMALL.png', 'en': './assets/cn/template/TEMPLATE_STAGE_CLEAR_SMALL.png', 'jp': './assets/cn/template/TEMPLATE_STAGE_CLEAR_SMALL.png', 'tw': './assets/cn/template/TEMPLATE_STAGE_CLEAR_SMALL.png'}) TEMPLATE_STAGE_GREEN_CLEAR = Template(file={'cn': './assets/cn/template/TEMPLATE_STAGE_GREEN_CLEAR.png', 'en': './assets/en/template/TEMPLATE_STAGE_GREEN_CLEAR.png', 'jp': './assets/jp/template/TEMPLATE_STAGE_GREEN_CLEAR.png', 'tw': './assets/tw/template/TEMPLATE_STAGE_GREEN_CLEAR.png'}) TEMPLATE_STAGE_HALF_PERCENT = Template(file={'cn': './assets/cn/template/TEMPLATE_STAGE_HALF_PERCENT.png', 'en': './assets/en/template/TEMPLATE_STAGE_HALF_PERCENT.png', 'jp': './assets/jp/template/TEMPLATE_STAGE_HALF_PERCENT.png', 'tw': './assets/tw/template/TEMPLATE_STAGE_HALF_PERCENT.png'})