Skip to content

Commit 3bd8a21

Browse files
LmeSzincLmeSzinc
authored
Bug fix (LmeSzinc#5567)
2 parents adfe978 + 7cddbaf commit 3bd8a21

4 files changed

Lines changed: 46 additions & 46 deletions

File tree

‎campaign/Readme.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,3 +283,4 @@ To add a new event, add a new row in here, and run `python -m module.config.conf
283283
| 20260212 | raid 20260212 | Spring Auction Adventure | 春宴怀玉香满庭 | Spring Auction Adventure | 新春玉逸品会 | 春宴懷玉香滿庭 |
284284
| 20260226 | event 20260226 cn | Springtide Inn Online | 春满客栈Online | Springtide Inn Online | 春色旅籠Online | 春滿客棧Online |
285285
| 20260312 | event 20240229 cn | Snowrealm Peregrination Rerun | 复刻雪境迷踪 | Snowrealm Peregrination Rerun | 銀界遊廻（復刻） | - |
286+
| 20260319 | event 20220728 cn | Aquilifer's Ballade | - | - | - | 復刻雄鷹的敘事歌 |

‎module/config/argument/args.json‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1641,8 +1641,8 @@
16411641
"type": "select",
16421642
"value": "campaign_main",
16431643
"option": [
1644-
"event_20240229_cn",
1645-
"event_20260226_cn"
1644+
"event_20220728_cn",
1645+
"event_20240229_cn"
16461646
],
16471647
"display": "hide",
16481648
"option_cn": [
@@ -1655,11 +1655,11 @@
16551655
"event_20240229_cn"
16561656
],
16571657
"option_tw": [
1658-
"event_20260226_cn"
1658+
"event_20220728_cn"
16591659
],
16601660
"option_bold": [
1661-
"event_20240229_cn",
1662-
"event_20260226_cn"
1661+
"event_20220728_cn",
1662+
"event_20240229_cn"
16631663
]
16641664
},
16651665
"Mode": {
@@ -1924,8 +1924,8 @@
19241924
"type": "state",
19251925
"value": "campaign_main",
19261926
"option": [
1927-
"event_20240229_cn",
1928-
"event_20260226_cn"
1927+
"event_20220728_cn",
1928+
"event_20240229_cn"
19291929
],
19301930
"option_cn": [
19311931
"event_20240229_cn"
@@ -1937,11 +1937,11 @@
19371937
"event_20240229_cn"
19381938
],
19391939
"option_tw": [
1940-
"event_20260226_cn"
1940+
"event_20220728_cn"
19411941
],
19421942
"option_bold": [
1943-
"event_20240229_cn",
1944-
"event_20260226_cn"
1943+
"event_20220728_cn",
1944+
"event_20240229_cn"
19451945
]
19461946
},
19471947
"Mode": {
@@ -2321,8 +2321,8 @@
23212321
"type": "state",
23222322
"value": "campaign_main",
23232323
"option": [
2324-
"event_20240229_cn",
2325-
"event_20260226_cn"
2324+
"event_20220728_cn",
2325+
"event_20240229_cn"
23262326
],
23272327
"option_cn": [
23282328
"event_20240229_cn"
@@ -2334,11 +2334,11 @@
23342334
"event_20240229_cn"
23352335
],
23362336
"option_tw": [
2337-
"event_20260226_cn"
2337+
"event_20220728_cn"
23382338
],
23392339
"option_bold": [
2340-
"event_20240229_cn",
2341-
"event_20260226_cn"
2340+
"event_20220728_cn",
2341+
"event_20240229_cn"
23422342
]
23432343
},
23442344
"Mode": {
@@ -4048,8 +4048,8 @@
40484048
"type": "state",
40494049
"value": "campaign_main",
40504050
"option": [
4051-
"event_20240229_cn",
4052-
"event_20260226_cn"
4051+
"event_20220728_cn",
4052+
"event_20240229_cn"
40534053
],
40544054
"option_cn": [
40554055
"event_20240229_cn"
@@ -4061,11 +4061,11 @@
40614061
"event_20240229_cn"
40624062
],
40634063
"option_tw": [
4064-
"event_20260226_cn"
4064+
"event_20220728_cn"
40654065
],
40664066
"option_bold": [
4067-
"event_20240229_cn",
4068-
"event_20260226_cn"
4067+
"event_20220728_cn",
4068+
"event_20240229_cn"
40694069
]
40704070
},
40714071
"Mode": {
@@ -4462,8 +4462,8 @@
44624462
"type": "state",
44634463
"value": "campaign_main",
44644464
"option": [
4465-
"event_20240229_cn",
4466-
"event_20260226_cn"
4465+
"event_20220728_cn",
4466+
"event_20240229_cn"
44674467
],
44684468
"option_cn": [
44694469
"event_20240229_cn"
@@ -4475,11 +4475,11 @@
44754475
"event_20240229_cn"
44764476
],
44774477
"option_tw": [
4478-
"event_20260226_cn"
4478+
"event_20220728_cn"
44794479
],
44804480
"option_bold": [
4481-
"event_20240229_cn",
4482-
"event_20260226_cn"
4481+
"event_20220728_cn",
4482+
"event_20240229_cn"
44834483
]
44844484
},
44854485
"Mode": {
@@ -4876,8 +4876,8 @@
48764876
"type": "state",
48774877
"value": "campaign_main",
48784878
"option": [
4879-
"event_20240229_cn",
4880-
"event_20260226_cn"
4879+
"event_20220728_cn",
4880+
"event_20240229_cn"
48814881
],
48824882
"option_cn": [
48834883
"event_20240229_cn"
@@ -4889,11 +4889,11 @@
48894889
"event_20240229_cn"
48904890
],
48914891
"option_tw": [
4892-
"event_20260226_cn"
4892+
"event_20220728_cn"
48934893
],
48944894
"option_bold": [
4895-
"event_20240229_cn",
4896-
"event_20260226_cn"
4895+
"event_20220728_cn",
4896+
"event_20240229_cn"
48974897
]
48984898
},
48994899
"Mode": {
@@ -5290,8 +5290,8 @@
52905290
"type": "state",
52915291
"value": "campaign_main",
52925292
"option": [
5293-
"event_20240229_cn",
5294-
"event_20260226_cn"
5293+
"event_20220728_cn",
5294+
"event_20240229_cn"
52955295
],
52965296
"option_cn": [
52975297
"event_20240229_cn"
@@ -5303,11 +5303,11 @@
53035303
"event_20240229_cn"
53045304
],
53055305
"option_tw": [
5306-
"event_20260226_cn"
5306+
"event_20220728_cn"
53075307
],
53085308
"option_bold": [
5309-
"event_20240229_cn",
5310-
"event_20260226_cn"
5309+
"event_20220728_cn",
5310+
"event_20240229_cn"
53115311
]
53125312
},
53135313
"Mode": {
@@ -5694,8 +5694,8 @@
56945694
"type": "state",
56955695
"value": "campaign_main",
56965696
"option": [
5697-
"event_20240229_cn",
5698-
"event_20260226_cn"
5697+
"event_20220728_cn",
5698+
"event_20240229_cn"
56995699
],
57005700
"option_cn": [
57015701
"event_20240229_cn"
@@ -5707,11 +5707,11 @@
57075707
"event_20240229_cn"
57085708
],
57095709
"option_tw": [
5710-
"event_20260226_cn"
5710+
"event_20220728_cn"
57115711
],
57125712
"option_bold": [
5713-
"event_20240229_cn",
5714-
"event_20260226_cn"
5713+
"event_20220728_cn",
5714+
"event_20240229_cn"
57155715
]
57165716
},
57175717
"Mode": {

‎module/config/i18n/zh-TW.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -735,7 +735,7 @@
735735
"event_20220414_cn": "復刻-永夜幻光",
736736
"event_20220428_cn": "復刻虹彩的終幕曲",
737737
"event_20220526_cn": "泠誓光庭",
738-
"event_20220728_cn": "雄鷹的敘事歌",
738+
"event_20220728_cn": "復刻雄鷹的敘事歌",
739739
"event_20220818_cn": "遠匯點作戰",
740740
"event_20220915_cn": "紫絳槿嵐",
741741
"event_20221124_cn": "復刻鍊金術士與秘密遺跡群島",

‎module/tactical/tactical_class.py‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ def handle_rapid_training(self):
373373
if self.appear(RAPID_TRAINING, offset=offset, interval=1):
374374
self.device.click(RAPID_TRAINING)
375375
# Clear interval to enter _tactical_books_choose fast
376-
self.interval_clear(TACTICAL_CLASS_CANCEL, interval=2)
376+
self.interval_clear(TACTICAL_CLASS_START, interval=2)
377377
return True
378378

379379
return False
@@ -444,7 +444,7 @@ def tactical_class_receive(self, skip_first_screenshot=True):
444444
# Get finish time
445445
# sometimes you have TACTICAL_CHECK without black-blurred background
446446
# TACTICAL_CLASS_CANCEL and TACTICAL_CHECK appears
447-
if not self.appear(TACTICAL_CLASS_CANCEL, offset=(20, 20)) \
447+
if not self.appear(TACTICAL_CLASS_START, offset=(20, 20)) \
448448
and self.appear(TACTICAL_CHECK, offset=(20, 20), interval=2):
449449
self.interval_clear([POPUP_CONFIRM, POPUP_CANCEL, GET_MISSION])
450450
if book_empty:
@@ -495,11 +495,10 @@ def tactical_class_receive(self, skip_first_screenshot=True):
495495
if self.appear(MISSION_POPUP_GO, offset=self._popup_offset, interval=2):
496496
self.device.click(MISSION_POPUP_ACK)
497497
continue
498-
if self.appear(TACTICAL_CLASS_CANCEL, offset=(30, 30), interval=2) \
499-
and self.appear(TACTICAL_CLASS_START, offset=(30, 30)):
498+
if self.appear(TACTICAL_CLASS_START, offset=(30, 30), interval=2):
500499
if self._tactical_books_choose():
501500
self.dock_select_index = 0
502-
self.interval_reset([TACTICAL_CLASS_CANCEL, BOOK_EMPTY_POPUP])
501+
self.interval_reset([TACTICAL_CLASS_START, BOOK_EMPTY_POPUP])
503502
self.interval_clear([POPUP_CONFIRM, POPUP_CANCEL, GET_MISSION])
504503
else:
505504
study_finished = True

0 commit comments

Comments
 (0)