Use main-window menus, cache maps, and handle settled sweep events
This commit is contained in:
@@ -11,6 +11,7 @@ from .market import PurchaseBudget
|
||||
from .management import expansion_quote, manual_monster_actions
|
||||
from .gifts import GiftPlanner
|
||||
from .master_sync import MasterSync
|
||||
from .stage_cache import StageCache
|
||||
|
||||
|
||||
class Engine:
|
||||
@@ -35,6 +36,7 @@ class Engine:
|
||||
self.master_sync = MasterSync(catalog)
|
||||
self.last_executed = False
|
||||
folder = Path(budget_path).parent if budget_path else None
|
||||
self.stage_cache = StageCache(catalog, folder / "maps.json" if folder else None)
|
||||
self.daily_policy = DailyPolicy()
|
||||
self.daily_ledger = DailyLedger(folder / "daily_claims.json" if folder else None)
|
||||
self.sweep_policy = SweepPolicy()
|
||||
@@ -72,6 +74,7 @@ class Engine:
|
||||
mon.update({field: entry[field] for field in fields if field in entry})
|
||||
rows.append(mon)
|
||||
self.snapshot.raw["monsters"] = rows
|
||||
self.sweeper.recover_reward_event(self.snapshot, getattr(getattr(self.client, "trace", None), "path", None))
|
||||
return self.snapshot
|
||||
|
||||
def master_sync_due(self):
|
||||
@@ -81,6 +84,15 @@ class Engine:
|
||||
self.read_snapshot()
|
||||
return self.snapshot, self.plans(), "已同步等级 / 体力"
|
||||
|
||||
def refresh_stages(self):
|
||||
self.auto = False
|
||||
if not self.demo:
|
||||
self.read_snapshot()
|
||||
elif self.snapshot is None:
|
||||
self.snapshot = demo_snapshot(self.catalog)
|
||||
self.stage_cache.get(self.snapshot, refresh=True)
|
||||
return self.snapshot, self.plans(), "已刷新关卡并保存当前账号的地图缓存"
|
||||
|
||||
def remember_growth(self, response):
|
||||
# MonsterCenter.checkGrowUpHandler treats these two arrays as the
|
||||
# authoritative stage and growth values, including after a stale read.
|
||||
@@ -156,6 +168,9 @@ class Engine:
|
||||
if not hatch_only:
|
||||
settled = self.settle_pending_growth()
|
||||
message = "状态已刷新" + (";已请求孵化 / 成长结算" if settled else "")
|
||||
if self.sweeper.recovered_event:
|
||||
message += ";已解除旧版对已结算奖励事件的误阻塞"
|
||||
self.sweeper.recovered_event = False
|
||||
if self.snapshot.growth_pending(self.catalog):
|
||||
message += ";成长状态等待服务器确认,将自动检查"
|
||||
try:
|
||||
@@ -177,8 +192,11 @@ class Engine:
|
||||
stage = self.sweeper.next(self.snapshot, self.sweep_policy)
|
||||
if self.demo:
|
||||
return self.snapshot, plans, "扫荡需要登录真实账号;演示不会提交战斗"
|
||||
self.sweeper.run(self.client, self.snapshot, stage, self.sweep_policy)
|
||||
result = self.sweeper.run(self.client, self.snapshot, stage, self.sweep_policy)
|
||||
self.read_snapshot()
|
||||
if self.sweeper.last_outcome == "event":
|
||||
from .maps import reward_summary
|
||||
return self.snapshot, self.plans(), f"探索奖励事件已结算:{stage.number} {stage.name} / 难度{stage.level};" + reward_summary(self.catalog, result["stageEvent"]["result"])
|
||||
return self.snapshot, self.plans(), f"扫荡完成:{stage.number} {stage.name} / 难度{stage.level}"
|
||||
if action.kind == "buy":
|
||||
price = int(self.catalog.data["markets"][action.payload["id"]]["money"])
|
||||
|
||||
Reference in New Issue
Block a user