Merge dev branch to master

This commit is contained in:
W1NDes 2026-05-01 05:31:03 +08:00
commit a405072655
11 changed files with 61 additions and 105 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.2 KiB

View File

@ -289,3 +289,4 @@ To add a new event, add a new row in here, and run `python -m module.config.conf
| 20260416 | event 20220915 cn | Violet Tempest Blooming Lycoris | - | - | - | 復刻紫絳槿嵐 |
| 20260417 | event 20260417 cn | Vacation Lane Beachside Brilliance | 假日航线闪耀海滨 | Vacation Lane Beachside Brilliance | バケーションレーン・きらめく砂浜 | - |
| 20260417 | event 20201126 cn | Vacation Lane Rerun | 复刻假日航线 | Vacation Lane Rerun | バケーションレーン(復刻) | - |
| 20250424 | event 20250424 cn | Toward Tulipas Seas Rerun | 复刻扬起郁金之旗 | Toward Tulipas Seas Rerun | チュリッパの海へ(復刻) | - |

View File

@ -539,12 +539,12 @@
},
"EventPt": {
"EventPtSwitch": false,
"Event2MapName": "sp4",
"EventDailyAMapName": false,
"Event2MapName": "HT3",
"EventDailyAMapName": "T1>T2>T3>HT1>HT2>HT3",
"EventDailySpMapName": "sp",
"EventDailyCD": false,
"EventResetStageAfterHours": 72,
"EventResetStageName": "sp1",
"EventResetStageName": "T1",
"EventResetStageRecord": "2020-01-01 00:00:00"
},
"Fleet": {

View File

@ -11,8 +11,8 @@ CHAPTER_20241219_SP = Button(area={'cn': (17, 372, 34, 388), 'en': (17, 372, 34,
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'})
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'})
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'})
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'})
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'})
EVENT_20201126_ENTRANCE_TEMP = Button(area={'cn': (1023, 368, 1100, 407), 'en': (1025, 367, 1095, 406), 'jp': (1023, 367, 1101, 402), 'tw': (1023, 368, 1100, 407)}, color={'cn': (160, 208, 243), 'en': (156, 206, 243), 'jp': (167, 213, 245), 'tw': (160, 208, 243)}, button={'cn': (1023, 368, 1100, 407), 'en': (1025, 367, 1095, 406), 'jp': (1023, 367, 1101, 402), 'tw': (1023, 368, 1100, 407)}, file={'cn': './assets/cn/campaign/EVENT_20201126_ENTRANCE_TEMP.png', 'en': './assets/en/campaign/EVENT_20201126_ENTRANCE_TEMP.png', 'jp': './assets/jp/campaign/EVENT_20201126_ENTRANCE_TEMP.png', 'tw': './assets/cn/campaign/EVENT_20201126_ENTRANCE_TEMP.png'})
EVENT_20201126_PT_ICON = Button(area={'cn': (1108, 102, 1133, 127), 'en': (1070, 99, 1100, 127), 'jp': (1108, 102, 1133, 127), 'tw': (1108, 102, 1133, 127)}, color={'cn': (231, 121, 159), 'en': (229, 116, 154), 'jp': (231, 121, 159), 'tw': (231, 121, 159)}, button={'cn': (1108, 102, 1133, 127), 'en': (1070, 99, 1100, 127), 'jp': (1108, 102, 1133, 127), 'tw': (1108, 102, 1133, 127)}, file={'cn': './assets/cn/campaign/EVENT_20201126_PT_ICON.png', 'en': './assets/en/campaign/EVENT_20201126_PT_ICON.png', 'jp': './assets/cn/campaign/EVENT_20201126_PT_ICON.png', 'tw': './assets/cn/campaign/EVENT_20201126_PT_ICON.png'})
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'})
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'})
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'})

View File

@ -1976,29 +1976,24 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20201126_cn",
"event_20220915_cn",
"event_20260417_cn"
"event_20250424_cn"
],
"option_cn": [
"event_20201126_cn",
"event_20260417_cn"
"event_20250424_cn"
],
"option_en": [
"event_20201126_cn",
"event_20260417_cn"
"event_20250424_cn"
],
"option_jp": [
"event_20201126_cn",
"event_20260417_cn"
"event_20250424_cn"
],
"option_tw": [
"event_20220915_cn"
],
"option_bold": [
"event_20201126_cn",
"event_20220915_cn",
"event_20260417_cn"
"event_20250424_cn"
]
},
"Mode": {
@ -2512,29 +2507,24 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20201126_cn",
"event_20220915_cn",
"event_20260417_cn"
"event_20250424_cn"
],
"option_cn": [
"event_20201126_cn",
"event_20260417_cn"
"event_20250424_cn"
],
"option_en": [
"event_20201126_cn",
"event_20260417_cn"
"event_20250424_cn"
],
"option_jp": [
"event_20201126_cn",
"event_20260417_cn"
"event_20250424_cn"
],
"option_tw": [
"event_20220915_cn"
],
"option_bold": [
"event_20201126_cn",
"event_20220915_cn",
"event_20260417_cn"
"event_20250424_cn"
]
},
"Mode": {
@ -2608,12 +2598,12 @@
},
"Event2MapName": {
"type": "state",
"value": "sp4",
"value": "HT3",
"display": "display"
},
"EventDailyAMapName": {
"type": "state",
"value": false,
"value": "T1>T2>T3>HT1>HT2>HT3",
"display": "display"
},
"EventDailySpMapName": {
@ -2633,7 +2623,7 @@
},
"EventResetStageName": {
"type": "state",
"value": "sp1",
"value": "T1",
"display": "display"
},
"EventResetStageRecord": {
@ -2955,29 +2945,24 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20201126_cn",
"event_20220915_cn",
"event_20260417_cn"
"event_20250424_cn"
],
"option_cn": [
"event_20201126_cn",
"event_20260417_cn"
"event_20250424_cn"
],
"option_en": [
"event_20201126_cn",
"event_20260417_cn"
"event_20250424_cn"
],
"option_jp": [
"event_20201126_cn",
"event_20260417_cn"
"event_20250424_cn"
],
"option_tw": [
"event_20220915_cn"
],
"option_bold": [
"event_20201126_cn",
"event_20220915_cn",
"event_20260417_cn"
"event_20250424_cn"
]
},
"Mode": {
@ -3357,29 +3342,24 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20201126_cn",
"event_20220915_cn",
"event_20260417_cn"
"event_20250424_cn"
],
"option_cn": [
"event_20201126_cn",
"event_20260417_cn"
"event_20250424_cn"
],
"option_en": [
"event_20201126_cn",
"event_20260417_cn"
"event_20250424_cn"
],
"option_jp": [
"event_20201126_cn",
"event_20260417_cn"
"event_20250424_cn"
],
"option_tw": [
"event_20220915_cn"
],
"option_bold": [
"event_20201126_cn",
"event_20220915_cn",
"event_20260417_cn"
"event_20250424_cn"
]
},
"Mode": {
@ -5101,29 +5081,24 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20201126_cn",
"event_20220915_cn",
"event_20260417_cn"
"event_20250424_cn"
],
"option_cn": [
"event_20201126_cn",
"event_20260417_cn"
"event_20250424_cn"
],
"option_en": [
"event_20201126_cn",
"event_20260417_cn"
"event_20250424_cn"
],
"option_jp": [
"event_20201126_cn",
"event_20260417_cn"
"event_20250424_cn"
],
"option_tw": [
"event_20220915_cn"
],
"option_bold": [
"event_20201126_cn",
"event_20220915_cn",
"event_20260417_cn"
"event_20250424_cn"
]
},
"Mode": {
@ -5524,29 +5499,24 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20201126_cn",
"event_20220915_cn",
"event_20260417_cn"
"event_20250424_cn"
],
"option_cn": [
"event_20201126_cn",
"event_20260417_cn"
"event_20250424_cn"
],
"option_en": [
"event_20201126_cn",
"event_20260417_cn"
"event_20250424_cn"
],
"option_jp": [
"event_20201126_cn",
"event_20260417_cn"
"event_20250424_cn"
],
"option_tw": [
"event_20220915_cn"
],
"option_bold": [
"event_20201126_cn",
"event_20220915_cn",
"event_20260417_cn"
"event_20250424_cn"
]
},
"Mode": {
@ -5947,29 +5917,24 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20201126_cn",
"event_20220915_cn",
"event_20260417_cn"
"event_20250424_cn"
],
"option_cn": [
"event_20201126_cn",
"event_20260417_cn"
"event_20250424_cn"
],
"option_en": [
"event_20201126_cn",
"event_20260417_cn"
"event_20250424_cn"
],
"option_jp": [
"event_20201126_cn",
"event_20260417_cn"
"event_20250424_cn"
],
"option_tw": [
"event_20220915_cn"
],
"option_bold": [
"event_20201126_cn",
"event_20220915_cn",
"event_20260417_cn"
"event_20250424_cn"
]
},
"Mode": {
@ -6370,29 +6335,24 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20201126_cn",
"event_20220915_cn",
"event_20260417_cn"
"event_20250424_cn"
],
"option_cn": [
"event_20201126_cn",
"event_20260417_cn"
"event_20250424_cn"
],
"option_en": [
"event_20201126_cn",
"event_20260417_cn"
"event_20250424_cn"
],
"option_jp": [
"event_20201126_cn",
"event_20260417_cn"
"event_20250424_cn"
],
"option_tw": [
"event_20220915_cn"
],
"option_bold": [
"event_20201126_cn",
"event_20220915_cn",
"event_20260417_cn"
"event_20250424_cn"
]
},
"Mode": {
@ -6793,29 +6753,24 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20201126_cn",
"event_20220915_cn",
"event_20260417_cn"
"event_20250424_cn"
],
"option_cn": [
"event_20201126_cn",
"event_20260417_cn"
"event_20250424_cn"
],
"option_en": [
"event_20201126_cn",
"event_20260417_cn"
"event_20250424_cn"
],
"option_jp": [
"event_20201126_cn",
"event_20260417_cn"
"event_20250424_cn"
],
"option_tw": [
"event_20220915_cn"
],
"option_bold": [
"event_20201126_cn",
"event_20220915_cn",
"event_20260417_cn"
"event_20250424_cn"
]
},
"Mode": {

View File

@ -57,11 +57,11 @@ Event:
AmbushEvade: true
EventPt:
Event2MapName:
value: sp4
value: HT3
type: state
display: display
EventDailyAMapName:
value: false
value: T1>T2>T3>HT1>HT2>HT3
type: state
display: display
EventDailySpMapName:
@ -77,7 +77,7 @@ Event:
type: state
display: display
EventResetStageName:
value: sp1
value: T1
type: state
display: display

View File

@ -1079,7 +1079,7 @@
"event_20241121_cn": "Dangerous Inventions Incoming",
"event_20241219_cn": "Substellar Crepuscule",
"event_20250227_cn": "Paradiso of Shackled Light",
"event_20250424_cn": "Toward Tulipas Seas",
"event_20250424_cn": "Toward Tulipas Seas Rerun",
"event_20250520_cn": "A Rose on the High Tower",
"event_20250724_cn": "The Alchemist and the Tower of Horizons",
"event_20250814_cn": "Secrets of the Abyss",

View File

@ -1079,7 +1079,7 @@
"event_20241121_cn": "危険発明接近中",
"event_20241219_cn": "星降る夕影の残光",
"event_20250227_cn": "籠檻に囚われし神光",
"event_20250424_cn": "チュリッパの海へ",
"event_20250424_cn": "チュリッパの海へ(復刻)",
"event_20250520_cn": "高い塔の薔薇",
"event_20250724_cn": "錬金術士と天空邂逅の塔",
"event_20250814_cn": "淵層界の秘密",

View File

@ -1079,7 +1079,7 @@
"event_20241121_cn": "危险发明迫近中",
"event_20241219_cn": "星光下的余晖",
"event_20250227_cn": "樊笼内的神光",
"event_20250424_cn": "扬起郁金之旗",
"event_20250424_cn": "复刻扬起郁金之旗",
"event_20250520_cn": "高塔上的蔷薇",
"event_20250724_cn": "优米雅的炼金工房",
"event_20250814_cn": "奇渊下的秘密",

View File

@ -250,7 +250,7 @@ class EventStory(CampaignUI, Combat, LoginHandler):
return 'unknown'
def run(self):
if datetime.now() < datetime(2026, 4, 27, 12, 0, 0):#eventSet
if datetime.now() < datetime(2026, 5, 7, 12, 0, 0):#eventSet
self.run_event_story()
else:
logger.info('Event story expired')