LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-14 07:39:25 +08:00
Code Activity

Add: hide_in_upper_left option for combat manual

Browse Source
This commit is contained in:
guoh064
2026-02-19 23:29:58 +08:00
committed by 0O0o0oOoO00
parent 9b98060c4d
commit 13aba919a2
10 changed files with 148 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.9 KiB

43
module/combat/combat_manual.py
View File

@@ -69,3 +69,46 @@ class CombatManual(ModuleBase):
return True
return False
from module.combat.my_assets import *
class CombatManual(CombatManual):
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(my_MOVE_LEFT_UP, duration=(1.5, 3.5))
return True
def handle_combat_manual(self, auto):
"""
Args:
auto (str): Combat auto mode.
Returns:
bool: If executed
"""
if self.manual_executed or not self.auto_mode_checked:
return False
if self.handle_combat_stand_still_in_the_middle(auto):
self.manual_executed = True
return True
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

7
module/combat/my_assets.py Normal file
View File

@@ -0,0 +1,7 @@
from module.base.button import Button
from module.base.template import Template
# This file was automatically generated by dev_tools/button_extract.py.
# Don't modify it manually.
my_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/my_MOVE_LEFT_UP.png', 'en': './assets/cn/combat/my_MOVE_LEFT_UP.png', 'jp': './assets/cn/combat/my_MOVE_LEFT_UP.png', 'tw': './assets/cn/combat/my_MOVE_LEFT_UP.png'})

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

@@ -1209,7 +1209,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet1Step": {
@@ -1251,7 +1252,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet2Step": {
@@ -1586,7 +1588,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet1Step": {
@@ -1628,7 +1631,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet2Step": {
@@ -1963,7 +1967,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet1Step": {
@@ -2005,7 +2010,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet2Step": {
@@ -2340,7 +2346,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet1Step": {
@@ -2382,7 +2389,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet2Step": {
@@ -2717,7 +2725,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet1Step": {
@@ -2759,7 +2768,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet2Step": {
@@ -3094,7 +3104,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet1Step": {
@@ -3136,7 +3147,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet2Step": {
@@ -3893,7 +3905,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet1Step": {
@@ -3935,7 +3948,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet2Step": {
@@ -4673,7 +4687,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet1Step": {
@@ -4715,7 +4730,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet2Step": {
@@ -5410,7 +5426,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet1Step": {
@@ -5452,7 +5469,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet2Step": {
@@ -6147,7 +6165,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet1Step": {
@@ -6189,7 +6208,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet2Step": {
@@ -6884,7 +6904,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet1Step": {
@@ -6926,7 +6947,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet2Step": {
@@ -7621,7 +7643,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet1Step": {
@@ -7663,7 +7686,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet2Step": {
@@ -8358,7 +8382,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet1Step": {
@@ -8400,7 +8425,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet2Step": {
@@ -9170,7 +9196,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
],
"display": "hide"
},
@@ -10255,7 +10282,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet1Step": {
@@ -10297,7 +10325,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet2Step": {
@@ -11009,7 +11038,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet1Step": {
@@ -11051,7 +11081,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet2Step": {
@@ -11763,7 +11794,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet1Step": {
@@ -11805,7 +11837,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet2Step": {
@@ -12517,7 +12550,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet1Step": {
@@ -12559,7 +12593,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet2Step": {
@@ -13271,7 +13306,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet1Step": {
@@ -13313,7 +13349,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet2Step": {
@@ -14015,7 +14052,8 @@
"combat_auto",
"combat_manual",
"stand_still_in_the_middle",
"hide_in_bottom_left"
"hide_in_bottom_left",
"hide_in_upper_left"
]
},
"Fleet1Step": {
@@ -14057,7 +14095,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

@@ -968,7 +968,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",
@@ -1002,7 +1003,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

@@ -968,7 +968,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",
@@ -1002,7 +1003,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

@@ -968,7 +968,8 @@
"combat_auto": "自律战斗",
"combat_manual": "手操",
"stand_still_in_the_middle": "中路站桩",
"hide_in_bottom_left": "躲左下角"
"hide_in_bottom_left": "躲左下角",
"hide_in_upper_left": "躲左上角"
},
"Fleet1Step": {
"name": "一队步长",
@@ -1002,7 +1003,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

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