feat: add daily commission history for Web 2.0.8
This commit is contained in:
+177
-11
@@ -12,7 +12,8 @@ from types import SimpleNamespace
|
||||
from .model import Action, Catalog, Planner, Policy, Snapshot, seconds
|
||||
from .daily import DailyLedger, DailyPolicy, selected_entries
|
||||
from .sweeping import SweepPolicy, SweepRunner
|
||||
from .quests import QuestPolicy, TaskPlanner
|
||||
from .quests import QuestPolicy, TaskPlanner, commission_priority
|
||||
from .commission_history import CommissionHistory
|
||||
from .market import PurchaseBudget
|
||||
from .management import expansion_quote, manual_monster_actions
|
||||
from .gifts import GiftPlanner
|
||||
@@ -104,6 +105,10 @@ class Engine:
|
||||
self._progression_state_loaded = False
|
||||
self._battle_catalog_ready = False
|
||||
self.battle_journal = BattleJournal(folder / "progression" / "journal.json" if folder else None)
|
||||
self._commission_history = CommissionHistory(folder / "progression" / "commission_history.json" if folder else None)
|
||||
self._commission_history_roles = set()
|
||||
self._commission_offer_diagnostics = []
|
||||
self._commission_diagnostics_key = None
|
||||
self.battles = BattleOrchestrator(catalog, self.battle_journal, battle_runtime, self.sweeper,
|
||||
request_builder=self._battle_request, observer=self._battle_observer)
|
||||
self._progression_cancel = threading.Event()
|
||||
@@ -454,6 +459,10 @@ class Engine:
|
||||
self.battle_journal.save()
|
||||
|
||||
def _battle_observer(self, event, intent, response):
|
||||
if event == "started" and self._is_commission(intent):
|
||||
record = self.battle_journal.pending(self.snapshot)
|
||||
if record is not None:
|
||||
self._journal_commission(record, intent)
|
||||
if value(intent, "kind") == "map_battle":
|
||||
stage = SimpleNamespace(stage_id=str(value(intent, "stage_id")), level=str(value(intent, "difficulty")))
|
||||
key = self.sweeper.key(self.snapshot, stage)
|
||||
@@ -487,6 +496,11 @@ class Engine:
|
||||
if farming:
|
||||
if event == "started":
|
||||
planner.mark_started(self.snapshot, intent) # validates the issued ordinary intent only
|
||||
elif event in ("settled", "event"):
|
||||
record = self.battle_journal.pending(self.snapshot)
|
||||
if record is not None:
|
||||
self.battle_journal.update(record, record["phase"],
|
||||
commission_action_response=gameplay_response(response), commission_action_confirmed=True)
|
||||
# Farming is a normal map action. Its journal and fresh server
|
||||
# snapshot govern the result; it never acknowledges a task step.
|
||||
return None
|
||||
@@ -701,6 +715,106 @@ class Engine:
|
||||
info = self.game_data.task(value(intent, "source_task_type_id") or value(intent, "task_type_id")) if self.game_data else None
|
||||
return bool(info and info.get("type") == 4)
|
||||
|
||||
def _commission_info(self, type_id):
|
||||
info = self.game_data.task(type_id) if self.game_data and type_id else None
|
||||
return info or self.catalog.data.get("task_info", {}).get(str(type_id)) or {}
|
||||
|
||||
def _sync_commission_history(self):
|
||||
"""Use the already loaded, bounded journal; ledger failures never retry a game write."""
|
||||
if self.snapshot is None or self.snapshot.raw.get("master", {}).get("id") is None:
|
||||
return
|
||||
role = str(self.snapshot.raw["master"]["id"])
|
||||
try:
|
||||
records = self.battle_journal.role(self.snapshot)["records"]
|
||||
self._commission_history.ingest(role, records, self._commission_info, self.snapshot)
|
||||
self._commission_history_roles.add(role)
|
||||
except (OSError, ValueError, TypeError, KeyError, AttributeError):
|
||||
self._commission_history.warning = "委托历史暂未写入磁盘;任务回包仍保存在原日志,稍后核对导入,请勿重发"
|
||||
|
||||
@account_serial
|
||||
def commission_history(self, day=None):
|
||||
"""Independent plain DTO; day is YYYY-MM-DD in Beijing, default wall-clock today.
|
||||
|
||||
summary: accepted_count/completed_count/pending_count/expected_ke/
|
||||
confirmed_ke/unknown_reward_count. Unknown row rewards are None.
|
||||
Only events on the selected day contribute to daily counts and rewards.
|
||||
"""
|
||||
role = str(self.snapshot.raw.get("master", {}).get("id", "")) if self.snapshot else ""
|
||||
if role and (role not in self._commission_history_roles or self._commission_history._dirty):
|
||||
self._sync_commission_history()
|
||||
return self._commission_history.query(role, day)
|
||||
|
||||
@account_serial
|
||||
def commission_offer_diagnostics(self):
|
||||
"""Cached offline eligibility; no journal reload, game calls or runtime inspection."""
|
||||
if self.snapshot is None:
|
||||
return []
|
||||
self._ensure_commission_diagnostics()
|
||||
return deepcopy(self._commission_offer_diagnostics)
|
||||
|
||||
def _ensure_commission_diagnostics(self):
|
||||
key = (id(self.snapshot), digest({"quest": vars(self.quest_policy), "ranch": vars(self.policy),
|
||||
"progression": vars(self.progression_policy), "checks": self._commission_offer_checks}))
|
||||
if key == self._commission_diagnostics_key:
|
||||
return
|
||||
if self.progression_planner is None:
|
||||
self._ensure_progression()
|
||||
# Reuse model checks from the worker's last planning pass. A missing
|
||||
# check remains explicitly unverified until that worker runs.
|
||||
self._commission_offer_diagnostics = self.progression_planner.commission_offers(
|
||||
self.snapshot, self.quest_policy, self.policy, battle_policy=self.progression_policy,
|
||||
accept_supported=lambda key: self._commission_offer_checks.get(str(key),
|
||||
(False, "后续步骤或战斗能力尚未验证,等待后台检查")))
|
||||
self._commission_diagnostics_key = key
|
||||
|
||||
def _journal_commission(self, record, intent, *, legacy=False):
|
||||
type_id = str(value(intent, "source_task_type_id") or value(intent, "task_type_id") or "")
|
||||
info = self._commission_info(type_id)
|
||||
if info.get("type", 4 if legacy else None) != 4 and value(intent, "kind") not in ("progression_loop_reset", "quest_reset"):
|
||||
return
|
||||
selected = getattr(self.tasks if legacy else self.progression_planner, "commission_selection", {}) or {}
|
||||
accepting = (record.get("path") or "").endswith("taskLoopReceive")
|
||||
meta = {"name": info.get("name", type_id or "每日委托"), "expected_ke": -commission_priority(info),
|
||||
"city": (record.get("payload") or {}).get("city")}
|
||||
number = value(intent, "source_step_number") or value(intent, "step_number") or 0
|
||||
steps = info.get("steps") or []
|
||||
if 1 <= number <= len(steps):
|
||||
step = steps[number - 1]
|
||||
kind, required = step.get("statusType"), step.get("statusValue") or {}
|
||||
remove = required.get("remove") is True
|
||||
prefix = "提交" if remove else "核对持有"
|
||||
type_key, count = str(required.get("type", "")), required.get("num", 0)
|
||||
if kind == "getMoney":
|
||||
detail = f"{prefix}金币×{required.get('money', 0)}"
|
||||
elif kind == "getItem" or kind == "getMonster" and required.get("mode") == 0:
|
||||
name = self.catalog.monster(type_key).get("name", type_key) + "蛋" if type_key in self.catalog.monsters else self.catalog.data.get("item_names", {}).get(type_key, f"道具#{type_key}")
|
||||
detail = f"{prefix}{name}×{count}"
|
||||
elif kind == "getMonster":
|
||||
detail = f"{prefix}{self.catalog.monster(type_key).get('name', '魔物#' + type_key)}×{count}"
|
||||
elif kind == "passStage":
|
||||
stage = self.game_data.stage(required.get("stage")) if self.game_data else None
|
||||
detail = f"通关{(stage or {}).get('name', required.get('stage', '指定关卡'))},难度{required.get('level', 1)}"
|
||||
elif kind == "battle":
|
||||
detail = "完成委托专用战斗"
|
||||
elif kind == "none":
|
||||
detail = "完成对话条件"
|
||||
elif kind == "killMonster":
|
||||
detail = f"核对{self.catalog.monster(type_key).get('name', '魔物#' + type_key)}累计击杀数量"
|
||||
elif kind == "passLevel":
|
||||
detail = f"核对角色等级达到{required.get('level', 0)}级"
|
||||
else:
|
||||
detail = str(value(intent, "description", ""))
|
||||
meta["operation_detail"] = detail
|
||||
if accepting and selected.get("task_type_id") == type_id:
|
||||
meta.update(deepcopy(selected))
|
||||
self.battle_journal.update(record, record["phase"], commission=meta)
|
||||
|
||||
def _commission_message(self, record, default):
|
||||
self._sync_commission_history()
|
||||
role = str(self.snapshot.raw["master"].get("id", ""))
|
||||
event = self._commission_history.state["roles"].get(role, {}).get(str(record.get("attempt_id")))
|
||||
return event["description"] if event else default
|
||||
|
||||
@staticmethod
|
||||
def _is_farm(intent):
|
||||
return bool(value(intent, "source_task_type_id")) and not value(intent, "task_id") and bool(value(intent, "stage_id"))
|
||||
@@ -725,18 +839,26 @@ class Engine:
|
||||
"" if supported else self._commission_offer_reason or "委托后续步骤当前无法自动完成")
|
||||
return supported
|
||||
|
||||
def _commission_offer_eligibility(self, type_id):
|
||||
self._check_commission_offer(type_id)
|
||||
return self._commission_offer_checks[str(type_id)]
|
||||
|
||||
def _commission_offer_supported(self, type_id):
|
||||
self._commission_offer_reason = "委托后续条件、剧情或战斗未验证支持,未消耗接取次数"
|
||||
info = self.game_data.task(type_id)
|
||||
if not info or info.get("type") != 4:
|
||||
self._commission_offer_reason = "委托配置缺失或类型不符"
|
||||
return False
|
||||
for number, step in enumerate(info.get("steps", []), 1):
|
||||
for name in (step.get("story"), step.get("afterStory")):
|
||||
if name and (self.game_data.script(name) or {}).get("supported") is not True:
|
||||
script = self.game_data.script(name) or {}
|
||||
self._commission_offer_reason = f"第{number}步剧情 {name} 未验证支持" + (":" + ";".join(script.get("block_reasons") or []) if script.get("block_reasons") else "")
|
||||
return False
|
||||
kind = step.get("statusType")
|
||||
if kind in ("battle", "passStage"):
|
||||
if not self.quest_policy.battle_tasks:
|
||||
self._commission_offer_reason = "委托战斗开关未启用"
|
||||
return False
|
||||
intent = {"kind": "progression_battle", "task_type_id": str(type_id), "task_id": 0,
|
||||
"step_number": number, "battle_kind": "passStage" if kind == "passStage" else "task",
|
||||
@@ -748,12 +870,24 @@ class Engine:
|
||||
return False
|
||||
else:
|
||||
policy = self._intent_policy({"task_type_id": str(type_id)})
|
||||
ready, _, _ = self.progression_planner.requirement(self.snapshot, step, {}, policy, self.policy)
|
||||
ready, _, requirement_reason = self.progression_planner.requirement(self.snapshot, step, {}, policy, self.policy)
|
||||
if not ready:
|
||||
sources = self.progression_planner.farming_intents(self.snapshot, step,
|
||||
{"id": 0, "typeId": str(type_id), "curStep": number}, policy, self.policy)
|
||||
if not any(self._is_sweep_intent(source) or self._battle_capability(source)[0] for source in sources):
|
||||
source_reasons = []
|
||||
feasible = False
|
||||
for source in sources:
|
||||
supported, reason = (True, "") if self._is_sweep_intent(source) else self._battle_capability(source)
|
||||
if supported:
|
||||
feasible = True
|
||||
break
|
||||
if reason:
|
||||
source_reasons.append(reason)
|
||||
if not feasible:
|
||||
self._commission_offer_reason = f"第{number}步:{requirement_reason}" + (";材料来源:" + ";".join(source_reasons) if source_reasons else ";没有当前可用的自动收集来源")
|
||||
return False
|
||||
if not info.get("steps"):
|
||||
self._commission_offer_reason = "委托没有有效步骤"
|
||||
return bool(info.get("steps"))
|
||||
|
||||
def _refresh_progression_cache(self, *, force=False):
|
||||
@@ -770,28 +904,33 @@ class Engine:
|
||||
"snapshot": self._battle_snapshot_digest, "runtime": id(self.battles.runtime)})
|
||||
key = digest({"snapshot": self._battle_snapshot_digest, "policy": vars(self.progression_policy),
|
||||
"quests": vars(self.quest_policy), "ranch": vars(self.policy), "local_state": self.progression_planner.state_signature(self.snapshot),
|
||||
"pending": self._progression_pending(), "runtime": id(self.battles.runtime), "day": int(self.snapshot.now // 86400)})
|
||||
"pending": self._progression_pending(), "runtime": id(self.battles.runtime),
|
||||
"day": ProgressionPlanner._loop_day(self.snapshot, self.snapshot.now - 10)})
|
||||
if force or key != self._progression_cache_key:
|
||||
self._commission_offer_checks = {}
|
||||
self._commission_diagnostics_key = None
|
||||
rows = self.progression_planner.rows(self.snapshot, self.progression_policy, self.policy, quest_policy=self.quest_policy)
|
||||
intents = self.progression_planner.plan(self.snapshot, self.progression_policy, self.policy)
|
||||
commission_plan = getattr(self.progression_planner, "commission_plan", None)
|
||||
self._commission_planner_available = callable(commission_plan)
|
||||
if self._commission_planner_available:
|
||||
intents += commission_plan(self.snapshot, self.quest_policy, self.policy,
|
||||
battle_policy=self.progression_policy, accept_supported=self._check_commission_offer)
|
||||
battle_policy=self.progression_policy, accept_supported=self._commission_offer_eligibility)
|
||||
self._commission_offer_diagnostics = deepcopy(self.progression_planner.commission_offer_rows)
|
||||
intents.sort(key=lambda intent: not self._is_commission(intent))
|
||||
self._progression_rows, self._progression_intents = self._overlay_battle_capabilities(rows, intents)
|
||||
self._persist_progression()
|
||||
self._progression_cache_key = digest({"snapshot": self._battle_snapshot_digest, "policy": vars(self.progression_policy),
|
||||
"quests": vars(self.quest_policy), "ranch": vars(self.policy), "local_state": self.progression_planner.state_signature(self.snapshot),
|
||||
"pending": self._progression_pending(), "runtime": id(self.battles.runtime), "day": int(self.snapshot.now // 86400)})
|
||||
"pending": self._progression_pending(), "runtime": id(self.battles.runtime),
|
||||
"day": ProgressionPlanner._loop_day(self.snapshot, self.snapshot.now - 10)})
|
||||
self._progression_error = ""
|
||||
except (ImportError, OSError, ValueError, TypeError, KeyError, AttributeError) as error:
|
||||
self._progression_error = "任务规划暂不可用:" + str(error)
|
||||
self._progression_rows = [{"state": "unsupported", "supported": False, "blocked_reason": self._progression_error}]
|
||||
self._progression_intents = []
|
||||
self._progression_records = self.battle_journal.records(self.snapshot)
|
||||
self._sync_commission_history()
|
||||
|
||||
@account_serial
|
||||
def refresh_progression(self):
|
||||
@@ -838,9 +977,15 @@ class Engine:
|
||||
try:
|
||||
self.last_executed = True
|
||||
kind = value(intent, "kind")
|
||||
self._sync_commission_history()
|
||||
if kind in ("progression_battle", "battle", "task_battle", "stage_battle", "map_battle", "sweep") or self._is_farm(intent):
|
||||
previous_attempts = {record["attempt_id"] for record in self.battle_journal.role(self.snapshot)["records"]}
|
||||
message = self.battles.run(self.client, self.snapshot, intent, effective_policy,
|
||||
cancel=self._progression_cancel, ranch=self.policy)
|
||||
records = [record for record in self.battle_journal.role(self.snapshot)["records"]
|
||||
if record["attempt_id"] not in previous_attempts]
|
||||
if records:
|
||||
message = self._commission_message(records[-1], message)
|
||||
else:
|
||||
message = self._execute_task_intent(intent)
|
||||
if self.battle_journal.pending(self.snapshot) and kind == "progression_battle":
|
||||
@@ -858,6 +1003,7 @@ class Engine:
|
||||
self._persist_progression()
|
||||
raise
|
||||
finally:
|
||||
self._sync_commission_history()
|
||||
self._refresh_progression_cache(force=True)
|
||||
|
||||
def _execute_task_intent(self, intent):
|
||||
@@ -875,12 +1021,14 @@ class Engine:
|
||||
return "任务补链必须提供计算后的三个数组;未发送查询或空补链"
|
||||
if self._progression_cancel.is_set():
|
||||
return "任务推进已取消"
|
||||
self._sync_commission_history()
|
||||
record = self.battle_journal.begin(self.snapshot, intent)
|
||||
self._journal_commission(record, intent)
|
||||
if local:
|
||||
self.progression_planner.acknowledge(self.snapshot, intent)
|
||||
self._persist_progression(save=False)
|
||||
self.battle_journal.finish(self.snapshot, record, "local", "已保存普通剧情的本地检查点")
|
||||
return "已推进普通剧情并保存本地检查点"
|
||||
return self._commission_message(record, "已推进普通剧情并保存本地检查点")
|
||||
try:
|
||||
self.progression_planner.mark_started(self.snapshot, intent)
|
||||
self._persist_progression(save=False)
|
||||
@@ -890,7 +1038,7 @@ class Engine:
|
||||
except CancelledBeforeDispatch:
|
||||
self._cancel_unsent_progression(intent)
|
||||
self.battle_journal.finish(self.snapshot, record, "cancelled", "任务请求尚未发送,已取消")
|
||||
return record["message"]
|
||||
return self._commission_message(record, record["message"])
|
||||
self.battle_journal.update(record, "acknowledged", response=gameplay_response(response), response_confirmed=True)
|
||||
acknowledged = self.progression_planner.acknowledge(self.snapshot, intent, gameplay_response(response))
|
||||
self._persist_progression(save=False)
|
||||
@@ -898,17 +1046,30 @@ class Engine:
|
||||
self.battle_journal.finish(self.snapshot, record, "task", "服务器已确认任务请求,已保存本地检查点")
|
||||
else:
|
||||
self.battle_journal.update(record, "unknown", message="任务成功回包缺少有效状态,等待核对")
|
||||
return value(intent, "description", "任务请求已确认")
|
||||
return self._commission_message(record, value(intent, "description", "任务请求已确认") if acknowledged else "任务成功回包缺少有效状态,等待核对,禁止重发")
|
||||
except Exception as error:
|
||||
self.battle_journal.update(record, "unknown", message="任务请求结果未确认,禁止自动重试", error_type=type(error).__name__)
|
||||
raise
|
||||
finally:
|
||||
self._sync_commission_history()
|
||||
|
||||
@account_serial
|
||||
def read_snapshot(self, *, sync_master=True):
|
||||
if self._progression_pending():
|
||||
self.last_pending_check = time.monotonic()
|
||||
self.snapshot = self.client.snapshot()
|
||||
self.battle_journal.reconcile(self.snapshot, trusted=True)
|
||||
pending = self.battle_journal.pending(self.snapshot)
|
||||
pending_id = pending.get("attempt_id") if pending else None
|
||||
if self.battle_journal.reconcile(self.snapshot, trusted=True) and pending_id:
|
||||
record = next((row for row in self.battle_journal.role(self.snapshot)["records"]
|
||||
if row["attempt_id"] == pending_id), None)
|
||||
if record and (record.get("path") or "").endswith("taskLoopReceive"):
|
||||
old = {str(task.get("id")) for task in record.get("baseline", {}).get("tasks", [])}
|
||||
task = next((task for task in self.snapshot.raw.get("currentTasks", [])
|
||||
if str(task.get("typeId")) == str(record.get("task_type_id")) and str(task.get("id")) not in old), None)
|
||||
if task:
|
||||
record["commission_task"] = {key: task[key] for key in ("id", "typeId", "curStep") if key in task}
|
||||
self._sync_commission_history()
|
||||
self.master_sync.apply(self.snapshot)
|
||||
if sync_master and not self._progression_pending():
|
||||
self.master_sync.settle(self.client, self.snapshot)
|
||||
@@ -1223,15 +1384,20 @@ class Engine:
|
||||
if str(task.get("id")) == str(payload.get("taskId"))), {})
|
||||
intent = {"kind": action.kind, "description": action.description, "path": action.path, "payload": payload,
|
||||
"task_id": payload.get("taskId"), "task_type_id": payload.get("taskTypeId"), "step_number": task.get("curStep")}
|
||||
self._sync_commission_history()
|
||||
record = self.battle_journal.begin(self.snapshot, intent)
|
||||
self._journal_commission(record, intent, legacy=True)
|
||||
try:
|
||||
self.battle_journal.update(record, "request_pending")
|
||||
response = self.battles._call(self.client, action.path, payload)
|
||||
self.battle_journal.update(record, "acknowledged", response=gameplay_response(response))
|
||||
self.battle_journal.update(record, "acknowledged", response=gameplay_response(response), response_confirmed=True)
|
||||
action.description = self._commission_message(record, action.description)
|
||||
return response
|
||||
except Exception as error:
|
||||
self.battle_journal.update(record, "unknown", message="委托请求结果未确认,禁止自动重试", error_type=type(error).__name__)
|
||||
raise
|
||||
finally:
|
||||
self._sync_commission_history()
|
||||
|
||||
def _map_policy(self):
|
||||
return SimpleNamespace(enabled=self.sweep_policy.enabled and (self.sweep_policy.allow_challenge or self.sweep_policy.allow_special),
|
||||
|
||||
Reference in New Issue
Block a user