Skip to content

Commit

Permalink
Merge pull request #4503 from LmeSzinc/dev
Browse files Browse the repository at this point in the history
Add: event entrance for rerun event 20250109
LmeSzinc authored Jan 9, 2025
2 parents a36b82b + 40a9e90 commit 30e5ff1
Showing 10 changed files with 53 additions and 51 deletions.
1 change: 1 addition & 0 deletions campaign/Readme.md
Original file line number Diff line number Diff line change
@@ -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 20231221 cn | Light-Chasing Sea of Stars | - | - | - | 星海逐光 |
| 20250102 | raid 20240130 | Spring Festive Fiasco | - | - | - | 寰昌宇定家事忙 |
| 20250109 | event 20221222 cn | Parallel Superimposition Rerun | 复刻定向折叠 | Parallel Superimposition Rerun | 積重なる事象の幻界(復刻) | - |
2 changes: 1 addition & 1 deletion campaign/event_20221222_cn/a1.py
Original file line number Diff line number Diff line change
@@ -57,7 +57,7 @@ class Config:
MAP_HAS_MYSTERY = False
# ===== End of generated config =====

MAP_SIREN_HAS_BOSS_ICON = True
MAP_SIREN_HAS_BOSS_ICON_SMALL = True
INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
'height': (80, 255 - 33),
'width': (1.5, 10),
2 changes: 1 addition & 1 deletion campaign/event_20221222_cn/b1.py
Original file line number Diff line number Diff line change
@@ -58,7 +58,7 @@ class Config:
MAP_HAS_MYSTERY = False
# ===== End of generated config =====

MAP_SIREN_HAS_BOSS_ICON = True
MAP_SIREN_HAS_BOSS_ICON_SMALL = True
INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
'height': (80, 255 - 33),
'width': (1.5, 10),
2 changes: 1 addition & 1 deletion campaign/event_20221222_cn/c1.py
Original file line number Diff line number Diff line change
@@ -57,7 +57,7 @@ class Config:
MAP_HAS_MYSTERY = False
# ===== End of generated config =====

MAP_SIREN_HAS_BOSS_ICON = True
MAP_SIREN_HAS_BOSS_ICON_SMALL = True
INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
'height': (80, 255 - 24),
'width': (1.5, 10),
2 changes: 1 addition & 1 deletion campaign/event_20221222_cn/d1.py
Original file line number Diff line number Diff line change
@@ -58,7 +58,7 @@ class Config:
MAP_HAS_MYSTERY = False
# ===== End of generated config =====

