Improve task filters, exploration rewards and V4 battle simulation

This commit is contained in:
AttilaNet
2026-11-10 14:09:53 +08:00
parent 5082c2df5c
commit 6d74730735
20 changed files with 1129 additions and 42 deletions
+53 -11
View File
@@ -23,9 +23,14 @@ BATTLE_ALIASES = {"task": "task_battle", "passStage": "task_pass_stage", "event"
BATTLE_MODES = {"original": "原版运行时(以能力检查为准)", "experimental": "实验模拟(近似,未完整验证)"}
STATES = {"available": "可接取", "unaccepted": "未接取", "active": "进行中", "in_progress": "进行中",
"ready": "待交付", "completed": "已完成", "complete": "已完成", "claimed": "已领奖",
"received": "进行中", "unlocked": "已解锁 / 待接取", "locked": "未解锁", "finished": "已完成",
"received": "进行中", "unlocked": "已解锁 / 待接取", "offered": "待接取", "locked": "未解锁", "finished": "已完成",
"ready_to_reward": "待领取任务奖励", "blocked": "受阻", "unsupported": "暂不支持", "unknown": "未知"}
CHINA_TIME = timezone(timedelta(hours=8))
STATE_FILTERS = (("current", "当前(进行中 + 待接取 + 待领奖)"), ("received", "进行中"), ("unlocked", "待接取"),
("ready_to_reward", "待领奖"), ("finished", "已完成"), ("locked", "未解锁"), ("", "全部状态"))
STATE_ALIASES = {"active": "received", "in_progress": "received", "available": "unlocked", "unaccepted": "unlocked", "offered": "unlocked",
"ready": "ready_to_reward", "completed": "finished", "complete": "finished", "claimed": "finished", "blocked": "received"}
CURRENT_STATES = {"received", "unlocked", "ready_to_reward"}
OUTCOMES = {"win": "胜利", "loss": "打不过", "unsupported": "暂不支持", "event": "地图奖励事件",
"completed": "已完成", "cancelled": "已取消", "timeout": "超时", "unknown": "结果待核对"}
@@ -65,7 +70,9 @@ def prepare_progression_views(engine, *, tasks=True, records=True):
row = copy.deepcopy(source)
kind = category(row.get("category", "unknown"))
kind = kind if kind in CATEGORIES else "unknown"
state = display(row.get("state"), "未知")
raw_state = row.get("state")
state = display(raw_state, "未知")
lifecycle_state = STATE_ALIASES.get(state, state)
reason = battle_message(display(row.get("blocked_reason") or row.get("block_reason") or row.get("reason"), ""))
supported = row.get("supported")
support = "受阻:" + reason if reason else "已支持" if supported is True else "暂不支持" if supported is False else "支持状态未确认"
@@ -81,7 +88,8 @@ def prepare_progression_views(engine, *, tasks=True, records=True):
"目标 / 位置:" + values[5] + ";NPC:" + display(row.get("npc_name")), "需求:" + values[6], "对话:" + dialogue,
"下一步:" + values[7] + ";战斗:" + values[8] + ";运行状态:" + display(row.get("status"), values[3]),
"支持状态 / 阻塞原因:" + support))
task_rows.append({"key": str(index), "category": kind, "values": values, "detail": detail,
task_rows.append({"key": str(index), "category": kind, "state": raw_state, "lifecycle_state": lifecycle_state,
"values": values, "detail": detail,
"search": (" ".join(values) + " " + dialogue).casefold()})
for index, source in enumerate(record_data):
row = copy.deepcopy(source)
@@ -111,6 +119,14 @@ def prepare_progression_views(engine, *, tasks=True, records=True):
detail = "\n".join(("时间(北京时间):" + values[0], "上下文:" + values[1] + ";任务 / 地图:" + values[2],
"战斗模式:" + BATTLE_MODES.get(mode, "记录未标明"),
"队伍:" + values[3] + ";结果:" + values[4], "详情 / 阻塞原因:" + values[5], "奖励:" + display(row.get("reward"))))
if row.get("damage_profile") == "client_v4_x10":
detail += "\n伤害规则:我方对敌最终伤害 10 倍,单次最高 50000;角色属性保持原值"
elif row.get("damage_profile") == "original_1x":
detail += "\n伤害规则:原始 1 倍;角色属性保持原值"
elif row.get("damage_profile") is not None:
detail += "\n伤害规则未识别"
else:
detail += "\n旧记录未标明伤害倍率"
record_rows.append({"key": str(index), "category": kind if kind in BATTLE_KINDS else "unknown", "values": values,
"detail": detail, "search": " ".join(values).casefold()})
message = "" if callable(task_reader) else "当前引擎尚未提供任务读取;任务只展示,不自动推进"
@@ -190,11 +206,19 @@ class ProgressionPages:
self.progression_filter = ComboBox()
for key, name in (("", "全部类别"), *CATEGORIES.items()):
self.progression_filter.addItem(name, key)
self.progression_filter.setCurrentIndex(self.progression_filter.findData("mainline"))
self.progression_state_filter = ComboBox()
for key, name in STATE_FILTERS:
self.progression_state_filter.addItem(name, key)
self.progression_search = W.QLineEdit()
self.progression_search.setPlaceholderText("按任务编号、名称、目标或阻塞原因筛选")
filters.addWidget(self.progression_filter)
filters.addWidget(self.progression_state_filter)
filters.addWidget(self.progression_search, 1)
task_layout.addLayout(filters)
self.progression_task_status = W.QLabel("默认只显示当前账号进行中、待接取和待领奖的主线任务")
self.progression_task_status.setWordWrap(True)
task_layout.addWidget(self.progression_task_status)
self.progression_table = CachedTable(["编号", "类别", "任务", "状态", "步骤", "目标 / 位置", "需求", "下一步", "战斗类型", "支持状态 / 阻塞原因"],
left_columns=(2, 5, 6, 7, 9))
self.progression_table.setColumnWidth(2, 180)
@@ -249,7 +273,7 @@ class ProgressionPages:
self.progression_item_reserves = W.QLineEdit()
self.progression_item_reserves.setPlaceholderText("物品编号:保留数量,多个用英文逗号分隔")
form.addRow("交付后至少保留", self.progression_item_reserves)
note = W.QLabel("勾选功能后,使用顶部绿色“开启”运行。支持状态以任务列表为准;未知状态不会自动执行。\n任务列表区分主线 / 支线 / 委托;战斗记录区分普通战斗、扫荡和地图奖励事件。未支持的步骤显示原因。")
note = W.QLabel("勾选功能后,使用顶部绿色“开启”运行。支持状态以任务列表为准;未知状态不会自动执行。\n任务列表区分主线 / 支线 / 委托;战斗记录区分普通战斗、扫荡和地图奖励事件。未支持的步骤显示原因。\n桌面模拟保持原始属性,仅将我方对敌最终伤害调整为 10 倍、上限 50000。")
note.setWordWrap(True)
form.addRow(note)
scroll = W.QScrollArea()
@@ -259,8 +283,9 @@ class ProgressionPages:
self.progression_tabs.addTab(scroll, "推进策略")
layout.addWidget(self.progression_tabs, 1)
self.tabs.addTab(self.progression_page, "自动主线")
self.progression_filter.currentIndexChanged.connect(self.render_progression)
self.progression_search.textChanged.connect(self.render_progression)
self.progression_filter.currentIndexChanged.connect(self.render_progression_filters)
self.progression_state_filter.currentIndexChanged.connect(self.render_progression_filters)
self.progression_search.textChanged.connect(self.render_progression_filters)
self.progression_table.itemSelectionChanged.connect(self.progression_selection_changed)
self.progression_enabled.toggled.connect(self.progression_settings_changed)
self.update_progression_status()
@@ -382,7 +407,7 @@ class ProgressionPages:
return
active = self.strategy_toggle.isChecked() and self.progression_enabled.isChecked()
text = "自动主线已开启" if active else "策略已停止;顶部“开启”后执行勾选功能" if self.progression_enabled.isChecked() else "自动主线未启用"
text += ";战斗按原始属性进行实验模拟,等待计算出的战斗时长后提交(近似推演,结果以实际记录为准)"
text += ";战斗保持原始属性,实验模拟中我方对敌最终伤害为 10 倍、上限 50000,等待计算出的战斗时长后提交(近似推演,结果以实际记录为准)"
if not callable(getattr(self.engine, "refresh_progression", None)):
text += ";当前引擎尚未接入任务刷新"
if not callable(getattr(self.engine, "run_progression_once", None)):
@@ -447,6 +472,7 @@ class ProgressionPages:
widget.set_rows([])
self.progression_detail.clear()
self.battle_record_detail.clear()
self.progression_task_status.setText("默认只显示当前账号进行中、待接取和待领奖的主线任务")
self.update_progression_status()
def accept_progression_views(self, views):
@@ -472,7 +498,10 @@ class ProgressionPages:
engine = self.engine
self.run_job("progression_view", lambda: prepare_progression_views(engine, tasks=tasks, records=not tasks))
def render_progression(self, *args):
def render_progression_filters(self, *args):
self.render_progression(request_missing=False)
def render_progression(self, *args, request_missing=True):
if self.closed or not self.presentation_active:
return
page = self.tabs.currentWidget()
@@ -480,15 +509,28 @@ class ProgressionPages:
return
views = self.progression_views
tasks = page is self.progression_page
if views is None or views.snapshot is not self.engine.snapshot or (views.tasks if tasks else views.records) is None:
if request_missing and (views is None or views.snapshot is not self.engine.snapshot or (views.tasks if tasks else views.records) is None):
self.request_progression_views()
table = self.progression_table if tasks else self.battle_records_table
rows = ((views.tasks if tasks else views.records) or []) if views else []
selected = self.progression_filter.currentData() if tasks else self.battle_records_filter.currentData()
query = (self.progression_search.text() if tasks else self.battle_records_search.text()).strip().casefold()
visible = [row for row in rows if (not selected or row["category"] == selected) and (not query or query in row["search"])]
state = self.progression_state_filter.currentData()
def matches(row):
if selected and row["category"] != selected:
return False
if query and query not in row["search"]:
return False
if not tasks or not state:
return True
lifecycle_state = row["lifecycle_state"]
return lifecycle_state in CURRENT_STATES if state == "current" else lifecycle_state == state
visible = [row for row in rows if matches(row)]
table.set_rows(visible)
if not tasks:
if tasks:
self.progression_task_status.setText(f"显示 {len(visible)} / {len(rows)} 条任务" if visible else
f"没有符合当前类别、状态和搜索条件的任务(共 {len(rows)} 条)")
else:
self.battle_records_status.setText(f"已读取 {len(rows)} 条记录,显示 {len(visible)} 条;战斗、扫荡和地图奖励事件分别标记" if rows else
"尚无已读取的战斗记录;未记录结果不代表战斗成功")
self.update_progression_status()