Merge pull request #696 from LmeSzinc/master

[pull] master from LmeSzinc:master
MengNianxiaoyao · Dec 2, 2024 · d61aeb3 · d61aeb3
2 parents d6c672b + f3e268d
commit d61aeb3
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/campaign/Readme.md b/campaign/Readme.md
@@ -222,3 +222,4 @@ To add a new event, add a new row in here, and run `python -m module.config.conf
 | 20241114   | event 20220915 cn        | Violet Tempest Blooming Lycoris Rerun        | 复刻紫绛槿岚           | Violet Tempest Blooming Lycoris Rerun        | 赫の涙月 菫の暁風（復刻）            | -                        |
 | 20241114   | event 20240229 cn        | Snowrealm Peregrination                      | -                      | -                                            | -                                    | 雪境迷蹤                 |
 | 20241121   | event 20241121 cn        | Dangerous Inventions Incoming                | 危险发明迫近中         | Dangerous Inventions Incoming                | 危険発明接近中                       | -                        |
+| 20241128   | event 20241121 cn        | -                                            | -                      | -                                            | -                                    | 危險發明逼近中           |
diff --git a/module/commission/project.py b/module/commission/project.py
@@ -36,6 +36,13 @@ def pre_process(self, image):
         if len(left):
             image = image[:, left[-1] - look_back:]
 
+        if server.server in ['jp']:
+            # slice top and bottom part to get clearer roman digits
+            # will need to pad white background for better recognization
+            image = image[8:-10, :]
+            cv2.normalize(image, image, -55, 255, cv2.NORM_MINMAX)
+            image = (image > 128).astype(np.uint8) * 255
+            image = np.pad(image, ((4, 4), (0, 0)), mode='constant', constant_values=255)
         return image
 
 
@@ -167,7 +174,7 @@ def commission_parse(self):
         self.genre = self.commission_name_parse(self.name)
 
         # Suffix
-        ocr = SuffixOcr(button, lang='azur_lane', letter=(255, 255, 255), threshold=128, alphabet='IV')
+        ocr = SuffixOcr(button, lang='azur_lane', letter=(201, 201, 201), threshold=128, alphabet='IV')
         self.suffix = self.beautify_name(ocr.ocr(self.image))
 
         # Duration time

diff --git a/module/config/argument/args.json b/module/config/argument/args.json
@@ -1715,13 +1715,12 @@
         ],
         "display": "hide",
         "option_bold": [
-          "event_20240229_cn",
           "event_20241121_cn"
         ],
         "cn": "event_20241121_cn",
         "en": "event_20241121_cn",
         "jp": "event_20241121_cn",
-        "tw": "event_20240229_cn"
+        "tw": "event_20241121_cn"
       },
       "Mode": {
         "type": "select",
@@ -2056,13 +2055,12 @@
           "event_20241121_cn"
         ],
         "option_bold": [
-          "event_20240229_cn",
           "event_20241121_cn"
         ],
         "cn": "event_20241121_cn",
         "en": "event_20241121_cn",
         "jp": "event_20241121_cn",
-        "tw": "event_20240229_cn"
+        "tw": "event_20241121_cn"
       },
       "Mode": {
         "type": "select",
@@ -2512,13 +2510,12 @@
           "event_20241121_cn"
         ],
         "option_bold": [
-          "event_20240229_cn",
           "event_20241121_cn"
         ],
         "cn": "event_20241121_cn",
         "en": "event_20241121_cn",
         "jp": "event_20241121_cn",
-        "tw": "event_20240229_cn"
+        "tw": "event_20241121_cn"
       },
       "Mode": {
         "type": "select",
@@ -3930,13 +3927,12 @@
           "event_20241121_cn"
         ],
         "option_bold": [
-          "event_20240229_cn",
           "event_20241121_cn"
         ],
         "cn": "event_20241121_cn",
         "en": "event_20241121_cn",
         "jp": "event_20241121_cn",
-        "tw": "event_20240229_cn"
+        "tw": "event_20241121_cn"
       },
       "Mode": {
         "type": "select",
@@ -4403,13 +4399,12 @@
           "event_20241121_cn"
         ],
         "option_bold": [
-          "event_20240229_cn",
           "event_20241121_cn"
         ],
         "cn": "event_20241121_cn",
         "en": "event_20241121_cn",
         "jp": "event_20241121_cn",
-        "tw": "event_20240229_cn"
+        "tw": "event_20241121_cn"
       },
       "Mode": {
         "type": "select",
@@ -4876,13 +4871,12 @@
           "event_20241121_cn"
         ],
         "option_bold": [
-          "event_20240229_cn",
           "event_20241121_cn"
         ],
         "cn": "event_20241121_cn",
         "en": "event_20241121_cn",
         "jp": "event_20241121_cn",
-        "tw": "event_20240229_cn"
+        "tw": "event_20241121_cn"
       },
       "Mode": {
         "type": "select",
@@ -5349,13 +5343,12 @@
           "event_20241121_cn"
         ],
         "option_bold": [
-          "event_20240229_cn",
           "event_20241121_cn"
         ],
         "cn": "event_20241121_cn",
         "en": "event_20241121_cn",
         "jp": "event_20241121_cn",
-        "tw": "event_20240229_cn"
+        "tw": "event_20241121_cn"
       },
       "Mode": {
         "type": "select",
@@ -5812,13 +5805,12 @@
           "event_20241121_cn"
         ],
         "option_bold": [
-          "event_20240229_cn",
           "event_20241121_cn"
         ],
         "cn": "event_20241121_cn",
         "en": "event_20241121_cn",
         "jp": "event_20241121_cn",
-        "tw": "event_20240229_cn"
+        "tw": "event_20241121_cn"
       },
       "Mode": {
         "type": "select",

diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json
@@ -734,7 +734,7 @@
       "event_20240829_cn": "埋葬於彼岸之花",
       "event_20240912_cn": "Ode of Everblooming Crimson",
       "event_20241024_cn": "Tempesta and the Sleeping Sea",
-      "event_20241121_cn": "Dangerous Inventions Incoming",
+      "event_20241121_cn": "危險發明逼近中",
       "raid_20200624": "特別演習埃塞克斯級(復刻)",
       "raid_20210708": "復刻穿越彼方的水線",
       "raid_20220127": "演習神秘事件調查",