Fix: Handle yet another CLEAR icon

LmeSzinc · Jul 25, 2024 · 5291bc4 · 5291bc4
1 parent 7ec61a7
commit 5291bc4
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 0 deletions.
diff --git a/assets/cn/template/TEMPLATE_STAGE_CLEAR_20240725.png b/assets/cn/template/TEMPLATE_STAGE_CLEAR_20240725.png
diff --git a/assets/en/template/TEMPLATE_STAGE_CLEAR_20240725.png b/assets/en/template/TEMPLATE_STAGE_CLEAR_20240725.png
diff --git a/assets/jp/template/TEMPLATE_STAGE_CLEAR_20240725.png b/assets/jp/template/TEMPLATE_STAGE_CLEAR_20240725.png
diff --git a/assets/tw/template/TEMPLATE_STAGE_CLEAR_20240725.png b/assets/tw/template/TEMPLATE_STAGE_CLEAR_20240725.png
diff --git 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
@@ -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'})