Skip to content

Commit 81218dc

Browse files
sync[bot]sync[bot]
committed
Merge remote-tracking branch 'upstream/master'
2 parents 0fefeea + b687048 commit 81218dc

9 files changed

Lines changed: 27 additions & 26 deletions

File tree

‎assets/cn/combat_ui/PAUSE_SpringInn.png‎

3.63 KB
Loading

‎assets/cn/combat_ui/QUIT_SpringInn.png‎

7.08 KB
Loading

‎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/combat/combat.py‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,8 @@ def is_combat_executing(self):
126126
return PAUSE_MaidCafe
127127
if PAUSE_Ancient.match_template_color(self.device.image, offset=(10, 10)):
128128
return PAUSE_Ancient
129+
if PAUSE_SpringInn.match_template_color(self.device.image, offset=(10, 10)):
130+
return PAUSE_SpringInn
129131
return False
130132

131133
def handle_combat_quit(self, offset=(20, 20), interval=3):
@@ -177,6 +179,10 @@ def handle_combat_quit(self, offset=(20, 20), interval=3):
177179
self.device.click(QUIT_MaidCafe)
178180
timer.reset()
179181
return True
182+
if QUIT_SpringInn.match_luma(self.device.image, offset=offset):
183+
self.device.click(QUIT_SpringInn)
184+
timer.reset()
185+
return True
180186
return False
181187

182188
def handle_combat_quit_reconfirm(self, interval=2):

