Skip to content

Commit 2c938c9

Browse files
authored
Merge pull request LmeSzinc#5625 from guoh064/event_rerun
Add: event entrance for dual event 20201126/20260417
2 parents 32ad98a + f6b44d6 commit 2c938c9

16 files changed

Lines changed: 111 additions & 46 deletions

File tree

17.1 KB
Loading
11.5 KB
Loading
11.4 KB
Loading
13.5 KB
Loading

campaign/Readme.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,3 +288,4 @@ To add a new event, add a new row in here, and run `python -m module.config.conf
288288
| 20260402 | event 20260326 cn | The Vagabond’s Recruitment Plan | - | - | - | 漫遊者招募計劃 |
289289
| 20260416 | event 20220915 cn | Violet Tempest Blooming Lycoris | - | - | - | 復刻紫絳槿嵐 |
290290
| 20260417 | event 20260417 cn | Vacation Lane – Beachside Brilliance | 假日航线闪耀海滨 | Vacation Lane – Beachside Brilliance | バケーションレーン・きらめく砂浜 | - |
291+
| 20260417 | event 20201126 cn | Vacation Lane Rerun | 复刻假日航线 | Vacation Lane Rerun | バケーションレーン(復刻) | - |

campaign/event_20201126_cn/campaign_base.py

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
from module.base.button import Button
2+
from module.campaign.assets import EVENT_20201126_ENTRANCE_TEMP, EVENT_20201126_PT_ICON
23
from module.campaign.campaign_base import CampaignBase as CampaignBase_
34
from module.exception import CampaignNameError
45
from module.logger import logger
6+
from module.ui.page import page_campaign_menu, page_event, page_main
57

68
EVENT_ANIMATION = Button(area=(49, 229, 119, 400), color=(118, 215, 240), button=(49, 229, 119, 400),
79
name='EVENT_ANIMATION')
@@ -16,6 +18,19 @@ class CampaignBase(CampaignBase_):
1618
Mode switch is meaningless.
1719
"""
1820

21+
def ui_goto_event(self):
22+
if self.appear(EVENT_20201126_PT_ICON, offset=(20, 20)) and self.ui_page_appear(page_event):
23+
logger.info('Already at EVENT_20201126')
24+
return True
25+
self.ui_ensure(page_campaign_menu)
26+
if self.is_event_entrance_available():
27+
self.ui_ensure(page_main)
28+
self.ui_click(EVENT_20201126_ENTRANCE_TEMP,
29+
check_button=EVENT_20201126_PT_ICON,
30+
appear_button=EVENT_20201126_ENTRANCE_TEMP)
31+
return True
32+
33+
1934
@staticmethod
2035
def _campaign_separate_name(name):
2136
"""

campaign/event_20260417_cn/campaign_base.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,23 @@
11
from module.base.button import Button
2+
from module.campaign.assets import EVENT_20260417_PT_ICON
23
from module.campaign.campaign_base import CampaignBase as CampaignBase_
34
from module.logger import logger
5+
from module.ui.page import page_campaign_menu, page_event
46

57
EVENT_ANIMATION = Button(area=(49, 229, 119, 400), color=(118, 215, 240), button=(49, 229, 119, 400),
68
name='EVENT_ANIMATION')
79

810

911
class CampaignBase(CampaignBase_):
12+
def ui_goto_event(self):
13+
if self.appear(EVENT_20260417_PT_ICON, offset=(20, 20)) and self.ui_page_appear(page_event):
14+
logger.info('Already at EVENT_20260417')
15+
return True
16+
self.ui_ensure(page_campaign_menu)
17+
if self.is_event_entrance_available():
18+
self.ui_goto(page_event)
19+
return True
20+
1021
@staticmethod
1122
def _campaign_ocr_result_process(result):
1223
result = CampaignBase_._campaign_ocr_result_process(result)

module/campaign/assets.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,13 @@
1111
CHAPTER_NEXT = Button(area={'cn': (1216, 362, 1232, 388), 'en': (1216, 362, 1232, 388), 'jp': (1216, 362, 1232, 388), 'tw': (1216, 362, 1232, 388)}, color={'cn': (121, 150, 198), 'en': (121, 150, 198), 'jp': (121, 150, 198), 'tw': (121, 150, 198)}, button={'cn': (1216, 362, 1232, 388), 'en': (1216, 362, 1232, 388), 'jp': (1216, 362, 1232, 388), 'tw': (1216, 362, 1232, 388)}, file={'cn': './assets/cn/campaign/CHAPTER_NEXT.png', 'en': './assets/en/campaign/CHAPTER_NEXT.png', 'jp': './assets/jp/campaign/CHAPTER_NEXT.png', 'tw': './assets/tw/campaign/CHAPTER_NEXT.png'})
1212
CHAPTER_PREV = Button(area={'cn': (42, 360, 58, 387), 'en': (42, 360, 58, 387), 'jp': (42, 360, 58, 387), 'tw': (42, 360, 58, 387)}, color={'cn': (105, 133, 169), 'en': (105, 133, 169), 'jp': (105, 133, 169), 'tw': (105, 133, 169)}, button={'cn': (42, 360, 58, 387), 'en': (42, 360, 58, 387), 'jp': (42, 360, 58, 387), 'tw': (42, 360, 58, 387)}, file={'cn': './assets/cn/campaign/CHAPTER_PREV.png', 'en': './assets/en/campaign/CHAPTER_PREV.png', 'jp': './assets/jp/campaign/CHAPTER_PREV.png', 'tw': './assets/tw/campaign/CHAPTER_PREV.png'})
1313
COMMISSION_NOTICE_AT_CAMPAIGN = Button(area={'cn': (1077, 637, 1083, 643), 'en': (1077, 637, 1083, 643), 'jp': (1077, 637, 1083, 643), 'tw': (1077, 637, 1083, 643)}, color={'cn': (172, 72, 49), 'en': (172, 72, 49), 'jp': (172, 72, 49), 'tw': (172, 72, 49)}, button={'cn': (1077, 637, 1083, 643), 'en': (1077, 637, 1083, 643), 'jp': (1077, 637, 1083, 643), 'tw': (1077, 637, 1083, 643)}, file={'cn': './assets/cn/campaign/COMMISSION_NOTICE_AT_CAMPAIGN.png', 'en': './assets/en/campaign/COMMISSION_NOTICE_AT_CAMPAIGN.png', 'jp': './assets/jp/campaign/COMMISSION_NOTICE_AT_CAMPAIGN.png', 'tw': './assets/tw/campaign/COMMISSION_NOTICE_AT_CAMPAIGN.png'})
14+
EVENT_20201126_ENTRANCE_TEMP = Button(area={'cn': (1023, 368, 1100, 407), 'en': (1023, 368, 1100, 407), 'jp': (1023, 367, 1101, 402), 'tw': (1023, 368, 1100, 407)}, color={'cn': (160, 208, 243), 'en': (160, 208, 243), 'jp': (167, 213, 245), 'tw': (160, 208, 243)}, button={'cn': (1023, 368, 1100, 407), 'en': (1023, 368, 1100, 407), 'jp': (1023, 367, 1101, 402), 'tw': (1023, 368, 1100, 407)}, file={'cn': './assets/cn/campaign/EVENT_20201126_ENTRANCE_TEMP.png', 'en': './assets/cn/campaign/EVENT_20201126_ENTRANCE_TEMP.png', 'jp': './assets/jp/campaign/EVENT_20201126_ENTRANCE_TEMP.png', 'tw': './assets/cn/campaign/EVENT_20201126_ENTRANCE_TEMP.png'})
15+
EVENT_20201126_PT_ICON = Button(area={'cn': (1108, 102, 1133, 127), 'en': (1108, 102, 1133, 127), 'jp': (1108, 102, 1133, 127), 'tw': (1108, 102, 1133, 127)}, color={'cn': (231, 121, 159), 'en': (231, 121, 159), 'jp': (231, 121, 159), 'tw': (231, 121, 159)}, button={'cn': (1108, 102, 1133, 127), 'en': (1108, 102, 1133, 127), 'jp': (1108, 102, 1133, 127), 'tw': (1108, 102, 1133, 127)}, file={'cn': './assets/cn/campaign/EVENT_20201126_PT_ICON.png', 'en': './assets/cn/campaign/EVENT_20201126_PT_ICON.png', 'jp': './assets/cn/campaign/EVENT_20201126_PT_ICON.png', 'tw': './assets/cn/campaign/EVENT_20201126_PT_ICON.png'})
1416
EVENT_20221124_ENTRANCE = Button(area={'cn': (1037, 162, 1077, 195), 'en': (1037, 162, 1077, 195), 'jp': (1037, 162, 1077, 195), 'tw': (1037, 162, 1077, 195)}, color={'cn': (207, 168, 148), 'en': (207, 168, 148), 'jp': (207, 168, 148), 'tw': (207, 168, 148)}, button={'cn': (1037, 162, 1077, 195), 'en': (1037, 162, 1077, 195), 'jp': (1037, 162, 1077, 195), 'tw': (1037, 162, 1077, 195)}, file={'cn': './assets/cn/campaign/EVENT_20221124_ENTRANCE.png', 'en': './assets/cn/campaign/EVENT_20221124_ENTRANCE.png', 'jp': './assets/cn/campaign/EVENT_20221124_ENTRANCE.png', 'tw': './assets/cn/campaign/EVENT_20221124_ENTRANCE.png'})
1517
EVENT_20221124_PT_ICON = Button(area={'cn': (1106, 109, 1135, 130), 'en': (1071, 109, 1101, 129), 'jp': (1106, 109, 1135, 130), 'tw': (1106, 109, 1135, 130)}, color={'cn': (151, 116, 139), 'en': (152, 115, 138), 'jp': (151, 116, 139), 'tw': (151, 116, 139)}, button={'cn': (1106, 109, 1135, 130), 'en': (1071, 109, 1101, 129), 'jp': (1106, 109, 1135, 130), 'tw': (1106, 109, 1135, 130)}, file={'cn': './assets/cn/campaign/EVENT_20221124_PT_ICON.png', 'en': './assets/en/campaign/EVENT_20221124_PT_ICON.png', 'jp': './assets/cn/campaign/EVENT_20221124_PT_ICON.png', 'tw': './assets/cn/campaign/EVENT_20221124_PT_ICON.png'})
1618
EVENT_20230817_STORY = Button(area={'cn': (610, 320, 670, 380), 'en': (610, 320, 670, 380), 'jp': (610, 320, 670, 380), 'tw': (610, 320, 670, 380)}, color={'cn': (183, 180, 190), 'en': (183, 180, 190), 'jp': (183, 180, 190), 'tw': (183, 180, 190)}, button={'cn': (610, 320, 670, 380), 'en': (610, 320, 670, 380), 'jp': (610, 320, 670, 380), 'tw': (610, 320, 670, 380)}, file={'cn': './assets/cn/campaign/EVENT_20230817_STORY.png', 'en': './assets/en/campaign/EVENT_20230817_STORY.png', 'jp': './assets/jp/campaign/EVENT_20230817_STORY.png', 'tw': './assets/tw/campaign/EVENT_20230817_STORY.png'})
1719
EVENT_20250724_PT_ICON = Button(area={'cn': (1102, 106, 1139, 121), 'en': (1067, 108, 1104, 123), 'jp': (1102, 106, 1139, 121), 'tw': (1102, 106, 1139, 121)}, color={'cn': (95, 103, 93), 'en': (97, 101, 94), 'jp': (95, 103, 93), 'tw': (95, 103, 93)}, button={'cn': (1102, 106, 1139, 121), 'en': (1067, 108, 1104, 123), 'jp': (1102, 106, 1139, 121), 'tw': (1102, 106, 1139, 121)}, file={'cn': './assets/cn/campaign/EVENT_20250724_PT_ICON.png', 'en': './assets/en/campaign/EVENT_20250724_PT_ICON.png', 'jp': './assets/cn/campaign/EVENT_20250724_PT_ICON.png', 'tw': './assets/cn/campaign/EVENT_20250724_PT_ICON.png'})
20+
EVENT_20260417_PT_ICON = Button(area={'cn': (1110, 106, 1133, 130), 'en': (1110, 106, 1133, 130), 'jp': (1110, 106, 1133, 130), 'tw': (1110, 106, 1133, 130)}, color={'cn': (119, 177, 213), 'en': (119, 177, 213), 'jp': (119, 177, 213), 'tw': (119, 177, 213)}, button={'cn': (1110, 106, 1133, 130), 'en': (1110, 106, 1133, 130), 'jp': (1110, 106, 1133, 130), 'tw': (1110, 106, 1133, 130)}, file={'cn': './assets/cn/campaign/EVENT_20260417_PT_ICON.png', 'en': './assets/cn/campaign/EVENT_20260417_PT_ICON.png', 'jp': './assets/cn/campaign/EVENT_20260417_PT_ICON.png', 'tw': './assets/cn/campaign/EVENT_20260417_PT_ICON.png'})
1821
OCR_COIN = Button(area={'cn': (815, 23, 922, 51), 'en': (815, 23, 922, 51), 'jp': (815, 23, 922, 51), 'tw': (815, 23, 922, 51)}, color={'cn': (61, 61, 73), 'en': (61, 61, 73), 'jp': (61, 61, 73), 'tw': (61, 61, 73)}, button={'cn': (815, 23, 922, 51), 'en': (815, 23, 922, 51), 'jp': (815, 23, 922, 51), 'tw': (815, 23, 922, 51)}, file={'cn': './assets/cn/campaign/OCR_COIN.png', 'en': './assets/en/campaign/OCR_COIN.png', 'jp': './assets/jp/campaign/OCR_COIN.png', 'tw': './assets/tw/campaign/OCR_COIN.png'})
1922
OCR_EVENT_PT = Button(area={'cn': (1196, 109, 1280, 131), 'en': (1190, 109, 1280, 129), 'jp': (1196, 109, 1280, 131), 'tw': (1196, 109, 1280, 131)}, color={'cn': (121, 110, 59), 'en': (88, 78, 51), 'jp': (121, 110, 59), 'tw': (121, 110, 59)}, button={'cn': (1196, 109, 1280, 131), 'en': (1190, 109, 1280, 129), 'jp': (1196, 109, 1280, 131), 'tw': (1196, 109, 1280, 131)}, file={'cn': './assets/cn/campaign/OCR_EVENT_PT.png', 'en': './assets/en/campaign/OCR_EVENT_PT.png', 'jp': './assets/jp/campaign/OCR_EVENT_PT.png', 'tw': './assets/tw/campaign/OCR_EVENT_PT.png'})
2023
OCR_OIL = Button(area={'cn': (614, 23, 714, 51), 'en': (614, 23, 714, 51), 'jp': (614, 23, 714, 51), 'tw': (614, 23, 714, 51)}, color={'cn': (64, 65, 79), 'en': (64, 65, 79), 'jp': (64, 65, 79), 'tw': (64, 65, 79)}, button={'cn': (614, 23, 714, 51), 'en': (614, 23, 714, 51), 'jp': (614, 23, 714, 51), 'tw': (614, 23, 714, 51)}, file={'cn': './assets/cn/campaign/OCR_OIL.png', 'en': './assets/en/campaign/OCR_OIL.png', 'jp': './assets/jp/campaign/OCR_OIL.png', 'tw': './assets/tw/campaign/OCR_OIL.png'})

module/campaign/run.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ def handle_stage_name(self, name, folder, mode='normal'):
170170
logger.info(f'Stage name {name} is from campaign_main')
171171
folder = 'campaign_main'
172172
else:
173-
folder = self.config.cross_get('Event.Campaign.Event')
173+
folder = self.config.cross_get('GemsFarming.Campaign.Event')
174174
if folder is not None:
175175
logger.info(f'Stage name {name} is from event {folder}')
176176
else:

module/config/argument/args.json

Lines changed: 51 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1642,23 +1642,27 @@
16421642
"type": "select",
16431643
"value": "campaign_main",
16441644
"option": [
1645+
"event_20201126_cn",
16451646
"event_20220915_cn",
16461647
"event_20260417_cn"
16471648
],
1648-
"display": "hide",
16491649
"option_cn": [
1650+
"event_20201126_cn",
16501651
"event_20260417_cn"
16511652
],
16521653
"option_en": [
1654+
"event_20201126_cn",
16531655
"event_20260417_cn"
16541656
],
16551657
"option_jp": [
1658+
"event_20201126_cn",
16561659
"event_20260417_cn"
16571660
],
16581661
"option_tw": [
16591662
"event_20220915_cn"
16601663
],
16611664
"option_bold": [
1665+
"event_20201126_cn",
16621666
"event_20220915_cn",
16631667
"event_20260417_cn"
16641668
]
@@ -1922,25 +1926,30 @@
19221926
"value": "12-4"
19231927
},
19241928
"Event": {
1925-
"type": "state",
1929+
"type": "select",
19261930
"value": "campaign_main",
19271931
"option": [
1932+
"event_20201126_cn",
19281933
"event_20220915_cn",
19291934
"event_20260417_cn"
19301935
],
19311936
"option_cn": [
1937+
"event_20201126_cn",
19321938
"event_20260417_cn"
19331939
],
19341940
"option_en": [
1941+
"event_20201126_cn",
19351942
"event_20260417_cn"
19361943
],
19371944
"option_jp": [
1945+
"event_20201126_cn",
19381946
"event_20260417_cn"
19391947
],
19401948
"option_tw": [
19411949
"event_20220915_cn"
19421950
],
19431951
"option_bold": [
1952+
"event_20201126_cn",
19441953
"event_20220915_cn",
19451954
"event_20260417_cn"
19461955
]
@@ -2319,25 +2328,30 @@
23192328
"value": "12-4"
23202329
},
23212330
"Event": {
2322-
"type": "state",
2331+
"type": "select",
23232332
"value": "campaign_main",
23242333
"option": [
2334+
"event_20201126_cn",
23252335
"event_20220915_cn",
23262336
"event_20260417_cn"
23272337
],
23282338
"option_cn": [
2339+
"event_20201126_cn",
23292340
"event_20260417_cn"
23302341
],
23312342
"option_en": [
2343+
"event_20201126_cn",
23322344
"event_20260417_cn"
23332345
],
23342346
"option_jp": [
2347+
"event_20201126_cn",
23352348
"event_20260417_cn"
23362349
],
23372350
"option_tw": [
23382351
"event_20220915_cn"
23392352
],
23402353
"option_bold": [
2354+
"event_20201126_cn",
23412355
"event_20220915_cn",
23422356
"event_20260417_cn"
23432357
]
@@ -2733,7 +2747,7 @@
27332747
"display": "hide"
27342748
},
27352749
"Event": {
2736-
"type": "state",
2750+
"type": "select",
27372751
"value": "campaign_main",
27382752
"option": [
27392753
"raid_20260212"
@@ -3132,7 +3146,7 @@
31323146
"display": "hide"
31333147
},
31343148
"Event": {
3135-
"type": "state",
3149+
"type": "select",
31363150
"value": "campaign_main",
31373151
"option": [
31383152
"coalition_20260122"
@@ -4046,25 +4060,30 @@
40464060
"display": "hide"
40474061
},
40484062
"Event": {
4049-
"type": "state",
4063+
"type": "select",
40504064
"value": "campaign_main",
40514065
"option": [
4066+
"event_20201126_cn",
40524067
"event_20220915_cn",
40534068
"event_20260417_cn"
40544069
],
40554070
"option_cn": [
4071+
"event_20201126_cn",
40564072
"event_20260417_cn"
40574073
],
40584074
"option_en": [
4075+
"event_20201126_cn",
40594076
"event_20260417_cn"
40604077
],
40614078
"option_jp": [
4079+
"event_20201126_cn",
40624080
"event_20260417_cn"
40634081
],
40644082
"option_tw": [
40654083
"event_20220915_cn"
40664084
],
40674085
"option_bold": [
4086+
"event_20201126_cn",
40684087
"event_20220915_cn",
40694088
"event_20260417_cn"
40704089
]
@@ -4460,25 +4479,30 @@
44604479
"display": "hide"
44614480
},
44624481
"Event": {
4463-
"type": "state",
4482+
"type": "select",
44644483
"value": "campaign_main",
44654484
"option": [
4485+
"event_20201126_cn",
44664486
"event_20220915_cn",
44674487
"event_20260417_cn"
44684488
],
44694489
"option_cn": [
4490+
"event_20201126_cn",
44704491
"event_20260417_cn"
44714492
],
44724493
"option_en": [
4494+
"event_20201126_cn",
44734495
"event_20260417_cn"
44744496
],
44754497
"option_jp": [
4498+
"event_20201126_cn",
44764499
"event_20260417_cn"
44774500
],
44784501
"option_tw": [
44794502
"event_20220915_cn"
44804503
],
44814504
"option_bold": [
4505+
"event_20201126_cn",
44824506
"event_20220915_cn",
44834507
"event_20260417_cn"
44844508
]
@@ -4874,25 +4898,30 @@
48744898
"display": "hide"
48754899
},
48764900
"Event": {
4877-
"type": "state",
4901+
"type": "select",
48784902
"value": "campaign_main",
48794903
"option": [
4904+
"event_20201126_cn",
48804905
"event_20220915_cn",
48814906
"event_20260417_cn"
48824907
],
48834908
"option_cn": [
4909+
"event_20201126_cn",
48844910
"event_20260417_cn"
48854911
],
48864912
"option_en": [
4913+
"event_20201126_cn",
48874914
"event_20260417_cn"
48884915
],
48894916
"option_jp": [
4917+
"event_20201126_cn",
48904918
"event_20260417_cn"
48914919
],
48924920
"option_tw": [
48934921
"event_20220915_cn"
48944922
],
48954923
"option_bold": [
4924+
"event_20201126_cn",
48964925
"event_20220915_cn",
48974926
"event_20260417_cn"
48984927
]
@@ -5288,25 +5317,30 @@
52885317
"display": "hide"
52895318
},
52905319
"Event": {
5291-
"type": "state",
5320+
"type": "select",
52925321
"value": "campaign_main",
52935322
"option": [
5323+
"event_20201126_cn",
52945324
"event_20220915_cn",
52955325
"event_20260417_cn"
52965326
],
52975327
"option_cn": [
5328+
"event_20201126_cn",
52985329
"event_20260417_cn"
52995330
],
53005331
"option_en": [
5332+
"event_20201126_cn",
53015333
"event_20260417_cn"
53025334
],
53035335
"option_jp": [
5336+
"event_20201126_cn",
53045337
"event_20260417_cn"
53055338
],
53065339
"option_tw": [
53075340
"event_20220915_cn"
53085341
],
53095342
"option_bold": [
5343+
"event_20201126_cn",
53105344
"event_20220915_cn",
53115345
"event_20260417_cn"
53125346
]
@@ -5692,25 +5726,30 @@
56925726
"display": "hide"
56935727
},
56945728
"Event": {
5695-
"type": "state",
5729+
"type": "select",
56965730
"value": "campaign_main",
56975731
"option": [
5732+
"event_20201126_cn",
56985733
"event_20220915_cn",
56995734
"event_20260417_cn"
57005735
],
57015736
"option_cn": [
5737+
"event_20201126_cn",
57025738
"event_20260417_cn"
57035739
],
57045740
"option_en": [
5741+
"event_20201126_cn",
57055742
"event_20260417_cn"
57065743
],
57075744
"option_jp": [
5745+
"event_20201126_cn",
57085746
"event_20260417_cn"
57095747
],
57105748
"option_tw": [
57115749
"event_20220915_cn"
57125750
],
57135751
"option_bold": [
5752+
"event_20201126_cn",
57145753
"event_20220915_cn",
57155754
"event_20260417_cn"
57165755
]
@@ -6103,7 +6142,7 @@
61036142
"display": "hide"
61046143
},
61056144
"Event": {
6106-
"type": "state",
6145+
"type": "select",
61076146
"value": "campaign_main",
61086147
"option": [
61096148
"raid_20260212"
@@ -6330,7 +6369,7 @@
63306369
"display": "hide"
63316370
},
63326371
"Event": {
6333-
"type": "state",
6372+
"type": "select",
63346373
"value": "campaign_main",
63356374
"option": [
63366375
"coalition_20260122"

0 commit comments

Comments
 (0)