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

Compare commits

base: sui_feng:master
Branches Tags
sui_feng:master sui_feng:dev sui_feng:island sui_feng:event_update sui_feng:logger_unlock_use sui_feng:war_archives_update sui_feng:island_project sui_feng:15-1
..
compare: sui_feng:dev
Branches Tags
sui_feng:master sui_feng:dev sui_feng:island sui_feng:event_update sui_feng:logger_unlock_use sui_feng:war_archives_update sui_feng:island_project sui_feng:15-1

1 Commits
master ... dev

Author SHA1 Message Date
positnuec
20d1b1c9a3 Opt: SkinBox position filter 2026-03-13 14:08:02 +08:00
18 changed files with 63 additions and 102 deletions
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: 7.6 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

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

Binary file not shown.
Side by Side

Before

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: 7.6 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.6 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.6 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

2
campaign/Readme.md
View File

@@ -283,4 +283,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 | 銀界遊廻（復刻） | - |
| 20260312 | event 20240229 cn | Snowrealm Peregrination | 复刻雪境迷踪 | 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, 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 = 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_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,7 +39,6 @@ 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': (601, 151, 704, 178), 'en': (565, 143, 692, 179), 'jp': (512, 154, 605, 176), 'tw': (602, 152, 702, 177)}, color={'cn': (158, 110, 113), '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,20 +42,6 @@ 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
@@ -81,8 +67,5 @@ 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

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

@@ -804,8 +804,7 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left",
"hide_in_upper_left"
"hide_in_bottom_left"
]
},
"Fleet1Step": {
@@ -847,8 +846,7 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left",
"hide_in_upper_left"
"hide_in_bottom_left"
]
},
"Fleet2Step": {
@@ -1200,8 +1198,7 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left",
"hide_in_upper_left"
"hide_in_bottom_left"
]
},
"Fleet1Step": {
@@ -1243,8 +1240,7 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left",
"hide_in_upper_left"
"hide_in_bottom_left"
]
},
"Fleet2Step": {
@@ -1596,8 +1592,7 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left",
"hide_in_upper_left"
"hide_in_bottom_left"
]
},
"Fleet1Step": {
@@ -1639,8 +1634,7 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left",
"hide_in_upper_left"
"hide_in_bottom_left"
]
},
"Fleet2Step": {
@@ -2094,8 +2088,7 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left",
"hide_in_upper_left"
"hide_in_bottom_left"
]
},
"Fleet1Step": {
@@ -2137,8 +2130,7 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left",
"hide_in_upper_left"
"hide_in_bottom_left"
]
},
"Fleet2Step": {
@@ -2505,8 +2497,7 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left",
"hide_in_upper_left"
"hide_in_bottom_left"
]
},
"Fleet1Step": {
@@ -2548,8 +2539,7 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left",
"hide_in_upper_left"
"hide_in_bottom_left"
]
},
"Fleet2Step": {
@@ -2919,8 +2909,7 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left",
"hide_in_upper_left"
"hide_in_bottom_left"
]
},
"Fleet1Step": {
@@ -2962,8 +2951,7 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left",
"hide_in_upper_left"
"hide_in_bottom_left"
]
},
"Fleet2Step": {
@@ -4301,8 +4289,7 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left",
"hide_in_upper_left"
"hide_in_bottom_left"
]
},
"Fleet1Step": {
@@ -4344,8 +4331,7 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left",
"hide_in_upper_left"
"hide_in_bottom_left"
]
},
"Fleet2Step": {
@@ -4733,8 +4719,7 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left",
"hide_in_upper_left"
"hide_in_bottom_left"
]
},
"Fleet1Step": {
@@ -4776,8 +4761,7 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left",
"hide_in_upper_left"
"hide_in_bottom_left"
]
},
"Fleet2Step": {
@@ -5165,8 +5149,7 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left",
"hide_in_upper_left"
"hide_in_bottom_left"
]
},
"Fleet1Step": {
@@ -5208,8 +5191,7 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left",
"hide_in_upper_left"
"hide_in_bottom_left"
]
},
"Fleet2Step": {
@@ -5597,8 +5579,7 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left",
"hide_in_upper_left"
"hide_in_bottom_left"
]
},
"Fleet1Step": {
@@ -5640,8 +5621,7 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left",
"hide_in_upper_left"
"hide_in_bottom_left"
]
},
"Fleet2Step": {
@@ -6029,8 +6009,7 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left",
"hide_in_upper_left"
"hide_in_bottom_left"
]
},
"Fleet1Step": {
@@ -6072,8 +6051,7 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left",
"hide_in_upper_left"
"hide_in_bottom_left"
]
},
"Fleet2Step": {
@@ -6451,8 +6429,7 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left",
"hide_in_upper_left"
"hide_in_bottom_left"
]
},
"Fleet1Step": {
@@ -6494,8 +6471,7 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left",
"hide_in_upper_left"
"hide_in_bottom_left"
]
},
"Fleet2Step": {

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

@@ -185,7 +185,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, hide_in_upper_left ]
option: [ combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_left ]
Fleet1Step:
value: 3
option: [ 2, 3, 4, 5 ]
@@ -197,7 +197,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, hide_in_upper_left ]
option: [ combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_left ]
Fleet2Step:
value: 2
option: [ 2, 3, 4, 5 ]

