sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-24 14:49:05 +08:00
Code Activity

Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript

Browse Source
This commit is contained in:
GH Action - Upstream Sync
2026-03-23 11:01:32 +00:00
parent 74e6fd021a 3bd8a21d3b
commit 37ef364631
4 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
campaign/Readme.md
View File

@@ -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 | 新春玉逸品会 | 春宴懷玉香滿庭 | | 20260212 | raid 20260212 | Spring Auction Adventure | 春宴怀玉香满庭 | Spring Auction Adventure | 新春玉逸品会 | 春宴懷玉香滿庭 |
| 20260226 | event 20260226 cn | Springtide Inn Online | 春满客栈Online | Springtide Inn Online | 春色旅籠Online | 春滿客棧Online | | 20260226 | event 20260226 cn | Springtide Inn Online | 春满客栈Online | Springtide Inn Online | 春色旅籠Online | 春滿客棧Online |
| 20260312 | event 20240229 cn | Snowrealm Peregrination Rerun | 复刻雪境迷踪 | Snowrealm Peregrination Rerun | 銀界遊廻（復刻） | - | | 20260312 | event 20240229 cn | Snowrealm Peregrination Rerun | 复刻雪境迷踪 | Snowrealm Peregrination Rerun | 銀界遊廻（復刻） | - |
| 20260319 | event 20220728 cn | Aquilifer's Ballade | - | - | - | 復刻雄鷹的敘事歌 |

80
module/config/argument/args.json
View File

