diff --git a/campaign/Readme.md b/campaign/Readme.md index 1db5bda15..a3d2d94b7 100644 --- a/campaign/Readme.md +++ b/campaign/Readme.md @@ -284,3 +284,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 1afe247de..4d2e77eea 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -1966,8 +1966,8 @@ "type": "select", "value": "campaign_main", "option": [ - "event_20240229_cn", - "event_20260226_cn" + "event_20220728_cn", + "event_20240229_cn" ], "display": "hide", "option_cn": [ @@ -1980,11 +1980,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": { @@ -2387,8 +2387,8 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20240229_cn", - "event_20260226_cn" + "event_20220728_cn", + "event_20240229_cn" ], "option_cn": [ "event_20240229_cn" @@ -2400,11 +2400,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": { @@ -2801,8 +2801,8 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20240229_cn", - "event_20260226_cn" + "event_20220728_cn", + "event_20240229_cn" ], "option_cn": [ "event_20240229_cn" @@ -2814,11 +2814,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": { @@ -4608,8 +4608,8 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20240229_cn", - "event_20260226_cn" + "event_20220728_cn", + "event_20240229_cn" ], "option_cn": [ "event_20240229_cn" @@ -4621,11 +4621,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": { @@ -5040,8 +5040,8 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20240229_cn", - "event_20260226_cn" + "event_20220728_cn", + "event_20240229_cn" ], "option_cn": [ "event_20240229_cn" @@ -5053,11 +5053,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": { @@ -5472,8 +5472,8 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20240229_cn", - "event_20260226_cn" + "event_20220728_cn", + "event_20240229_cn" ], "option_cn": [ "event_20240229_cn" @@ -5485,11 +5485,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": { @@ -5904,8 +5904,8 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20240229_cn", - "event_20260226_cn" + "event_20220728_cn", + "event_20240229_cn" ], "option_cn": [ "event_20240229_cn" @@ -5917,11 +5917,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": { @@ -6326,8 +6326,8 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20240229_cn", - "event_20260226_cn" + "event_20220728_cn", + "event_20240229_cn" ], "option_cn": [ "event_20240229_cn" @@ -6339,11 +6339,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 c895a0960..bd21ec06a 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -765,7 +765,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": "復刻鍊金術士與秘密遺跡群島", 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