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

Merge pull request #4503 from LmeSzinc/dev

Browse Source 
Add: event entrance for rerun event 20250109
This commit is contained in:
LmeSzinc
2025-01-09 22:36:04 +08:00
committed by GitHub
parent a36b82b227 40a9e901e2
commit 30e5ff10cb
10 changed files with 53 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
campaign/Readme.md
View File

@@ -226,3 +226,4 @@ To add a new event, add a new row in here, and run `python -m module.config.conf
| 20241219 | event 20241219 cn | Substellar Crepuscule | 星光下的余晖 | Substellar Crepuscule | 星降る夕影の残光 | - | | 20241219 | event 20241219 cn | Substellar Crepuscule | 星光下的余晖 | Substellar Crepuscule | 星降る夕影の残光 | - |
| 20241219 | event 20231221 cn | Light-Chasing Sea of Stars | - | - | - | 星海逐光 | | 20241219 | event 20231221 cn | Light-Chasing Sea of Stars | - | - | - | 星海逐光 |
| 20250102 | raid 20240130 | Spring Festive Fiasco | - | - | - | 寰昌宇定家事忙 | | 20250102 | raid 20240130 | Spring Festive Fiasco | - | - | - | 寰昌宇定家事忙 |
| 20250109 | event 20221222 cn | Parallel Superimposition Rerun | 复刻定向折叠 | Parallel Superimposition Rerun | 積重なる事象の幻界（復刻） | - |

2
campaign/event_20221222_cn/a1.py
View File

@@ -57,7 +57,7 @@ class Config:
MAP_HAS_MYSTERY = False MAP_HAS_MYSTERY = False
# ===== End of generated config ===== # ===== End of generated config =====
MAP_SIREN_HAS_BOSS_ICON = True MAP_SIREN_HAS_BOSS_ICON_SMALL = True
INTERNAL_LINES_FIND_PEAKS_PARAMETERS = { INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
'height': (80, 255 - 33), 'height': (80, 255 - 33),
'width': (1.5, 10), 'width': (1.5, 10),

2
campaign/event_20221222_cn/b1.py
View File

@@ -58,7 +58,7 @@ class Config:
MAP_HAS_MYSTERY = False MAP_HAS_MYSTERY = False
# ===== End of generated config ===== # ===== End of generated config =====
MAP_SIREN_HAS_BOSS_ICON = True MAP_SIREN_HAS_BOSS_ICON_SMALL = True
INTERNAL_LINES_FIND_PEAKS_PARAMETERS = { INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
'height': (80, 255 - 33), 'height': (80, 255 - 33),
'width': (1.5, 10), 'width': (1.5, 10),

2
campaign/event_20221222_cn/c1.py
View File

@@ -57,7 +57,7 @@ class Config:
MAP_HAS_MYSTERY = False MAP_HAS_MYSTERY = False
# ===== End of generated config ===== # ===== End of generated config =====
MAP_SIREN_HAS_BOSS_ICON = True MAP_SIREN_HAS_BOSS_ICON_SMALL = True
INTERNAL_LINES_FIND_PEAKS_PARAMETERS = { INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
'height': (80, 255 - 24), 'height': (80, 255 - 24),
'width': (1.5, 10), 'width': (1.5, 10),

2
campaign/event_20221222_cn/d1.py
View File

@@ -58,7 +58,7 @@ class Config:
MAP_HAS_MYSTERY = False MAP_HAS_MYSTERY = False
# ===== End of generated config ===== # ===== End of generated config =====
MAP_SIREN_HAS_BOSS_ICON = True MAP_SIREN_HAS_BOSS_ICON_SMALL = True
INTERNAL_LINES_FIND_PEAKS_PARAMETERS = { INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
'height': (80, 255 - 24), 'height': (80, 255 - 24),
'width': (1.5, 10), 'width': (1.5, 10),

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

@@ -1716,12 +1716,12 @@
], ],
"display": "hide", "display": "hide",
"option_bold": [ "option_bold": [
"event_20231221_cn", "event_20221222_cn",
"event_20241219_cn" "event_20231221_cn"
], ],
"cn": "event_20241219_cn", "cn": "event_20221222_cn",
"en": "event_20241219_cn", "en": "event_20221222_cn",
"jp": "event_20241219_cn", "jp": "event_20221222_cn",
"tw": "event_20231221_cn" "tw": "event_20231221_cn"
}, },
"Mode": { "Mode": {
@@ -2058,12 +2058,12 @@
"event_20241219_cn" "event_20241219_cn"
], ],
"option_bold": [ "option_bold": [
"event_20231221_cn", "event_20221222_cn",
"event_20241219_cn" "event_20231221_cn"
], ],
"cn": "event_20241219_cn", "cn": "event_20221222_cn",
"en": "event_20241219_cn", "en": "event_20221222_cn",
"jp": "event_20241219_cn", "jp": "event_20221222_cn",
"tw": "event_20231221_cn" "tw": "event_20231221_cn"
}, },
"Mode": { "Mode": {
@@ -2515,12 +2515,12 @@
"event_20241219_cn" "event_20241219_cn"
], ],
"option_bold": [ "option_bold": [
"event_20231221_cn", "event_20221222_cn",
"event_20241219_cn" "event_20231221_cn"
], ],
"cn": "event_20241219_cn", "cn": "event_20221222_cn",
"en": "event_20241219_cn", "en": "event_20221222_cn",
"jp": "event_20241219_cn", "jp": "event_20221222_cn",
"tw": "event_20231221_cn" "tw": "event_20231221_cn"
}, },
"Mode": { "Mode": {
@@ -3935,12 +3935,12 @@
"event_20241219_cn" "event_20241219_cn"
], ],
"option_bold": [ "option_bold": [
"event_20231221_cn", "event_20221222_cn",
"event_20241219_cn" "event_20231221_cn"
], ],
"cn": "event_20241219_cn", "cn": "event_20221222_cn",
"en": "event_20241219_cn", "en": "event_20221222_cn",
"jp": "event_20241219_cn", "jp": "event_20221222_cn",
"tw": "event_20231221_cn" "tw": "event_20231221_cn"
}, },
"Mode": { "Mode": {
@@ -4409,12 +4409,12 @@
"event_20241219_cn" "event_20241219_cn"
], ],
"option_bold": [ "option_bold": [
"event_20231221_cn", "event_20221222_cn",
"event_20241219_cn" "event_20231221_cn"
], ],
"cn": "event_20241219_cn", "cn": "event_20221222_cn",
"en": "event_20241219_cn", "en": "event_20221222_cn",
"jp": "event_20241219_cn", "jp": "event_20221222_cn",
"tw": "event_20231221_cn" "tw": "event_20231221_cn"
}, },
"Mode": { "Mode": {
@@ -4883,12 +4883,12 @@
"event_20241219_cn" "event_20241219_cn"
], ],
"option_bold": [ "option_bold": [
"event_20231221_cn", "event_20221222_cn",
"event_20241219_cn" "event_20231221_cn"
], ],
"cn": "event_20241219_cn", "cn": "event_20221222_cn",
"en": "event_20241219_cn", "en": "event_20221222_cn",
"jp": "event_20241219_cn", "jp": "event_20221222_cn",
"tw": "event_20231221_cn" "tw": "event_20231221_cn"
}, },
"Mode": { "Mode": {
@@ -5357,12 +5357,12 @@
"event_20241219_cn" "event_20241219_cn"
], ],
"option_bold": [ "option_bold": [
"event_20231221_cn", "event_20221222_cn",
"event_20241219_cn" "event_20231221_cn"
], ],
"cn": "event_20241219_cn", "cn": "event_20221222_cn",
"en": "event_20241219_cn", "en": "event_20221222_cn",
"jp": "event_20241219_cn", "jp": "event_20221222_cn",
"tw": "event_20231221_cn" "tw": "event_20231221_cn"
}, },
"Mode": { "Mode": {
@@ -5821,12 +5821,12 @@
"event_20241219_cn" "event_20241219_cn"
], ],
"option_bold": [ "option_bold": [
"event_20231221_cn", "event_20221222_cn",
"event_20241219_cn" "event_20231221_cn"
], ],
"cn": "event_20241219_cn", "cn": "event_20221222_cn",
"en": "event_20241219_cn", "en": "event_20221222_cn",
"jp": "event_20241219_cn", "jp": "event_20221222_cn",
"tw": "event_20231221_cn" "tw": "event_20231221_cn"
}, },
"Mode": { "Mode": {

2
module/config/i18n/en-US.json
View File

@@ -721,7 +721,7 @@
"event_20220818_cn": "Operation Convergence", "event_20220818_cn": "Operation Convergence",
"event_20220915_cn": "Violet Tempest Blooming Lycoris Rerun", "event_20220915_cn": "Violet Tempest Blooming Lycoris Rerun",
"event_20221124_cn": "The Alchemist and the Archipelago of Secrets", "event_20221124_cn": "The Alchemist and the Archipelago of Secrets",
"event_20221222_cn": "Parallel Superimposition", "event_20221222_cn": "Parallel Superimposition Rerun",
"event_20230223_cn": "Revelations of Dust", "event_20230223_cn": "Revelations of Dust",
"event_20230525_cn": "Confluence of Nothingness", "event_20230525_cn": "Confluence of Nothingness",
"event_20230803_cn": "Anthem of Remembrance", "event_20230803_cn": "Anthem of Remembrance",

2
module/config/i18n/ja-JP.json
View File

@@ -721,7 +721,7 @@
"event_20220818_cn": "結像点作戦", "event_20220818_cn": "結像点作戦",
"event_20220915_cn": "赫の涙月 菫の暁風（復刻）", "event_20220915_cn": "赫の涙月 菫の暁風（復刻）",
"event_20221124_cn": "錬金術士と謎の遺跡群島", "event_20221124_cn": "錬金術士と謎の遺跡群島",
"event_20221222_cn": "積重なる事象の幻界", "event_20221222_cn": "積重なる事象の幻界（復刻）",
"event_20230223_cn": "黙示の遺構", "event_20230223_cn": "黙示の遺構",
"event_20230525_cn": "覆天せし万象の塵", "event_20230525_cn": "覆天せし万象の塵",
"event_20230803_cn": "燃ゆる聖都の回想曲", "event_20230803_cn": "燃ゆる聖都の回想曲",

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

@@ -721,7 +721,7 @@
"event_20220818_cn": "远汇点作战", "event_20220818_cn": "远汇点作战",
"event_20220915_cn": "复刻紫绛槿岚", "event_20220915_cn": "复刻紫绛槿岚",
"event_20221124_cn": "炼金术士与秘密遗迹群岛", "event_20221124_cn": "炼金术士与秘密遗迹群岛",
"event_20221222_cn": "定向折叠", "event_20221222_cn": "复刻定向折叠",
"event_20230223_cn": "湮烬尘墟", "event_20230223_cn": "湮烬尘墟",
"event_20230525_cn": "空相交汇点", "event_20230525_cn": "空相交汇点",
"event_20230803_cn": "奏响鸢尾之歌", "event_20230803_cn": "奏响鸢尾之歌",

9
module/os_shop/shop.py
View File

@@ -1,5 +1,6 @@
from module.base.decorator import cached_property from module.base.decorator import cached_property
from module.base.timer import Timer from module.base.timer import Timer
from module.combat.assets import GET_ITEMS_1
from module.config.utils import get_os_reset_remain from module.config.utils import get_os_reset_remain
from module.exception import GameStuckError, ScriptError from module.exception import GameStuckError, ScriptError
from module.logger import logger from module.logger import logger
@@ -23,10 +24,10 @@ class OSShop(PortShop, AkashiShop):
""" """
success = False success = False
amount_finish = False amount_finish = False
self.interval_clear(PORT_SUPPLY_CHECK) self.interval_clear([
self.interval_clear(SHOP_BUY_CONFIRM) PORT_SUPPLY_CHECK, SHOP_BUY_CONFIRM_AMOUNT,
self.interval_clear(SHOP_BUY_CONFIRM_AMOUNT) SHOP_BUY_CONFIRM, OS_SHOP_BUY_CONFIRM, GET_ITEMS_1
self.interval_clear(OS_SHOP_BUY_CONFIRM) ])
while True: while True:
if skip_first_screenshot: if skip_first_screenshot: