Skip to content

Commit 30e5ff1

Browse files
LmeSzincLmeSzinc
authored
Merge pull request #4503 from LmeSzinc/dev
Add: event entrance for rerun event 20250109
2 parents a36b82b + 40a9e90 commit 30e5ff1

10 files changed

Lines changed: 53 additions & 51 deletions

File tree

‎campaign/Readme.md‎

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

‎campaign/event_20221222_cn/a1.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class Config:
5757
MAP_HAS_MYSTERY = False
5858
# ===== End of generated config =====
5959

60-
MAP_SIREN_HAS_BOSS_ICON = True
60+
MAP_SIREN_HAS_BOSS_ICON_SMALL = True
6161
INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
6262
'height': (80, 255 - 33),
6363
'width': (1.5, 10),

‎campaign/event_20221222_cn/b1.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class Config:
5858
MAP_HAS_MYSTERY = False
5959
# ===== End of generated config =====
6060

61-
MAP_SIREN_HAS_BOSS_ICON = True
61+
MAP_SIREN_HAS_BOSS_ICON_SMALL = True
6262
INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
6363
'height': (80, 255 - 33),
6464
'width': (1.5, 10),

‎campaign/event_20221222_cn/c1.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class Config:
5757
MAP_HAS_MYSTERY = False
5858
# ===== End of generated config =====
5959

60-
MAP_SIREN_HAS_BOSS_ICON = True
60+
MAP_SIREN_HAS_BOSS_ICON_SMALL = True
6161
INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
6262
'height': (80, 255 - 24),
6363
'width': (1.5, 10),

‎campaign/event_20221222_cn/d1.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class Config:
5858
MAP_HAS_MYSTERY = False
5959
# ===== End of generated config =====
6060