‎module/combat_ui/assets.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
PAUSE_Pharaoh = Button(area={'cn': (1229, 55, 1259, 62), 'en': (1229, 55, 1259, 62), 'jp': (1229, 55, 1259, 62), 'tw': (1229, 55, 1259, 62)}, color={'cn': (164, 119, 78), 'en': (164, 119, 78), 'jp': (164, 119, 78), 'tw': (164, 119, 78)}, button={'cn': (1229, 55, 1259, 62), 'en': (1229, 55, 1259, 62), 'jp': (1229, 55, 1259, 62), 'tw': (1229, 55, 1259, 62)}, file={'cn': './assets/cn/combat_ui/PAUSE_Pharaoh.png', 'en': './assets/cn/combat_ui/PAUSE_Pharaoh.png', 'jp': './assets/cn/combat_ui/PAUSE_Pharaoh.png', 'tw': './assets/cn/combat_ui/PAUSE_Pharaoh.png'})
2121
PAUSE_Seaside = Button(area={'cn': (1214, 31, 1239, 59), 'en': (1214, 31, 1239, 59), 'jp': (1214, 31, 1239, 59), 'tw': (1214, 31, 1239, 59)}, color={'cn': (172, 196, 212), 'en': (172, 196, 212), 'jp': (172, 196, 212), 'tw': (172, 196, 212)}, button={'cn': (1214, 31, 1239, 59), 'en': (1214, 31, 1239, 59), 'jp': (1214, 31, 1239, 59), 'tw': (1214, 31, 1239, 59)}, file={'cn': './assets/cn/combat_ui/PAUSE_Seaside.png', 'en': './assets/cn/combat_ui/PAUSE_Seaside.png', 'jp': './assets/cn/combat_ui/PAUSE_Seaside.png', 'tw': './assets/cn/combat_ui/PAUSE_Seaside.png'})
2222
PAUSE_ShadowPuppetry = Button(area={'cn': (1216, 37, 1234, 55), 'en': (1216, 37, 1234, 55), 'jp': (1216, 37, 1234, 55), 'tw': (1216, 37, 1234, 55)}, color={'cn': (139, 112, 72), 'en': (139, 112, 72), 'jp': (139, 112, 72), 'tw': (139, 112, 72)}, button={'cn': (1216, 37, 1234, 55), 'en': (1216, 37, 1234, 55), 'jp': (1216, 37, 1234, 55), 'tw': (1216, 37, 1234, 55)}, file={'cn': './assets/cn/combat_ui/PAUSE_ShadowPuppetry.png', 'en': './assets/cn/combat_ui/PAUSE_ShadowPuppetry.png', 'jp': './assets/cn/combat_ui/PAUSE_ShadowPuppetry.png', 'tw': './assets/cn/combat_ui/PAUSE_ShadowPuppetry.png'})
23+
PAUSE_SpringInn = Button(area={'cn': (1212, 37, 1235, 61), 'en': (1212, 37, 1235, 61), 'jp': (1212, 37, 1235, 61), 'tw': (1212, 37, 1235, 61)}, color={'cn': (201, 91, 78), 'en': (201, 91, 78), 'jp': (201, 91, 78), 'tw': (201, 91, 78)}, button={'cn': (1212, 37, 1235, 61), 'en': (1212, 37, 1235, 61), 'jp': (1212, 37, 1235, 61), 'tw': (1212, 37, 1235, 61)}, file={'cn': './assets/cn/combat_ui/PAUSE_SpringInn.png', 'en': './assets/cn/combat_ui/PAUSE_SpringInn.png', 'jp': './assets/cn/combat_ui/PAUSE_SpringInn.png', 'tw': './assets/cn/combat_ui/PAUSE_SpringInn.png'})
2324
PAUSE_Star = Button(area={'cn': (1234, 36, 1250, 57), 'en': (1234, 36, 1250, 57), 'jp': (1234, 36, 1250, 57), 'tw': (1234, 36, 1250, 57)}, color={'cn': (169, 179, 179), 'en': (169, 179, 179), 'jp': (169, 179, 179), 'tw': (169, 179, 179)}, button={'cn': (1234, 36, 1250, 57), 'en': (1234, 36, 1250, 57), 'jp': (1234, 36, 1250, 57), 'tw': (1234, 36, 1250, 57)}, file={'cn': './assets/cn/combat_ui/PAUSE_Star.png', 'en': './assets/cn/combat_ui/PAUSE_Star.png', 'jp': './assets/cn/combat_ui/PAUSE_Star.png', 'tw': './assets/cn/combat_ui/PAUSE_Star.png'})
2425
QUIT = Button(area={'cn': (420, 490, 593, 548), 'en': (473, 508, 567, 532), 'jp': (433, 490, 606, 547), 'tw': (433, 490, 606, 547)}, color={'cn': (199, 122, 114), 'en': (216, 168, 164), 'jp': (196, 120, 113), 'tw': (200, 126, 118)}, button={'cn': (420, 490, 593, 548), 'en': (473, 508, 567, 532), 'jp': (433, 490, 606, 547), 'tw': (433, 490, 606, 547)}, file={'cn': './assets/cn/combat_ui/QUIT.png', 'en': './assets/en/combat_ui/QUIT.png', 'jp': './assets/jp/combat_ui/QUIT.png', 'tw': './assets/tw/combat_ui/QUIT.png'})
2526
QUIT_Christmas = Button(area={'cn': (400, 506, 477, 525), 'en': (410, 507, 469, 524), 'jp': (400, 506, 477, 525), 'tw': (400, 506, 477, 525)}, color={'cn': (195, 139, 166), 'en': (207, 166, 185), 'jp': (195, 139, 166), 'tw': (195, 139, 166)}, button={'cn': (400, 506, 477, 525), 'en': (410, 507, 469, 524), 'jp': (400, 506, 477, 525), 'tw': (400, 506, 477, 525)}, file={'cn': './assets/cn/combat_ui/QUIT_Christmas.png', 'en': './assets/en/combat_ui/QUIT_Christmas.png', 'jp': './assets/cn/combat_ui/QUIT_Christmas.png', 'tw': './assets/cn/combat_ui/QUIT_Christmas.png'})
@@ -31,3 +32,4 @@
3132
QUIT_Nurse = Button(area={'cn': (400, 507, 477, 525), 'en': (400, 507, 477, 525), 'jp': (400, 507, 477, 525), 'tw': (400, 507, 477, 525)}, color={'cn': (254, 193, 170), 'en': (254, 193, 170), 'jp': (254, 193, 170), 'tw': (254, 193, 170)}, button={'cn': (400, 507, 477, 525), 'en': (400, 507, 477, 525), 'jp': (400, 507, 477, 525), 'tw': (400, 507, 477, 525)}, file={'cn': './assets/cn/combat_ui/QUIT_Nurse.png', 'en': './assets/cn/combat_ui/QUIT_Nurse.png', 'jp': './assets/cn/combat_ui/QUIT_Nurse.png', 'tw': './assets/cn/combat_ui/QUIT_Nurse.png'})
3233
QUIT_Pharaoh = Button(area={'cn': (400, 507, 477, 525), 'en': (400, 507, 477, 525), 'jp': (400, 507, 477, 525), 'tw': (400, 507, 477, 525)}, color={'cn': (204, 132, 108), 'en': (204, 132, 108), 'jp': (204, 132, 108), 'tw': (204, 132, 108)}, button={'cn': (400, 507, 477, 525), 'en': (400, 507, 477, 525), 'jp': (400, 507, 477, 525), 'tw': (400, 507, 477, 525)}, file={'cn': './assets/cn/combat_ui/QUIT_Pharaoh.png', 'en': './assets/cn/combat_ui/QUIT_Pharaoh.png', 'jp': './assets/cn/combat_ui/QUIT_Pharaoh.png', 'tw': './assets/cn/combat_ui/QUIT_Pharaoh.png'})
3334
QUIT_Seaside = Button(area={'cn': (398, 509, 476, 528), 'en': (398, 509, 476, 528), 'jp': (398, 509, 476, 528), 'tw': (398, 509, 476, 528)}, color={'cn': (247, 208, 188), 'en': (247, 208, 188), 'jp': (247, 208, 188), 'tw': (247, 208, 188)}, button={'cn': (398, 509, 476, 528), 'en': (398, 509, 476, 528), 'jp': (398, 509, 476, 528), 'tw': (398, 509, 476, 528)}, file={'cn': './assets/cn/combat_ui/QUIT_Seaside.png', 'en': './assets/cn/combat_ui/QUIT_Seaside.png', 'jp': './assets/cn/combat_ui/QUIT_Seaside.png', 'tw': './assets/cn/combat_ui/QUIT_Seaside.png'})
35+
QUIT_SpringInn = Button(area={'cn': (396, 559, 478, 584), 'en': (396, 559, 478, 584), 'jp': (396, 559, 478, 584), 'tw': (396, 559, 478, 584)}, color={'cn': (145, 88, 80), 'en': (145, 88, 80), 'jp': (145, 88, 80), 'tw': (145, 88, 80)}, button={'cn': (396, 559, 478, 584), 'en': (396, 559, 478, 584), 'jp': (396, 559, 478, 584), 'tw': (396, 559, 478, 584)}, file={'cn': './assets/cn/combat_ui/QUIT_SpringInn.png', 'en': './assets/cn/combat_ui/QUIT_SpringInn.png', 'jp': './assets/cn/combat_ui/QUIT_SpringInn.png', 'tw': './assets/cn/combat_ui/QUIT_SpringInn.png'})

