Skip to content

Commit b687048

Browse files
LmeSzincLmeSzinc
authored
Merge pull request LmeSzinc#5545 from LmeSzinc/dev
Bug fix
2 parents 8618ea2 + c9e9570 commit b687048

4 files changed

Lines changed: 18 additions & 26 deletions

File tree

‎campaign/Readme.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,4 +281,4 @@ To add a new event, add a new row in here, and run `python -m module.config.conf
281281
| 20260129 | coalition 20260122 | Light & Shadow Fashion Shoot! | - | - | - | 光影風尚-拍攝進行時 |
282282
| 20260205 | raid 20240328 | From Zero to Hero | 复刻从零开始的魔王讨伐之旅 | From Zero to Hero Rerun | ゼロから頑張る魔王討伐（復刻） | - |
283283
| 20260212 | raid 20260212 | Spring Auction Adventure | 春宴怀玉香满庭 | Spring Auction Adventure | 新春玉逸品会 | 春宴懷玉香滿庭 |
284-
| 20260226 | event 20260226 cn | Springtide Inn Online | 春满客栈Online | Springtide Inn Online | 春色旅籠Online | - |
284+
| 20260226 | event 20260226 cn | Springtide Inn Online | 春满客栈Online | Springtide Inn Online | 春色旅籠Online | 春滿客棧Online |

‎module/config/argument/args.json‎

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1635,7 +1635,6 @@
16351635
"type": "select",
16361636
"value": "campaign_main",
16371637
"option": [
1638-
"event_20220526_cn",
16391638
"event_20260226_cn"
16401639
],
16411640
"display": "hide",
@@ -1649,10 +1648,9 @@
16491648
"event_20260226_cn"
16501649
],
16511650
"option_tw": [
1652-
"event_20220526_cn"
1651+
"event_20260226_cn"
16531652
],
16541653
"option_bold": [
1655-
"event_20220526_cn",
16561654
"event_20260226_cn"
16571655
]
16581656
},
@@ -1916,7 +1914,6 @@
19161914
"type": "state",
19171915
"value": "campaign_main",
19181916
"option": [
1919-
"event_20220526_cn",
19201917
"event_20260226_cn"
19211918
],
19221919
"option_cn": [
@@ -1929,10 +1926,9 @@
19291926
"event_20260226_cn"
19301927
],
19311928
"option_tw": [
1932-
"event_20220526_cn"
1929+
"event_20260226_cn"
19331930
],
19341931
"option_bold": [
1935-
"event_20220526_cn",
19361932
"event_20260226_cn"
19371933
]
19381934
},
@@ -2311,7 +2307,6 @@
23112307
"type": "state",
23122308
"value": "campaign_main",
23132309
"option": [
2314-
"event_20220526_cn",
23152310
"event_20260226_cn"
23162311
],
23172312
"option_cn": [
@@ -2324,10 +2319,9 @@
23242319
"event_20260226_cn"
23252320
],
23262321
"option_tw": [
2327-
"event_20220526_cn"
2322+
"event_20260226_cn"
23282323
],
23292324
"option_bold": [
2330-
"event_20220526_cn",
23312325
"event_20260226_cn"
23322326
]
23332327
},
@@ -4034,7 +4028,6 @@
40344028
"type": "state",
40354029
"value": "campaign_main",
40364030
"option": [
4037-
"event_20220526_cn",
40384031
"event_20260226_cn"
40394032
],
40404033
"option_cn": [
@@ -4047,10 +4040,9 @@
40474040
"event_20260226_cn"
40484041
],
40494042
"option_tw": [
4050-
"event_20220526_cn"
4043+
"event_20260226_cn"
40514044
],
40524045
"option_bold": [
4053-
"event_20220526_cn",
40544046
"event_20260226_cn"
40554047
]
40564048
},
@@ -4446,7 +4438,6 @@
44464438
"type": "state",
44474439
"value": "campaign_main",
44484440
"option": [
4449-
"event_20220526_cn",
44504441
"event_20260226_cn"
44514442
],
44524443
"option_cn": [
@@ -4459,10 +4450,9 @@
44594450
"event_20260226_cn"
44604451
],
44614452
"option_tw": [
4462-
"event_20220526_cn"
4453+
"event_20260226_cn"
44634454
],
44644455
"option_bold": [
4465-
"event_20220526_cn",
44664456
"event_20260226_cn"
44674457
]
44684458
},
@@ -4858,7 +4848,6 @@
48584848
"type": "state",
48594849
"value": "campaign_main",
48604850
"option": [
4861-
"event_20220526_cn",
48624851
"event_20260226_cn"
48634852
],
48644853
"option_cn": [
@@ -4871,10 +4860,9 @@
48714860
"event_20260226_cn"
48724861
],
48734862
"option_tw": [
4874-
"event_20220526_cn"
4863+
"event_20260226_cn"
48754864
],
48764865
"option_bold": [
4877-
"event_20220526_cn",
48784866
"event_20260226_cn"
48794867
]
48804868
},
@@ -5270,7 +5258,6 @@
52705258
"type": "state",
52715259
"value": "campaign_main",
52725260
"option": [
5273-
"event_20220526_cn",
52745261
"event_20260226_cn"
52755262
],
52765263
"option_cn": [
@@ -5283,10 +5270,9 @@
52835270
"event_20260226_cn"
52845271
],
52855272
"option_tw": [
5286-
"event_20220526_cn"
5273+
"event_20260226_cn"
52875274
],
52885275
"option_bold": [
5289-
"event_20220526_cn",
52905276
"event_20260226_cn"
52915277
]
52925278
},
@@ -5672,7 +5658,6 @@
56725658
"type": "state",
56735659
"value": "campaign_main",
56745660
"option": [
5675-
"event_20220526_cn",
56765661
"event_20260226_cn"
56775662
],
56785663
"option_cn": [
@@ -5685,10 +5670,9 @@
56855670
"event_20260226_cn"
56865671
],
56875672
"option_tw": [
5688-
"event_20220526_cn"
5673+
"event_20260226_cn"
56895674
],
56905675
"option_bold": [
5691-
"event_20220526_cn",
56925676
"event_20260226_cn"
56935677
]
56945678
},

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -766,7 +766,7 @@
766766
"event_20250912_cn": "起舞於天原之上",
767767
"event_20251023_cn": "颶風與自由群島",
768768
"event_20251218_cn": "響徹於天穹之音",
769-
"event_20260226_cn": "Springtide Inn Online",
769+
"event_20260226_cn": "春滿客棧Online",
770770
"raid_20200624": "特別演習埃塞克斯級(復刻)",
771771
"raid_20210708": "復刻穿越彼方的水線",
772772
"raid_20220127": "演習神秘事件調查",

‎module/eventstory/eventstory.py‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,14 @@ def get_event_story_state(self):
201201
return 'unknown'
202202

203203
def run(self):
204+
event = self.config.cross_get('Event.Campaign.Event', '')
205+
if event in [
206+
# event story is in event minigame
207+
'event_20260226_cn',
208+
]:
209+
logger.info(f'Current event ({event}) does not have event story, stopped')
210+
return
211+
204212
if not self.device.app_is_running():
205213
logger.warning('Game is not running, start it')
206214
self.app_start()

0 commit comments

Comments
 (0)