MAP_SIREN_HAS_BOSS_ICON = True
MAP_SIREN_HAS_BOSS_ICON_SMALL = True
INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
'height': (80, 255 - 24),
'width': (1.5, 10),
80 changes: 40 additions & 40 deletions module/config/argument/args.json
Original file line number Diff line number Diff line change
@@ -1716,12 +1716,12 @@
],
"display": "hide",
"option_bold": [
"event_20231221_cn",
"event_20241219_cn"
"event_20221222_cn",
"event_20231221_cn"
],
"cn": "event_20241219_cn",
"en": "event_20241219_cn",
"jp": "event_20241219_cn",
"cn": "event_20221222_cn",
"en": "event_20221222_cn",
"jp": "event_20221222_cn",
"tw": "event_20231221_cn"
},
"Mode": {
@@ -2058,12 +2058,12 @@
"event_20241219_cn"
],
"option_bold": [
"event_20231221_cn",
"event_20241219_cn"
"event_20221222_cn",
"event_20231221_cn"
],
"cn": "event_20241219_cn",
"en": "event_20241219_cn",
"jp": "event_20241219_cn",
"cn": "event_20221222_cn",
"en": "event_20221222_cn",
"jp": "event_20221222_cn",
"tw": "event_20231221_cn"
},
"Mode": {
@@ -2515,12 +2515,12 @@
"event_20241219_cn"
],
"option_bold": [
"event_20231221_cn",
"event_20241219_cn"
"event_20221222_cn",
"event_20231221_cn"
],
"cn": "event_20241219_cn",
"en": "event_20241219_cn",
"jp": "event_20241219_cn",
"cn": "event_20221222_cn",
"en": "event_20221222_cn",
"jp": "event_20221222_cn",
"tw": "event_20231221_cn"
},
"Mode": {
@@ -3935,12 +3935,12 @@
"event_20241219_cn"
],
"option_bold": [
"event_20231221_cn",
"event_20241219_cn"
"event_20221222_cn",
"event_20231221_cn"
],
"cn": "event_20241219_cn",
"en": "event_20241219_cn",
"jp": "event_20241219_cn",
"cn": "event_20221222_cn",
"en": "event_20221222_cn",
"jp": "event_20221222_cn",
"tw": "event_20231221_cn"
},
"Mode": {
@@ -4409,12 +4409,12 @@
"event_20241219_cn"
],
"option_bold": [
"event_20231221_cn",
"event_20241219_cn"
"event_20221222_cn",
"event_20231221_cn"
],
"cn": "event_20241219_cn",
"en": "event_20241219_cn",
"jp": "event_20241219_cn",
"cn": "event_20221222_cn",
"en": "event_20221222_cn",
"jp": "event_20221222_cn",
"tw": "event_20231221_cn"
},
"Mode": {
@@ -4883,12 +4883,12 @@
"event_20241219_cn"
],
"option_bold": [
"event_20231221_cn",
"event_20241219_cn"
"event_20221222_cn",
"event_20231221_cn"
],
"cn": "event_20241219_cn",
"en": "event_20241219_cn",
"jp": "event_20241219_cn",
"cn": "event_20221222_cn",
"en": "event_20221222_cn",
"jp": "event_20221222_cn",
"tw": "event_20231221_cn"
},
"Mode": {
@@ -5357,12 +5357,12 @@
"event_20241219_cn"
],
"option_bold": [
"event_20231221_cn",
"event_20241219_cn"
"event_20221222_cn",
"event_20231221_cn"
],
"cn": "event_20241219_cn",
"en": "event_20241219_cn",
"jp": "event_20241219_cn",
"cn": "event_20221222_cn",
"en": "event_20221222_cn",
"jp": "event_20221222_cn",
"tw": "event_20231221_cn"
},
"Mode": {
@@ -5821,12 +5821,12 @@
"event_20241219_cn"
],
"option_bold": [
"event_20231221_cn",
"event_20241219_cn"
"event_20221222_cn",
"event_20231221_cn"
],
"cn": "event_20241219_cn",
"en": "event_20241219_cn",
"jp": "event_20241219_cn",
"cn": "event_20221222_cn",
"en": "event_20221222_cn",
"jp": "event_20221222_cn",
"tw": "event_20231221_cn"
},
"Mode": {
2 changes: 1 addition & 1 deletion module/config/i18n/en-US.json
Original file line number Diff line number Diff line change
@@ -721,7 +721,7 @@
"event_20220818_cn": "Operation Convergence",
"event_20220915_cn": "Violet Tempest Blooming Lycoris Rerun",
"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_20230525_cn": "Confluence of Nothingness",
"event_20230803_cn": "Anthem of Remembrance",
2 changes: 1 addition & 1 deletion module/config/i18n/ja-JP.json
Original file line number Diff line number Diff line change
@@ -721,7 +721,7 @@
"event_20220818_cn": "結像点作戦",
"event_20220915_cn": "赫の涙月 菫の暁風(復刻)",
"event_20221124_cn": "錬金術士と謎の遺跡群島",
"event_20221222_cn": "積重なる事象の幻界",
"event_20221222_cn": "積重なる事象の幻界(復刻)",
"event_20230223_cn": "黙示の遺構",
"event_20230525_cn": "覆天せし万象の塵",
"event_20230803_cn": "燃ゆる聖都の回想曲",
2 changes: 1 addition & 1 deletion module/config/i18n/zh-CN.json
Original file line number Diff line number Diff line change
@@ -721,7 +721,7 @@
"event_20220818_cn": "远汇点作战",
"event_20220915_cn": "复刻紫绛槿岚",
"event_20221124_cn": "炼金术士与秘密遗迹群岛",
"event_20221222_cn": "定向折叠",
"event_20221222_cn": "复刻定向折叠",
"event_20230223_cn": "湮烬尘墟",
"event_20230525_cn": "空相交汇点",
"event_20230803_cn": "奏响鸢尾之歌",
9 changes: 5 additions & 4 deletions module/os_shop/shop.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from module.base.decorator import cached_property
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.exception import GameStuckError, ScriptError
from module.logger import logger
@@ -23,10 +24,10 @@ def os_shop_buy_execute(self, button, skip_first_screenshot=True) -> bool:
"""
success = False
amount_finish = False
self.interval_clear(PORT_SUPPLY_CHECK)
self.interval_clear(SHOP_BUY_CONFIRM)
self.interval_clear(SHOP_BUY_CONFIRM_AMOUNT)
self.interval_clear(OS_SHOP_BUY_CONFIRM)
self.interval_clear([
PORT_SUPPLY_CHECK, SHOP_BUY_CONFIRM_AMOUNT,
SHOP_BUY_CONFIRM, OS_SHOP_BUY_CONFIRM, GET_ITEMS_1
])

while True:
if skip_first_screenshot:

0 comments on commit 30e5ff1

Please sign in to comment.