Prioritize commission rewards and fix built-in battle simulation flow

This commit is contained in:
AttilaNet
2026-11-08 20:07:26 +08:00
parent 1ee030a8e3
commit 001ed9d36d
12 changed files with 260 additions and 59 deletions
+11 -8
View File
@@ -228,13 +228,12 @@ class ProgressionPages:
"仍受任务规则、战斗能力、保留体力和顶部“开启 / 停止”限制;无法匹配的目标会显示原因。")
form.addRow("任务目标", self.progression_auto_farm)
self.progression_commissions.setToolTip("委托交付由“自动委托”页独立配置;此项只纳入任务诊断,不开启委托执行")
self.progression_battle_mode = ComboBox()
# Keep the combo for existing config/autosave glue; the GUI always simulates.
self.progression_battle_mode = ComboBox(settings)
for mode, label in BATTLE_MODES.items():
self.progression_battle_mode.addItem(label, mode)
self.progression_battle_mode.setToolTip("原版运行时:只执行当前能力检查确认支持的战斗。\n"
"实验模拟:近似推演,不保证与原版结果一致,也不代表全部规则已经验证;实际可用范围以能力检查为准。\n"
"任务和委托战斗共用此模式,仍由顶部“开启 / 停止”控制。")
form.addRow("战斗模式(任务 / 委托)", self.progression_battle_mode)
self.progression_battle_mode.setCurrentIndex(self.progression_battle_mode.findData("experimental"))
self.progression_battle_mode.hide()
self.progression_team = ComboBox()
for team in ("teamA", "teamB", "teamC"):
self.progression_team.addItem(team, team)
@@ -314,7 +313,10 @@ class ProgressionPages:
value = {}
for key, default in asdict(ProgressionPolicy()).items():
widget = getattr(self, "progression_" + key)
if key == "item_reserves":
if key == "battle_mode":
# Legacy GUI glue may restore the hidden combo after loading.
value[key] = "experimental"
elif key == "item_reserves":
reserves = {}
for entry in widget.text().split(","):
if entry.strip():
@@ -329,6 +331,8 @@ class ProgressionPages:
def load_progression_policy(self, policy):
for key, value in asdict(policy).items():
if key == "battle_mode":
value = "experimental"
widget = getattr(self, "progression_" + key)
blocker = C.QSignalBlocker(widget)
if key == "item_reserves":
@@ -377,8 +381,7 @@ class ProgressionPages:
return
active = self.strategy_toggle.isChecked() and self.progression_enabled.isChecked()
text = "自动主线已开启" if active else "策略已停止;顶部“开启”后执行勾选功能" if self.progression_enabled.isChecked() else "自动主线未启用"
mode = self.progression_battle_mode.currentData()
text += ";战斗模式:" + BATTLE_MODES.get(mode, "未选择,请检查策略")
text += ";战斗按原始属性进行实验模拟,等待计算出的战斗时长后提交(近似推演,结果以实际记录为准)"
if not callable(getattr(self.engine, "refresh_progression", None)):
text += ";当前引擎尚未接入任务刷新"
if not callable(getattr(self.engine, "run_progression_once", None)):