wangpeng/wow
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add 复活点路线与死亡按键可配置

Browse Source 
- 死亡管理新增复活点路线JSON两阶段跑尸逻辑
- GUI参数配置支持释放灵魂/复活按键自定义
- 复活点路线JSON选择控件移到攻击循环前面

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
王鹏
2026-04-11 22:58:44 +08:00
parent dc1b3a4368
commit d0df69184d
6 changed files with 130 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
auto_bot_move.py
View File

@@ -93,6 +93,9 @@ class AutoBotMove:
eat_hp_threshold=None,
eat_max_wait_sec=None,
stop_check=None,
resurrection_waypoints_path=None,
release_spirit_key=None,
resurrect_key=None,
):
self.last_tab_time = 0
self.is_running = True
@@ -120,7 +123,11 @@ class AutoBotMove:
mount_retry_after_sec=float(layout.get("mount_retry_after_sec", 2.0)),
enable_mount=bool(layout.get("enable_mount", True)),
)
self.death_manager = DeathManager(self.patrol_controller)
self.death_manager = DeathManager(
self.patrol_controller, resurrection_waypoints_path,
release_spirit_key=layout.get('release_spirit_key', '9') if release_spirit_key is None else release_spirit_key,
resurrect_key=layout.get('resurrect_key', '0') if resurrect_key is None else resurrect_key,
)
vendor_file = vendor_path or get_config_path('vendor.json')
self.logistics_manager = LogisticsManager(vendor_file)
self.logistics_manager.bag_full_hearthstone = bool(layout.get("bag_full_hearthstone", False))
@@ -230,7 +237,8 @@ class AutoBotMove:
self.death_manager.on_death(state)
return
if death == 2:
self.death_manager.run_to_corpse(state)
get_state = (lambda: None if self._should_stop() else parse_game_state())
self.death_manager.run_to_corpse(state, get_state)
return
# 2. 后勤检查（脱战时）：空格或耐久不足则回城

4
combat_loops/DK.json
View File

