sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-12 03:58:22 +08:00
Code Activity

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

Browse Source
This commit is contained in:
GH Action - Upstream Sync
2024-11-06 12:38:41 +00:00
parent 81a95fcfcd 1889ab1ac6
commit acaecd33b0
5 changed files with 39 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1769,13 +1769,13 @@
],
"display": "hide",
"option_bold": [
"event_20230914_cn",
"event_20240829_cn",
"event_20241024_cn"
],
"cn": "event_20241024_cn",
"en": "event_20241024_cn",
"jp": "event_20241024_cn",
"tw": "event_20230914_cn"
"tw": "event_20240829_cn"
},
"Mode": {
"type": "select",
@@ -2197,13 +2197,13 @@
"event_20241024_cn"
],
"option_bold": [
"event_20230914_cn",
"event_20240829_cn",
"event_20241024_cn"
],
"cn": "event_20241024_cn",
"en": "event_20241024_cn",
"jp": "event_20241024_cn",
"tw": "event_20230914_cn"
"tw": "event_20240829_cn"
},
"Mode": {
"type": "select",
@@ -2660,13 +2660,13 @@
"event_20241024_cn"
],
"option_bold": [
"event_20230914_cn",
"event_20240829_cn",
"event_20241024_cn"
],
"cn": "event_20241024_cn",
"en": "event_20241024_cn",
"jp": "event_20241024_cn",
"tw": "event_20230914_cn"
"tw": "event_20240829_cn"
},
"Mode": {
"type": "select",
@@ -4109,13 +4109,13 @@
"event_20241024_cn"
],
"option_bold": [
"event_20230914_cn",
"event_20240829_cn",
"event_20241024_cn"
],
"cn": "event_20241024_cn",
"en": "event_20241024_cn",
"jp": "event_20241024_cn",
"tw": "event_20230914_cn"
"tw": "event_20240829_cn"
},
"Mode": {
"type": "select",
@@ -4589,13 +4589,13 @@
"event_20241024_cn"
],
"option_bold": [
"event_20230914_cn",
"event_20240829_cn",
"event_20241024_cn"
],
"cn": "event_20241024_cn",
"en": "event_20241024_cn",
"jp": "event_20241024_cn",
"tw": "event_20230914_cn"
"tw": "event_20240829_cn"
},
"Mode": {
"type": "select",
@@ -5069,13 +5069,13 @@
"event_20241024_cn"
],
"option_bold": [
"event_20230914_cn",
"event_20240829_cn",
"event_20241024_cn"
],
"cn": "event_20241024_cn",
"en": "event_20241024_cn",
"jp": "event_20241024_cn",
"tw": "event_20230914_cn"
"tw": "event_20240829_cn"
},
"Mode": {
"type": "select",
@@ -5549,13 +5549,13 @@
"event_20241024_cn"
],
"option_bold": [
"event_20230914_cn",
"event_20240829_cn",
"event_20241024_cn"
],
"cn": "event_20241024_cn",
"en": "event_20241024_cn",
"jp": "event_20241024_cn",
"tw": "event_20230914_cn"
"tw": "event_20240829_cn"
},
"Mode": {
"type": "select",
@@ -6019,13 +6019,13 @@
"event_20241024_cn"
],
"option_bold": [
"event_20230914_cn",
"event_20240829_cn",
"event_20241024_cn"
],
"cn": "event_20241024_cn",
"en": "event_20241024_cn",
"jp": "event_20241024_cn",
"tw": "event_20230914_cn"
"tw": "event_20240829_cn"
},
"Mode": {
"type": "select",

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

@@ -735,7 +735,7 @@
"event_20240521_cn": "Light of the Martyrium",
"event_20240725_cn": "Interlude of Illusions",
"event_20240815_cn": "Windborne Steel Wings",
"event_20240829_cn": "Whence Flowers Bear No Fruit",
"event_20240829_cn": "埋葬於彼岸之花",
"event_20240912_cn": "Ode of Everblooming Crimson",
"event_20241024_cn": "Tempesta and the Sleeping Sea",
"raid_20200624": "特別演習埃塞克斯級(復刻)",

4
module/tactical/tactical_class.py
View File

@@ -449,12 +449,16 @@ class RewardTacticalClass(Dock):
# Popups
if self.appear_then_click(REWARD_2, offset=(20, 20), interval=3):
self.interval_reset(REWARD_2_WHITE)
continue
if self.appear_then_click(REWARD_2_WHITE, offset=(20, 20), interval=3):
self.interval_reset(REWARD_2)
continue
if self.appear_then_click(REWARD_GOTO_TACTICAL, offset=(20, 20), interval=3):
self.interval_reset(REWARD_GOTO_TACTICAL_WHITE)
continue
if self.appear_then_click(REWARD_GOTO_TACTICAL_WHITE, offset=(20, 20), interval=3):
self.interval_reset(REWARD_GOTO_TACTICAL)
continue
if self.ui_main_appear_then_click(page_reward, interval=3):
continue