‎module/config/argument/args.json‎

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1649,7 +1649,6 @@
16491649
"type": "select",
16501650
"value": "campaign_main",
16511651
"option": [
1652-
"event_20220526_cn",
16531652
"event_20260226_cn"
16541653
],
16551654
"display": "hide",
@@ -1663,10 +1662,9 @@
16631662
"event_20260226_cn"
16641663
],
16651664
"option_tw": [
1666-
"event_20220526_cn"
1665+
"event_20260226_cn"
16671666
],
16681667
"option_bold": [
1669-
"event_20220526_cn",
16701668
"event_20260226_cn"
16711669
]
16721670
},
@@ -1970,7 +1968,6 @@
19701968
"type": "state",
19711969
"value": "campaign_main",
19721970
"option": [
1973-
"event_20220526_cn",
19741971
"event_20260226_cn"
19751972
],
19761973
"option_cn": [
@@ -1983,10 +1980,9 @@
19831980
"event_20260226_cn"
19841981
],
19851982
"option_tw": [
1986-
"event_20220526_cn"
1983+
"event_20260226_cn"
19871984
],
19881985
"option_bold": [
1989-
"event_20220526_cn",
19901986
"event_20260226_cn"
19911987
]
19921988
},
@@ -2365,7 +2361,6 @@
23652361
"type": "state",
23662362
"value": "campaign_main",
23672363
"option": [
2368-
"event_20220526_cn",
23692364
"event_20260226_cn"
23702365
],
23712366
"option_cn": [
@@ -2378,10 +2373,9 @@
23782373
"event_20260226_cn"
23792374
],
23802375
"option_tw": [
2381-
"event_20220526_cn"
2376+
"event_20260226_cn"
23822377
],
23832378
"option_bold": [
2384-
"event_20220526_cn",
23852379
"event_20260226_cn"
23862380
]
23872381
},
@@ -4088,7 +4082,6 @@
40884082
"type": "state",
40894083
"value": "campaign_main",
40904084
"option": [
4091-
"event_20220526_cn",
40924085
"event_20260226_cn"
40934086
],
40944087
"option_cn": [
@@ -4101,10 +4094,9 @@
41014094
"event_20260226_cn"
41024095
],
41034096
"option_tw": [
4104-
"event_20220526_cn"
4097+
"event_20260226_cn"
41054098
],
41064099
"option_bold": [
4107-
"event_20220526_cn",
41084100
"event_20260226_cn"
41094101
]
41104102
},
@@ -4500,7 +4492,6 @@
45004492
"type": "state",
45014493
"value": "campaign_main",
45024494
"option": [
4503-
"event_20220526_cn",
45044495
"event_20260226_cn"
45054496
],
45064497
"option_cn": [
@@ -4513,10 +4504,9 @@
45134504
"event_20260226_cn"
45144505
],
45154506
"option_tw": [
4516-
"event_20220526_cn"
4507+
"event_20260226_cn"
45174508
],
45184509
"option_bold": [
4519-
"event_20220526_cn",
45204510
"event_20260226_cn"
45214511
]
45224512
},
@@ -4912,7 +4902,6 @@
49124902
"type": "state",
49134903
"value": "campaign_main",
49144904
"option": [
4915-
"event_20220526_cn",
49164905
"event_20260226_cn"
49174906
],
49184907
"option_cn": [
@@ -4925,10 +4914,9 @@
49254914
"event_20260226_cn"
49264915
],
49274916
"option_tw": [
4928-
"event_20220526_cn"
4917+
"event_20260226_cn"
49294918
],
49304919
"option_bold": [
4931-
"event_20220526_cn",
49324920
"event_20260226_cn"
49334921
]
49344922
},
@@ -5324,7 +5312,6 @@
53245312
"type": "state",
53255313
"value": "campaign_main",
53265314
"option": [
5327-
"event_20220526_cn",
53285315
"event_20260226_cn"
53295316
],
53305317
"option_cn": [
@@ -5337,10 +5324,9 @@
53375324
"event_20260226_cn"
53385325
],
53395326
"option_tw": [
5340-
"event_20220526_cn"
5327+
"event_20260226_cn"
53415328
],
53425329
"option_bold": [
5343-
"event_20220526_cn",
53445330
"event_20260226_cn"
53455331
]
53465332
},
@@ -5726,7 +5712,6 @@
57265712
"type": "state",
57275713
"value": "campaign_main",
57285714
"option": [
5729-
"event_20220526_cn",
57305715
"event_20260226_cn"
57315716
],
57325717
"option_cn": [
@@ -5739,10 +5724,9 @@
57395724
"event_20260226_cn"
57405725
],
57415726
"option_tw": [
5742-
"event_20220526_cn"
5727+
"event_20260226_cn"
57435728
],
57445729
"option_bold": [
5745-
"event_20220526_cn",
57465730
"event_20260226_cn"
57475731
]
57485732
},

‎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()

‎module/exercise/hp_daemon.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ def _at_low_hp(self, image, pause=PAUSE):
7777
PAUSE_ShadowPuppetry,
7878
PAUSE_MaidCafe,
7979
PAUSE_Ancient,
80+
PAUSE_SpringInn,
8081
]:
8182
self.attacker_hp = self._calculate_hp(image, area=ATTACKER_HP_AREA_New.area, reverse=True)
8283
self.defender_hp = self._calculate_hp(image, area=DEFENDER_HP_AREA_New.area, reverse=True)

0 commit comments

Comments
 (0)