61-
MAP_SIREN_HAS_BOSS_ICON = True
61+
MAP_SIREN_HAS_BOSS_ICON_SMALL = True
6262
INTERNAL_LINES_FIND_PEAKS_PARAMETERS = {
6363
'height': (80, 255 - 24),
6464
'width': (1.5, 10),

‎module/config/argument/args.json‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1716,12 +1716,12 @@
17161716
],
17171717
"display": "hide",
17181718
"option_bold": [
1719-
"event_20231221_cn",
1720-
"event_20241219_cn"
1719+
"event_20221222_cn",
1720+
"event_20231221_cn"
17211721
],
1722-
"cn": "event_20241219_cn",
1723-
"en": "event_20241219_cn",
1724-
"jp": "event_20241219_cn",
1722+
"cn": "event_20221222_cn",
1723+
"en": "event_20221222_cn",
1724+
"jp": "event_20221222_cn",
17251725
"tw": "event_20231221_cn"
17261726
},
17271727
"Mode": {
@@ -2058,12 +2058,12 @@
20582058
"event_20241219_cn"
20592059
],
20602060
"option_bold": [
2061-
"event_20231221_cn",
2062-
"event_20241219_cn"
2061+
"event_20221222_cn",
2062+
"event_20231221_cn"
20632063
],
2064-
"cn": "event_20241219_cn",
2065-
"en": "event_20241219_cn",
2066-
"jp": "event_20241219_cn",
2064+
"cn": "event_20221222_cn",
2065+
"en": "event_20221222_cn",
2066+
"jp": "event_20221222_cn",
20672067
"tw": "event_20231221_cn"
20682068
},
20692069
"Mode": {
@@ -2515,12 +2515,12 @@
25152515
"event_20241219_cn"
25162516
],
25172517
"option_bold": [
2518-
"event_20231221_cn",
2519-
"event_20241219_cn"
2518+
"event_20221222_cn",
2519+
"event_20231221_cn"
25202520
],
2521-
"cn": "event_20241219_cn",
2522-
"en": "event_20241219_cn",
2523-
"jp": "event_20241219_cn",
2521+
"cn": "event_20221222_cn",
2522+
"en": "event_20221222_cn",
2523+
"jp": "event_20221222_cn",
25242524
"tw": "event_20231221_cn"
25252525
},
25262526
"Mode": {
@@ -3935,12 +3935,12 @@
39353935
"event_20241219_cn"
39363936
],
39373937
"option_bold": [
3938-
"event_20231221_cn",
3939-
"event_20241219_cn"
3938+
"event_20221222_cn",
3939+
"event_20231221_cn"
39403940
],
3941-
"cn": "event_20241219_cn",
3942-
"en": "event_20241219_cn",
3943-
"jp": "event_20241219_cn",
3941+
"cn": "event_20221222_cn",
3942+
"en": "event_20221222_cn",
3943+
"jp": "event_20221222_cn",
39443944
"tw": "event_20231221_cn"
39453945
},
39463946
"Mode": {
@@ -4409,12 +4409,12 @@
44094409
"event_20241219_cn"
44104410
],
44114411
"option_bold": [
4412-
"event_20231221_cn",
4413-
"event_20241219_cn"
4412+
"event_20221222_cn",
4413+
"event_20231221_cn"
44144414
],
4415-
"cn": "event_20241219_cn",
4416-
"en": "event_20241219_cn",
4417-
"jp": "event_20241219_cn",
4415+
"cn": "event_20221222_cn",
4416+
"en": "event_20221222_cn",
4417+
"jp": "event_20221222_cn",
44184418
"tw": "event_20231221_cn"
44194419
},
44204420
"Mode": {
@@ -4883,12 +4883,12 @@
48834883
"event_20241219_cn"
48844884
],
48854885
"option_bold": [
4886-
"event_20231221_cn",
4887-
"event_20241219_cn"
4886+
"event_20221222_cn",
4887+
"event_20231221_cn"
48884888
],
4889-
"cn": "event_20241219_cn",
4890-
"en": "event_20241219_cn",
4891-
"jp": "event_20241219_cn",
4889+
"cn": "event_20221222_cn",
4890+
"en": "event_20221222_cn",
4891+
"jp": "event_20221222_cn",
48924892
"tw": "event_20231221_cn"
48934893
},
48944894
"Mode": {
@@ -5357,12 +5357,12 @@
53575357
"event_20241219_cn"
53585358
],
53595359
"option_bold": [
5360-
"event_20231221_cn",
5361-
"event_20241219_cn"
5360+
"event_20221222_cn",
5361+
"event_20231221_cn"
53625362
],
5363-
"cn": "event_20241219_cn",
5364-
"en": "event_20241219_cn",
5365-
"jp": "event_20241219_cn",
5363+
"cn": "event_20221222_cn",
5364+
"en": "event_20221222_cn",
5365+
"jp": "event_20221222_cn",
53665366
"tw": "event_20231221_cn"
53675367
},
53685368
"Mode": {
@@ -5821,12 +5821,12 @@
58215821
"event_20241219_cn"
58225822
],
58235823
"option_bold": [
5824-
"event_20231221_cn",
5825-
"event_20241219_cn"
5824+
"event_20221222_cn",
5825+
"event_20231221_cn"
58265826
],
5827-
"cn": "event_20241219_cn",
5828-
"en": "event_20241219_cn",
5829-
"jp": "event_20241219_cn",
5827+
"cn": "event_20221222_cn",
5828+
"en": "event_20221222_cn",
5829+
"jp": "event_20221222_cn",
58305830
"tw": "event_20231221_cn"
58315831
},
58325832
"Mode": {

‎module/config/i18n/en-US.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,7 @@
721721
"event_20220818_cn": "Operation Convergence",
722722
"event_20220915_cn": "Violet Tempest Blooming Lycoris Rerun",
723723
"event_20221124_cn": "The Alchemist and the Archipelago of Secrets",
724-
"event_20221222_cn": "Parallel Superimposition",
724+
"event_20221222_cn": "Parallel Superimposition Rerun",
725725
"event_20230223_cn": "Revelations of Dust",
726726
"event_20230525_cn": "Confluence of Nothingness",
727727
"event_20230803_cn": "Anthem of Remembrance",

‎module/config/i18n/ja-JP.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,7 @@
721721
"event_20220818_cn": "結像点作戦",
722722
"event_20220915_cn": "赫の涙月 菫の暁風（復刻）",
723723
"event_20221124_cn": "錬金術士と謎の遺跡群島",
724-
"event_20221222_cn": "積重なる事象の幻界",
724+
"event_20221222_cn": "積重なる事象の幻界（復刻）",
725725
"event_20230223_cn": "黙示の遺構",
726726
"event_20230525_cn": "覆天せし万象の塵",
727727
"event_20230803_cn": "燃ゆる聖都の回想曲",

‎module/config/i18n/zh-CN.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,7 @@
721721
"event_20220818_cn": "远汇点作战",
722722
"event_20220915_cn": "复刻紫绛槿岚",
723723
"event_20221124_cn": "炼金术士与秘密遗迹群岛",
724-
"event_20221222_cn": "定向折叠",
724+
"event_20221222_cn": "复刻定向折叠",
725725
"event_20230223_cn": "湮烬尘墟",
726726
"event_20230525_cn": "空相交汇点",
727727
"event_20230803_cn": "奏响鸢尾之歌",

‎module/os_shop/shop.py‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from module.base.decorator import cached_property
22
from module.base.timer import Timer
3+
from module.combat.assets import GET_ITEMS_1
34
from module.config.utils import get_os_reset_remain
45
from module.exception import GameStuckError, ScriptError
56
from module.logger import logger
@@ -23,10 +24,10 @@ def os_shop_buy_execute(self, button, skip_first_screenshot=True) -> bool:
2324
"""
2425
success = False
2526
amount_finish = False
26-
self.interval_clear(PORT_SUPPLY_CHECK)
27-
self.interval_clear(SHOP_BUY_CONFIRM)
28-
self.interval_clear(SHOP_BUY_CONFIRM_AMOUNT)
29-
self.interval_clear(OS_SHOP_BUY_CONFIRM)
27+
self.interval_clear([
28+
PORT_SUPPLY_CHECK, SHOP_BUY_CONFIRM_AMOUNT,
29+
SHOP_BUY_CONFIRM, OS_SHOP_BUY_CONFIRM, GET_ITEMS_1
30+
])
3031

3132
while True:
3233
if skip_first_screenshot:

0 commit comments

Comments
 (0)