fix(web): finalize quick battle and commission procurement for 2.0.9
This commit is contained in:
+158
-6
@@ -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, commission_priority
|
||||
from .quests import QuestPolicy, TaskPlanner, commission_priority, commission_reason_kind
|
||||
from .procurement import resource_kind
|
||||
from .commission_history import CommissionHistory
|
||||
from .market import PurchaseBudget
|
||||
from .management import expansion_quote, manual_monster_actions
|
||||
@@ -389,6 +390,8 @@ class Engine:
|
||||
self.game_data = load_progression_data()
|
||||
if self.progression_planner is None:
|
||||
self.progression_planner = ProgressionPlanner(self.catalog, self.game_data, account_key=self._progression_namespace)
|
||||
self.progression_planner.guard.cultivation = self.cultivation
|
||||
self.progression_planner.procurement_daily_left = self.purchase_budget.remaining(self.snapshot.now, self.policy.daily_buy_money) if self.snapshot else 0
|
||||
# This is a read-only preflight; the same check must precede navigation
|
||||
# and dialogue, not just the battle action they lead to.
|
||||
self.progression_planner.battle_capability = self._battle_capability
|
||||
@@ -531,6 +534,7 @@ class Engine:
|
||||
|
||||
def _recover_confirmed_progression(self):
|
||||
"""Replay only local acknowledgement of a durably received success."""
|
||||
self._reconcile_procurement()
|
||||
record = self.battle_journal.pending(self.snapshot)
|
||||
if (not record or str(record.get("role_id")) != str(self.snapshot.raw["master"].get("id"))
|
||||
or not str(record.get("kind", "")).startswith("progression_")):
|
||||
@@ -657,7 +661,8 @@ class Engine:
|
||||
source_supported = row.get("supported") is not False
|
||||
check = self._commission_offer_checks.get(str(row.get("task_type_id")))
|
||||
if row.get("category") == "commission" and row.get("state") == "offered" and check is not None:
|
||||
row.update(block_reason=check[1], next_action="接取城市委托" if check[0] else "暂不接取:" + check[1])
|
||||
if not check[0]:
|
||||
row.update(block_reason=check[1], next_action="暂不接取:" + check[1])
|
||||
commission = commissions.get(str(row.get("task_type_id")))
|
||||
if commission is not None:
|
||||
row.update(next_action=value(commission, "description"), block_reason=value(commission, "block_reason", ""))
|
||||
@@ -675,6 +680,7 @@ class Engine:
|
||||
else:
|
||||
row["supported"] = bool(source_supported and not reason)
|
||||
row["block_reason"] = row["blocked_reason"] = reason
|
||||
row["reason_kind"] = commission_reason_kind(reason)
|
||||
return rows, adjusted
|
||||
|
||||
def _battle_request(self, snapshot, intent, policy, request):
|
||||
@@ -754,7 +760,9 @@ class Engine:
|
||||
|
||||
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}))
|
||||
"progression": vars(self.progression_policy), "checks": self._commission_offer_checks,
|
||||
"budget": self.purchase_budget.remaining(self.snapshot.now, self.policy.daily_buy_money),
|
||||
"state": self.progression_planner.state_signature(self.snapshot) if self.progression_planner else ""}))
|
||||
if key == self._commission_diagnostics_key:
|
||||
return
|
||||
if self.progression_planner is None:
|
||||
@@ -872,6 +880,13 @@ class Engine:
|
||||
policy = self._intent_policy({"task_type_id": str(type_id)})
|
||||
ready, _, requirement_reason = self.progression_planner.requirement(self.snapshot, step, {}, policy, self.policy)
|
||||
if not ready:
|
||||
if resource_kind(step) and isinstance(self.progression_planner, ProgressionPlanner):
|
||||
supply = self.progression_planner.resource_plan(self.snapshot, info.get("steps") or [],
|
||||
{"id": 0, "typeId": str(type_id), "curStep": number}, policy, self.policy)
|
||||
if supply.feasible:
|
||||
continue
|
||||
self._commission_offer_reason = supply.reason
|
||||
return False
|
||||
sources = self.progression_planner.farming_intents(self.snapshot, step,
|
||||
{"id": 0, "typeId": str(type_id), "curStep": number}, policy, self.policy)
|
||||
source_reasons = []
|
||||
@@ -904,6 +919,7 @@ 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),
|
||||
"purchase_left": self.progression_planner.procurement_daily_left,
|
||||
"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:
|
||||
@@ -919,9 +935,18 @@ class Engine:
|
||||
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)
|
||||
for row in self._progression_rows:
|
||||
if row.get("category") == "commission" and row.get("state") == "offered":
|
||||
offer = next((r for r in self._commission_offer_diagnostics if r["task_type_id"] == row["task_type_id"]), None)
|
||||
if offer:
|
||||
row.update(reason_kind=offer["reason_kind"], resources=offer["resources"],
|
||||
progress_plan=offer["progress_plan"], next_action=offer["next_step"],
|
||||
block_reason="" if offer["eligible"] else offer["reason"],
|
||||
blocked_reason="" if offer["eligible"] else offer["reason"], supported=offer["eligible"])
|
||||
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),
|
||||
"purchase_left": self.progression_planner.procurement_daily_left,
|
||||
"pending": self._progression_pending(), "runtime": id(self.battles.runtime),
|
||||
"day": ProgressionPlanner._loop_day(self.snapshot, self.snapshot.now - 10)})
|
||||
self._progression_error = ""
|
||||
@@ -986,6 +1011,8 @@ class Engine:
|
||||
if record["attempt_id"] not in previous_attempts]
|
||||
if records:
|
||||
message = self._commission_message(records[-1], message)
|
||||
elif kind == "progression_procure":
|
||||
message = self._execute_procurement(intent)
|
||||
else:
|
||||
message = self._execute_task_intent(intent)
|
||||
if self.battle_journal.pending(self.snapshot) and kind == "progression_battle":
|
||||
@@ -998,7 +1025,7 @@ class Engine:
|
||||
self.read_snapshot(sync_master=False)
|
||||
return self.snapshot, self.plans(), message
|
||||
except Exception:
|
||||
if self.battle_journal.pending(self.snapshot) and not self._is_farm(intent) and value(intent, "kind", "").startswith("progression_"):
|
||||
if self.battle_journal.pending(self.snapshot) and not self._is_farm(intent) and value(intent, "kind") != "progression_procure" and value(intent, "kind", "").startswith("progression_"):
|
||||
self.progression_planner.mark_uncertain(self.snapshot, intent, "任务 / 战斗结果待核对,禁止重放")
|
||||
self._persist_progression()
|
||||
raise
|
||||
@@ -1006,6 +1033,117 @@ class Engine:
|
||||
self._sync_commission_history()
|
||||
self._refresh_progression_cache(force=True)
|
||||
|
||||
def _execute_procurement(self, intent):
|
||||
"""Journal resource writes separately; never advance a task cursor."""
|
||||
if self._progression_cancel.is_set() or self._progression_pending():
|
||||
return "补资源已取消或有待核对请求;未发送"
|
||||
planner = self.progression_planner
|
||||
planner.mark_started(self.snapshot, intent) # validates account and issued payload only
|
||||
key = str(value(intent, "source_task_type_id"))
|
||||
policy = self._intent_policy(intent)
|
||||
source_id = int(value(intent, "source_task_id", 0) or 0)
|
||||
info = self._commission_info(key)
|
||||
if source_id:
|
||||
source = next((t for t in self.snapshot.raw.get("currentTasks", [])
|
||||
if int(t.get("id", 0)) == source_id and str(t.get("typeId")) == key), None)
|
||||
if source is None:
|
||||
return "资源来源任务已变化,等待重新规划;未发送"
|
||||
else:
|
||||
offers = planner.commission_offers(self.snapshot, self.quest_policy, self.policy,
|
||||
battle_policy=self.progression_policy, accept_supported=self._commission_offer_eligibility)
|
||||
if not any(row["task_type_id"] == key and row.get("preparable") for row in offers):
|
||||
return "委托额度、城市或资源条件已变化,未采购、未消耗接取次数"
|
||||
source = {"id": 0, "typeId": key}
|
||||
planner.procurement_daily_left = self.purchase_budget.remaining(self.snapshot.now, self.policy.daily_buy_money)
|
||||
supply = planner.remaining_resource_plan(self.snapshot, info, source, policy, self.policy)
|
||||
action = supply.action
|
||||
if not supply.feasible or action is None or action.path != value(intent, "path") or action.payload != value(intent, "payload"):
|
||||
return "资源缺口或保护状态已变化,等待重新规划;未发送"
|
||||
allowed = {"gachaService/gachaGetEggs": {"id", "num", "voucherNum", "traceInfo"},
|
||||
"stackService/stackAddMonster": {"eggs"}, "stackService/stackTransferMonster": {"datas"}}
|
||||
if action.path not in allowed or set(action.payload) != allowed[action.path]:
|
||||
return "补资源请求未验证,未发送"
|
||||
def admission_signature():
|
||||
return digest({"snapshot": self.snapshot.raw, "quest": vars(self.quest_policy), "ranch": vars(self.policy),
|
||||
"progression": vars(self.progression_policy), "task": self._commission_info(key),
|
||||
"day": planner._loop_day(self.snapshot, self.snapshot.now - 10)})
|
||||
admitted = admission_signature()
|
||||
self._sync_commission_history()
|
||||
record = self.battle_journal.begin(self.snapshot, intent)
|
||||
self._journal_commission(record, intent)
|
||||
baseline = {str(i["typeId"]): 0 for i in self.snapshot.raw["items"]}
|
||||
for item in self.snapshot.raw["items"]:
|
||||
baseline[str(item["typeId"])] += max(0, int(item.get("num", 0)))
|
||||
self.battle_journal.update(record, "prepared", procurement_baseline=baseline)
|
||||
dispatched = False
|
||||
try:
|
||||
if self._progression_cancel.is_set() or admission_signature() != admitted:
|
||||
raise CancelledBeforeDispatch()
|
||||
if action.kind == "buy":
|
||||
self.purchase_budget.record(self.snapshot.now, supply.purchase_cost, self.policy.daily_buy_money)
|
||||
self.battle_journal.update(record, "request_pending")
|
||||
if admission_signature() != admitted:
|
||||
raise CancelledBeforeDispatch()
|
||||
dispatched = True
|
||||
response = self.battles._call(self.client, action.path, deepcopy(action.payload), cancel=self._progression_cancel)
|
||||
receipt = gameplay_response(response)
|
||||
if action.kind == "buy" and isinstance(response.get("eggs"), list):
|
||||
receipt["eggs"] = [{k: egg[k] for k in ("typeId", "num") if k in egg}
|
||||
for egg in response["eggs"] if isinstance(egg, dict)]
|
||||
self.battle_journal.update(record, "acknowledged", response=receipt, response_confirmed=True,
|
||||
message="补资源请求已返回,等待权威背包/孵化位核对;不重复发送")
|
||||
if action.kind == "buy":
|
||||
self.record_draw(response.get("eggs") or [])
|
||||
return record["message"]
|
||||
except CancelledBeforeDispatch:
|
||||
self.battle_journal.finish(self.snapshot, record, "cancelled", "补资源请求尚未发送,已取消")
|
||||
return record["message"]
|
||||
except Exception as error:
|
||||
if dispatched:
|
||||
self.battle_journal.update(record, "unknown", message="补资源请求结果未知,禁止重购或重复装填", error_type=type(error).__name__)
|
||||
else:
|
||||
self.battle_journal.finish(self.snapshot, record, "cancelled", "补资源准备未完成,未发送")
|
||||
raise
|
||||
finally:
|
||||
self._sync_commission_history()
|
||||
|
||||
def _reconcile_procurement(self):
|
||||
if self.snapshot is None:
|
||||
return
|
||||
record = self.battle_journal.pending(self.snapshot)
|
||||
if not record or record.get("kind") != "progression_procure" or record.get("response_confirmed") is not True:
|
||||
return
|
||||
payload, response = record.get("payload") or {}, record.get("response") or {}
|
||||
if str(record.get("role_id")) != str(self.snapshot.raw["master"].get("id")) or response.get("resCode", 0) not in (0, "0"):
|
||||
return
|
||||
path, confirmed = record.get("path"), False
|
||||
if path == "gachaService/gachaGetEggs":
|
||||
eggs, expected = response.get("eggs"), {}
|
||||
if isinstance(eggs, list):
|
||||
for egg in eggs:
|
||||
if isinstance(egg, dict) and str(egg.get("typeId")) in self.catalog.monsters and int(egg.get("num", 0)) > 0:
|
||||
key = str(egg["typeId"])
|
||||
expected[key] = expected.get(key, 0) + int(egg["num"])
|
||||
totals = {}
|
||||
for item in self.snapshot.raw["items"]:
|
||||
key = str(item.get("typeId"))
|
||||
totals[key] = totals.get(key, 0) + int(item.get("num", 0))
|
||||
baseline = record.get("procurement_baseline") or {}
|
||||
confirmed = bool(expected) and sum(expected.values()) >= int(payload.get("num", 0)) and all(
|
||||
totals.get(k, 0) >= baseline.get(k, 0) + n for k, n in expected.items())
|
||||
elif path == "stackService/stackAddMonster":
|
||||
confirmed = bool(payload.get("eggs")) and all(any(int(s["id"]) == int(egg["stackId"])
|
||||
and int(s.get("monsterId") or 0) in self.snapshot.monsters for s in self.snapshot.raw["stacks"])
|
||||
for egg in payload["eggs"])
|
||||
elif path == "stackService/stackTransferMonster":
|
||||
confirmed = bool(payload.get("datas")) and all(
|
||||
(self.snapshot.monsters.get(int(mid)) or {}).get("process") == 3
|
||||
and int((self.snapshot.monsters.get(int(mid)) or {}).get("roomId") or 0) == int(data["roomId"])
|
||||
for data in payload["datas"] for mid in data["monsterId"])
|
||||
if confirmed:
|
||||
self.battle_journal.finish(self.snapshot, record, "task", "已按服务器背包/孵化位确认补资源;任务步骤仍需独立核对提交")
|
||||
self._sync_commission_history()
|
||||
|
||||
def _execute_task_intent(self, intent):
|
||||
path, kind = value(intent, "path", "") or "", value(intent, "kind")
|
||||
payload = deepcopy(value(intent, "payload", {}) or {})
|
||||
@@ -1058,6 +1196,7 @@ class Engine:
|
||||
if self._progression_pending():
|
||||
self.last_pending_check = time.monotonic()
|
||||
self.snapshot = self.client.snapshot()
|
||||
self._reconcile_procurement()
|
||||
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:
|
||||
@@ -1512,10 +1651,23 @@ class Engine:
|
||||
# One owner for commission writes; never accept the same offer through
|
||||
# both the legacy planner and the full progression planner.
|
||||
quests = [] if self._commission_planner_available else self.tasks.plan(self.snapshot, self.quest_policy, self.policy)
|
||||
types, eggs = self.tasks.reservations(self.snapshot)
|
||||
preparing = []
|
||||
for intent in self._progression_intents:
|
||||
key = str(value(intent, "source_task_type_id") or value(intent, "task_type_id") or "")
|
||||
if self._is_commission(intent) and key and not value(intent, "source_task_id") and not value(intent, "task_id"):
|
||||
info = self._commission_info(key)
|
||||
if any(r.get("task_type_id") == key and r.get("preparable") for r in self._commission_offer_diagnostics):
|
||||
preparing.append({"typeId": key, "curStep": 1, "info": info})
|
||||
types, eggs = self.tasks.reservations(self.snapshot, extra_tasks=preparing)
|
||||
reserved = dict(self.policy.reserved_eggs)
|
||||
for key, count in eggs.items():
|
||||
reserved[key] = max(reserved.get(key, 0), count)
|
||||
# The task supply planner owns these eggs, including when it is waiting
|
||||
# for one already growing. Generic hatch/refill must not overproduce.
|
||||
for type_id in types:
|
||||
key = str(type_id)
|
||||
reserved[key] = max(reserved.get(key, 0), sum(int(i.get("num", 0)) for i in self.snapshot.raw["items"]
|
||||
if str(i.get("typeId")) == key))
|
||||
policy = replace(self.policy, reserved_types=list(set(self.policy.reserved_types) | types), reserved_eggs=reserved)
|
||||
self.hatch_planner.notes = []
|
||||
self.pending_hatches = self.hatch_planner.hatch_actions(self.snapshot, policy)
|
||||
@@ -1524,7 +1676,7 @@ class Engine:
|
||||
map_action = self._next_map_action()
|
||||
sweep_actions = [map_action] if map_action else []
|
||||
gifts = self.gift_planner.plan(self.snapshot, policy, self.quest_policy)
|
||||
ranch = self.planner.plan(self.snapshot, policy, left)
|
||||
ranch = self.planner.plan(self.snapshot, replace(policy, buy=False) if types or eggs else policy, left)
|
||||
explore = self.explore_planner.plan(self.snapshot, self.explore_policy, policy)
|
||||
breakthrough_policy = SimpleNamespace(**(asdict(policy) | {"item_reserves": dict(self.quest_policy.item_reserves)}))
|
||||
self.breakthrough_planner.notes = []
|
||||
|
||||
Reference in New Issue
Block a user