4
module/config/config_generated.py
View File

@@ -100,11 +100,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, hide_in_upper_left
Fleet_Fleet1Mode = 'combat_auto' # combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_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, hide_in_upper_left
Fleet_Fleet2Mode = 'combat_auto' # combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_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

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

@@ -958,8 +958,7 @@
"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_upper_left": "hide_in_upper_left"
"hide_in_bottom_left": "hide_in_bottom_left"
},
"Fleet1Step": {
"name": "Fleet 1 Step Number",
@@ -993,8 +992,7 @@
"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_upper_left": "hide_in_upper_left"
"hide_in_bottom_left": "hide_in_bottom_left"
},
"Fleet2Step": {
"name": "Fleet 2 Step Number",

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

@@ -958,8 +958,7 @@
"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_upper_left": "hide_in_upper_left"
"hide_in_bottom_left": "hide_in_bottom_left"
},
"Fleet1Step": {
"name": "Fleet.Fleet1Step.name",
@@ -993,8 +992,7 @@
"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_upper_left": "hide_in_upper_left"
"hide_in_bottom_left": "hide_in_bottom_left"
},
"Fleet2Step": {
"name": "Fleet.Fleet2Step.name",

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

@@ -958,8 +958,7 @@
"combat_auto": "自律战斗",
"combat_manual": "手操",
"stand_still_in_the_middle": "中路站桩",
"hide_in_bottom_left": "躲左下角",
"hide_in_upper_left": "躲左上角"
"hide_in_bottom_left": "躲左下角"
},
"Fleet1Step": {
"name": "一队步长",
@@ -993,8 +992,7 @@
"combat_auto": "自律战斗",
"combat_manual": "手操",
"stand_still_in_the_middle": "中路站桩",
"hide_in_bottom_left": "躲左下角",
"hide_in_upper_left": "躲左上角"
"hide_in_bottom_left": "躲左下角"
},
"Fleet2Step": {
"name": "二队步长",

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

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

4
module/minigame/minigame.py
View File

@@ -196,10 +196,6 @@ class Minigame(UI):
if self.ui_page_appear(page_academy, interval=5):
self.device.click(ACADEMY_GOTO_GAME_ROOM)
continue
# You've reached your monthly limit of Game Tickets, and will not be able to earn any more.
# Continue playing the minigame?
if self.handle_popup_confirm('MINIGAME_ENTER'):
continue
# game room and choose game have same header, go to game room first
self.go_to_main_page()

5
module/os_ash/meta.py
View File

@@ -47,7 +47,10 @@ class MetaDigitCounter(DigitCounter):
class Meta(UI, MapEventHandler):
def digit_ocr_point_and_check(self, button: Button, check_number: int):
point_ocr = MetaDigitCounter(button, letter=(235, 235, 235), threshold=160, name='POINT_OCR')
if server.server != 'jp':
point_ocr = MetaDigitCounter(button, letter=(235, 235, 235), threshold=160, name='POINT_OCR')
else:
point_ocr = MetaDigitCounter(button, letter=(192, 192, 192), threshold=160, name='POINT_OCR')
point, _, _ = point_ocr.ocr(self.device.image)
if point >= check_number:
return True

30
module/shop/shop_general.py
View File

@@ -1,15 +1,11 @@
import re
from module.base.decorator import cached_property
from module.base.filter import Filter
from module.logger import logger
from module.shop.base import ShopItemGrid, ShopItemGrid_250814
from module.shop.clerk import ShopClerk
from module.shop.shop_status import ShopStatus
from module.shop.ui import ShopUI
SKINBOX_POSITION_FILTER = Filter(re.compile(r'^(\d+)$'), ('position',))
import re
class GeneralShop_250814(ShopClerk, ShopUI, ShopStatus):
gems = 0
@@ -33,13 +29,29 @@ class GeneralShop_250814(ShopClerk, ShopUI, ShopStatus):
Returns:
set[int]:
"""
skinbox_filter = self.config.GeneralShop_SkinBoxPositionFilter.strip()
if not skinbox_filter:
raw_filter = self.config.GeneralShop_SkinBoxPositionFilter.strip()
if not raw_filter:
return None
SKINBOX_POSITION_FILTER.load(skinbox_filter)
allowed = {int(pos) for pos in SKINBOX_POSITION_FILTER.filter_raw if pos.isdigit()}
raw_filter = re.sub(r'[＞﹥›˃ᐳ❯]', '>', raw_filter)
allowed = {int(pos) for pos in raw_filter.split('>') if pos.strip().isdigit()}
logger.attr('SkinBox_filter', ' > '.join([str(pos) for pos in allowed]))
# raw_filter = raw_filter.replace('，', ',')
# allowed = {int(pos) for pos in raw_filter.split(',') if pos.strip().isdigit()}
# logger.attr('SkinBox_filter', ', '.join([str(pos) for pos in allowed]))
# raw_filter = raw_filter.replace('，', ',')
# allowed = set()
# for item in raw_filter.split(','):
# pos_str = item.strip()
# if not pos_str:
# continue
# if pos_str.isdigit():
# allowed.add(int(pos_str))
# continue
# logger.warning(f"Invalid position index: {pos_str}")
# logger.attr('SkinBox_filter', ', '.join([str(pos) for pos in allowed]))
if not allowed:
logger.warning("No valid positions found")