Unify strategy controls and refresh logged-in accounts automatically

This commit is contained in:
AttilaNet
2026-11-08 12:23:34 +08:00
parent 1eef0f80d1
commit 3c1b3d6af2
19 changed files with 235 additions and 185 deletions
+68 -82
View File
@@ -171,19 +171,18 @@ class Window(ActivityPages, W.QMainWindow):
self.data_summary = W.QLabel("等待读取培育室、背包和牧场状态")
self.interval = combo([("随机30秒", 30), ("随机60秒", 60), ("随机2分钟", 120), ("随机5分钟", 300)])
self.interval.setToolTip("整体刷新完成后,从0到所选上限随机等待。空坑装填独立随机1~2秒;孵化/成长到期会单独同步。")
self.start_monitor = W.QPushButton("开始监控")
self.start_monitor.setCheckable(True)
self.start_monitor.toggled.connect(self.toggle_monitor)
self.strategy_toggle = W.QPushButton("开启策略")
self.strategy_toggle.setCheckable(True)
self.strategy_toggle.setToolTip("开启后执行各页面已勾选的功能;关闭后继续自动刷新状态。")
self.strategy_toggle.toggled.connect(self.strategy_changed)
refresh = W.QPushButton("刷新 / 预览策略")
refresh.clicked.connect(self.refresh)
self.execute = W.QCheckBox("自动执行已启用策略")
self.execute.toggled.connect(self.execution_changed)
debug_button = W.QPushButton("调试窗口")
debug_button.clicked.connect(self.show_debug)
self.show_log = W.QPushButton("隐藏日志")
self.show_log.setCheckable(True)
self.show_log.setChecked(True)
for widget in (self.summary, self.interval, self.start_monitor, refresh, self.execute, debug_button, self.show_log):
for widget in (self.summary, self.interval, self.strategy_toggle, refresh, debug_button, self.show_log):
toolbar.addWidget(widget)
toolbar.addStretch()
layout.addLayout(toolbar)
@@ -399,7 +398,7 @@ class Window(ActivityPages, W.QMainWindow):
logout_row.addWidget(clear_button)
logout_row.addStretch()
form.addRow(logout_row)
note = W.QLabel("账号密码和登录会话自动加密保存。各账号独立运行,登录后再开启自动执行。")
note = W.QLabel("账号密码和登录会话自动加密保存。登录后自动刷新状态,配置功能后开启顶部策略开关。")
note.setWordWrap(True)
form.addRow(note)
self.tabs.addTab(tab, "登录")
@@ -490,8 +489,7 @@ class Window(ActivityPages, W.QMainWindow):
buttons = W.QHBoxLayout()
for label, callback in (("去背包选择物品", lambda: self.tabs.setCurrentWidget(self.inventory_tabs)),
("去牧场选择目标", lambda: self.tabs.setCurrentWidget(self.room_page)),
("刷新 / 预览培养对象", self.refresh),
("开始执行勾选策略", self.start_workflow), ("停止执行", self.stop_workflow)):
("刷新 / 预览培养对象", self.refresh)):
button = W.QPushButton(label)
button.clicked.connect(callback)
buttons.addWidget(button)
@@ -502,25 +500,15 @@ class Window(ActivityPages, W.QMainWindow):
def automation_tab(self):
self.automation_page = W.QWidget()
layout = W.QVBoxLayout(self.automation_page)
self.workflow_status = W.QLabel("未启动;可先预览,再开始执行")
self.workflow_status = W.QLabel("策略已关闭;配置功能后开启顶部策略开关")
self.workflow_status.setWordWrap(True)
layout.addWidget(self.workflow_status)
self.workflow_next = W.QLabel("等待读取角色状态")
self.workflow_next.setWordWrap(True)
layout.addWidget(self.workflow_next)
buttons = W.QHBoxLayout()
self.workflow_start = W.QPushButton("开始执行勾选功能")
self.workflow_start.clicked.connect(self.start_workflow)
monitor = W.QPushButton("仅监控")
monitor.clicked.connect(self.monitor_only)
self.workflow_stop = W.QPushButton("停止执行")
self.workflow_stop.setToolTip("停止后不再发送下一项操作;已经发出的请求会正常返回。")
self.workflow_stop.clicked.connect(self.stop_workflow)
preview = W.QPushButton("刷新 / 预览")
preview.clicked.connect(self.refresh)
for widget in (self.workflow_start, monitor, self.workflow_stop, preview):
buttons.addWidget(widget)
layout.addLayout(buttons)
layout.addWidget(preview)
settings = W.QWidget()
settings_layout = W.QVBoxLayout(settings)
settings_scroll = W.QScrollArea()
@@ -570,7 +558,7 @@ class Window(ActivityPages, W.QMainWindow):
settings_layout.addStretch()
preset = W.QPushButton("绿色史莱姆金币预设(仅孵此蛋)")
preset.clicked.connect(self.gold_preset)
preset.setToolTip("只勾选绿色史莱姆:优先级1、派遣、低于1时补至10,莉莉托斯市场;保留4星以上/A资质。应用后仍需开始执行。")
preset.setToolTip("只勾选绿色史莱姆:优先级1、派遣、低于1时补至10,莉莉托斯市场;保留4星以上/A资质。应用后开启顶部策略开关。")
bottom = W.QHBoxLayout()
bottom.addWidget(preset)
layout.addLayout(bottom)
@@ -595,13 +583,17 @@ class Window(ActivityPages, W.QMainWindow):
self.keep_better_quality.toggled.connect(self.update_workflow_status)
self.update_workflow_status()
def execution_changed(self, value):
if not value:
self.engine.auto = False
self.pending_execute = False
self.arm_hatching()
self.trace.emit("info", "自动执行状态", scope="local", enabled=value, monitoring=self.monitoring)
self.update_workflow_status()
def strategy_changed(self, enabled):
if enabled:
self.start_workflow()
else:
self.stop_workflow()
def set_strategy_checked(self, enabled):
blocker = C.QSignalBlocker(self.strategy_toggle)
self.strategy_toggle.setChecked(enabled)
self.strategy_toggle.setText("关闭策略" if enabled else "开启策略")
del blocker
def start_workflow(self):
try:
@@ -609,35 +601,35 @@ class Window(ActivityPages, W.QMainWindow):
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("请先勾选至少一项功能,并启用对应策略")
self.stop_workflow()
return
self.read_quest_policy()
if policy.enabled and not any(rule["enabled"] for rule in policy.egg_rules.values()) and not other:
self.report("请先在“背包魔物蛋”勾选要孵化的蛋,并设置优先级和孵出后的去向")
self.tabs.setCurrentWidget(self.egg_page)
self.stop_workflow()
return
except ValueError:
self.report("请先修正牧场策略中的保留编号和数量")
self.stop_workflow()
return
self.save_config(quiet=True)
self.start_monitor.setChecked(True)
self.execute.setChecked(True)
self.monitoring = True
self.engine.heartbeat_enabled = True
self.set_strategy_checked(True)
self.next_poll = 0
if self.busy:
self.pending_execute = True
self.report("当前请求完成后开始执行勾选功能")
self.report("策略已开启,当前请求完成后运行勾选功能")
else:
self.refresh(automated=True)
self.update_workflow_status()
def monitor_only(self):
self.stop_workflow()
self.start_monitor.setChecked(True)
self.refresh()
def stop_workflow(self):
self.execute.setChecked(False)
self.set_strategy_checked(False)
self.engine.auto = False
self.pending_execute = False
self.arm_hatching()
self.update_workflow_status()
def gold_preset(self):
@@ -656,7 +648,7 @@ class Window(ActivityPages, W.QMainWindow):
self.render_egg_rules()
self.min_gold.setValue(0)
self.min_exp.setValue(0)
self.report("已应用绿色史莱姆规则:优先级1、孵出后派遣、低于1补至10;莉莉托斯市场随机购蛋。点击开始执行后生效。")
self.report("已应用绿色史莱姆规则:优先级1、孵出后派遣、低于1补至10;开启顶部策略开关后运行。")
self.refresh()
def update_target_status(self, *args):
@@ -671,11 +663,10 @@ class Window(ActivityPages, W.QMainWindow):
def update_workflow_status(self, *args):
if not hasattr(self, "workflow_status"):
return
active = self.execute.isChecked() and self.monitoring
state = "执行中" if active else "仅监控(自动同步成长,不派遣或喂养)" if self.monitoring else "已停止(不会自动派遣)"
active = self.strategy_toggle.isChecked() and self.monitoring
state = "策略已开启" if active else "策略已关闭"
state += " · 状态自动刷新" if self.monitoring else ""
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(), {})
snapshot = self.engine.snapshot
if snapshot:
@@ -954,7 +945,7 @@ class Window(ActivityPages, W.QMainWindow):
ready = bool(ids) and not self.busy and not self.closed
self.lock_monsters.setEnabled(ready)
self.unlock_monsters.setEnabled(ready)
self.monster_selection.setText(f"已选择 {len(ids)} 只;操作后暂停自动执行" if ids else "选择魔物后可锁定 / 解锁,也可右键操作")
self.monster_selection.setText(f"已选择 {len(ids)} 只;操作后关闭策略" if ids else "选择魔物后可锁定 / 解锁,也可右键操作")
def change_monster_lock(self, locked):
if self.busy or self.closed:
@@ -1071,12 +1062,12 @@ class Window(ActivityPages, W.QMainWindow):
except (OSError, ValueError, TypeError, KeyError):
self.error("保存的会话无法读取,请重新登录")
return
self.start_monitor.setChecked(False)
self.execute.setChecked(False)
self.monitoring = False
self.stop_workflow()
self.session_label = self.saved_sessions.currentText().rsplit(" / ", 1)[0]
label = self.session_label
client = Client(session, trace=self.trace, on_session_change=lambda current: self.session_store.save(current, label))
self.login_status.setText("正在恢复会话并校验角色,自动执行保持关闭")
self.login_status.setText("正在恢复会话并校验角色,策略保持关闭")
def restore():
try:
return client, client.snapshot()
@@ -1106,8 +1097,8 @@ class Window(ActivityPages, W.QMainWindow):
return
if self.active_identity:
self.save_config(quiet=True)
self.start_monitor.setChecked(False)
self.execute.setChecked(False)
self.monitoring = False
self.stop_workflow()
self.active_identity = key
self.state = self.profile_root / "roles" / key
self.load_config(copy.deepcopy(self.default_config))
@@ -1181,7 +1172,7 @@ class Window(ActivityPages, W.QMainWindow):
elif self.pending_refresh is not None:
tab, self.pending_refresh = self.pending_refresh, None
C.QTimer.singleShot(0, lambda: self.refresh_page(tab))
elif self.pending_execute and self.monitoring and self.execute.isChecked() and not self.closed:
elif self.pending_execute and self.monitoring and self.strategy_toggle.isChecked() and not self.closed:
self.pending_execute = False
C.QTimer.singleShot(0, lambda: self.refresh(automated=True))
@@ -1206,13 +1197,16 @@ class Window(ActivityPages, W.QMainWindow):
def apply_result(self, kind, value):
if kind in ("poll", "hatch", "monster_lock", "manual_monsters", "expansion", "growth_sync", "master_sync", "map_refresh", "daily_claim"):
snapshot, plans, message = value
if not self.engine.demo and not self.closed:
self.monitoring = True
self.engine.heartbeat_enabled = True
self.render(snapshot, plans)
self.report(message)
self.reload_saved_sessions()
if kind == "poll":
self.next_poll = time.monotonic() + self.poll_delay()
if "策略暂不可用" in message:
self.execute.setChecked(False)
self.stop_workflow()
self.arm_hatching()
elif kind == "heartbeat":
self.report(value)
@@ -1254,7 +1248,9 @@ class Window(ActivityPages, W.QMainWindow):
self.key.setText(client.session.key)
self.mode.setText("已登录")
self.login_status.setText("已进入所选区服并读取角色")
self.execute.setChecked(False)
self.stop_workflow()
self.monitoring = not self.closed
self.next_poll = 0
self.account.setReadOnly(True)
self.render(snapshot, [])
try:
@@ -1267,7 +1263,7 @@ class Window(ActivityPages, W.QMainWindow):
self.report("状态已显示;策略暂不可用:" + str(error))
self.profile_changed.emit(self.session_label or snapshot.raw["master"].get("roleName", "已连接"))
self.tabs.setCurrentWidget(self.room_page)
self.report("已登录并读取角色;基础信息在登录页后方,自动操作需在“自动孵蛋”开始执行")
self.report("已登录并开始自动刷新状态;配置功能后,点击顶部“开启策略”即可运行")
elif kind == "sdk":
client, response, values = value
try:
@@ -1311,9 +1307,8 @@ class Window(ActivityPages, W.QMainWindow):
self.login_status.setText("操作失败,调试窗口中保留了请求和响应")
self.engine.auto = False
self.engine.heartbeat_enabled = False
self.execute.setChecked(False)
self.monitoring = False
self.start_monitor.setChecked(False)
self.stop_workflow()
self.report("已停止:" + message)
self.statusBar().showMessage(message)
@@ -1356,29 +1351,17 @@ class Window(ActivityPages, W.QMainWindow):
self.engine.quest_policy = self.read_quest_policy()
self.engine.daily_policy = self.read_daily_policy()
self.engine.sweep_policy = self.read_sweep_policy()
self.engine.auto = self.execute.isChecked() and automated and self.monitoring
self.engine.auto = self.strategy_toggle.isChecked() and automated and self.monitoring
if hatch_only:
self.hatch_timer.stop()
self.next_hatch = float("inf")
self.submit("hatch" if hatch_only else "poll", lambda: self.engine.poll(hatch_only=hatch_only, defer_hatch=not hatch_only))
except ValueError:
if automated:
self.error("请核对策略中的魔物编号和保留数量")
else:
self.engine.auto = False
self.engine.policy = Policy(enabled=False)
self.engine.quest_policy = QuestPolicy()
self.report("策略格式有误,本次仅刷新角色数据")
self.submit("poll", self.engine.poll)
def toggle_monitor(self, value):
self.monitoring = value
self.start_monitor.setText("停止监控" if value else "开始监控")
if value:
self.next_poll = 0
else:
self.execute.setChecked(False)
self.update_workflow_status()
self.stop_workflow()
self.engine.policy = Policy(enabled=False)
self.engine.quest_policy = QuestPolicy()
self.report("策略输入尚未完整,已关闭策略;本次继续刷新角色数据")
self.submit("poll", self.engine.poll)
def poll_delay(self):
return random.uniform(0, self.interval.currentData())
@@ -1388,7 +1371,7 @@ class Window(ActivityPages, W.QMainWindow):
self.save_config(quiet=True)
def arm_hatching(self):
if (self.engine.pending_hatches and self.monitoring and self.execute.isChecked()
if (self.engine.pending_hatches and self.monitoring and self.strategy_toggle.isChecked()
and self.ranch_enabled.isChecked() and self.fill.isChecked() and not self.closed):
if self.next_hatch < float("inf"):
if not self.hatch_timer.isActive():
@@ -1411,7 +1394,7 @@ class Window(ActivityPages, W.QMainWindow):
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()
elif (self.monitoring and self.strategy_toggle.isChecked() and self.fill.isChecked()
and self.ranch_enabled.isChecked() and now >= self.next_hatch):
self.refresh(automated=True, hatch_only=True)
elif self.monitoring and now >= self.next_poll:
@@ -1614,7 +1597,8 @@ class Window(ActivityPages, W.QMainWindow):
def connect_session(self):
if self.busy:
return
self.start_monitor.setChecked(False)
self.monitoring = False
self.stop_workflow()
self.session_label = ""
if not self.token.text().strip():
self.error("请先导入手机会话或填写 Token")
@@ -1625,8 +1609,8 @@ class Window(ActivityPages, W.QMainWindow):
def demo(self):
if self.busy:
return
self.start_monitor.setChecked(False)
self.execute.setChecked(False)
self.monitoring = False
self.stop_workflow()
if self.active_identity:
self.save_config(quiet=True)
if self.engine.client:
@@ -1664,7 +1648,8 @@ class Window(ActivityPages, W.QMainWindow):
if not all(values[:3]):
self.error("需要登录中心、SDK用户ID和SDK Token")
return
self.start_monitor.setChecked(False)
self.monitoring = False
self.stop_workflow()
client = Client(Session(key=self.key.text()), trace=self.trace)
self.submit("sdk", lambda: (client, client.sdk_login(values[0], values[1], values[2], values[3], values[4], values[5],
tj_channel=self.catalog.data.get("tjchannel", {}).get("tjchannel", "unknow")), values))
@@ -1680,7 +1665,8 @@ class Window(ActivityPages, W.QMainWindow):
self.report("该账号已在另一个页签连接,请切换到该页签")
return
self.save_login_info(quiet=True)
self.start_monitor.setChecked(False)
self.monitoring = False
self.stop_workflow()
self.enter_button.setEnabled(False)
self.server_list.clear()
if self.password_login_result and self.password_login_result[0] is not self.engine.client:
@@ -1756,7 +1742,7 @@ class Window(ActivityPages, W.QMainWindow):
self.engine.quest_policy = QuestPolicy(**value["quest_policy"])
self.engine.daily_policy = DailyPolicy(**value["daily_policy"])
self.engine.sweep_policy = SweepPolicy(**value["sweep_policy"])
if changed and self.monitoring and self.execute.isChecked():
if changed and self.monitoring and self.strategy_toggle.isChecked():
if self.busy:
self.pending_execute = True
else:
@@ -1803,7 +1789,7 @@ class Window(ActivityPages, W.QMainWindow):
self.persist_settings()
policy = self.read_policy()
matched = len(policy.feed_targets) + len(policy.gift_targets)
self.report(f"已导入并保存策略;已匹配 {matched} 个当前账号的喂养/赠礼目标;自动执行保持停止")
self.report(f"已导入并保存策略;已匹配 {matched} 个当前账号的喂养/赠礼目标;顶部策略开关保持关闭")
except (OSError, ValueError, TypeError, KeyError) as error:
self.report("策略导入失败:" + str(error))