sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-16 04:37:44 +08:00
Code Activity

Add: hide_in_upper_left option for combat manual

Browse Source
This commit is contained in:
guoh064
2026-02-19 01:48:45 +08:00
committed by LmeSzinc
parent 5611dce94b
commit 3f9e7edf4e
10 changed files with 86 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

1
module/combat/assets.py
View File

@@ -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

72
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": {
@@ -1755,7 +1761,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 +1804,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet2Step": {
@@ -2025,7 +2033,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 +2076,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet2Step": {
@@ -2418,7 +2428,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 +2471,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 +3747,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 +3790,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet2Step": {
@@ -4145,7 +4159,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 +4202,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet2Step": {
@@ -4555,7 +4571,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 +4614,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet2Step": {
@@ -4965,7 +4983,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 +5026,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet2Step": {
@@ -5375,7 +5395,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 +5438,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet2Step": {
@@ -5775,7 +5797,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 +5840,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

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

@@ -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",

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

@@ -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",

6
module/config/i18n/zh-CN.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": "二队步长",

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": "二隊步幅",