sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-18 19:33:33 +08:00
Code Activity

Merge pull request #5555 from LmeSzinc/dev

Browse Source 
Add: event entrance for event_20240229_cn rerun
This commit is contained in:
LmeSzinc
2026-03-12 19:34:30 +08:00
committed by GitHub
parent b687048405 9a9454df26
commit a6f1695de5
15 changed files with 131 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/cn/combat/COMBAT_AUTO.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 7.6 KiB

BIN
assets/cn/combat/MOVE_LEFT_UP.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.9 KiB

BIN
assets/en/combat/COMBAT_AUTO.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 7.6 KiB

BIN
assets/jp/combat/COMBAT_AUTO.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 7.6 KiB

BIN
assets/tw/combat/COMBAT_AUTO.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 7.6 KiB

1
campaign/Readme.md
View File

@@ -282,3 +282,4 @@ To add a new event, add a new row in here, and run `python -m module.config.conf
| 20260205 | raid 20240328 | From Zero to Hero | 复刻从零开始的魔王讨伐之旅 | From Zero to Hero Rerun | ゼロから頑張る魔王討伐（復刻） | - |
| 20260212 | raid 20260212 | Spring Auction Adventure | 春宴怀玉香满庭 | Spring Auction Adventure | 新春玉逸品会 | 春宴懷玉香滿庭 |
| 20260226 | event 20260226 cn | Springtide Inn Online | 春满客栈Online | Springtide Inn Online | 春色旅籠Online | 春滿客棧Online |
| 20260312 | event 20240229 cn | Snowrealm Peregrination Rerun | 复刻雪境迷踪 | Snowrealm Peregrination Rerun | 銀界遊廻（復刻） | - |

3
module/combat/assets.py
View File

@@ -17,7 +17,7 @@ BATTLE_STATUS_B = Button(area={'cn': (625, 297, 712, 317), 'en': (625, 297, 712,
BATTLE_STATUS_C = Button(area={'cn': (625, 211, 647, 297), 'en': (625, 211, 647, 297), 'jp': (625, 211, 647, 297), 'tw': (625, 211, 647, 297)}, color={'cn': (199, 208, 198), 'en': (199, 208, 198), 'jp': (199, 208, 198), 'tw': (199, 208, 198)}, button={'cn': (1000, 631, 1055, 689), 'en': (1000, 631, 1055, 689), 'jp': (1000, 631, 1055, 689), 'tw': (1000, 631, 1055, 689)}, file={'cn': './assets/cn/combat/BATTLE_STATUS_C.png', 'en': './assets/en/combat/BATTLE_STATUS_C.png', 'jp': './assets/jp/combat/BATTLE_STATUS_C.png', 'tw': './assets/tw/combat/BATTLE_STATUS_C.png'})
BATTLE_STATUS_D = Button(area={'cn': (618, 191, 639, 317), 'en': (618, 191, 639, 317), 'jp': (618, 191, 639, 317), 'tw': (618, 191, 639, 317)}, color={'cn': (199, 208, 199), 'en': (199, 208, 199), 'jp': (199, 208, 199), 'tw': (199, 208, 199)}, button={'cn': (1000, 631, 1055, 689), 'en': (1000, 631, 1055, 689), 'jp': (1000, 631, 1055, 689), 'tw': (1000, 631, 1055, 689)}, file={'cn': './assets/cn/combat/BATTLE_STATUS_D.png', 'en': './assets/en/combat/BATTLE_STATUS_D.png', 'jp': './assets/jp/combat/BATTLE_STATUS_D.png', 'tw': './assets/tw/combat/BATTLE_STATUS_D.png'})
BATTLE_STATUS_S = Button(area={'cn': (643, 297, 722, 317), 'en': (643, 297, 722, 317), 'jp': (643, 297, 722, 317), 'tw': (643, 297, 722, 317)}, color={'cn': (233, 242, 127), 'en': (233, 242, 127), 'jp': (233, 242, 127), 'tw': (233, 242, 127)}, button={'cn': (1000, 631, 1055, 689), 'en': (999, 630, 1047, 691), 'jp': (1000, 631, 1055, 689), 'tw': (1000, 631, 1055, 689)}, file={'cn': './assets/cn/combat/BATTLE_STATUS_S.png', 'en': './assets/en/combat/BATTLE_STATUS_S.png', 'jp': './assets/jp/combat/BATTLE_STATUS_S.png', 'tw': './assets/tw/combat/BATTLE_STATUS_S.png'})
COMBAT_AUTO = Button(area={'cn': (136, 573, 167, 604), 'en': (136, 573, 167, 604), 'jp': (136, 573, 167, 604), 'tw': (136, 573, 167, 604)}, color={'cn': (229, 242, 255), 'en': (229, 242, 255), 'jp': (229, 242, 255), 'tw': (229, 242, 255)}, button={'cn': (136, 573, 167, 604), 'en': (136, 573, 167, 604), 'jp': (136, 573, 167, 604), 'tw': (136, 573, 167, 604)}, file={'cn': './assets/cn/combat/COMBAT_AUTO.png', 'en': './assets/en/combat/COMBAT_AUTO.png', 'jp': './assets/jp/combat/COMBAT_AUTO.png', 'tw': './assets/tw/combat/COMBAT_AUTO.png'})
COMBAT_AUTO = Button(area={'cn': (136, 572, 167, 605), 'en': (136, 572, 167, 605), 'jp': (136, 572, 167, 605), 'tw': (136, 572, 167, 605)}, color={'cn': (234, 244, 255), 'en': (234, 244, 255), 'jp': (234, 244, 255), 'tw': (234, 244, 255)}, button={'cn': (136, 572, 167, 605), 'en': (136, 572, 167, 605), 'jp': (136, 572, 167, 605), 'tw': (136, 572, 167, 605)}, file={'cn': './assets/cn/combat/COMBAT_AUTO.png', 'en': './assets/en/combat/COMBAT_AUTO.png', 'jp': './assets/jp/combat/COMBAT_AUTO.png', 'tw': './assets/tw/combat/COMBAT_AUTO.png'})
COMBAT_AUTO_133 = Button(area={'cn': (131, 568, 170, 609), 'en': (131, 568, 170, 609), 'jp': (131, 568, 170, 609), 'tw': (131, 568, 170, 609)}, color={'cn': (234, 244, 255), 'en': (234, 244, 255), 'jp': (234, 244, 255), 'tw': (234, 244, 255)}, button={'cn': (131, 568, 170, 609), 'en': (131, 568, 170, 609), 'jp': (131, 568, 170, 609), 'tw': (131, 568, 170, 609)}, file={'cn': './assets/cn/combat/COMBAT_AUTO_133.png', 'en': './assets/en/combat/COMBAT_AUTO_133.png', 'jp': './assets/jp/combat/COMBAT_AUTO_133.png', 'tw': './assets/tw/combat/COMBAT_AUTO_133.png'})
COMBAT_AUTO_150 = Button(area={'cn': (129, 567, 172, 611), 'en': (129, 567, 172, 611), 'jp': (129, 567, 172, 611), 'tw': (129, 567, 172, 611)}, color={'cn': (238, 247, 255), 'en': (238, 247, 255), 'jp': (238, 247, 255), 'tw': (238, 247, 255)}, button={'cn': (129, 567, 172, 611), 'en': (129, 567, 172, 611), 'jp': (129, 567, 172, 611), 'tw': (129, 567, 172, 611)}, file={'cn': './assets/cn/combat/COMBAT_AUTO_150.png', 'en': './assets/en/combat/COMBAT_AUTO_150.png', 'jp': './assets/jp/combat/COMBAT_AUTO_150.png', 'tw': './assets/tw/combat/COMBAT_AUTO_150.png'})
COMBAT_AUTO_SWITCH = Button(area={'cn': (18, 38, 36, 56), 'en': (16, 31, 140, 62), 'jp': (18, 36, 54, 57), 'tw': (18, 38, 36, 56)}, color={'cn': (179, 198, 235), 'en': (105, 137, 189), 'jp': (160, 177, 220), 'tw': (179, 198, 235)}, button={'cn': (18, 38, 36, 56), 'en': (16, 31, 140, 62), 'jp': (18, 36, 54, 57), 'tw': (18, 38, 36, 56)}, file={'cn': './assets/cn/combat/COMBAT_AUTO_SWITCH.png', 'en': './assets/en/combat/COMBAT_AUTO_SWITCH.png', 'jp': './assets/jp/combat/COMBAT_AUTO_SWITCH.png', 'tw': './assets/tw/combat/COMBAT_AUTO_SWITCH.png'})
@@ -39,6 +39,7 @@ LOADING_BAR = Button(area={'cn': (33, 676, 1247, 680), 'en': (33, 676, 1247, 680
MAIN_FLEET_POWER_ZERO = Button(area={'cn': (131, 151, 232, 206), 'en': (131, 151, 232, 206), 'jp': (131, 151, 232, 206), 'tw': (131, 151, 232, 206)}, color={'cn': (63, 79, 98), 'en': (63, 79, 98), 'jp': (63, 79, 98), 'tw': (63, 79, 98)}, button={'cn': (131, 151, 232, 206), 'en': (131, 151, 232, 206), 'jp': (131, 151, 232, 206), 'tw': (131, 151, 232, 206)}, file={'cn': './assets/cn/combat/MAIN_FLEET_POWER_ZERO.png', 'en': './assets/en/combat/MAIN_FLEET_POWER_ZERO.png', 'jp': './assets/jp/combat/MAIN_FLEET_POWER_ZERO.png', 'tw': './assets/tw/combat/MAIN_FLEET_POWER_ZERO.png'})
MOVE_DOWN = Button(area={'cn': (148, 647, 155, 669), 'en': (148, 647, 155, 669), 'jp': (148, 647, 155, 669), 'tw': (148, 647, 155, 669)}, color={'cn': (21, 28, 57), 'en': (21, 28, 57), 'jp': (21, 28, 57), 'tw': (21, 28, 57)}, button={'cn': (148, 647, 155, 669), 'en': (148, 647, 155, 669), 'jp': (148, 647, 155, 669), 'tw': (148, 647, 155, 669)}, file={'cn': './assets/cn/combat/MOVE_DOWN.png', 'en': './assets/en/combat/MOVE_DOWN.png', 'jp': './assets/jp/combat/MOVE_DOWN.png', 'tw': './assets/tw/combat/MOVE_DOWN.png'})
MOVE_LEFT_DOWN = Button(area={'cn': (67, 668, 112, 707), 'en': (67, 668, 112, 707), 'jp': (67, 668, 112, 707), 'tw': (67, 668, 112, 707)}, color={'cn': (65, 80, 100), 'en': (65, 80, 100), 'jp': (65, 80, 100), 'tw': (65, 80, 100)}, button={'cn': (67, 668, 112, 707), 'en': (67, 668, 112, 707), 'jp': (67, 668, 112, 707), 'tw': (67, 668, 112, 707)}, file={'cn': './assets/cn/combat/MOVE_LEFT_DOWN.png', 'en': './assets/en/combat/MOVE_LEFT_DOWN.png', 'jp': './assets/jp/combat/MOVE_LEFT_DOWN.png', 'tw': './assets/tw/combat/MOVE_LEFT_DOWN.png'})
MOVE_LEFT_UP = Button(area={'cn': (101, 539, 136, 574), 'en': (101, 539, 136, 574), 'jp': (101, 539, 136, 574), 'tw': (101, 539, 136, 574)}, color={'cn': (255, 255, 255), 'en': (255, 255, 255), 'jp': (255, 255, 255), 'tw': (255, 255, 255)}, button={'cn': (101, 539, 136, 574), 'en': (101, 539, 136, 574), 'jp': (101, 539, 136, 574), 'tw': (101, 539, 136, 574)}, file={'cn': './assets/cn/combat/MOVE_LEFT_UP.png', 'en': './assets/cn/combat/MOVE_LEFT_UP.png', 'jp': './assets/cn/combat/MOVE_LEFT_UP.png', 'tw': './assets/cn/combat/MOVE_LEFT_UP.png'})
NEW_SHIP = Button(area={'cn': (206, 87, 213, 93), 'en': (206, 87, 213, 93), 'jp': (206, 87, 213, 93), 'tw': (206, 87, 213, 93)}, color={'cn': (235, 171, 60), 'en': (235, 171, 60), 'jp': (235, 171, 60), 'tw': (235, 171, 60)}, button={'cn': (206, 87, 213, 93), 'en': (206, 87, 213, 93), 'jp': (206, 87, 213, 93), 'tw': (206, 87, 213, 93)}, file={'cn': './assets/cn/combat/NEW_SHIP.png', 'en': './assets/en/combat/NEW_SHIP.png', 'jp': './assets/jp/combat/NEW_SHIP.png', 'tw': './assets/tw/combat/NEW_SHIP.png'})
OPTS_INFO_D = Button(area={'cn': (602, 151, 703, 179), 'en': (565, 143, 692, 179), 'jp': (512, 154, 605, 176), 'tw': (602, 152, 702, 177)}, color={'cn': (157, 115, 123), 'en': (171, 116, 110), 'jp': (201, 187, 191), 'tw': (164, 130, 137)}, button={'cn': (583, 605, 677, 628), 'en': (590, 587, 627, 647), 'jp': (574, 596, 685, 635), 'tw': (583, 604, 676, 627)}, file={'cn': './assets/cn/combat/OPTS_INFO_D.png', 'en': './assets/en/combat/OPTS_INFO_D.png', 'jp': './assets/jp/combat/OPTS_INFO_D.png', 'tw': './assets/tw/combat/OPTS_INFO_D.png'})
QUIT_RECONFIRM = Button(area={'cn': (749, 501, 828, 540), 'en': (761, 495, 818, 523), 'jp': (746, 490, 830, 530), 'tw': (754, 491, 825, 522)}, color={'cn': (207, 140, 133), 'en': (208, 147, 141), 'jp': (203, 138, 132), 'tw': (211, 158, 152)}, button={'cn': (749, 501, 828, 540), 'en': (761, 495, 818, 523), 'jp': (746, 490, 830, 530), 'tw': (754, 491, 825, 522)}, file={'cn': './assets/cn/combat/QUIT_RECONFIRM.png', 'en': './assets/en/combat/QUIT_RECONFIRM.png', 'jp': './assets/jp/combat/QUIT_RECONFIRM.png', 'tw': './assets/tw/combat/QUIT_RECONFIRM.png'})

17
module/combat/combat_manual.py
View File

@@ -42,6 +42,20 @@ class CombatManual(ModuleBase):
self.device.long_click(MOVE_LEFT_DOWN, duration=(3.5, 5.5))
return True
def handle_combat_stand_still_upper_left(self, auto):
"""
Args:
auto (str): Combat auto mode.
Returns:
bool: If executed
"""
if auto != 'hide_in_upper_left':
return False
self.device.long_click(MOVE_LEFT_UP, duration=(1.5, 3.5))
return True
def handle_combat_weapon_release(self):
if self.appear_then_click(READY_AIR_RAID, interval=10):
return True
@@ -67,5 +81,8 @@ class CombatManual(ModuleBase):
if self.handle_combat_stand_still_bottom_left(auto):
self.manual_executed = True
return True
if self.handle_combat_stand_still_upper_left(auto):
self.manual_executed = True
return True
return False

136
module/config/argument/args.json
View File

@@ -563,7 +563,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet1Step": {
@@ -605,7 +606,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet2Step": {
@@ -940,7 +942,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet1Step": {
@@ -982,7 +985,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet2Step": {
@@ -1317,7 +1321,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet1Step": {
@@ -1359,7 +1364,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet2Step": {
@@ -1635,22 +1641,24 @@
"type": "select",
"value": "campaign_main",
"option": [
"event_20240229_cn",
"event_20260226_cn"
],
"display": "hide",
"option_cn": [
"event_20260226_cn"
"event_20240229_cn"
],
"option_en": [
"event_20260226_cn"
"event_20240229_cn"
],
"option_jp": [
"event_20260226_cn"
"event_20240229_cn"
],
"option_tw": [
"event_20260226_cn"
],
"option_bold": [
"event_20240229_cn",
"event_20260226_cn"
]
},
@@ -1755,7 +1763,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet1Step": {
@@ -1797,7 +1806,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet2Step": {
@@ -1914,21 +1924,23 @@
"type": "state",
"value": "campaign_main",
"option": [
"event_20240229_cn",
"event_20260226_cn"
],
"option_cn": [
"event_20260226_cn"
"event_20240229_cn"
],
"option_en": [
"event_20260226_cn"
"event_20240229_cn"
],
"option_jp": [
"event_20260226_cn"
"event_20240229_cn"
],
"option_tw": [
"event_20260226_cn"
],
"option_bold": [
"event_20240229_cn",
"event_20260226_cn"
]
},
@@ -2025,7 +2037,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet1Step": {
@@ -2067,7 +2080,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet2Step": {
@@ -2307,21 +2321,23 @@
"type": "state",
"value": "campaign_main",
"option": [
"event_20240229_cn",
"event_20260226_cn"
],
"option_cn": [
"event_20260226_cn"
"event_20240229_cn"
],
"option_en": [
"event_20260226_cn"
"event_20240229_cn"
],
"option_jp": [
"event_20260226_cn"
"event_20240229_cn"
],
"option_tw": [
"event_20260226_cn"
],
"option_bold": [
"event_20240229_cn",
"event_20260226_cn"
]
},
@@ -2418,7 +2434,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet1Step": {
@@ -2460,7 +2477,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet2Step": {
@@ -3735,7 +3753,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet1Step": {
@@ -3777,7 +3796,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet2Step": {
@@ -4028,21 +4048,23 @@
"type": "state",
"value": "campaign_main",
"option": [
"event_20240229_cn",
"event_20260226_cn"
],
"option_cn": [
"event_20260226_cn"
"event_20240229_cn"
],
"option_en": [
"event_20260226_cn"
"event_20240229_cn"
],
"option_jp": [
"event_20260226_cn"
"event_20240229_cn"
],
"option_tw": [
"event_20260226_cn"
],
"option_bold": [
"event_20240229_cn",
"event_20260226_cn"
]
},
@@ -4145,7 +4167,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet1Step": {
@@ -4187,7 +4210,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet2Step": {
@@ -4438,21 +4462,23 @@
"type": "state",
"value": "campaign_main",
"option": [
"event_20240229_cn",
"event_20260226_cn"
],
"option_cn": [
"event_20260226_cn"
"event_20240229_cn"
],
"option_en": [
"event_20260226_cn"
"event_20240229_cn"
],
"option_jp": [
"event_20260226_cn"
"event_20240229_cn"
],
"option_tw": [
"event_20260226_cn"
],
"option_bold": [
"event_20240229_cn",
"event_20260226_cn"
]
},
@@ -4555,7 +4581,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet1Step": {
@@ -4597,7 +4624,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet2Step": {
@@ -4848,21 +4876,23 @@
"type": "state",
"value": "campaign_main",
"option": [
"event_20240229_cn",
"event_20260226_cn"
],
"option_cn": [
"event_20260226_cn"
"event_20240229_cn"
],
"option_en": [
"event_20260226_cn"
"event_20240229_cn"
],
"option_jp": [
"event_20260226_cn"
"event_20240229_cn"
],
"option_tw": [
"event_20260226_cn"
],
"option_bold": [
"event_20240229_cn",
"event_20260226_cn"
]
},
@@ -4965,7 +4995,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet1Step": {
@@ -5007,7 +5038,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet2Step": {
@@ -5258,21 +5290,23 @@
"type": "state",
"value": "campaign_main",
"option": [
"event_20240229_cn",
"event_20260226_cn"
],
"option_cn": [
"event_20260226_cn"
"event_20240229_cn"
],
"option_en": [
"event_20260226_cn"
"event_20240229_cn"
],
"option_jp": [
"event_20260226_cn"
"event_20240229_cn"
],
"option_tw": [
"event_20260226_cn"
],
"option_bold": [
"event_20240229_cn",
"event_20260226_cn"
]
},
@@ -5375,7 +5409,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet1Step": {
@@ -5417,7 +5452,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet2Step": {
@@ -5658,21 +5694,23 @@
"type": "state",
"value": "campaign_main",
"option": [
"event_20240229_cn",
"event_20260226_cn"
],
"option_cn": [
"event_20260226_cn"
"event_20240229_cn"
],
"option_en": [
"event_20260226_cn"
"event_20240229_cn"
],
"option_jp": [
"event_20260226_cn"
"event_20240229_cn"
],
"option_tw": [
"event_20260226_cn"
],
"option_bold": [
"event_20240229_cn",
"event_20260226_cn"
]
},
@@ -5775,7 +5813,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet1Step": {
@@ -5817,7 +5856,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet2Step": {

4
module/config/argument/argument.yaml
View File

@@ -175,7 +175,7 @@ Fleet:
option: [ line_ahead, double_line, diamond ]
Fleet1Mode:
value: combat_auto
option: [ combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_left ]
option: [ combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_left, hide_in_upper_left ]
Fleet1Step:
value: 3
option: [ 2, 3, 4, 5 ]
@@ -187,7 +187,7 @@ Fleet:
option: [ line_ahead, double_line, diamond ]
Fleet2Mode:
value: combat_auto
option: [ combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_left ]
option: [ combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_left, hide_in_upper_left ]
Fleet2Step:
value: 2
option: [ 2, 3, 4, 5 ]

4
module/config/config_generated.py
View File

@@ -93,11 +93,11 @@ class GeneratedConfig:
# Group `Fleet`
Fleet_Fleet1 = 1 # 1, 2, 3, 4, 5, 6
Fleet_Fleet1Formation = 'double_line' # line_ahead, double_line, diamond
Fleet_Fleet1Mode = 'combat_auto' # combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_left
Fleet_Fleet1Mode = 'combat_auto' # combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_left, hide_in_upper_left
Fleet_Fleet1Step = 3 # 2, 3, 4, 5
Fleet_Fleet2 = 2 # 0, 1, 2, 3, 4, 5, 6
Fleet_Fleet2Formation = 'double_line' # line_ahead, double_line, diamond
Fleet_Fleet2Mode = 'combat_auto' # combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_left
Fleet_Fleet2Mode = 'combat_auto' # combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_left, hide_in_upper_left
Fleet_Fleet2Step = 2 # 2, 3, 4, 5
Fleet_FleetOrder = 'fleet1_mob_fleet2_boss' # fleet1_mob_fleet2_boss, fleet1_boss_fleet2_mob, fleet1_all_fleet2_standby, fleet1_standby_fleet2_all

8
module/config/i18n/en-US.json
View File

@@ -748,7 +748,7 @@
"event_20231026_cn": "Tempesta and the Fountain of Youth",
"event_20231123_cn": "The Ninja Scrolls: Azur Flash",
"event_20231221_cn": "Light-Chasing Sea of Stars Rerun",
"event_20240229_cn": "Snowrealm Peregrination",
"event_20240229_cn": "Snowrealm Peregrination Rerun",
"event_20240425_cn": "Heart-Linking Harmony",
"event_20240521_cn": "Light of the Martyrium",
"event_20240725_cn": "Interlude of Illusions",
@@ -913,7 +913,8 @@
"combat_auto": "combat_auto",
"combat_manual": "combat_manual",
"stand_still_in_the_middle": "stand_still_in_the_middle",
"hide_in_bottom_left": "hide_in_bottom_left"
"hide_in_bottom_left": "hide_in_bottom_left",
"hide_in_upper_left": "hide_in_upper_left"
},
"Fleet1Step": {
"name": "Fleet 1 Step Number",
@@ -947,7 +948,8 @@
"combat_auto": "combat_auto",
"combat_manual": "combat_manual",
"stand_still_in_the_middle": "stand_still_in_the_middle",
"hide_in_bottom_left": "hide_in_bottom_left"
"hide_in_bottom_left": "hide_in_bottom_left",
"hide_in_upper_left": "hide_in_upper_left"
},
"Fleet2Step": {
"name": "Fleet 2 Step Number",

8
module/config/i18n/ja-JP.json
View File

@@ -748,7 +748,7 @@
"event_20231026_cn": "テンペスタと若返りの泉",
"event_20231123_cn": "蒼閃忍法帖",
"event_20231221_cn": "光追う星の海（復刻）",
"event_20240229_cn": "銀界遊廻",
"event_20240229_cn": "銀界遊廻（復刻）",
"event_20240425_cn": "共鳴のパッション",
"event_20240521_cn": "赫輝のマルティリウム",
"event_20240725_cn": "夢幻の間奏曲",
@@ -913,7 +913,8 @@
"combat_auto": "combat_auto",
"combat_manual": "combat_manual",
"stand_still_in_the_middle": "stand_still_in_the_middle",
"hide_in_bottom_left": "hide_in_bottom_left"
"hide_in_bottom_left": "hide_in_bottom_left",
"hide_in_upper_left": "hide_in_upper_left"
},
"Fleet1Step": {
"name": "Fleet.Fleet1Step.name",
@@ -947,7 +948,8 @@
"combat_auto": "combat_auto",
"combat_manual": "combat_manual",
"stand_still_in_the_middle": "stand_still_in_the_middle",
"hide_in_bottom_left": "hide_in_bottom_left"
"hide_in_bottom_left": "hide_in_bottom_left",
"hide_in_upper_left": "hide_in_upper_left"
},
"Fleet2Step": {
"name": "Fleet.Fleet2Step.name",

8
module/config/i18n/zh-CN.json
View File

@@ -748,7 +748,7 @@
"event_20231026_cn": "飓风与青春之泉",
"event_20231123_cn": "苍闪忍法帖",
"event_20231221_cn": "复刻星海逐光",
"event_20240229_cn": "雪境迷踪",
"event_20240229_cn": "复刻雪境迷踪",
"event_20240425_cn": "共鸣的PASSION",
"event_20240521_cn": "绽放于辉光之城",
"event_20240725_cn": "幻梦间奏曲",
@@ -913,7 +913,8 @@
"combat_auto": "自律战斗",
"combat_manual": "手操",
"stand_still_in_the_middle": "中路站桩",
"hide_in_bottom_left": "躲左下角"
"hide_in_bottom_left": "躲左下角",
"hide_in_upper_left": "躲左上角"
},
"Fleet1Step": {
"name": "一队步长",
@@ -947,7 +948,8 @@
"combat_auto": "自律战斗",
"combat_manual": "手操",
"stand_still_in_the_middle": "中路站桩",
"hide_in_bottom_left": "躲左下角"
"hide_in_bottom_left": "躲左下角",
"hide_in_upper_left": "躲左上角"
},
"Fleet2Step": {
"name": "二队步长",

6
module/config/i18n/zh-TW.json
View File

@@ -913,7 +913,8 @@
"combat_auto": "自律戰鬥",
"combat_manual": "手動",
"stand_still_in_the_middle": "中路站樁",
"hide_in_bottom_left": "躲左下角"
"hide_in_bottom_left": "躲左下角",
"hide_in_upper_left": "躲左上角"
},
"Fleet1Step": {
"name": "一隊步幅",
@@ -947,7 +948,8 @@
"combat_auto": "自律戰鬥",
"combat_manual": "手動",
"stand_still_in_the_middle": "中路站樁",
"hide_in_bottom_left": "躲左下角"
"hide_in_bottom_left": "躲左下角",
"hide_in_upper_left": "躲左上角"
},
"Fleet2Step": {
"name": "二隊步幅",