Show Chinese battle blockers and label actual defeats clearly
This commit is contained in:
@@ -2,6 +2,8 @@
|
|||||||
|
|
||||||
## 2026-11-08 增量收尾与下次待办
|
## 2026-11-08 增量收尾与下次待办
|
||||||
|
|
||||||
|
界面增量:战斗阻塞原因统一显示中文;实际模拟战败显示“打不过”。任务1002002第二步对应0202难度1,其原始失败条件包含保护单位阵亡(`loseType=3`),尚未实现保护/摧毁目标的完整判定及对象单位行为;本轮只改善提示,该关卡仍会暂停,保护战斗支持留待后续实现。
|
||||||
|
|
||||||
按用户剩余额度限制,本轮只完成短路径修改:桌面程序统一使用内置实验模拟并等待计算出的战斗时长,移除运行时选择;修复任务1002002(再次出发,0201难度1)纯显示 `buffMovie` 控制器造成的阻塞;委托按奖励氪金20→15→10排序,委托执行优先于普通策略,材料不足时接通现有扫荡/挑战来源。保留原属性、资源保护和未知结果核对机制,未执行真实游戏请求。
|
按用户剩余额度限制,本轮只完成短路径修改:桌面程序统一使用内置实验模拟并等待计算出的战斗时长,移除运行时选择;修复任务1002002(再次出发,0201难度1)纯显示 `buffMovie` 控制器造成的阻塞;委托按奖励氪金20→15→10排序,委托执行优先于普通策略,材料不足时接通现有扫荡/挑战来源。保留原属性、资源保护和未知结果核对机制,未执行真实游戏请求。
|
||||||
|
|
||||||
本轮定向验证:任务/编排/委托优先级141项、最终界面及配置/原自动化回归51项、战斗模型40项通过。未运行长时间原AIR试验,也未重新执行全量回归。
|
本轮定向验证:任务/编排/委托优先级141项、最终界面及配置/原自动化回归51项、战斗模型40项通过。未运行长时间原AIR试验,也未重新执行全量回归。
|
||||||
|
|||||||
@@ -0,0 +1,38 @@
|
|||||||
|
"""Chinese presentation for combat diagnostics; raw evidence stays unchanged."""
|
||||||
|
import re
|
||||||
|
|
||||||
|
|
||||||
|
def battle_message(message):
|
||||||
|
text = str(message or "")
|
||||||
|
objective = "Non-elimination win/loss objective is unsupported"
|
||||||
|
units = "Protected/destroy objective units are unsupported"
|
||||||
|
if objective in text and units in text:
|
||||||
|
text = text.replace(objective + "; " + units,
|
||||||
|
"本关需要保护或摧毁指定目标,当前模拟器尚未支持这类战斗规则")
|
||||||
|
for source, target in (
|
||||||
|
(objective, "本关采用特殊胜负条件,当前模拟器尚未支持"),
|
||||||
|
(units, "本关涉及保护或摧毁指定目标,当前模拟器尚未支持"),
|
||||||
|
("Elimination battle must contain configured enemies", "关卡缺少有效敌方配置,暂时无法模拟"),
|
||||||
|
("Selected team is absent from the raw snapshot", "未找到所选战斗队伍,请重新选择队伍"),
|
||||||
|
("Team must contain distinct original roster monsters", "队伍为空或包含重复魔物,请检查队伍"),
|
||||||
|
("Selected team uses a locked original team slot", "队伍使用了尚未解锁的出战位置"),
|
||||||
|
("Only hatched, positive-level roster monsters can fight", "队伍包含尚未孵化或等级无效的魔物"),
|
||||||
|
("Full original battleField configuration is required", "关卡缺少完整战场配置,暂时无法模拟"),
|
||||||
|
("Unknown original configured species", "关卡包含资料未知的魔物,暂时无法模拟"),
|
||||||
|
("Unknown original player species", "出战魔物资料未知,暂时无法模拟"),
|
||||||
|
("实验模型战败(近似)", "打不过(模拟结果)"),
|
||||||
|
("实际战败", "打不过"),
|
||||||
|
):
|
||||||
|
text = text.replace(source, target)
|
||||||
|
for pattern, target in (
|
||||||
|
(r"Unsupported monster controller: [^;;\n]+", "当前模拟器尚未支持这种魔物行为规则"),
|
||||||
|
(r"Unsupported battle controller: [^;;\n]+", "当前模拟器尚未支持这种战斗机制"),
|
||||||
|
(r"Unsupported battle triggers: [^;;\n]+", "当前模拟器尚未支持这种战斗触发事件"),
|
||||||
|
(r"Unsupported active field area: [^;;\n]+", "当前模拟器尚未支持这种战场区域效果"),
|
||||||
|
(r"Full roster is missing monster field [^;;\n]+", "魔物属性数据不完整,暂时无法模拟"),
|
||||||
|
(r"Invalid numeric field: [^;;\n]+", "战斗数据包含无效数值,暂时无法模拟"),
|
||||||
|
):
|
||||||
|
text = re.sub(pattern, target, text)
|
||||||
|
if re.search(r"[a-zA-Z]{2,}", text) and not re.search(r"[\u3400-\u9fff]", text):
|
||||||
|
return "战斗模拟暂时无法处理当前数据,详细原因已保留在调试记录中"
|
||||||
|
return text
|
||||||
@@ -22,6 +22,7 @@ from .sweeping import SweepPolicy
|
|||||||
from .progression import ProgressionPolicy
|
from .progression import ProgressionPolicy
|
||||||
from .activity_gui import ActivityPages
|
from .activity_gui import ActivityPages
|
||||||
from .progression_gui import ProgressionPages, prepare_progression_views
|
from .progression_gui import ProgressionPages, prepare_progression_views
|
||||||
|
from .battle_messages import battle_message
|
||||||
from .presentation import Presented, prepare_views, monster_rows
|
from .presentation import Presented, prepare_views, monster_rows
|
||||||
from .credentials import CredentialStore
|
from .credentials import CredentialStore
|
||||||
from .debug import TraceLog
|
from .debug import TraceLog
|
||||||
@@ -891,7 +892,7 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
|||||||
message = message.replace(secret, "<隐藏>")
|
message = message.replace(secret, "<隐藏>")
|
||||||
if "策略暂不可用" in message or "页面数据暂不可用" in message:
|
if "策略暂不可用" in message or "页面数据暂不可用" in message:
|
||||||
self.trace.emit("error", "本地策略 / 页面处理", scope="local", message=message)
|
self.trace.emit("error", "本地策略 / 页面处理", scope="local", message=message)
|
||||||
self.log.appendPlainText(time.strftime("%H:%M:%S ") + message)
|
self.log.appendPlainText(time.strftime("%H:%M:%S ") + battle_message(message))
|
||||||
|
|
||||||
def remember_log_sizes(self, *args):
|
def remember_log_sizes(self, *args):
|
||||||
if self.show_log.isChecked():
|
if self.show_log.isChecked():
|
||||||
@@ -1468,6 +1469,7 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
|||||||
last = self.trace.events[-1] if self.trace.events else {}
|
last = self.trace.events[-1] if self.trace.events else {}
|
||||||
if last.get("kind") != "error" or last.get("message") != self.trace.redact(message):
|
if last.get("kind") != "error" or last.get("message") != self.trace.redact(message):
|
||||||
self.trace.emit("error", "界面 / 任务处理", scope="local", message=message)
|
self.trace.emit("error", "界面 / 任务处理", scope="local", message=message)
|
||||||
|
message = battle_message(message)
|
||||||
self.login_status.setText("操作失败,调试窗口中保留了请求和响应")
|
self.login_status.setText("操作失败,调试窗口中保留了请求和响应")
|
||||||
self.engine.auto = False
|
self.engine.auto = False
|
||||||
self.engine.heartbeat_enabled = False
|
self.engine.heartbeat_enabled = False
|
||||||
|
|||||||
@@ -443,7 +443,7 @@ class ProgressionPlanner:
|
|||||||
return False, None, "等待已验证的引导记录:" + str(guide)
|
return False, None, "等待已验证的引导记录:" + str(guide)
|
||||||
kind, value = step.get("statusType"), step.get("statusValue") or {}
|
kind, value = step.get("statusType"), step.get("statusValue") or {}
|
||||||
if kind in ("battle", "passStage"):
|
if kind in ("battle", "passStage"):
|
||||||
return False, None, "需要真实任务战斗" if kind == "battle" else "需要通过指定关卡的任务战斗"
|
return False, None, "需要进行任务战斗" if kind == "battle" else "需要通过指定关卡的任务战斗"
|
||||||
if kind == "none":
|
if kind == "none":
|
||||||
return True, None, "对话步骤"
|
return True, None, "对话步骤"
|
||||||
if kind == "getMoney":
|
if kind == "getMoney":
|
||||||
@@ -639,7 +639,7 @@ class ProgressionPlanner:
|
|||||||
reason = self._battle_resources(snapshot, policy, ranch, stage, level)
|
reason = self._battle_resources(snapshot, policy, ranch, stage, level)
|
||||||
if reason:
|
if reason:
|
||||||
return block(reason)
|
return block(reason)
|
||||||
return make("progression_battle", "请求真实任务战斗:" + info.get("name", ""),
|
return make("progression_battle", "执行任务战斗:" + info.get("name", ""),
|
||||||
path="battleService/battleStart", payload={"battleType": "task", "taskTypeId": str(task["typeId"])})
|
path="battleService/battleStart", payload={"battleType": "task", "taskTypeId": str(task["typeId"])})
|
||||||
return make("progression_step", "提交任务步骤:" + requirement,
|
return make("progression_step", "提交任务步骤:" + requirement,
|
||||||
path="taskService/taskCompleteStep", payload={"taskId": _integer(task["id"]), "taskTypeId": str(task["typeId"]), "removeIds": ids})
|
path="taskService/taskCompleteStep", payload={"taskId": _integer(task["id"]), "taskTypeId": str(task["typeId"]), "removeIds": ids})
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ from .native_widgets import ComboBox, IntegerInput, RowBatch
|
|||||||
from .policy_io import checked_progression_policy
|
from .policy_io import checked_progression_policy
|
||||||
from .progression import ProgressionPolicy
|
from .progression import ProgressionPolicy
|
||||||
from .table_widgets import set_value, table_item
|
from .table_widgets import set_value, table_item
|
||||||
|
from .battle_messages import battle_message
|
||||||
|
|
||||||
|
|
||||||
CATEGORIES = {"mainline": "主线", "sidequest": "支线", "commission": "委托", "event": "活动(暂不自动)",
|
CATEGORIES = {"mainline": "主线", "sidequest": "支线", "commission": "委托", "event": "活动(暂不自动)",
|
||||||
@@ -25,7 +26,7 @@ STATES = {"available": "可接取", "unaccepted": "未接取", "active": "进行
|
|||||||
"received": "进行中", "unlocked": "已解锁 / 待接取", "locked": "未解锁", "finished": "已完成",
|
"received": "进行中", "unlocked": "已解锁 / 待接取", "locked": "未解锁", "finished": "已完成",
|
||||||
"ready_to_reward": "待领取任务奖励", "blocked": "受阻", "unsupported": "暂不支持", "unknown": "未知"}
|
"ready_to_reward": "待领取任务奖励", "blocked": "受阻", "unsupported": "暂不支持", "unknown": "未知"}
|
||||||
CHINA_TIME = timezone(timedelta(hours=8))
|
CHINA_TIME = timezone(timedelta(hours=8))
|
||||||
OUTCOMES = {"win": "胜利", "loss": "战败", "unsupported": "暂不支持", "event": "地图奖励事件",
|
OUTCOMES = {"win": "胜利", "loss": "打不过", "unsupported": "暂不支持", "event": "地图奖励事件",
|
||||||
"completed": "已完成", "cancelled": "已取消", "timeout": "超时", "unknown": "结果待核对"}
|
"completed": "已完成", "cancelled": "已取消", "timeout": "超时", "unknown": "结果待核对"}
|
||||||
|
|
||||||
|
|
||||||
@@ -65,7 +66,7 @@ def prepare_progression_views(engine, *, tasks=True, records=True):
|
|||||||
kind = category(row.get("category", "unknown"))
|
kind = category(row.get("category", "unknown"))
|
||||||
kind = kind if kind in CATEGORIES else "unknown"
|
kind = kind if kind in CATEGORIES else "unknown"
|
||||||
state = display(row.get("state"), "未知")
|
state = display(row.get("state"), "未知")
|
||||||
reason = display(row.get("blocked_reason") or row.get("block_reason") or row.get("reason"), "")
|
reason = battle_message(display(row.get("blocked_reason") or row.get("block_reason") or row.get("reason"), ""))
|
||||||
supported = row.get("supported")
|
supported = row.get("supported")
|
||||||
support = "受阻:" + reason if reason else "已支持" if supported is True else "暂不支持" if supported is False else "支持状态未确认"
|
support = "受阻:" + reason if reason else "已支持" if supported is True else "暂不支持" if supported is False else "支持状态未确认"
|
||||||
step = display(row.get("step_number")) + " / " + display(row.get("total_steps"))
|
step = display(row.get("step_number")) + " / " + display(row.get("total_steps"))
|
||||||
@@ -102,7 +103,7 @@ def prepare_progression_views(engine, *, tasks=True, records=True):
|
|||||||
values = [display(stamp), BATTLE_KINDS.get(kind, display(raw_kind)),
|
values = [display(stamp), BATTLE_KINDS.get(kind, display(raw_kind)),
|
||||||
display(row.get("name") or row.get("task_type_id") or row.get("stage_id") or row.get("stage") or row.get("description")),
|
display(row.get("name") or row.get("task_type_id") or row.get("stage_id") or row.get("stage") or row.get("description")),
|
||||||
display(row.get("team")), OUTCOMES.get(outcome, outcome),
|
display(row.get("team")), OUTCOMES.get(outcome, outcome),
|
||||||
display(row.get("blocked_reason") or row.get("block_reason") or row.get("message") or row.get("reason"))]
|
battle_message(display(row.get("blocked_reason") or row.get("block_reason") or row.get("message") or row.get("reason")))]
|
||||||
mode = row.get("battle_mode") or row.get("execution_mode")
|
mode = row.get("battle_mode") or row.get("execution_mode")
|
||||||
mode = mode if isinstance(mode, str) else None
|
mode = mode if isinstance(mode, str) else None
|
||||||
if mode == "experimental":
|
if mode == "experimental":
|
||||||
|
|||||||
@@ -0,0 +1,36 @@
|
|||||||
|
from copy import deepcopy
|
||||||
|
from types import SimpleNamespace
|
||||||
|
import unittest
|
||||||
|
|
||||||
|
from ranch_assistant.battle_messages import battle_message
|
||||||
|
from ranch_assistant.progression_gui import prepare_progression_views
|
||||||
|
|
||||||
|
|
||||||
|
class BattleMessagesTests(unittest.TestCase):
|
||||||
|
def test_objective_blocker_is_chinese_and_not_reported_as_defeat(self):
|
||||||
|
reason = "Non-elimination win/loss objective is unsupported; Protected/destroy objective units are unsupported"
|
||||||
|
source = [{"task_type_id": "1002002", "category": "mainline", "supported": False,
|
||||||
|
"block_reason": reason, "step_number": 2, "total_steps": 2}]
|
||||||
|
original = deepcopy(source)
|
||||||
|
engine = SimpleNamespace(snapshot=None, progression_rows=lambda: source, progression_records=lambda: [])
|
||||||
|
detail = prepare_progression_views(engine).tasks[0]["detail"]
|
||||||
|
self.assertIn("保护或摧毁指定目标", detail)
|
||||||
|
self.assertNotIn("unsupported", detail)
|
||||||
|
self.assertNotIn("打不过", detail)
|
||||||
|
self.assertEqual(source, original)
|
||||||
|
|
||||||
|
def test_known_and_future_diagnostics_do_not_show_raw_english(self):
|
||||||
|
for text in ("Unsupported monster controller: buffMovie", "Unsupported battle triggers: bossWave",
|
||||||
|
"Invalid numeric field: mon.hp", "Some future unsupported mechanic"):
|
||||||
|
with self.subTest(text=text):
|
||||||
|
self.assertRegex(battle_message(text), r"[\u3400-\u9fff]")
|
||||||
|
self.assertNotEqual(battle_message(text), text)
|
||||||
|
|
||||||
|
def test_only_actual_losses_show_cannot_win(self):
|
||||||
|
engine = SimpleNamespace(snapshot=None, progression_rows=lambda: [], progression_records=lambda: [
|
||||||
|
{"outcome": "loss", "message": "实验模型战败(近似);已停止此轮任务推进"},
|
||||||
|
{"outcome": "unsupported", "reason": "Unsupported monster controller: buffMovie"}])
|
||||||
|
rows = prepare_progression_views(engine).records
|
||||||
|
self.assertEqual(rows[0]["values"][4], "打不过")
|
||||||
|
self.assertIn("打不过", rows[0]["detail"])
|
||||||
|
self.assertNotIn("打不过", rows[1]["detail"])
|
||||||
@@ -756,7 +756,7 @@ class ProgressionGuiTests(unittest.TestCase):
|
|||||||
original = copy.deepcopy(records)
|
original = copy.deepcopy(records)
|
||||||
engine = SimpleNamespace(snapshot=object(), progression_rows=lambda: [], progression_records=lambda: records)
|
engine = SimpleNamespace(snapshot=object(), progression_rows=lambda: [], progression_records=lambda: records)
|
||||||
rows = prepare_progression_views(engine).records
|
rows = prepare_progression_views(engine).records
|
||||||
for row, outcome in zip(rows, ("胜利", "战败", "暂不支持")):
|
for row, outcome in zip(rows, ("胜利", "打不过", "暂不支持")):
|
||||||
self.assertEqual(row["values"][4], outcome + "(实验近似)")
|
self.assertEqual(row["values"][4], outcome + "(实验近似)")
|
||||||
self.assertIn("近似,未完整验证", row["detail"])
|
self.assertIn("近似,未完整验证", row["detail"])
|
||||||
self.assertIn("能力检查未通过", rows[2]["detail"])
|
self.assertIn("能力检查未通过", rows[2]["detail"])
|
||||||
|
|||||||
Reference in New Issue
Block a user