Settle player level and stamina; unify strategy configuration
This commit is contained in:
+66
-33
@@ -27,7 +27,7 @@ from .debug_window import DebugWindow
|
||||
from .sessions import SessionStore, identity
|
||||
from .inventory_gui import ITEM_TYPES, InventoryTable
|
||||
from .ranch_gui import RanchView
|
||||
from .policy_io import portable_policy, import_policy
|
||||
from .policy_io import portable_config, import_config
|
||||
from .table_widgets import table_item
|
||||
|
||||
APP_VERSION = "1.1.0"
|
||||
@@ -274,6 +274,7 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.room_page = self.monster_page
|
||||
self.tabs.addTab(self.room_page, "牧场")
|
||||
self.policy_page = self.policy_tab(embedded=True)
|
||||
self.gifting_tab()
|
||||
self.automation_tab()
|
||||
self.yield_tab()
|
||||
self.quests_tab()
|
||||
@@ -282,10 +283,13 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.plans = table(["操作", "下一步计划(每轮只执行一项,并重新读取状态)"])
|
||||
self.tabs.addTab(self.plans, "执行计划")
|
||||
order = [self.tabs.widget(0), self.slot_page, self.inventory_tabs, self.room_page,
|
||||
self.daily_page, self.automation_page, self.quests_table.parentWidget(), self.map_page,
|
||||
self.daily_page, self.automation_page, self.gift_page, self.quests_table.parentWidget(), self.map_page,
|
||||
self.plans, self.yields.parentWidget()]
|
||||
for page in order:
|
||||
self.tabs.addTab(page, self.tabs.tabText(self.tabs.indexOf(page)))
|
||||
strategies = self.menuBar().addMenu("策略配置")
|
||||
strategies.addAction("导入全部策略…", self.import_policies)
|
||||
strategies.addAction("导出全部策略…", self.export_policies)
|
||||
self.monster_view.currentIndexChanged.connect(self.monster_view_changed)
|
||||
self.monster_room.currentIndexChanged.connect(self.monster_view_changed)
|
||||
self.monster_view.setCurrentIndex(self.monster_view.findData(0))
|
||||
@@ -418,7 +422,7 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.min_gold = spin(0, 1000000, 0, True)
|
||||
self.min_exp = spin(0, 1000000, 0, True)
|
||||
rows = [("保留此星级及以上", self.protect_star), ("资质保留条件", self.protect_quality),
|
||||
("喂养目标", self.target), ("喂养达到此等级后停止", self.target_level), ("收取到牧场", self.room),
|
||||
("收取到牧场", self.room),
|
||||
("额外保留魔物编号(逗号分隔)", self.reserved_types),
|
||||
("保留蛋数量(编号:数量,逗号分隔)", self.reserve_eggs)]
|
||||
for label, widget in rows:
|
||||
@@ -428,20 +432,22 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
form.addRow(W.QLabel("孵蛋开关、优先级和去向在“背包 → 魔物蛋”逐项配置。"))
|
||||
self.target_status = W.QLabel("选择喂养目标后显示当前突破上限")
|
||||
self.target_status.setWordWrap(True)
|
||||
form.addRow("实际喂养上限", self.target_status)
|
||||
feed_page = W.QWidget()
|
||||
self.feed_form = W.QFormLayout(feed_page)
|
||||
self.feed_form.addRow("默认喂养目标", self.target)
|
||||
self.feed_form.addRow("喂养达到此等级后停止", self.target_level)
|
||||
self.feed_form.addRow("实际喂养上限", self.target_status)
|
||||
feed_note = W.QLabel("在“牧场”勾选喂养目标并设置优先级,优先采用这些目标。达到当前突破等级上限后转向下一只;用于喂养的魔物由蛋规则指定。")
|
||||
feed_note.setWordWrap(True)
|
||||
self.feed_form.addRow(feed_note)
|
||||
self.feed_form.setSizeConstraint(W.QLayout.SizeConstraint.SetMinimumSize)
|
||||
self.feed_scroll = W.QScrollArea()
|
||||
self.feed_scroll.setWidgetResizable(True)
|
||||
self.feed_scroll.setFrameShape(W.QFrame.Shape.NoFrame)
|
||||
self.feed_scroll.setWidget(feed_page)
|
||||
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)
|
||||
for label in tab.findChildren(W.QLabel):
|
||||
label.setWordWrap(True)
|
||||
form.setSizeConstraint(W.QLayout.SizeConstraint.SetMinimumSize)
|
||||
@@ -454,6 +460,32 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
return scroll
|
||||
self.tabs.addTab(scroll, "牧场策略")
|
||||
|
||||
def gifting_tab(self):
|
||||
self.gift_page = W.QWidget()
|
||||
layout = W.QVBoxLayout(self.gift_page)
|
||||
self.gift_enabled = W.QCheckBox("启用自动赠礼(在背包勾选物品,在牧场勾选目标)")
|
||||
self.gift_liked_only = W.QCheckBox("仅赠送目标喜欢的物品")
|
||||
self.gift_liked_only.setChecked(True)
|
||||
self.gift_status = W.QLabel("未启用;达到当前羁绊对应的好感上限后停止。")
|
||||
self.gift_status.setWordWrap(True)
|
||||
for widget in (self.gift_enabled, self.gift_liked_only, self.gift_status):
|
||||
layout.addWidget(widget)
|
||||
for widget in (self.gift_enabled, self.gift_liked_only):
|
||||
widget.toggled.connect(self.update_gift_status)
|
||||
note = W.QLabel("物品用量、保留数量和目标优先级分别在“背包”和“牧场”设置;修改后自动生效。达到当前好感上限或处于赠礼冷却时停止。")
|
||||
note.setWordWrap(True)
|
||||
layout.addWidget(note)
|
||||
buttons = W.QHBoxLayout()
|
||||
for label, callback in (("去背包选择物品", lambda: self.tabs.setCurrentWidget(self.inventory_tabs)),
|
||||
("去牧场选择目标", lambda: self.tabs.setCurrentWidget(self.room_page)),
|
||||
("开始执行勾选策略", self.start_workflow), ("停止执行", self.stop_workflow)):
|
||||
button = W.QPushButton(label)
|
||||
button.clicked.connect(callback)
|
||||
buttons.addWidget(button)
|
||||
layout.addLayout(buttons)
|
||||
layout.addStretch()
|
||||
self.tabs.addTab(self.gift_page, "自动赠礼")
|
||||
|
||||
def automation_tab(self):
|
||||
self.automation_page = W.QWidget()
|
||||
layout = W.QVBoxLayout(self.automation_page)
|
||||
@@ -491,6 +523,7 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.dispatch = W.QCheckBox("成熟后按策略自动派遣")
|
||||
self.collect = W.QCheckBox("保留或待喂养的魔物自动收取到牧场")
|
||||
self.feed = W.QCheckBox("按策略喂养选定目标(受当前突破上限限制)")
|
||||
self.feed_form.insertRow(0, self.feed)
|
||||
for widget in (self.dispatch, self.collect, self.feed):
|
||||
widget.setChecked(True)
|
||||
self.market = combo([(f"{r['name']}市场 · {int(r['money'])} 金币/蛋", key) for key, r in self.catalog.data.get("markets", {}).items()])
|
||||
@@ -506,7 +539,7 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
("购买方式", self.buy_ten), ("单抽时每批上限", self.buy_batch),
|
||||
("至少保留金币", self.keep_money), ("每日购蛋金币额度(0=不购买)", self.daily_buy_money),
|
||||
("孵蛋", self.fill), ("派遣", self.dispatch),
|
||||
("收取", self.collect), ("喂养", self.feed)):
|
||||
("收取", self.collect)):
|
||||
form.addRow(label, widget)
|
||||
settings_layout.addLayout(form)
|
||||
self.market_status = W.QLabel()
|
||||
@@ -527,10 +560,6 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
preset.setToolTip("只勾选绿色史莱姆:优先级1、派遣、低于1时补至10,莉莉托斯市场;保留4星以上/A资质。应用后仍需开始执行。")
|
||||
bottom = W.QHBoxLayout()
|
||||
bottom.addWidget(preset)
|
||||
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))
|
||||
@@ -538,8 +567,9 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.tabs.insertTab(1, self.automation_page, "自动孵蛋")
|
||||
policy_tab = self.policy_page
|
||||
self.automation_tabs = W.QTabWidget()
|
||||
self.automation_tabs.addTab(settings_scroll, "孵蛋设置")
|
||||
self.automation_tabs.addTab(policy_tab, "牧场与赠礼策略")
|
||||
self.automation_tabs.addTab(settings_scroll, "孵蛋策略")
|
||||
self.automation_tabs.addTab(policy_tab, "牧场策略")
|
||||
self.automation_tabs.addTab(self.feed_scroll, "喂养策略")
|
||||
layout.removeWidget(settings_scroll)
|
||||
layout.insertWidget(2, self.automation_tabs, 1)
|
||||
self.market.currentIndexChanged.connect(self.update_workflow_status)
|
||||
@@ -562,7 +592,7 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
def start_workflow(self):
|
||||
try:
|
||||
policy = self.read_policy()
|
||||
other = self.quest_enabled.isChecked() or self.daily_enabled.isChecked() or self.map_enabled.isChecked()
|
||||
other = self.quest_enabled.isChecked() or self.daily_enabled.isChecked() or self.map_enabled.isChecked() or policy.gift_enabled
|
||||
if not (policy.enabled and any((policy.buy, policy.fill, policy.dispatch, policy.collect, policy.feed))) and not other:
|
||||
self.report("请先勾选至少一项功能,并启用对应策略")
|
||||
return
|
||||
@@ -1076,7 +1106,7 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
def background():
|
||||
started = time.perf_counter()
|
||||
value = function()
|
||||
if kind in ("poll", "hatch", "monster_lock", "manual_monsters", "expansion", "growth_sync", "daily_claim", "connected"):
|
||||
if kind in ("poll", "hatch", "monster_lock", "manual_monsters", "expansion", "growth_sync", "master_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()
|
||||
@@ -1123,7 +1153,7 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
note="worker总耗时包含网络;大列表在后续短批次更新")
|
||||
|
||||
def apply_result(self, kind, value):
|
||||
if kind in ("poll", "hatch", "monster_lock", "manual_monsters", "expansion", "growth_sync", "daily_claim"):
|
||||
if kind in ("poll", "hatch", "monster_lock", "manual_monsters", "expansion", "growth_sync", "master_sync", "daily_claim"):
|
||||
snapshot, plans, message = value
|
||||
self.render(snapshot, plans)
|
||||
self.report(message)
|
||||
@@ -1315,6 +1345,8 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
now = time.monotonic()
|
||||
if not self.engine.demo and self.engine.heartbeat_enabled and now - self.engine.last_heartbeat >= 240:
|
||||
self.submit("heartbeat", self.engine.keep_alive)
|
||||
elif not self.engine.demo and self.engine.heartbeat_enabled and self.engine.master_sync_due():
|
||||
self.submit("master_sync", self.engine.sync_master)
|
||||
elif not self.engine.demo and self.engine.heartbeat_enabled and self.engine.growth_sync_due():
|
||||
self.submit("growth_sync", self.engine.sync_growth)
|
||||
elif (self.monitoring and self.execute.isChecked() and self.fill.isChecked()
|
||||
@@ -1667,13 +1699,13 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.statusBar().showMessage("设置尚未保存,请检查输入格式及本地目录", 5000)
|
||||
|
||||
def export_policies(self):
|
||||
path, _ = W.QFileDialog.getSaveFileName(self, "导出培养策略", "ranch-policies-1.1.0.json", "策略文件 (*.json)")
|
||||
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)
|
||||
value = portable_config(self.config_value(), self.engine.snapshot)
|
||||
Path(path).write_text(json.dumps(value, ensure_ascii=False, indent=2), encoding="utf-8")
|
||||
self.report("已导出培养策略;文件不包含账号、密码、Token、会话或本机路径")
|
||||
self.report("已导出全部策略;文件不包含账号、密码、Token、会话或本机路径")
|
||||
except (OSError, ValueError, TypeError) as error:
|
||||
self.report("策略导出失败:" + str(error))
|
||||
|
||||
@@ -1681,16 +1713,17 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
if self.busy:
|
||||
self.report("请等待当前操作完成,再导入策略")
|
||||
return
|
||||
path, _ = W.QFileDialog.getOpenFileName(self, "导入培养策略", "", "策略文件 (*.json)")
|
||||
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)
|
||||
config = import_config(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} 个当前账号的喂养/赠礼目标;自动执行保持停止")
|
||||
self.load_config(self.config_value() | config)
|
||||
self.persist_settings()
|
||||
policy = self.read_policy()
|
||||
matched = len(policy.feed_targets) + len(policy.gift_targets)
|
||||
self.report(f"已导入并保存策略;已匹配 {matched} 个当前账号的喂养/赠礼目标;自动执行保持停止")
|
||||
except (OSError, ValueError, TypeError, KeyError) as error:
|
||||
self.report("策略导入失败:" + str(error))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user