Keep multi-account refresh responsive and batch monster feeding
This commit is contained in:
+165
-44
@@ -15,12 +15,13 @@ from .farming import Adb, FarmConfig, FarmRunner
|
||||
from .model import Catalog, Policy, WIKI, duration
|
||||
from .egg_rules_gui import EggTable
|
||||
from .management import expansion_quote, manual_monster_actions
|
||||
from .native_widgets import IntegerInput, use_native_scrollbars
|
||||
from .native_widgets import IntegerInput, RowBatch, use_native_scrollbars
|
||||
from .login import PasswordLogin, device_id, server_labels
|
||||
from .quests import QuestPolicy
|
||||
from .daily import DailyPolicy
|
||||
from .sweeping import SweepPolicy
|
||||
from .activity_gui import ActivityPages
|
||||
from .presentation import Presented, prepare_views, monster_rows
|
||||
from .capture import PAGES, load_buttons, read_profile, saved_profiles, save_page
|
||||
from .credentials import CredentialStore
|
||||
from .debug import TraceLog
|
||||
@@ -195,6 +196,9 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.farm = FarmRunner(Adb(), self.catalog, self.state)
|
||||
self.busy, self.monitoring = False, False
|
||||
self.active_job = None
|
||||
self.presentation_active = True
|
||||
self.latest_render = None
|
||||
self.prepared_views = None
|
||||
self.next_poll = self.next_farm = 0
|
||||
self.client_pending = None
|
||||
self.password_login_result = None
|
||||
@@ -239,6 +243,9 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.eggs.rules_changed.connect(self.egg_rules_changed)
|
||||
self.monsters = table(["魔物ID", "名称", "星", "等级 / 当前上限", "资质 攻/防/血/敏", "位置", "锁定", "管理范围",
|
||||
"喂养目标", "喂养优先级", "突破等级", "参考攻击", "参考防御", "参考生命", "参考敏捷", "好感", "喜欢的物品"])
|
||||
self.monsters.horizontalHeader().setSectionResizeMode(W.QHeaderView.ResizeMode.Interactive)
|
||||
for column, width in enumerate((115, 140, 45, 120, 150, 140, 80, 130, 90, 110, 85, 90, 90, 90, 90, 65, 220)):
|
||||
self.monsters.setColumnWidth(column, width)
|
||||
self.rooms_table = table(["牧场ID", "名称", "类型", "当前魔物", "容量", "空位"])
|
||||
self.slot_page = W.QWidget()
|
||||
slot_layout = W.QVBoxLayout(self.slot_page)
|
||||
@@ -342,6 +349,7 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.refresh_capture_profiles()
|
||||
self.render_catalog()
|
||||
self.install_refresh_menus()
|
||||
self.tabs.currentChanged.connect(self.render_current_page)
|
||||
self.reload_saved_sessions()
|
||||
self.timer = C.QTimer(self)
|
||||
self.timer.timeout.connect(self.schedule)
|
||||
@@ -1205,11 +1213,22 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
return
|
||||
self.busy = True
|
||||
self.update_monster_actions()
|
||||
job = Job(kind, function)
|
||||
catalog, engine = self.catalog, self.engine
|
||||
def background():
|
||||
started = time.perf_counter()
|
||||
value = function()
|
||||
if kind in ("poll", "monster_lock", "manual_monsters", "expansion", "growth_sync", "daily_claim", "connected"):
|
||||
snapshot = value[1] if kind == "connected" else value[0]
|
||||
managed = set() if kind == "connected" else set(engine.planner.managed)
|
||||
preparing = time.perf_counter()
|
||||
views = prepare_views(catalog, snapshot, managed)
|
||||
return Presented(value, views, (time.perf_counter() - preparing) * 1000, (time.perf_counter() - started) * 1000)
|
||||
return value
|
||||
job = Job(kind, background)
|
||||
self.active_job = job
|
||||
job.signals.result.connect(self.result)
|
||||
job.signals.error.connect(self.error)
|
||||
job.signals.done.connect(self.job_done)
|
||||
job.signals.result.connect(self.result, C.Qt.ConnectionType.QueuedConnection)
|
||||
job.signals.error.connect(self.error, C.Qt.ConnectionType.QueuedConnection)
|
||||
job.signals.done.connect(self.job_done, C.Qt.ConnectionType.QueuedConnection)
|
||||
self.pool.start(job)
|
||||
|
||||
@C.Slot()
|
||||
@@ -1226,11 +1245,23 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.pending_execute = False
|
||||
C.QTimer.singleShot(0, lambda: self.refresh(automated=True))
|
||||
|
||||
@C.Slot(str, object)
|
||||
def result(self, kind, value):
|
||||
metrics = None
|
||||
if isinstance(value, Presented):
|
||||
self.prepared_views = value.views
|
||||
metrics = value
|
||||
value = value.value
|
||||
started = time.perf_counter()
|
||||
try:
|
||||
self.apply_result(kind, value)
|
||||
except (ValueError, TypeError, KeyError, AttributeError) as error:
|
||||
self.error("显示数据时出错:" + str(error))
|
||||
if metrics and not self.engine.demo:
|
||||
self.trace.emit("info", "刷新耗时", scope="local", task=kind,
|
||||
worker_total_ms=round(metrics.worker_ms, 1), data_prepare_ms=round(metrics.prepare_ms, 1),
|
||||
ui_callback_ms=round((time.perf_counter() - started) * 1000, 1),
|
||||
note="worker总耗时包含网络;大列表在后续短批次更新")
|
||||
|
||||
def apply_result(self, kind, value):
|
||||
if kind in ("poll", "monster_lock", "manual_monsters", "expansion", "growth_sync", "daily_claim"):
|
||||
@@ -1238,6 +1269,8 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.render(snapshot, plans)
|
||||
self.report(message)
|
||||
self.reload_saved_sessions()
|
||||
if kind == "poll" and self.engine.last_executed and self.execute.isChecked() and self.monitoring:
|
||||
self.next_poll = time.monotonic() + .15
|
||||
if "策略暂不可用" in message:
|
||||
self.execute.setChecked(False)
|
||||
elif kind == "heartbeat":
|
||||
@@ -1339,6 +1372,7 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.login_status.setText(f"已获取 {self.server_list.count()} 个官方区服,请选择后点击“进入选中区服”")
|
||||
self.report(f"账号验证成功;官方返回 {self.server_list.count()} 个区服,请选择后进入")
|
||||
|
||||
@C.Slot(str)
|
||||
def error(self, message):
|
||||
last = self.trace.events[-1] if self.trace.events else {}
|
||||
if last.get("kind") != "error" or last.get("message") != self.trace.redact(message):
|
||||
@@ -1362,7 +1396,7 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
type_id, count = item.split(":")
|
||||
eggs[str(int(type_id))] = max(0, int(count))
|
||||
return Policy(enabled=self.ranch_enabled.isChecked(), strategy=self.strategy.currentData(), protect_star=self.protect_star.value(), protect_quality=self.protect_quality.currentData(),
|
||||
feed_target=self.target.currentData() or 0, target_level=self.target_level.value(), room_id=self.room.currentData() or 0,
|
||||
feed_target=getattr(self, "restore_target", self.target.currentData() or 0), target_level=self.target_level.value(), room_id=getattr(self, "restore_room", self.room.currentData() or 0),
|
||||
coins_per_exp=self.coin_exp.value(), fill=self.fill.isChecked(), egg_order=self.egg_order.currentData(),
|
||||
reserved_types=reserved, reserved_eggs=eggs, min_gold_per_hour=self.min_gold.value(), min_exp_per_hour=self.min_exp.value(),
|
||||
collect=self.collect.isChecked(), dispatch=self.dispatch.isChecked(), feed=self.feed.isChecked(), hatch_max_star=self.hatch_max_star.currentData(),
|
||||
@@ -1425,6 +1459,8 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.submit("farm", lambda: self.farm.tick(self.engine.snapshot))
|
||||
|
||||
def render(self, snapshot, plans):
|
||||
self.latest_render = (snapshot, plans)
|
||||
self.engine.snapshot = snapshot
|
||||
master = snapshot.raw["master"]
|
||||
self.summary.setText(f"{master.get('roleName', '')} | 金币 {master.get('money', '?')} | 氪金 {master.get('ke', '?')} | 体力 {master.get('ti', '?')}")
|
||||
decisions = {int((a.payload.get('monsterId') or a.payload.get('monsterIds') or a.payload.get('foods') or [0])[0]): a.description for a in plans if a.kind in ('sell', 'feed')}
|
||||
@@ -1450,15 +1486,98 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
rows.append([position + 1, slot["id"], status, "空位", "", "", "", "", ""])
|
||||
fill_table(self.slots, rows)
|
||||
self.slot_status.setText(f"已开启 {len(opened)} / {total_slots} 个坑位;第4坑为VIP专用({'已激活' if vip else '未激活'})。选择“未开启”的普通坑位后可扩建。")
|
||||
self.render_egg_rules()
|
||||
monster_rows = [[m["id"], m.get("nicName") or self.catalog.monster(m["typeId"]).get("name", "未知"), self.catalog.monster(m["typeId"]).get("star", "?"),
|
||||
f"{m.get('level', 1)} / {self.catalog.max_level(m) or '?'}", self.catalog.quality_text(m), "培育室 · " + snapshot.phase_text(m, self.catalog) if m.get("process") == 2 else f"牧场 {m.get('roomId', 0)}", "系统锁定" if m.get("sysLock") else "是" if m.get("lock") else "否",
|
||||
"本次培育" if int(m["id"]) in self.engine.planner.managed else "已有:不自动处理", "", "", m.get("potentialLevel", "?"),
|
||||
*self.catalog.reference_stats(m), m.get("feel", "?"), self.catalog.likes_text(m["typeId"])] for m in snapshot.raw["monsters"]]
|
||||
fill_table(self.monsters, monster_rows, sorting=False)
|
||||
for row_index, mon in enumerate(snapshot.raw["monsters"]):
|
||||
eggs = snapshot.eggs(self.catalog)
|
||||
incubating = sum(int(slot.get("monsterId") or 0) > 0 for slot in snapshot.raw["stacks"])
|
||||
stamp = time.strftime("%H:%M:%S", time.localtime(snapshot.received_at))
|
||||
self.data_summary.setText(f"{'演示数据' if self.engine.demo else '真实角色数据'} | 培育坑位 {len(snapshot.raw['stacks'])}(使用 {incubating}) | 魔物蛋 {len(eggs)} 类 / {sum(int(egg.get('num') or 0) for egg in eggs)} 枚 | 魔物 {len(snapshot.raw['monsters'])} | 牧场 {len(snapshot.raw['rooms'])} | 更新 {stamp}")
|
||||
fill_table(self.plans, [[a.kind, a.description] for a in plans])
|
||||
self.workflow_next.setText("下一步:" + plans[0].description if plans else "当前等待:" + ";".join(list(dict.fromkeys(self.engine.planner.notes))[:4]) if self.engine.planner.notes else "点击刷新 / 预览查看下一步")
|
||||
self.update_workflow_status()
|
||||
left = snapshot.raw.get("history", {}).get("loopTaskNum", "未知")
|
||||
self.quest_summary.setText(f"今日剩余可接次数:{left};当前委托:{len(self.engine.tasks.current(snapshot))}")
|
||||
if not self.engine.demo:
|
||||
self.reqid.setValue(self.engine.client.session.reqid)
|
||||
self.reqsid.setValue(self.engine.client.session.reqsid)
|
||||
|
||||
if self.presentation_active:
|
||||
self.render_current_page()
|
||||
|
||||
def set_presentation_active(self, active):
|
||||
self.presentation_active = active
|
||||
if not active:
|
||||
for name in ("map_render_timer", "monster_render_timer"):
|
||||
timer = getattr(self, name, None)
|
||||
if timer:
|
||||
timer.stop()
|
||||
if hasattr(self.eggs, "row_batch"):
|
||||
self.eggs.row_batch.stop()
|
||||
elif self.latest_render:
|
||||
self.render_current_page()
|
||||
|
||||
def render_current_page(self, *args):
|
||||
if self.closed or not self.presentation_active or not self.latest_render:
|
||||
return
|
||||
snapshot, plans = self.latest_render
|
||||
page = self.tabs.currentWidget()
|
||||
for name, target in (("map_render_timer", self.map_page), ("monster_render_timer", self.monster_page)):
|
||||
timer = getattr(self, name, None)
|
||||
if timer and page is not target:
|
||||
timer.stop()
|
||||
if page is not self.egg_page and hasattr(self.eggs, "row_batch"):
|
||||
self.eggs.row_batch.stop()
|
||||
try:
|
||||
if page is self.monster_page:
|
||||
self.render_monsters(snapshot)
|
||||
elif page is self.egg_page:
|
||||
self.render_egg_rules()
|
||||
elif page is self.room_page:
|
||||
self.render_rooms(snapshot)
|
||||
elif page is self.quests_table.parentWidget():
|
||||
self.render_quests(snapshot)
|
||||
elif page is self.map_page:
|
||||
self.render_maps()
|
||||
elif page is self.daily_page:
|
||||
self.render_daily()
|
||||
elif page is self.target.parentWidget() or page is self.automation_page:
|
||||
self.refresh_target_choices(snapshot)
|
||||
except (ValueError, TypeError, KeyError, AttributeError) as error:
|
||||
self.report("页面数据暂不可用:" + str(error))
|
||||
|
||||
def render_monsters(self, snapshot):
|
||||
views = self.prepared_views
|
||||
managed = self.engine.planner.managed
|
||||
if views and views.snapshot is snapshot and views.monster_source == repr(snapshot.raw["monsters"]) and views.managed == managed:
|
||||
rows = views.monsters
|
||||
else:
|
||||
rows = monster_rows(self.catalog, snapshot, managed)
|
||||
signature = (rows, dict(self.feed_targets))
|
||||
if getattr(self, "monster_render_signature", None) == signature:
|
||||
return
|
||||
if not hasattr(self, "monster_render_timer"):
|
||||
self.monster_render_timer = RowBatch(self)
|
||||
self.monsters.setSortingEnabled(False)
|
||||
self.monsters.setRowCount(len(rows))
|
||||
def apply(entry):
|
||||
row_index, mon, values = entry
|
||||
for column, value in enumerate(values):
|
||||
item = self.monsters.item(row_index, column)
|
||||
if item is None:
|
||||
item = W.QTableWidgetItem()
|
||||
self.monsters.setItem(row_index, column, item)
|
||||
if item.data(C.Qt.ItemDataRole.DisplayRole) != value:
|
||||
item.setData(C.Qt.ItemDataRole.DisplayRole, value)
|
||||
mid = str(mon["id"])
|
||||
existing = self.monsters.cellWidget(row_index, 8)
|
||||
if existing and existing.property("monster_id") == mid:
|
||||
priority = self.monsters.cellWidget(row_index, 9)
|
||||
blockers = [C.QSignalBlocker(existing), C.QSignalBlocker(priority)]
|
||||
existing.setChecked(mid in self.feed_targets)
|
||||
existing.setEnabled(mon.get("process") == 3)
|
||||
if not priority.hasFocus():
|
||||
priority.setValue(self.feed_targets.get(mid, 100))
|
||||
return
|
||||
check, priority = W.QCheckBox(), IntegerInput()
|
||||
check.setProperty("monster_id", mid)
|
||||
priority.setRange(1, 999)
|
||||
priority.setValue(self.feed_targets.get(mid, 100))
|
||||
check.setChecked(mid in self.feed_targets)
|
||||
@@ -1477,8 +1596,23 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
priority.valueChanged.connect(changed)
|
||||
self.monsters.setCellWidget(row_index, 8, check)
|
||||
self.monsters.setCellWidget(row_index, 9, priority)
|
||||
self.monsters.item(row_index, 16).setToolTip(self.catalog.likes_text(mon["typeId"]))
|
||||
self.monsters.setSortingEnabled(True)
|
||||
self.monsters.item(row_index, 16).setToolTip(str(values[16]))
|
||||
def finish():
|
||||
self.monster_render_signature = copy.deepcopy(signature)
|
||||
self.monsters.setSortingEnabled(True)
|
||||
self.monster_render_timer.start(((i, mon, values) for i, (mon, values) in enumerate(zip(snapshot.raw["monsters"], rows))), apply, finish)
|
||||
|
||||
def refresh_target_choices(self, snapshot):
|
||||
self.update_combo(self.target, [("未设置:不自动喂养", 0)] + [(f"{self.catalog.monster(m['typeId']).get('name')} Lv.{m.get('level', 1)}/{self.catalog.max_level(m) or '?'} #{m['id']}", int(m["id"])) for m in snapshot.raw["monsters"] if m.get("process") == 3])
|
||||
self.update_combo(self.room, [("自动选择有空位的牧场", 0)] + [(f"牧场 {r['id']}", int(r["id"])) for r in snapshot.raw["rooms"]])
|
||||
if hasattr(self, "restore_target"):
|
||||
self.target.setCurrentIndex(max(0, self.target.findData(self.restore_target)))
|
||||
self.room.setCurrentIndex(max(0, self.room.findData(self.restore_room)))
|
||||
del self.restore_target
|
||||
del self.restore_room
|
||||
self.update_target_status()
|
||||
|
||||
def render_rooms(self, snapshot):
|
||||
rooms = []
|
||||
for room in snapshot.raw["rooms"]:
|
||||
info = self.catalog.data["room_info"].get(str(room.get("typeId")), {})
|
||||
@@ -1487,39 +1621,20 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
rooms.append([room["id"], room.get("name") or info.get("name") or "牧场", room.get("typeId", ""), used,
|
||||
capacity if capacity is not None else "未知", max(0, int(capacity) - used) if capacity is not None else "未知"])
|
||||
fill_table(self.rooms_table, rooms)
|
||||
eggs = snapshot.eggs(self.catalog)
|
||||
incubating = sum(int(slot.get("monsterId") or 0) > 0 for slot in snapshot.raw["stacks"])
|
||||
stamp = time.strftime("%H:%M:%S", time.localtime(snapshot.received_at))
|
||||
self.data_summary.setText(f"{'演示数据' if self.engine.demo else '真实角色数据'} | 培育坑位 {len(snapshot.raw['stacks'])}(使用 {incubating}) | 魔物蛋 {len(eggs)} 类 / {sum(int(egg.get('num') or 0) for egg in eggs)} 枚 | 魔物 {len(snapshot.raw['monsters'])} | 牧场 {len(rooms)} | 更新 {stamp}")
|
||||
fill_table(self.plans, [[a.kind, a.description] for a in plans])
|
||||
self.workflow_next.setText("下一步:" + plans[0].description if plans else "当前等待:" + ";".join(list(dict.fromkeys(self.engine.planner.notes))[:4]) if self.engine.planner.notes else "点击刷新 / 预览查看下一步")
|
||||
self.update_workflow_status()
|
||||
try:
|
||||
quest_policy = self.read_quest_policy()
|
||||
quest_rows = self.engine.tasks.rows(snapshot, quest_policy, self.read_policy())
|
||||
fill_table(self.quests_table, [[key, name, status,
|
||||
self.catalog.data["task_info"][key].get("reward", {}).get("money", 0),
|
||||
self.catalog.data["task_info"][key].get("reward", {}).get("ke", 0), text] for key, name, status, text, _ in quest_rows])
|
||||
self.render_maps()
|
||||
self.render_daily()
|
||||
except (ValueError, TypeError, KeyError, AttributeError) as error:
|
||||
self.report("基础数据已显示;委托或地图暂不可用:" + str(error))
|
||||
left = snapshot.raw.get("history", {}).get("loopTaskNum", "未知")
|
||||
self.quest_summary.setText(f"今日剩余可接次数:{left};当前委托:{len(self.engine.tasks.current(snapshot))}")
|
||||
self.update_combo(self.target, [("未设置:不自动喂养", 0)] + [(f"{self.catalog.monster(m['typeId']).get('name')} Lv.{m.get('level', 1)}/{self.catalog.max_level(m) or '?'} #{m['id']}", int(m["id"])) for m in snapshot.raw["monsters"] if m.get("process") == 3])
|
||||
self.update_combo(self.room, [("自动选择有空位的牧场", 0)] + [(f"牧场 {r['id']}", int(r["id"])) for r in snapshot.raw["rooms"]])
|
||||
if hasattr(self, "restore_target") and not self.engine.demo:
|
||||
self.target.setCurrentIndex(max(0, self.target.findData(self.restore_target)))
|
||||
self.room.setCurrentIndex(max(0, self.room.findData(self.restore_room)))
|
||||
del self.restore_target
|
||||
self.update_target_status()
|
||||
if not self.engine.demo:
|
||||
self.reqid.setValue(self.engine.client.session.reqid)
|
||||
self.reqsid.setValue(self.engine.client.session.reqsid)
|
||||
|
||||
def render_quests(self, snapshot):
|
||||
quest_policy = self.read_quest_policy()
|
||||
quest_rows = self.engine.tasks.rows(snapshot, quest_policy, self.read_policy())
|
||||
fill_table(self.quests_table, [[key, name, status,
|
||||
self.catalog.data["task_info"][key].get("reward", {}).get("money", 0),
|
||||
self.catalog.data["task_info"][key].get("reward", {}).get("ke", 0), text] for key, name, status, text, _ in quest_rows])
|
||||
|
||||
@staticmethod
|
||||
def update_combo(widget, rows):
|
||||
if [(widget.itemText(i), widget.itemData(i)) for i in range(widget.count())] == rows:
|
||||
return
|
||||
previous = widget.currentData()
|
||||
blocker = C.QSignalBlocker(widget)
|
||||
widget.clear()
|
||||
for text, data in rows:
|
||||
widget.addItem(text, data)
|
||||
@@ -1831,6 +1946,12 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.timer.stop()
|
||||
if hasattr(self, "activity_save_timer"):
|
||||
self.activity_save_timer.stop()
|
||||
if hasattr(self.eggs, "row_batch"):
|
||||
self.eggs.row_batch.stop()
|
||||
for name in ("map_render_timer", "monster_render_timer"):
|
||||
timer = getattr(self, name, None)
|
||||
if timer:
|
||||
timer.stop()
|
||||
self.pending_refresh = None
|
||||
self.engine.auto = False
|
||||
self.monitoring = False
|
||||
|
||||
Reference in New Issue
Block a user