Merge pull request #4223 from LmeSzinc/dev

Bug fix
LmeSzinc · Sep 20, 2024 · 1ffdcf0 · 1ffdcf0
2 parents b88e0df + 4852d66
commit 1ffdcf0
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 18 deletions.
diff --git a/assets/jp/retire/TEMPLATE_IN_COMMISSION.gif b/assets/jp/retire/TEMPLATE_IN_COMMISSION.gif
diff --git a/assets/jp/retire/TEMPLATE_IN_COMMISSION.png b/assets/jp/retire/TEMPLATE_IN_COMMISSION.png
diff --git a/campaign/Readme.md b/campaign/Readme.md
@@ -209,3 +209,4 @@ To add a new event, add a new row in here, and run `python -m module.config.conf
 | 20240829 | event 20240829 cn | Whence Flowers Bear No Fruit | 埋葬于彼岸之花 | Whence Flowers Bear No Fruit | 徒花咲かす彼岸 | - |
 | 20240829 | event 20220324 cn | Virtual Tower | - | - | - | 復刻虛像構築之塔 |
 | 20240912 | event 20240912 cn | Ode of Everblooming Crimson | 唤醒苍红之炎 | Ode of Everblooming Crimson | 絳染む丹華の詠歌 | - |
+| 20240919 | event 20230914 cn | Effulgence Before Eclipse   | - | -  | - | 須臾望月抄    |
diff --git a/module/config/argument/args.json b/module/config/argument/args.json
@@ -1713,13 +1713,13 @@
         ],
         "display": "hide",
         "option_bold": [
-          "event_20220324_cn",
+          "event_20230914_cn",
           "event_20240912_cn"
         ],
         "cn": "event_20240912_cn",
         "en": "event_20240912_cn",
         "jp": "event_20240912_cn",
-        "tw": "event_20220324_cn"
+        "tw": "event_20230914_cn"
       },
       "Mode": {
         "type": "select",
@@ -2052,13 +2052,13 @@
           "event_20240912_cn"
         ],
         "option_bold": [
-          "event_20220324_cn",
+          "event_20230914_cn",
           "event_20240912_cn"
         ],
         "cn": "event_20240912_cn",
         "en": "event_20240912_cn",
         "jp": "event_20240912_cn",
-        "tw": "event_20220324_cn"
+        "tw": "event_20230914_cn"
       },
       "Mode": {
         "type": "select",
@@ -2506,13 +2506,13 @@
           "event_20240912_cn"
         ],
         "option_bold": [
-          "event_20220324_cn",
+          "event_20230914_cn",
           "event_20240912_cn"
         ],
         "cn": "event_20240912_cn",
         "en": "event_20240912_cn",
         "jp": "event_20240912_cn",
-        "tw": "event_20220324_cn"
+        "tw": "event_20230914_cn"
       },
       "Mode": {
         "type": "select",
@@ -3918,13 +3918,13 @@
           "event_20240912_cn"
         ],
         "option_bold": [
-          "event_20220324_cn",
+          "event_20230914_cn",
           "event_20240912_cn"
         ],
         "cn": "event_20240912_cn",
         "en": "event_20240912_cn",
         "jp": "event_20240912_cn",
-        "tw": "event_20220324_cn"
+        "tw": "event_20230914_cn"
       },
       "Mode": {
         "type": "select",
@@ -4389,13 +4389,13 @@
           "event_20240912_cn"
         ],
         "option_bold": [
-          "event_20220324_cn",
+          "event_20230914_cn",
           "event_20240912_cn"
         ],
         "cn": "event_20240912_cn",
         "en": "event_20240912_cn",
         "jp": "event_20240912_cn",
-        "tw": "event_20220324_cn"
+        "tw": "event_20230914_cn"
       },
       "Mode": {
         "type": "select",
@@ -4860,13 +4860,13 @@
           "event_20240912_cn"
         ],
         "option_bold": [
-          "event_20220324_cn",
+          "event_20230914_cn",
           "event_20240912_cn"
         ],
         "cn": "event_20240912_cn",
         "en": "event_20240912_cn",
         "jp": "event_20240912_cn",
-        "tw": "event_20220324_cn"
+        "tw": "event_20230914_cn"
       },
       "Mode": {
         "type": "select",
@@ -5331,13 +5331,13 @@
           "event_20240912_cn"
         ],
         "option_bold": [
-          "event_20220324_cn",
+          "event_20230914_cn",
           "event_20240912_cn"
         ],
         "cn": "event_20240912_cn",
         "en": "event_20240912_cn",
         "jp": "event_20240912_cn",
-        "tw": "event_20220324_cn"
+        "tw": "event_20230914_cn"
       },
       "Mode": {
         "type": "select",
@@ -5792,13 +5792,13 @@
           "event_20240912_cn"
         ],
         "option_bold": [
-          "event_20220324_cn",
+          "event_20230914_cn",
           "event_20240912_cn"
         ],
         "cn": "event_20240912_cn",
         "en": "event_20240912_cn",
         "jp": "event_20240912_cn",
-        "tw": "event_20220324_cn"
+        "tw": "event_20230914_cn"
       },
       "Mode": {
         "type": "select",

diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json
@@ -722,7 +722,7 @@
       "event_20230525_cn": "空相交會點",
       "event_20230803_cn": "奏響鳶尾之歌",
       "event_20230817_cn": "愚者的天平",
-      "event_20230914_cn": "Effulgence Before Eclipse",
+      "event_20230914_cn": "須臾望月抄",
       "event_20231026_cn": "飓風與青春之泉",
       "event_20231123_cn": "蒼閃忍法帖",
       "event_20231221_cn": "Light-Chasing Sea of Stars",

diff --git a/module/minigame/minigame.py b/module/minigame/minigame.py
@@ -59,6 +59,7 @@ def deal_popup(self):
         if self.deal_specific_popup():
             return True
         if self.handle_popup_confirm('TICKETS_FULL'):
+            self.interval_reset(COIN_POPUP, interval=3)
             return True
         # coins more than 31, deal popup
         if self.appear_then_click(COIN_POPUP, offset=(5, 5), interval=3):

diff --git a/module/retire/assets.py b/module/retire/assets.py
@@ -58,7 +58,7 @@
 TEMPLATE_FOOTE = Template(file={'cn': './assets/cn/retire/TEMPLATE_FOOTE.png', 'en': './assets/en/retire/TEMPLATE_FOOTE.png', 'jp': './assets/jp/retire/TEMPLATE_FOOTE.png', 'tw': './assets/tw/retire/TEMPLATE_FOOTE.png'})
 TEMPLATE_HERMES = Template(file={'cn': './assets/cn/retire/TEMPLATE_HERMES.png', 'en': './assets/en/retire/TEMPLATE_HERMES.png', 'jp': './assets/jp/retire/TEMPLATE_HERMES.png', 'tw': './assets/tw/retire/TEMPLATE_HERMES.png'})
 TEMPLATE_IN_BATTLE = Template(file={'cn': './assets/cn/retire/TEMPLATE_IN_BATTLE.png', 'en': './assets/en/retire/TEMPLATE_IN_BATTLE.png', 'jp': './assets/jp/retire/TEMPLATE_IN_BATTLE.png', 'tw': './assets/tw/retire/TEMPLATE_IN_BATTLE.png'})
-TEMPLATE_IN_COMMISSION = Template(file={'cn': './assets/cn/retire/TEMPLATE_IN_COMMISSION.png', 'en': './assets/en/retire/TEMPLATE_IN_COMMISSION.png', 'jp': './assets/jp/retire/TEMPLATE_IN_COMMISSION.png', 'tw': './assets/tw/retire/TEMPLATE_IN_COMMISSION.png'})
+TEMPLATE_IN_COMMISSION = Template(file={'cn': './assets/cn/retire/TEMPLATE_IN_COMMISSION.png', 'en': './assets/en/retire/TEMPLATE_IN_COMMISSION.png', 'jp': './assets/jp/retire/TEMPLATE_IN_COMMISSION.gif', 'tw': './assets/tw/retire/TEMPLATE_IN_COMMISSION.png'})
 TEMPLATE_IN_EVENT_FLEET = Template(file={'cn': './assets/cn/retire/TEMPLATE_IN_EVENT_FLEET.png', 'en': './assets/cn/retire/TEMPLATE_IN_EVENT_FLEET.png', 'jp': './assets/cn/retire/TEMPLATE_IN_EVENT_FLEET.png', 'tw': './assets/cn/retire/TEMPLATE_IN_EVENT_FLEET.png'})
 TEMPLATE_LANGLEY = Template(file={'cn': './assets/cn/retire/TEMPLATE_LANGLEY.png', 'en': './assets/en/retire/TEMPLATE_LANGLEY.png', 'jp': './assets/jp/retire/TEMPLATE_LANGLEY.png', 'tw': './assets/tw/retire/TEMPLATE_LANGLEY.png'})
 TEMPLATE_RANGER = Template(file={'cn': './assets/cn/retire/TEMPLATE_RANGER.png', 'en': './assets/en/retire/TEMPLATE_RANGER.png', 'jp': './assets/jp/retire/TEMPLATE_RANGER.png', 'tw': './assets/tw/retire/TEMPLATE_RANGER.png'})