Skip to content

Commit efc1f81

Browse files
sync[bot]sync[bot]
committed
Merge remote-tracking branch 'upstream/master'
2 parents 89059b6 + 3bd8a21 commit efc1f81

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
@@ -1655,8 +1655,8 @@
16551655
"type": "select",
16561656
"value": "campaign_main",
16571657
"option": [
1658-
"event_20240229_cn",
1659-
"event_20260226_cn"
1658+
"event_20220728_cn",
1659+
"event_20240229_cn"
16601660
],
16611661
"display": "hide",
16621662
"option_cn": [
@@ -1669,11 +1669,11 @@
16691669
"event_20240229_cn"
16701670
],
16711671
"option_tw": [
1672-
"event_20260226_cn"
1672+
"event_20220728_cn"
16731673
],
16741674
"option_bold": [
1675-
"event_20240229_cn",
1676-
"event_20260226_cn"
1675+
"event_20220728_cn",
1676+
"event_20240229_cn"
16771677
]
16781678
},
16791679
"Mode": {
@@ -1978,8 +1978,8 @@
19781978
"type": "state",
19791979
"value": "campaign_main",
19801980
"option": [
1981-
"event_20240229_cn",
1982-
"event_20260226_cn"
1981+
"event_20220728_cn",
1982+
"event_20240229_cn"
19831983
],
19841984
"option_cn": [
19851985
"event_20240229_cn"
@@ -1991,11 +1991,11 @@
19911991
"event_20240229_cn"
19921992
],
19931993
"option_tw": [
1994-
"event_20260226_cn"
1994+
"event_20220728_cn"
19951995
],
19961996
"option_bold": [
1997-
"event_20240229_cn",
1998-
"event_20260226_cn"
1997+
"event_20220728_cn",
1998+
"event_20240229_cn"
19991999
]
20002000
},
20012001
"Mode": {
@@ -2375,8 +2375,8 @@
23752375
"type": "state",
23762376
"value": "campaign_main",
23772377
"option": [
2378-
"event_20240229_cn",
2379-
"event_20260226_cn"
2378+
"event_20220728_cn",
2379+
"event_20240229_cn"
23802380
],
23812381
"option_cn": [
23822382
"event_20240229_cn"
@@ -2388,11 +2388,11 @@
23882388
"event_20240229_cn"
23892389
],
23902390
"option_tw": [
2391-
"event_20260226_cn"
2391+
"event_20220728_cn"
23922392
],
23932393
"option_bold": [
2394-
"event_20240229_cn",
2395-
"event_20260226_cn"
2394+
"event_20220728_cn",
2395+
"event_20240229_cn"
23962396
]
23972397
},
23982398
"Mode": {
@@ -4102,8 +4102,8 @@
41024102
"type": "state",
41034103
"value": "campaign_main",
41044104
"option": [
4105-
"event_20240229_cn",
4106-
"event_20260226_cn"
4105+
"event_20220728_cn",
4106+
"event_20240229_cn"
41074107
],
41084108
"option_cn": [
41094109
"event_20240229_cn"
@@ -4115,11 +4115,11 @@
41154115
"event_20240229_cn"
41164116
],
41174117
"option_tw": [
4118-
"event_20260226_cn"
4118+
"event_20220728_cn"
41194119
],
41204120
"option_bold": [
4121-
"event_20240229_cn",
4122-
"event_20260226_cn"
4121+
"event_20220728_cn",
4122+
"event_20240229_cn"
41234123
]
41244124
},
41254125
"Mode": {
@@ -4516,8 +4516,8 @@
45164516
"type": "state",
45174517
"value": "campaign_main",
45184518
"option": [
4519-
"event_20240229_cn",
4520-
"event_20260226_cn"
4519+
"event_20220728_cn",
4520+
"event_20240229_cn"
45214521
],
45224522
"option_cn": [
45234523
"event_20240229_cn"
@@ -4529,11 +4529,11 @@
45294529
"event_20240229_cn"
45304530
],
45314531
"option_tw": [
4532-
"event_20260226_cn"
4532+
"event_20220728_cn"
45334533
],
45344534
"option_bold": [
4535-
"event_20240229_cn",
4536-
"event_20260226_cn"
4535+
"event_20220728_cn",
4536+
"event_20240229_cn"
45374537
]
45384538
},
45394539
"Mode": {
@@ -4930,8 +4930,8 @@
49304930
"type": "state",
49314931
"value": "campaign_main",
49324932
"option": [
4933-
"event_20240229_cn",
4934-
"event_20260226_cn"
4933+
"event_20220728_cn",
4934+
"event_20240229_cn"
49354935
],
49364936
"option_cn": [
49374937
"event_20240229_cn"
@@ -4943,11 +4943,11 @@
49434943
"event_20240229_cn"
49444944
],
49454945
"option_tw": [
4946-
"event_20260226_cn"
4946+
"event_20220728_cn"
49474947
],
49484948
"option_bold": [
4949-
"event_20240229_cn",
4950-
"event_20260226_cn"
4949+
"event_20220728_cn",
4950+
"event_20240229_cn"
49514951
]
49524952
},
49534953
"Mode": {
@@ -5344,8 +5344,8 @@
53445344
"type": "state",
53455345
"value": "campaign_main",
53465346
"option": [
5347-
"event_20240229_cn",
5348-
"event_20260226_cn"
5347+
"event_20220728_cn",
5348+
"event_20240229_cn"
53495349
],
53505350
"option_cn": [
53515351
"event_20240229_cn"
@@ -5357,11 +5357,11 @@
53575357
"event_20240229_cn"
53585358
],
53595359
"option_tw": [
5360-
"event_20260226_cn"
5360+
"event_20220728_cn"
53615361
],
53625362
"option_bold": [
5363-
"event_20240229_cn",
5364-
"event_20260226_cn"
5363+
"event_20220728_cn",
5364+
"event_20240229_cn"
53655365
]
53665366
},
53675367
"Mode": {
@@ -5748,8 +5748,8 @@
57485748
"type": "state",
57495749
"value": "campaign_main",
57505750
"option": [
5751-
"event_20240229_cn",
5752-
"event_20260226_cn"
5751+
"event_20220728_cn",
5752+
"event_20240229_cn"
57535753
],
57545754
"option_cn": [
57555755
"event_20240229_cn"
@@ -5761,11 +5761,11 @@
57615761
"event_20240229_cn"
57625762
],
57635763
"option_tw": [
5764-
"event_20260226_cn"
5764+
"event_20220728_cn"
57655765
],
57665766
"option_bold": [
5767-
"event_20240229_cn",
5768-
"event_20260226_cn"
5767+
"event_20220728_cn",
5768+
"event_20240229_cn"
57695769
]
57705770
},
57715771
"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)