@@ -2,6 +2,10 @@
"name": "DK",
"trigger_chance": 0.5,
"steps": [
{
"key": "4",
"delay": 0.5
},
{
"key": "2",
"delay": 0.5

52
death_manager.py
View File

@@ -4,17 +4,39 @@ import pydirectinput
class DeathManager:
def __init__(self, patrol_system):
def __init__(self, patrol_system, resurrection_waypoints_path=None,
release_spirit_key='9', resurrect_key='0'):
self.corpse_pos = None
self.patrol_system = patrol_system
self.is_running_to_corpse = False
self._spirit_release_sent = False
self.resurrection_waypoints = self._load_waypoints(resurrection_waypoints_path)
self._resurrection_completed = False
self.release_spirit_key = str(release_spirit_key).strip() or '9'
self.resurrect_key = str(resurrect_key).strip() or '0'
def _load_waypoints(self, path):
"""加载复活点路线 JSON，可置空。"""
if not path:
return None
import json, os
if not os.path.exists(path):
return None
try:
with open(path, 'r', encoding='utf-8') as f:
data = json.load(f)
if isinstance(data, list) and len(data) > 0:
return [(float(p[0]), float(p[1])) for p in data]
except Exception:
pass
return None
def reset_when_alive(self):
"""存活时清标志，避免下次死亡无法再次释放灵魂/记录尸体坐标。"""
self._spirit_release_sent = False
self.corpse_pos = None
self.is_running_to_corpse = False
self._resurrection_completed = False
def on_death(self, state):
"""1. 死亡瞬间调用：从 player_position 获取坐标并记录"""
@@ -24,25 +46,37 @@ class DeathManager:
self.corpse_pos = (state['x'], state['y'])
self.is_running_to_corpse = True
print(f">>> [系统] 记录死亡坐标: {self.corpse_pos}，准备释放灵魂...")
pydirectinput.press('9') # 绑定宏: /run RepopMe()
pydirectinput.press(self.release_spirit_key)
time.sleep(5) # 等待加载界面
def run_to_corpse(self, state):
"""2. 跑尸寻路逻辑：坐标与朝向从 player_position 获取"""
def run_to_corpse(self, state, get_state=None):
"""
2. 跑尸寻路逻辑：坐标与朝向从 player_position 获取。
两阶段逻辑：
- 阶段1：若配置了复活点路线，先跑完该路线
- 阶段2：路线跑完后（或无路线），跑向尸体
"""
if not self.corpse_pos:
return
# 阶段1：复活路线未走完 → navigate_path 跑完路线
if self.resurrection_waypoints and not self._resurrection_completed:
if get_state is None:
return
if self.patrol_system.navigate_path(get_state, self.resurrection_waypoints):
self._resurrection_completed = True
print(">>> 复活路线跑完，开始跑向尸体...")
return
# 阶段2：复活路线走完（或无） → 直接跑向尸体
is_arrived = self.patrol_system.navigate_to_point(state, self.corpse_pos)
# 如果距离尸体很近（0.005 约等于 10-20 码）
if is_arrived:
print(">>> 已到达尸体附近，尝试复活...")
pydirectinput.press('0') # 绑定宏: /run RetrieveCorpse()
pydirectinput.press(self.resurrect_key)
time.sleep(5)
self.is_running_to_corpse = False
self.corpse_pos = None
return
def handle_resurrection_popup(self):
"""处理复活确认框"""
# 配合 Lua 插件自动点击，或者 Python 模拟按键
pydirectinput.press('enter')

7
game_state_config.json
View File

@@ -5,7 +5,10 @@
"scan_region_height": 15,
"offset_left": 20,
"offset_top": 45,
"enable_mount": false,
"mount_key": "x",
"mount_hold_sec": 1.6,
"mount_retry_after_sec": 2.0
"mount_hold_sec": 2.0,
"mount_retry_after_sec": 2.5,
"hearthstone_key": "6",
"bag_full_hearthstone": true
}

65
wow_multikey_gui.py
View File

@@ -317,6 +317,9 @@ class GameLoopWorker(QThread):
flight_takeoff_hold_sec=None,
flight_land_key=None,
flight_land_hold_sec=None,
resurrection_waypoints_path=None,
release_spirit_key=None,
resurrect_key=None,
):
super().__init__()
self.mode = mode # 'monitor' | 'patrol' | 'combat' | 'quest_follow' | 'flight' | 'record'
@@ -352,6 +355,9 @@ class GameLoopWorker(QThread):
self.flight_takeoff_hold_sec = flight_takeoff_hold_sec
self.flight_land_key = flight_land_key
self.flight_land_hold_sec = flight_land_hold_sec
self.resurrection_waypoints_path = resurrection_waypoints_path
self.release_spirit_key = release_spirit_key
self.resurrect_key = resurrect_key
def run(self):
try:
@@ -372,6 +378,9 @@ class GameLoopWorker(QThread):
eat_hp_threshold=self.eat_hp_threshold,
eat_max_wait_sec=self.eat_max_wait_sec,
stop_check=lambda: not self.running,
resurrection_waypoints_path=self.resurrection_waypoints_path,
release_spirit_key=self.release_spirit_key,
resurrect_key=self.resurrect_key,
)
self.bot_move._on_hearthstone_stop = self.stop_signal.emit
except ImportError as e:
@@ -606,6 +615,9 @@ class WoWMultiKeyGUI(QMainWindow):
refresh_btn.clicked.connect(self._refresh_recorder_combos)
patrol_layout.addRow("巡逻点 JSON:", self.waypoints_combo)
patrol_layout.addRow("修理商 JSON:", self.vendor_combo)
self.resurrection_waypoints_combo = QComboBox()
self.resurrection_waypoints_combo.setMinimumWidth(200)
patrol_layout.addRow("复活点路线 JSON:", self.resurrection_waypoints_combo)
patrol_layout.addRow("攻击循环:", self.patrol_attack_loop_combo)
patrol_layout.addRow("", refresh_btn)
self.patrol_group.setVisible(False)
@@ -945,6 +957,17 @@ class WoWMultiKeyGUI(QMainWindow):
params_right.addRow("上马按住时长 (mount_hold_sec):", self.gs_mount_hold)
params_right.addRow("上马重试间隔 (mount_retry_after_sec):", self.gs_mount_retry)
self.gs_release_spirit_key = QLineEdit()
self.gs_release_spirit_key.setPlaceholderText("如 9")
self.gs_release_spirit_key.setMaxLength(16)
self.gs_release_spirit_key.setText("9")
self.gs_resurrect_key = QLineEdit()
self.gs_resurrect_key.setPlaceholderText("如 0")
self.gs_resurrect_key.setMaxLength(16)
self.gs_resurrect_key.setText("0")
params_right.addRow("释放灵魂按键:", self.gs_release_spirit_key)
params_right.addRow("复活按键:", self.gs_resurrect_key)
params_row.addLayout(params_left)
params_row.addLayout(params_right)
params_layout.addWidget(params_content)
@@ -985,6 +1008,8 @@ class WoWMultiKeyGUI(QMainWindow):
self.gs_hearthstone_key.setText(str(cfg.get('hearthstone_key', 'b') or 'b'))
self.gs_bag_full_hearthstone.setChecked(bool(cfg.get('bag_full_hearthstone', False)))
self.gs_mount_retry.setValue(float(cfg.get('mount_retry_after_sec', 2.0)))
self.gs_release_spirit_key.setText(str(cfg.get('release_spirit_key', '9') or '9'))
self.gs_resurrect_key.setText(str(cfg.get('resurrect_key', '0') or '0'))
except Exception as e:
self.log(f"加载参数配置失败: {e}")
try:
@@ -1017,6 +1042,8 @@ class WoWMultiKeyGUI(QMainWindow):
cfg['mount_retry_after_sec'] = float(self.gs_mount_retry.value())
cfg['hearthstone_key'] = (self.gs_hearthstone_key.text().strip() or 'b')
cfg['bag_full_hearthstone'] = self.gs_bag_full_hearthstone.isChecked()
cfg['release_spirit_key'] = (self.gs_release_spirit_key.text().strip() or '9')
cfg['resurrect_key'] = (self.gs_resurrect_key.text().strip() or '0')
path = save_layout_config(cfg)
# bot 参数写入主配置文件
self.config = self.config or {}
@@ -1212,22 +1239,34 @@ class WoWMultiKeyGUI(QMainWindow):
self.preview_canvas.reset_view()
def _refresh_recorder_combos(self):
"""刷新巡逻点、修理商下拉列表"""
"""刷新巡逻点、修理商、复活点路线下拉列表"""
items = list_recorder_json()
combos = [(self.waypoints_combo, 'waypoints.json'), (self.vendor_combo, 'vendor.json')]
combos_with_default = [
(self.waypoints_combo, 'waypoints.json'),
(self.vendor_combo, 'vendor.json'),
]
if hasattr(self, "repair_vendor_combo"):
combos.append((self.repair_vendor_combo, 'vendor.json'))
for combo, default_name in combos:
combos_with_default.append((self.repair_vendor_combo, 'vendor.json'))
for combo, default_name in combos_with_default:
combo.blockSignals(True)
combo.clear()
combo.addItem("-- 请选择 --", "")
for name, path in items:
combo.addItem(name, path)
# 尝试选中默认项
idx = combo.findData(os.path.join(get_recorder_dir(), default_name))
if idx >= 0:
combo.setCurrentIndex(idx)
elif combo.count() > 1:
combo.setCurrentIndex(1)
combo.blockSignals(False)
# 复活点路线下拉（无默认值，可置空）
if hasattr(self, "resurrection_waypoints_combo"):
self.resurrection_waypoints_combo.blockSignals(True)
self.resurrection_waypoints_combo.clear()
self.resurrection_waypoints_combo.addItem("-- 置空（直接跑尸体） --", "")
for name, path in items:
self.resurrection_waypoints_combo.addItem(name, path)
self.resurrection_waypoints_combo.blockSignals(False)
def _refresh_repair_vendor_json_combo(self):
"""刷新“回城修理配置”的修理商下拉框。"""
@@ -1365,9 +1404,11 @@ class WoWMultiKeyGUI(QMainWindow):
waypoints_path = None
vendor_path = None
flight_json_path = None
resurrection_waypoints_path = None
if mode == 'patrol':
wp = self.waypoints_combo.currentData() or ""
vp = self.vendor_combo.currentData() or ""
rwp = self.resurrection_waypoints_combo.currentData() or ""
if not wp:
QMessageBox.warning(self, "提示", "巡逻打怪模式需选择巡逻点 JSON 文件")
return
@@ -1382,6 +1423,7 @@ class WoWMultiKeyGUI(QMainWindow):
return
waypoints_path = wp
vendor_path = vp
resurrection_waypoints_path = rwp if rwp and os.path.exists(rwp) else None
attack_loop_path = None
if mode == 'patrol':
attack_loop_path = self.patrol_attack_loop_combo.currentData() or None
@@ -1447,6 +1489,16 @@ class WoWMultiKeyGUI(QMainWindow):
except Exception:
eat_max_wait_sec = 30.0
# 从 layout_config 读取死亡/复活按键
try:
from game_state import load_layout_config
layout_cfg = load_layout_config()
release_spirit_key = str(layout_cfg.get('release_spirit_key', '9') or '9')
resurrect_key = str(layout_cfg.get('resurrect_key', '0') or '0')
except Exception:
release_spirit_key = '9'
resurrect_key = '0'
self.game_worker = GameLoopWorker(
mode, waypoints_path=waypoints_path, vendor_path=vendor_path,
attack_loop_path=attack_loop_path,
@@ -1462,6 +1514,9 @@ class WoWMultiKeyGUI(QMainWindow):
flight_takeoff_hold_sec=self.flight_takeoff_hold_spin.value(),
flight_land_key=self.flight_land_key_edit.text(),
flight_land_hold_sec=self.flight_land_hold_spin.value(),
resurrection_waypoints_path=resurrection_waypoints_path,
release_spirit_key=release_spirit_key,
resurrect_key=resurrect_key,
)
self.game_worker.state_signal.connect(self.state_label.setText)
self.game_worker.log_signal.connect(self.log)

6
wow_multikey_qt.json
View File

@@ -6,6 +6,10 @@
"takeoff_hold_sec": 2.0,
"land_key": "p",
"land_hold_sec": 2.0
}
},
"skinning_wait_sec": 1.5,
"food_key": "f1",
"eat_hp_threshold": 30,
"eat_max_wait_sec": 30.0
}
}