From 561aa27942c3e780bfc64c7ffce0433511b17f0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8B=E9=9D=A2=E6=88=91=E7=B0=A1=E5=96=AE=E5=96=B5?= =?UTF-8?q?=E5=85=A9=E5=8F=A5?= <48844954+appleapple802@users.noreply.github.com> Date: Fri, 20 Mar 2026 18:52:03 +0800 Subject: [PATCH 1/2] Upd:[TW]event 20260319 update (#5564) --- campaign/Readme.md | 1 + module/config/argument/args.json | 80 ++++++++++++++++---------------- module/config/i18n/zh-TW.json | 2 +- 3 files changed, 42 insertions(+), 41 deletions(-) diff --git a/campaign/Readme.md b/campaign/Readme.md index a166f5702..de1b8c891 100644 --- a/campaign/Readme.md +++ b/campaign/Readme.md @@ -283,3 +283,4 @@ To add a new event, add a new row in here, and run `python -m module.config.conf | 20260212 | raid 20260212 | Spring Auction Adventure | 春宴怀玉香满庭 | Spring Auction Adventure | 新春玉逸品会 | 春宴懷玉香滿庭 | | 20260226 | event 20260226 cn | Springtide Inn Online | 春满客栈Online | Springtide Inn Online | 春色旅籠Online | 春滿客棧Online | | 20260312 | event 20240229 cn | Snowrealm Peregrination Rerun | 复刻雪境迷踪 | Snowrealm Peregrination Rerun | 銀界遊廻（復刻） | - | +| 20260319 | event 20220728 cn | Aquilifer's Ballade | - | - | - | 復刻雄鷹的敘事歌 | diff --git a/module/config/argument/args.json b/module/config/argument/args.json index 498af10af..d9cc5ef90 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -1641,8 +1641,8 @@ "type": "select", "value": "campaign_main", "option": [ - "event_20240229_cn", - "event_20260226_cn" + "event_20220728_cn", + "event_20240229_cn" ], "display": "hide", "option_cn": [ @@ -1655,11 +1655,11 @@ "event_20240229_cn" ], "option_tw": [ - "event_20260226_cn" + "event_20220728_cn" ], "option_bold": [ - "event_20240229_cn", - "event_20260226_cn" + "event_20220728_cn", + "event_20240229_cn" ] }, "Mode": { @@ -1924,8 +1924,8 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20240229_cn", - "event_20260226_cn" + "event_20220728_cn", + "event_20240229_cn" ], "option_cn": [ "event_20240229_cn" @@ -1937,11 +1937,11 @@ "event_20240229_cn" ], "option_tw": [ - "event_20260226_cn" + "event_20220728_cn" ], "option_bold": [ - "event_20240229_cn", - "event_20260226_cn" + "event_20220728_cn", + "event_20240229_cn" ] }, "Mode": { @@ -2321,8 +2321,8 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20240229_cn", - "event_20260226_cn" + "event_20220728_cn", + "event_20240229_cn" ], "option_cn": [ "event_20240229_cn" @@ -2334,11 +2334,11 @@ "event_20240229_cn" ], "option_tw": [ - "event_20260226_cn" + "event_20220728_cn" ], "option_bold": [ - "event_20240229_cn", - "event_20260226_cn" + "event_20220728_cn", + "event_20240229_cn" ] }, "Mode": { @@ -4048,8 +4048,8 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20240229_cn", - "event_20260226_cn" + "event_20220728_cn", + "event_20240229_cn" ], "option_cn": [ "event_20240229_cn" @@ -4061,11 +4061,11 @@ "event_20240229_cn" ], "option_tw": [ - "event_20260226_cn" + "event_20220728_cn" ], "option_bold": [ - "event_20240229_cn", - "event_20260226_cn" + "event_20220728_cn", + "event_20240229_cn" ] }, "Mode": { @@ -4462,8 +4462,8 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20240229_cn", - "event_20260226_cn" + "event_20220728_cn", + "event_20240229_cn" ], "option_cn": [ "event_20240229_cn" @@ -4475,11 +4475,11 @@ "event_20240229_cn" ], "option_tw": [ - "event_20260226_cn" + "event_20220728_cn" ], "option_bold": [ - "event_20240229_cn", - "event_20260226_cn" + "event_20220728_cn", + "event_20240229_cn" ] }, "Mode": { @@ -4876,8 +4876,8 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20240229_cn", - "event_20260226_cn" + "event_20220728_cn", + "event_20240229_cn" ], "option_cn": [ "event_20240229_cn" @@ -4889,11 +4889,11 @@ "event_20240229_cn" ], "option_tw": [ - "event_20260226_cn" + "event_20220728_cn" ], "option_bold": [ - "event_20240229_cn", - "event_20260226_cn" + "event_20220728_cn", + "event_20240229_cn" ] }, "Mode": { @@ -5290,8 +5290,8 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20240229_cn", - "event_20260226_cn" + "event_20220728_cn", + "event_20240229_cn" ], "option_cn": [ "event_20240229_cn" @@ -5303,11 +5303,11 @@ "event_20240229_cn" ], "option_tw": [ - "event_20260226_cn" + "event_20220728_cn" ], "option_bold": [ - "event_20240229_cn", - "event_20260226_cn" + "event_20220728_cn", + "event_20240229_cn" ] }, "Mode": { @@ -5694,8 +5694,8 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20240229_cn", - "event_20260226_cn" + "event_20220728_cn", + "event_20240229_cn" ], "option_cn": [ "event_20240229_cn" @@ -5707,11 +5707,11 @@ "event_20240229_cn" ], "option_tw": [ - "event_20260226_cn" + "event_20220728_cn" ], "option_bold": [ - "event_20240229_cn", - "event_20260226_cn" + "event_20220728_cn", + "event_20240229_cn" ] }, "Mode": { diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index f9a984146..51f8d664a 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -735,7 +735,7 @@ "event_20220414_cn": "復刻-永夜幻光", "event_20220428_cn": "復刻虹彩的終幕曲", "event_20220526_cn": "泠誓光庭", - "event_20220728_cn": "雄鷹的敘事歌", + "event_20220728_cn": "復刻雄鷹的敘事歌", "event_20220818_cn": "遠匯點作戰", "event_20220915_cn": "紫絳槿嵐", "event_20221124_cn": "復刻鍊金術士與秘密遺跡群島", From 7cddbaf7a19426288272ed44fd384af0236dac89 Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Mon, 23 Mar 2026 18:24:10 +0800 Subject: [PATCH 2/2] Fix: Prefer TACTICAL_CLASS_START than TACTICAL_CLASS_CANCEL because TACTICAL_CLASS_CANCEL might be "Cancel" or "Return" in EN --- module/tactical/tactical_class.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/module/tactical/tactical_class.py b/module/tactical/tactical_class.py index b25f13a48..3c2e9f022 100644 --- a/module/tactical/tactical_class.py +++ b/module/tactical/tactical_class.py @@ -373,7 +373,7 @@ class RewardTacticalClass(Dock): if self.appear(RAPID_TRAINING, offset=offset, interval=1): self.device.click(RAPID_TRAINING) # Clear interval to enter _tactical_books_choose fast - self.interval_clear(TACTICAL_CLASS_CANCEL, interval=2) + self.interval_clear(TACTICAL_CLASS_START, interval=2) return True return False @@ -444,7 +444,7 @@ class RewardTacticalClass(Dock): # Get finish time # sometimes you have TACTICAL_CHECK without black-blurred background # TACTICAL_CLASS_CANCEL and TACTICAL_CHECK appears - if not self.appear(TACTICAL_CLASS_CANCEL, offset=(20, 20)) \ + if not self.appear(TACTICAL_CLASS_START, offset=(20, 20)) \ and self.appear(TACTICAL_CHECK, offset=(20, 20), interval=2): self.interval_clear([POPUP_CONFIRM, POPUP_CANCEL, GET_MISSION]) if book_empty: @@ -495,11 +495,10 @@ class RewardTacticalClass(Dock): if self.appear(MISSION_POPUP_GO, offset=self._popup_offset, interval=2): self.device.click(MISSION_POPUP_ACK) continue - if self.appear(TACTICAL_CLASS_CANCEL, offset=(30, 30), interval=2) \ - and self.appear(TACTICAL_CLASS_START, offset=(30, 30)): + if self.appear(TACTICAL_CLASS_START, offset=(30, 30), interval=2): if self._tactical_books_choose(): self.dock_select_index = 0 - self.interval_reset([TACTICAL_CLASS_CANCEL, BOOK_EMPTY_POPUP]) + self.interval_reset([TACTICAL_CLASS_START, BOOK_EMPTY_POPUP]) self.interval_clear([POPUP_CONFIRM, POPUP_CANCEL, GET_MISSION]) else: study_finished = True