Release ranch assistant 1.1.0
This commit is contained in:
+212
-27
@@ -27,6 +27,10 @@ from .credentials import CredentialStore
|
||||
from .debug import TraceLog
|
||||
from .debug_window import DebugWindow
|
||||
from .sessions import SessionStore, identity
|
||||
from .inventory_gui import ITEM_TYPES, InventoryTable, RanchView
|
||||
from .policy_io import portable_policy, import_policy
|
||||
|
||||
APP_VERSION = "1.1.0"
|
||||
|
||||
ROOT = Path(sys.executable).parent if getattr(sys, "frozen", False) else Path(__file__).resolve().parent.parent
|
||||
STATE = ROOT / "local_state" / "ranch_helper"
|
||||
@@ -205,11 +209,13 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.capture_profile = None
|
||||
self.egg_rules = {}
|
||||
self.feed_targets = {}
|
||||
self.gift_targets = {}
|
||||
self.gift_items = {}
|
||||
central = W.QWidget()
|
||||
layout = W.QVBoxLayout(central)
|
||||
self.setCentralWidget(central)
|
||||
toolbar = W.QHBoxLayout()
|
||||
self.mode = W.QLabel("离线演示")
|
||||
self.mode = W.QLabel("未登录")
|
||||
self.summary = W.QLabel()
|
||||
self.data_summary = W.QLabel("等待读取培育室、背包和牧场状态")
|
||||
self.interval = combo([("5秒", 5), ("10秒", 10), ("30秒", 30), ("60秒", 60)])
|
||||
@@ -226,7 +232,7 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.show_log = W.QPushButton("隐藏日志")
|
||||
self.show_log.setCheckable(True)
|
||||
self.show_log.setChecked(True)
|
||||
for widget in (self.mode, self.summary, self.interval, self.start_monitor, refresh, self.execute, debug_button, self.show_log):
|
||||
for widget in (self.summary, self.interval, self.start_monitor, refresh, self.execute, debug_button, self.show_log):
|
||||
toolbar.addWidget(widget)
|
||||
toolbar.addStretch()
|
||||
layout.addLayout(toolbar)
|
||||
@@ -242,9 +248,9 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.eggs = EggTable(self.catalog)
|
||||
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)):
|
||||
for column, width in enumerate((115, 140, 45, 120, 150, 140, 80, 130, 90, 110, 85, 90, 90, 90, 90, 90, 220, 65, 110)):
|
||||
self.monsters.setColumnWidth(column, width)
|
||||
self.rooms_table = table(["牧场ID", "名称", "类型", "当前魔物", "容量", "空位"])
|
||||
self.slot_page = W.QWidget()
|
||||
@@ -277,7 +283,24 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
egg_buttons.addStretch()
|
||||
egg_layout.addLayout(egg_buttons)
|
||||
egg_layout.addWidget(self.eggs)
|
||||
self.tabs.addTab(self.egg_page, "背包魔物蛋")
|
||||
self.inventory = InventoryTable(self.catalog)
|
||||
self.inventory.gifts_changed.connect(self.gift_items_changed)
|
||||
self.inventory_tabs = W.QTabWidget()
|
||||
self.inventory_tabs.addTab(self.egg_page, "魔物蛋")
|
||||
item_page = W.QWidget()
|
||||
item_layout = W.QVBoxLayout(item_page)
|
||||
item_tools = W.QHBoxLayout()
|
||||
self.item_search = W.QLineEdit()
|
||||
self.item_search.setPlaceholderText("按物品名称或类型编号筛选")
|
||||
self.item_category = combo([(label, value) for value, label in ITEM_TYPES])
|
||||
item_tools.addWidget(self.item_category)
|
||||
item_tools.addWidget(self.item_search, 1)
|
||||
item_layout.addLayout(item_tools)
|
||||
item_layout.addWidget(self.inventory)
|
||||
self.inventory_tabs.addTab(item_page, "物品与装备")
|
||||
self.tabs.addTab(self.inventory_tabs, "背包")
|
||||
self.egg_page = self.inventory_tabs
|
||||
self.egg_rules_page = self.inventory_tabs.widget(0)
|
||||
self.monster_page = W.QWidget()
|
||||
monster_layout = W.QVBoxLayout(self.monster_page)
|
||||
monster_tools = W.QHBoxLayout()
|
||||
@@ -286,17 +309,23 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.lock_monsters.clicked.connect(lambda: self.change_monster_lock(True))
|
||||
self.unlock_monsters.clicked.connect(lambda: self.change_monster_lock(False))
|
||||
self.monster_selection = W.QLabel("选择魔物后可锁定 / 解锁,也可右键操作")
|
||||
for widget in (self.lock_monsters, self.unlock_monsters, self.monster_selection):
|
||||
self.monster_view = combo([("按牧场分组", 1), ("全部魔物", 0)])
|
||||
self.monster_room = combo([("全部牧场", 0)])
|
||||
for widget in (self.monster_view, self.monster_room, self.lock_monsters, self.unlock_monsters, self.monster_selection):
|
||||
monster_tools.addWidget(widget)
|
||||
for label, currency in (("新建牧场(金币)", "money"), ("新建牧场(氪金)", "ke")):
|
||||
button = W.QPushButton(label)
|
||||
button.clicked.connect(lambda checked=False, currency=currency: self.request_expansion("room", currency))
|
||||
monster_tools.addWidget(button)
|
||||
monster_tools.addStretch()
|
||||
monster_layout.addLayout(monster_tools)
|
||||
detail_note = W.QLabel("勾选“喂养目标”并设置优先级(数字小的先喂);当前突破上限满级后转下一个目标。参考属性含等级、潜能、好感和升星,不含装备、羁绊或全局加成。")
|
||||
detail_note.setWordWrap(True)
|
||||
monster_layout.addWidget(detail_note)
|
||||
monster_layout.addWidget(self.monsters)
|
||||
self.ranch_view = RanchView(self.rooms_table, self.monsters)
|
||||
monster_layout.addWidget(self.ranch_view)
|
||||
self.monsters.itemSelectionChanged.connect(self.update_monster_actions)
|
||||
self.monsters.cellDoubleClicked.connect(lambda row, column: self.show_monster_detail(row))
|
||||
self.tabs.addTab(self.monster_page, "魔物")
|
||||
self.room_page = W.QWidget()
|
||||
room_layout = W.QVBoxLayout(self.room_page)
|
||||
room_tools = W.QHBoxLayout()
|
||||
@@ -309,9 +338,10 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.room_status = W.QLabel("已开启的牧场列在下方;新建前会显示费用并确认。")
|
||||
self.room_status.setWordWrap(True)
|
||||
room_layout.addWidget(self.room_status)
|
||||
room_layout.addWidget(self.rooms_table)
|
||||
self.tabs.addTab(self.room_page, "牧场概况")
|
||||
self.policy_tab()
|
||||
self.room_page.hide()
|
||||
self.room_page = self.monster_page
|
||||
self.tabs.addTab(self.room_page, "牧场")
|
||||
self.policy_tab(embedded=True)
|
||||
self.automation_tab()
|
||||
self.yield_tab()
|
||||
self.quests_tab()
|
||||
@@ -321,6 +351,17 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.capture_tab()
|
||||
self.plans = table(["操作", "下一步计划(每轮只执行一项,并重新读取状态)"])
|
||||
self.tabs.addTab(self.plans, "执行计划")
|
||||
order = [self.tabs.widget(0), self.slot_page, self.inventory_tabs, self.room_page,
|
||||
self.quests_table.parentWidget(), self.yields.parentWidget(), self.daily_page, self.map_page,
|
||||
self.automation_page, self.start_farm.parentWidget(), self.capture_scroll, self.plans]
|
||||
for page in order:
|
||||
self.tabs.addTab(page, self.tabs.tabText(self.tabs.indexOf(page)))
|
||||
self.monster_view.currentIndexChanged.connect(self.monster_view_changed)
|
||||
self.monster_room.currentIndexChanged.connect(self.monster_view_changed)
|
||||
self.item_search.textChanged.connect(lambda text: self.inventory.set_filter(text, self.item_category.currentData()))
|
||||
self.item_category.currentIndexChanged.connect(lambda: self.inventory.set_filter(self.item_search.text(), self.item_category.currentData()))
|
||||
self.inventory_tabs.currentChanged.connect(self.render_current_page)
|
||||
self.inventory_tabs.setCurrentIndex(0)
|
||||
self.log = W.QPlainTextEdit()
|
||||
self.log.setReadOnly(True)
|
||||
self.log.setMaximumBlockCount(600)
|
||||
@@ -413,15 +454,21 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.reqsid = spin(0, 2147483647, 0)
|
||||
for widget in (self.server, self.token, self.key, self.reqid, self.reqsid):
|
||||
widget.setParent(self.session_fields)
|
||||
demo_button = W.QPushButton("切回离线演示")
|
||||
demo_button = W.QPushButton("退出登录")
|
||||
demo_button.clicked.connect(self.demo)
|
||||
form.addRow(demo_button)
|
||||
clear_button = W.QPushButton("退出登录并清除登录记录")
|
||||
clear_button.clicked.connect(self.logout_and_clear)
|
||||
logout_row = W.QHBoxLayout()
|
||||
logout_row.addWidget(demo_button)
|
||||
logout_row.addWidget(clear_button)
|
||||
logout_row.addStretch()
|
||||
form.addRow(logout_row)
|
||||
note = W.QLabel("账号密码和登录会话自动加密保存。各账号独立运行,登录后再开启自动执行。")
|
||||
note.setWordWrap(True)
|
||||
form.addRow(note)
|
||||
self.tabs.addTab(tab, "登录")
|
||||
|
||||
def policy_tab(self):
|
||||
def policy_tab(self, embedded=False):
|
||||
tab, form = W.QWidget(), W.QFormLayout()
|
||||
tab.setLayout(form)
|
||||
self.ranch_enabled = W.QCheckBox("启用培育室自动管理")
|
||||
@@ -449,16 +496,28 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
form.addRow(label, widget)
|
||||
for widget in (self.strategy, self.coin_exp, self.egg_order, self.min_gold, self.min_exp):
|
||||
widget.setParent(self.session_fields)
|
||||
form.addRow(W.QLabel("孵蛋优先级和孵出后的去向,在“背包魔物蛋”逐种配置。"))
|
||||
form.addRow(W.QLabel("孵蛋开关、优先级和去向在“背包 → 魔物蛋”逐项配置。"))
|
||||
self.target_status = W.QLabel("选择喂养目标后显示当前突破上限")
|
||||
self.target_status.setWordWrap(True)
|
||||
form.addRow("实际喂养上限", self.target_status)
|
||||
self.target.currentIndexChanged.connect(self.update_target_status)
|
||||
self.target_level.valueChanged.connect(self.update_target_status)
|
||||
form.addRow(W.QLabel("仅处理本次运行观察到的培育室魔物;已有牧场魔物不作为自动派遣/喂养素材。\n锁定、羁绊、已装备、队伍/探索中的魔物会保留。蛋的手机本地锁定无法从服务器读取,请设置保留蛋数量。"))
|
||||
self.gift_enabled = W.QCheckBox("启用自动赠礼(在背包勾选物品,在牧场勾选目标)")
|
||||
self.gift_liked_only = W.QCheckBox("仅赠送目标喜欢的物品")
|
||||
self.gift_liked_only.setChecked(True)
|
||||
form.addRow("好感培养", self.gift_enabled)
|
||||
form.addRow(self.gift_liked_only)
|
||||
self.gift_status = W.QLabel("未启用;达到当前羁绊对应的好感上限后停止。")
|
||||
self.gift_status.setWordWrap(True)
|
||||
form.addRow(self.gift_status)
|
||||
for widget in (self.gift_enabled, self.gift_liked_only):
|
||||
widget.toggled.connect(self.update_gift_status)
|
||||
save = W.QPushButton("保存设置")
|
||||
save.clicked.connect(self.save_config)
|
||||
form.addRow(save)
|
||||
if embedded:
|
||||
return tab
|
||||
self.tabs.addTab(tab, "牧场策略")
|
||||
|
||||
def automation_tab(self):
|
||||
@@ -537,11 +596,21 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
bottom = W.QHBoxLayout()
|
||||
bottom.addWidget(preset)
|
||||
bottom.addWidget(save)
|
||||
for label, function in (("导入策略…", self.import_policies), ("导出策略…", self.export_policies)):
|
||||
button = W.QPushButton(label)
|
||||
button.clicked.connect(function)
|
||||
bottom.addWidget(button)
|
||||
layout.addLayout(bottom)
|
||||
configure = W.QPushButton("去背包配置孵蛋规则")
|
||||
configure.clicked.connect(lambda: self.tabs.setCurrentWidget(self.egg_page))
|
||||
layout.addWidget(configure)
|
||||
self.tabs.insertTab(1, self.automation_page, "自动孵蛋")
|
||||
policy_tab = self.policy_tab(embedded=True)
|
||||
self.automation_tabs = W.QTabWidget()
|
||||
self.automation_tabs.addTab(settings_scroll, "孵蛋设置")
|
||||
self.automation_tabs.addTab(policy_tab, "牧场与赠礼策略")
|
||||
layout.removeWidget(settings_scroll)
|
||||
layout.insertWidget(2, self.automation_tabs, 1)
|
||||
self.market.currentIndexChanged.connect(self.update_workflow_status)
|
||||
self.daily_buy_money.valueChanged.connect(self.update_workflow_status)
|
||||
for widget in (self.strategy, self.protect_quality, self.hatch_max_star):
|
||||
@@ -641,7 +710,7 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
return
|
||||
active = self.execute.isChecked() and self.monitoring
|
||||
state = "执行中" if active else "仅监控(不结算成长、不派遣;请点“开始执行”)" if self.monitoring else "已停止(不会自动派遣)"
|
||||
self.workflow_status.setText(("离线演示 · " if self.engine.demo else "真实角色 · ") + state)
|
||||
self.workflow_status.setText(("演示 · " if self.engine.demo else "已登录 · ") + state)
|
||||
self.workflow_start.setEnabled(not active)
|
||||
self.workflow_stop.setEnabled(self.execute.isChecked())
|
||||
market = self.catalog.data.get("markets", {}).get(self.market.currentData(), {})
|
||||
@@ -676,6 +745,26 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.update_workflow_status()
|
||||
self.statusBar().showMessage("孵蛋规则已保存;下一轮按新规则执行", 5000)
|
||||
|
||||
def gift_items_changed(self, rules, key):
|
||||
self.gift_items = rules
|
||||
if rules[key]["enabled"]:
|
||||
self.gift_enabled.setChecked(True)
|
||||
self.save_config(quiet=True)
|
||||
self.update_gift_status()
|
||||
|
||||
def update_gift_status(self, *args):
|
||||
if not hasattr(self, "gift_status"):
|
||||
return
|
||||
self.gift_status.setText(f"已允许 {sum(bool(r.get('enabled')) for r in self.gift_items.values())} 种物品;已选择 {len(self.gift_targets)} 个目标;每次赠礼一件,达到当前好感上限或处于赠礼间隔时停止。")
|
||||
|
||||
def monster_view_changed(self, *args):
|
||||
grouped = bool(self.monster_view.currentData())
|
||||
self.monster_room.setEnabled(grouped)
|
||||
self.ranch_view.set_view(grouped, self.monster_room.currentData() or 0)
|
||||
self.monster_render_signature = None
|
||||
if self.latest_render:
|
||||
self.render_monsters(self.latest_render[0])
|
||||
|
||||
def add_egg_rule(self):
|
||||
choices = {f"{row.get('name', key)} [{key}]": key for key, row in self.catalog.monsters.items()
|
||||
if not row.get("npc") and self.catalog.total_time(key) > 0}
|
||||
@@ -1180,7 +1269,7 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
if not key or self.busy:
|
||||
return
|
||||
if self.engine.client and isinstance(self.engine.client.session, Session) and identity(self.engine.client.session) == key:
|
||||
self.report("请先切回离线演示,再删除当前正在使用的会话")
|
||||
self.report("请先退出登录,再删除当前正在使用的会话")
|
||||
return
|
||||
try:
|
||||
self.session_store.remove(key)
|
||||
@@ -1208,6 +1297,30 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.refresh_capture_profiles()
|
||||
self.render_catalog()
|
||||
|
||||
def logout_and_clear(self):
|
||||
if self.busy:
|
||||
self.report("请等待当前操作完成,再清除登录记录")
|
||||
return
|
||||
keys = [entry["session_id"] for entry in self.session_store.entries()]
|
||||
text = "将退出登录,并删除当前账号页签保存的会话和账号密码。\n培养策略、日志及其他账号的记录不受影响。"
|
||||
if W.QMessageBox.question(self, "清除登录记录", text, W.QMessageBox.StandardButton.Yes | W.QMessageBox.StandardButton.No,
|
||||
W.QMessageBox.StandardButton.No) != W.QMessageBox.StandardButton.Yes:
|
||||
return
|
||||
self.demo()
|
||||
try:
|
||||
for key in keys:
|
||||
self.session_store.remove(key)
|
||||
self.credentials.save("", "", False)
|
||||
self.account.clear()
|
||||
self.password.clear()
|
||||
self.account.setReadOnly(False)
|
||||
self.password_login_result = None
|
||||
self.reload_saved_sessions()
|
||||
self.login_status.setText("已退出登录并清除当前账号页签的登录记录")
|
||||
self.report("已清除当前账号页签的登录记录")
|
||||
except (OSError, ValueError, KeyError):
|
||||
self.report("部分登录记录未能删除,请检查本地状态目录")
|
||||
|
||||
def submit(self, kind, function):
|
||||
if self.busy or self.closed:
|
||||
return
|
||||
@@ -1321,7 +1434,7 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.server.setText(client.session.server_url)
|
||||
self.token.setText(client.session.token)
|
||||
self.key.setText(client.session.key)
|
||||
self.mode.setText("真实会话")
|
||||
self.mode.setText("已登录")
|
||||
self.login_status.setText("已进入所选区服并读取角色")
|
||||
self.execute.setChecked(False)
|
||||
self.account.setReadOnly(True)
|
||||
@@ -1335,8 +1448,8 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
except (ValueError, TypeError, KeyError, AttributeError) as error:
|
||||
self.report("状态已显示;策略暂不可用:" + str(error))
|
||||
self.profile_changed.emit(self.session_label or snapshot.raw["master"].get("roleName", "已连接"))
|
||||
self.tabs.setCurrentWidget(self.automation_page)
|
||||
self.report("已连接角色;请在“背包魔物蛋”配置规则,再到“自动孵蛋”开始执行")
|
||||
self.tabs.setCurrentWidget(self.room_page)
|
||||
self.report("已登录并读取角色;基础信息在登录页后方,自动操作需在“自动孵蛋”开始执行")
|
||||
elif kind == "sdk":
|
||||
client, response, values = value
|
||||
try:
|
||||
@@ -1404,6 +1517,8 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
buy_ten=self.buy_ten.isChecked(),
|
||||
manual_eggs=True, egg_rules=copy.deepcopy(self.egg_rules),
|
||||
feed_targets=copy.deepcopy(self.feed_targets),
|
||||
gift_enabled=self.gift_enabled.isChecked(), gift_targets=copy.deepcopy(self.gift_targets),
|
||||
gift_items=copy.deepcopy(self.gift_items), gift_liked_only=self.gift_liked_only.isChecked(),
|
||||
keep_money=self.keep_money.value(), daily_buy_money=self.daily_buy_money.value())
|
||||
|
||||
def read_quest_policy(self):
|
||||
@@ -1462,7 +1577,7 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
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', '?')}")
|
||||
self.summary.setText(f"{master.get('roleName', '')} | Lv.{master.get('level', '?')} | 经验 {self.catalog.master_experience(master)} | 金币 {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')}
|
||||
rows = []
|
||||
opened = {int(s.get("position", -1)): s for s in snapshot.raw["stacks"]}
|
||||
@@ -1489,7 +1604,7 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
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}")
|
||||
self.data_summary.setText(f"培育坑位 {len(snapshot.raw['stacks'])}(使用 {incubating}) | 魔物蛋 {len(eggs)} 类 / {sum(int(egg.get('num') or 0) for egg in eggs)} 枚 | 物品 {sum(int(i.get('num') or 0) > 0 for i in snapshot.raw['items'])} 类 | 魔物 {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()
|
||||
@@ -1525,9 +1640,17 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
timer.stop()
|
||||
if page is not self.egg_page and hasattr(self.eggs, "row_batch"):
|
||||
self.eggs.row_batch.stop()
|
||||
if page is not self.inventory_tabs and hasattr(self.inventory, "row_batch"):
|
||||
self.inventory.row_batch.stop()
|
||||
try:
|
||||
if page is self.monster_page:
|
||||
self.render_rooms(snapshot)
|
||||
self.render_monsters(snapshot)
|
||||
elif page is self.inventory_tabs:
|
||||
if self.inventory_tabs.currentWidget() is self.egg_rules_page:
|
||||
self.render_egg_rules()
|
||||
else:
|
||||
self.inventory.set_data(snapshot, self.gift_items)
|
||||
elif page is self.egg_page:
|
||||
self.render_egg_rules()
|
||||
elif page is self.room_page:
|
||||
@@ -1549,8 +1672,12 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
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))
|
||||
rows = monster_rows(self.catalog, snapshot, managed, self.monster_room.currentData() or 0)
|
||||
room_id = self.monster_room.currentData() or 0
|
||||
if room_id:
|
||||
rows = monster_rows(self.catalog, snapshot, managed, room_id)
|
||||
visible_monsters = [mon for mon in snapshot.raw["monsters"] if not room_id or mon.get("process") == 3 and int(mon.get("roomId") or 0) == room_id]
|
||||
signature = (rows, dict(self.feed_targets), dict(self.gift_targets), room_id)
|
||||
if getattr(self, "monster_render_signature", None) == signature:
|
||||
return
|
||||
if not hasattr(self, "monster_render_timer"):
|
||||
@@ -1570,11 +1697,14 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
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)]
|
||||
gift_check, gift_priority = self.monsters.cellWidget(row_index, 17), self.monsters.cellWidget(row_index, 18)
|
||||
blockers = [C.QSignalBlocker(existing), C.QSignalBlocker(priority), C.QSignalBlocker(gift_check), C.QSignalBlocker(gift_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))
|
||||
gift_check.setChecked(mid in self.gift_targets)
|
||||
gift_priority.setValue(self.gift_targets.get(mid, 100))
|
||||
return
|
||||
check, priority = W.QCheckBox(), IntegerInput()
|
||||
check.setProperty("monster_id", mid)
|
||||
@@ -1597,10 +1727,28 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.monsters.setCellWidget(row_index, 8, check)
|
||||
self.monsters.setCellWidget(row_index, 9, priority)
|
||||
self.monsters.item(row_index, 16).setToolTip(str(values[16]))
|
||||
gift_check, gift_priority = W.QCheckBox(), IntegerInput()
|
||||
gift_check.setChecked(mid in self.gift_targets)
|
||||
gift_check.setEnabled(mon.get("process") == 3)
|
||||
gift_priority.setRange(1, 999)
|
||||
gift_priority.setValue(self.gift_targets.get(mid, 100))
|
||||
gift_priority.setEnabled(mon.get("process") == 3)
|
||||
def gift_changed(*args, mid=mid, check=gift_check, priority=gift_priority):
|
||||
if check.isChecked():
|
||||
self.gift_targets[mid] = priority.value()
|
||||
self.gift_enabled.setChecked(True)
|
||||
else:
|
||||
self.gift_targets.pop(mid, None)
|
||||
self.save_config(quiet=True)
|
||||
self.update_gift_status()
|
||||
gift_check.toggled.connect(gift_changed)
|
||||
gift_priority.valueChanged.connect(gift_changed)
|
||||
self.monsters.setCellWidget(row_index, 17, gift_check)
|
||||
self.monsters.setCellWidget(row_index, 18, gift_priority)
|
||||
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)
|
||||
self.monster_render_timer.start(((i, mon, values) for i, (mon, values) in enumerate(zip(visible_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])
|
||||
@@ -1611,6 +1759,8 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
del self.restore_target
|
||||
del self.restore_room
|
||||
self.update_target_status()
|
||||
self.update_combo(self.monster_room, [("全部牧场", 0)] + [(f"{r.get('name') or '牧场'} #{r['id']}", int(r["id"])) for r in snapshot.raw["rooms"]])
|
||||
self.update_gift_status()
|
||||
|
||||
def render_rooms(self, snapshot):
|
||||
rooms = []
|
||||
@@ -1717,7 +1867,7 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.load_config()
|
||||
self.session_label = ""
|
||||
self.account.setReadOnly(self.saved_sessions.count() > 0)
|
||||
self.mode.setText("离线演示")
|
||||
self.mode.setText("未登录")
|
||||
self.refresh()
|
||||
|
||||
def sdk_login(self):
|
||||
@@ -1864,6 +2014,34 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
except ValueError:
|
||||
self.error("设置格式不正确,未保存")
|
||||
|
||||
def export_policies(self):
|
||||
path, _ = W.QFileDialog.getSaveFileName(self, "导出培养策略", "ranch-policies-1.1.0.json", "策略文件 (*.json)")
|
||||
if not path:
|
||||
return
|
||||
try:
|
||||
value = portable_policy(self.read_policy(), self.engine.snapshot)
|
||||
Path(path).write_text(json.dumps(value, ensure_ascii=False, indent=2), encoding="utf-8")
|
||||
self.report("已导出培养策略;文件不包含账号、密码、Token、会话或本机路径")
|
||||
except (OSError, ValueError, TypeError) as error:
|
||||
self.report("策略导出失败:" + str(error))
|
||||
|
||||
def import_policies(self):
|
||||
if self.busy:
|
||||
self.report("请等待当前操作完成,再导入策略")
|
||||
return
|
||||
path, _ = W.QFileDialog.getOpenFileName(self, "导入培养策略", "", "策略文件 (*.json)")
|
||||
if not path:
|
||||
return
|
||||
try:
|
||||
policy = import_policy(json.loads(Path(path).read_text(encoding="utf-8-sig")), self.engine.snapshot)
|
||||
self.stop_workflow()
|
||||
self.load_config({"policy": asdict(policy)})
|
||||
self.save_config(quiet=True)
|
||||
missing = (len(policy.feed_targets) + len(policy.gift_targets))
|
||||
self.report(f"已导入并保存培养策略;已匹配 {missing} 个当前账号的喂养/赠礼目标;自动执行保持停止")
|
||||
except (OSError, ValueError, TypeError, KeyError) as error:
|
||||
self.report("策略导入失败:" + str(error))
|
||||
|
||||
def load_config(self, value=None):
|
||||
path = self.state / "settings.json"
|
||||
if value is None and not path.exists():
|
||||
@@ -1892,6 +2070,10 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.map_team.setCurrentIndex(max(0, self.map_team.findData(sweep.team)))
|
||||
self.egg_rules = copy.deepcopy(policy.egg_rules)
|
||||
self.feed_targets = copy.deepcopy(policy.feed_targets)
|
||||
self.gift_targets = copy.deepcopy(policy.gift_targets)
|
||||
self.gift_items = copy.deepcopy(policy.gift_items)
|
||||
self.gift_enabled.setChecked(policy.gift_enabled)
|
||||
self.gift_liked_only.setChecked(policy.gift_liked_only)
|
||||
for widget, data in ((self.strategy, policy.strategy), (self.protect_quality, policy.protect_quality), (self.egg_order, policy.egg_order), (self.interval, value.get("interval", 10)),
|
||||
(self.market, policy.market_id), (self.hatch_max_star, policy.hatch_max_star)):
|
||||
widget.setCurrentIndex(max(0, widget.findData(data)))
|
||||
@@ -1938,6 +2120,9 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.render_egg_rules()
|
||||
self.render_catalog()
|
||||
self.update_workflow_status()
|
||||
self.monster_render_signature = None
|
||||
if self.latest_render:
|
||||
self.render_current_page()
|
||||
except Exception:
|
||||
self.report("旧设置无法读取,已使用默认设置")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user