@@ -1966,8 +1966,8 @@
"type": "select", "type": "select",
"value": "campaign_main", "value": "campaign_main",
"option": [ "option": [
"event_20240229_cn", "event_20220728_cn",
"event_20260226_cn" "event_20240229_cn"
], ],
"display": "hide", "display": "hide",
"option_cn": [ "option_cn": [
@@ -1980,11 +1980,11 @@
"event_20240229_cn" "event_20240229_cn"
], ],
"option_tw": [ "option_tw": [
"event_20260226_cn" "event_20220728_cn"
], ],
"option_bold": [ "option_bold": [
"event_20240229_cn", "event_20220728_cn",
"event_20260226_cn" "event_20240229_cn"
] ]
}, },
"Mode": { "Mode": {
@@ -2387,8 +2387,8 @@
"type": "state", "type": "state",
"value": "campaign_main", "value": "campaign_main",
"option": [ "option": [
"event_20240229_cn", "event_20220728_cn",
"event_20260226_cn" "event_20240229_cn"
], ],
"option_cn": [ "option_cn": [
"event_20240229_cn" "event_20240229_cn"
@@ -2400,11 +2400,11 @@
"event_20240229_cn" "event_20240229_cn"
], ],
"option_tw": [ "option_tw": [
"event_20260226_cn" "event_20220728_cn"
], ],
"option_bold": [ "option_bold": [
"event_20240229_cn", "event_20220728_cn",
"event_20260226_cn" "event_20240229_cn"
] ]
}, },
"Mode": { "Mode": {
@@ -2801,8 +2801,8 @@
"type": "state", "type": "state",
"value": "campaign_main", "value": "campaign_main",
"option": [ "option": [
"event_20240229_cn", "event_20220728_cn",
"event_20260226_cn" "event_20240229_cn"
], ],
"option_cn": [ "option_cn": [
"event_20240229_cn" "event_20240229_cn"
@@ -2814,11 +2814,11 @@
"event_20240229_cn" "event_20240229_cn"
], ],
"option_tw": [ "option_tw": [
"event_20260226_cn" "event_20220728_cn"
], ],
"option_bold": [ "option_bold": [
"event_20240229_cn", "event_20220728_cn",
"event_20260226_cn" "event_20240229_cn"
] ]
}, },
"Mode": { "Mode": {
@@ -4608,8 +4608,8 @@
"type": "state", "type": "state",
"value": "campaign_main", "value": "campaign_main",
"option": [ "option": [
"event_20240229_cn", "event_20220728_cn",
"event_20260226_cn" "event_20240229_cn"
], ],
"option_cn": [ "option_cn": [
"event_20240229_cn" "event_20240229_cn"
@@ -4621,11 +4621,11 @@
"event_20240229_cn" "event_20240229_cn"
], ],
"option_tw": [ "option_tw": [
"event_20260226_cn" "event_20220728_cn"
], ],
"option_bold": [ "option_bold": [
"event_20240229_cn", "event_20220728_cn",
"event_20260226_cn" "event_20240229_cn"
] ]
}, },
"Mode": { "Mode": {
@@ -5040,8 +5040,8 @@
"type": "state", "type": "state",
"value": "campaign_main", "value": "campaign_main",
"option": [ "option": [
"event_20240229_cn", "event_20220728_cn",
"event_20260226_cn" "event_20240229_cn"
], ],
"option_cn": [ "option_cn": [
"event_20240229_cn" "event_20240229_cn"
@@ -5053,11 +5053,11 @@
"event_20240229_cn" "event_20240229_cn"
], ],
"option_tw": [ "option_tw": [
"event_20260226_cn" "event_20220728_cn"
], ],
"option_bold": [ "option_bold": [
"event_20240229_cn", "event_20220728_cn",
"event_20260226_cn" "event_20240229_cn"
] ]
}, },
"Mode": { "Mode": {
@@ -5472,8 +5472,8 @@
"type": "state", "type": "state",
"value": "campaign_main", "value": "campaign_main",
"option": [ "option": [
"event_20240229_cn", "event_20220728_cn",
"event_20260226_cn" "event_20240229_cn"
], ],
"option_cn": [ "option_cn": [
"event_20240229_cn" "event_20240229_cn"
@@ -5485,11 +5485,11 @@
"event_20240229_cn" "event_20240229_cn"
], ],
"option_tw": [ "option_tw": [
"event_20260226_cn" "event_20220728_cn"
], ],
"option_bold": [ "option_bold": [
"event_20240229_cn", "event_20220728_cn",
"event_20260226_cn" "event_20240229_cn"
] ]
}, },
"Mode": { "Mode": {
@@ -5904,8 +5904,8 @@
"type": "state", "type": "state",
"value": "campaign_main", "value": "campaign_main",
"option": [ "option": [
"event_20240229_cn", "event_20220728_cn",
"event_20260226_cn" "event_20240229_cn"
], ],
"option_cn": [ "option_cn": [
"event_20240229_cn" "event_20240229_cn"
@@ -5917,11 +5917,11 @@
"event_20240229_cn" "event_20240229_cn"
], ],
"option_tw": [ "option_tw": [
"event_20260226_cn" "event_20220728_cn"
], ],
"option_bold": [ "option_bold": [
"event_20240229_cn", "event_20220728_cn",
"event_20260226_cn" "event_20240229_cn"
] ]
}, },
"Mode": { "Mode": {
@@ -6326,8 +6326,8 @@
"type": "state", "type": "state",
"value": "campaign_main", "value": "campaign_main",
"option": [ "option": [
"event_20240229_cn", "event_20220728_cn",
"event_20260226_cn" "event_20240229_cn"
], ],
"option_cn": [ "option_cn": [
"event_20240229_cn" "event_20240229_cn"
@@ -6339,11 +6339,11 @@
"event_20240229_cn" "event_20240229_cn"
], ],
"option_tw": [ "option_tw": [
"event_20260226_cn" "event_20220728_cn"
], ],
"option_bold": [ "option_bold": [
"event_20240229_cn", "event_20220728_cn",
"event_20260226_cn" "event_20240229_cn"
] ]
}, },
"Mode": { "Mode": {

2
module/config/i18n/zh-TW.json
View File

@@ -765,7 +765,7 @@
"event_20220414_cn": "復刻-永夜幻光", "event_20220414_cn": "復刻-永夜幻光",
"event_20220428_cn": "復刻虹彩的終幕曲", "event_20220428_cn": "復刻虹彩的終幕曲",
"event_20220526_cn": "泠誓光庭", "event_20220526_cn": "泠誓光庭",
"event_20220728_cn": "雄鷹的敘事歌", "event_20220728_cn": "復刻雄鷹的敘事歌",
"event_20220818_cn": "遠匯點作戰", "event_20220818_cn": "遠匯點作戰",
"event_20220915_cn": "紫絳槿嵐", "event_20220915_cn": "紫絳槿嵐",
"event_20221124_cn": "復刻鍊金術士與秘密遺跡群島", "event_20221124_cn": "復刻鍊金術士與秘密遺跡群島",

9
module/tactical/tactical_class.py
View File

@@ -373,7 +373,7 @@ class RewardTacticalClass(Dock):
if self.appear(RAPID_TRAINING, offset=offset, interval=1): if self.appear(RAPID_TRAINING, offset=offset, interval=1):
self.device.click(RAPID_TRAINING) self.device.click(RAPID_TRAINING)
# Clear interval to enter _tactical_books_choose fast # 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 True
return False return False
@@ -444,7 +444,7 @@ class RewardTacticalClass(Dock):
# Get finish time # Get finish time
# sometimes you have TACTICAL_CHECK without black-blurred background # sometimes you have TACTICAL_CHECK without black-blurred background
# TACTICAL_CLASS_CANCEL and TACTICAL_CHECK appears # 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): and self.appear(TACTICAL_CHECK, offset=(20, 20), interval=2):
self.interval_clear([POPUP_CONFIRM, POPUP_CANCEL, GET_MISSION]) self.interval_clear([POPUP_CONFIRM, POPUP_CANCEL, GET_MISSION])
if book_empty: if book_empty:
@@ -495,11 +495,10 @@ class RewardTacticalClass(Dock):
if self.appear(MISSION_POPUP_GO, offset=self._popup_offset, interval=2): if self.appear(MISSION_POPUP_GO, offset=self._popup_offset, interval=2):
self.device.click(MISSION_POPUP_ACK) self.device.click(MISSION_POPUP_ACK)
continue continue
if self.appear(TACTICAL_CLASS_CANCEL, offset=(30, 30), interval=2) \ if self.appear(TACTICAL_CLASS_START, offset=(30, 30), interval=2):
and self.appear(TACTICAL_CLASS_START, offset=(30, 30)):
if self._tactical_books_choose(): if self._tactical_books_choose():
self.dock_select_index = 0 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]) self.interval_clear([POPUP_CONFIRM, POPUP_CANCEL, GET_MISSION])
else: else:
study_finished = True study_finished = True