Unify strategy controls and refresh logged-in accounts automatically
This commit is contained in:
+20
-20
@@ -13,7 +13,7 @@
|
||||
下拉框收起时悬停可查看完整选项,动态加载的区服、市场和魔物名称会重新计算宽度。
|
||||
规则修改后自动保存并应用,无需点击保存按钮;连续输入会合并保存,尚未完整的输入不会覆盖已保存配置。
|
||||
数字输入框仅在点击或键盘切换获得焦点后响应滚轮;未聚焦时滚动页面,不修改数字。
|
||||
主窗口使用原生菜单栏:“账号”管理页签和保存会话,“监控”提供全部开始/停止,“策略配置”操作当前选中账号,“帮助 → 关于”显示版本号。
|
||||
主窗口使用原生菜单栏:“账号”管理页签和保存会话,“策略”提供全部账号策略的开启/关闭,“策略配置”操作当前选中账号,“帮助 → 关于”显示版本号。
|
||||
“保存当前账号策略”(Ctrl+S)可立即保存并应用当前配置,自动保存仍然有效。
|
||||
勾选状态、优先级、孵出后的处理方式及保留数量都支持点击表头排序;刷新后保留排序,排序不改变策略优先级。
|
||||
表格中的编号和名称靠左,星级、数量、优先级等内容及勾选框居中显示。
|
||||
@@ -31,19 +31,19 @@
|
||||
勾选喂养/赠礼目标并分别设置优先级;显示突破、当前等级上限、成长资质、参考属性、当前好感上限和喜欢的物品。
|
||||
双击查看详情;右键可锁定、解锁、派遣、喂给指定魔物。
|
||||
- 每个页面的表格和空白处可右键“刷新本页”;刷新会同步到期的成长状态,不执行派遣、喂养等消耗类策略。
|
||||
- 多账号:同一程序内多个独立账号页签,各自监控、自动执行、记录日志;切换页签不停止其他账号。
|
||||
- 多账号:同一程序内多个独立账号页签,登录后各自自动刷新状态,策略分别开启或关闭;切换页签不停止其他账号。
|
||||
- 会话保存:成功读取角色后自动加密保存 Token、账号/区服/角色和请求编号,重启后可恢复。
|
||||
- 自动孵蛋:按手动规则执行,提供开始执行、仅监控、停止按钮;支持十连优先、金币保留和每日购蛋额度。
|
||||
- 自动孵蛋:按手动规则执行,使用顶部统一的“开启策略 / 关闭策略”开关;支持十连优先、金币保留和每日购蛋额度。
|
||||
可选随机30秒、60秒、2分钟或5分钟,每轮刷新完成后从0到所选上限重新取间隔;喂养遵守当前突破上限,满级后转到下一喂养目标。
|
||||
空坑装填单独计时:有可用蛋时随机等待1~2秒装填一个坑位,确认成功后继续下一坑,不受整体刷新间隔影响。
|
||||
每次装填前重新读取坑位和库存;无可用蛋、坑位已满或停止自动执行时暂停。此快速计时不会执行购蛋、派遣或其他操作。
|
||||
每次装填前重新读取坑位和库存;无可用蛋、坑位已满或关闭策略时暂停。此快速计时不会执行购蛋、派遣或其他操作。
|
||||
子页分为“孵蛋策略”“牧场策略”“喂养策略”,内容超出高度时滚动显示,修改后自动保存并应用。
|
||||
“牧场策略”新增独立开关“保留资质高于牧场同种培养代表的新魔物”,与S/A/B/C、4S及星级保护分别生效。
|
||||
同种培养代表优先选等级最高者,再依次比较好感、综合成长资质;新魔物的四项成长按各自范围归一化后取平均,严格更高才算提升。
|
||||
同分不算提升;牧场尚无同种时保留首只,代表资质未同步完整时暂留。已有锁定、队伍及保留种类保护继续生效。
|
||||
- 统一策略配置:通过主窗口菜单“策略配置”,保存、导入或导出当前账号的全部孵蛋、牧场、喂养、赠礼、委托、每日事务、扫荡及监控间隔设置,包含自定义收益资料。
|
||||
跨账号按魔物种类匹配喂养和赠礼目标;牧场实例编号不跨账号复制,默认使用有空位的牧场。兼容旧版培养策略文件。
|
||||
导入保留功能勾选和规则,执行保持停止,核对后手动开始;文件不包含账号、密码、Token、会话或本机路径。
|
||||
导入保留功能勾选和规则,策略开关保持关闭,核对后手动开启;文件不包含账号、密码、Token、会话或本机路径。
|
||||
- 自动赠礼:独立页签,在背包勾选可用物品,在牧场勾选目标并设置优先级,再到“自动赠礼”启用。
|
||||
每次消耗一件物品,默认只使用目标喜欢的物品;遵守当前羁绊好感上限、赠礼间隔、物品保留数量及委托保留。
|
||||
勾选“每种魔物只培养一只,自动选择培养代表”后,自动为牧场中的每种魔物选一只,按等级 → 好感 → 综合成长资质排序,无需逐只勾选。
|
||||
@@ -72,7 +72,7 @@
|
||||
数据按账号/角色保存在本地 `sweep_rewards.sqlite3`,重启保留;首次后台补录现有调试日志中能匹配角色、关卡和成功结算的记录,重复响应不重复计数。
|
||||
“刷新本地统计”仅读取本机数据;统计与图表不额外请求服务器,不上传数据。实测概率随样本变化,不代表官方掉率。
|
||||
- 每日事务:集中查看每日签到礼包、七日签到、累计奖励、VIP日奖和邮件附件;
|
||||
可立即领取勾选项目,或开启自动执行时领取;手动刷新不领奖。
|
||||
可立即领取勾选项目,或开启顶部策略开关后自动领取;手动刷新不领奖。
|
||||
- 离线演示:不连接游戏服务器即可查看数据、策略和模拟操作。
|
||||
- 等级与体力:经验达到下一等级门槛时自动请求官方升级结算;按客户端150秒恢复周期请求体力结算并显示服务器返回值。
|
||||
到期检查独立于随机刷新间隔,在账号后台线程串行执行;未开启消耗类策略时也会同步,退出登录或连接出错后停止。
|
||||
@@ -86,22 +86,22 @@
|
||||
密码保存在本机加密文件 `local_state/ranch_helper/credentials.json`,重启自动填回,不再自动清空。
|
||||
2. 从“官方返回的区服 / 已有角色”选择区服,点击“进入选中区服”。
|
||||
登录中心取自 APK,游戏服务器地址取自选中区服的 `gameServerAddress`。
|
||||
3. 确认真实角色名称、培育室和背包数量。成功后 Token 自动保存到该账号工作区的 `sessions/`,无需复制。
|
||||
3. 确认角色名称、培育室和背包数量。成功后 Token 自动保存到该账号工作区的 `sessions/`,并开始自动刷新状态,无需另开监控。
|
||||
4. 在“背包魔物蛋”逐种配置:勾选“孵化”,设置优先级(1最高),选择“孵出后”派遣、喂养或保留。
|
||||
“低于补货”是可用蛋少于多少开始购买,0表示关闭;“补至”是希望补充到的可用蛋数量。
|
||||
每行可选包含该蛋的金币市场;蛋用完后这一行仍会保留。规则自动保存。
|
||||
5. 到“自动孵蛋”启用需要的买蛋、孵蛋、派遣、收取或喂养开关。
|
||||
点“刷新 / 预览”查看下一步,再点“开始执行勾选功能”。页面会显示“执行中”、
|
||||
下一步操作或等待原因。“仅监控”和手动刷新会自动同步到期的成长状态,但不会派遣、喂养、购蛋或领奖;“停止执行”保留监控。
|
||||
已经发送的请求会返回,停止后不发送下一项。重启或恢复会话后需重新点开始执行。
|
||||
点“刷新 / 预览”查看下一步,再点击顶部“开启策略”。各页面只配置功能和规则,不再分别开始或停止。
|
||||
点击“关闭策略”后仍会刷新状态、同步到期成长,但不再自动派遣、喂养、购蛋或领奖。手动刷新只更新状态。
|
||||
已经发送的请求会正常返回,关闭后不发送下一项自动操作。重启或恢复会话后自动刷新,策略开关默认关闭。
|
||||
6. 需要经验时,在“牧场”勾选接收经验的喂养目标并设置优先级。优先级数字小的先喂,达到当前突破上限后换下一个;
|
||||
在“自动孵蛋 → 喂养策略”设置全局停止等级,在“牧场策略”设置星级/资质保护和保留蛋数量。“收益资料”的星级勾选只筛选表格显示。
|
||||
7. 需要提升好感时,在“背包”的对应物品分类中勾选物品并设置保留数量,在“牧场”勾选目标并设置赠礼优先级;
|
||||
在独立的“自动赠礼”页启用。达到当前好感上限或仍在赠礼间隔时不会继续消耗物品。
|
||||
菜单“策略配置”可导出全部策略供其他账号导入;导入后需逐项核对并手动开启自动执行。
|
||||
菜单“策略配置”可导出全部策略供其他账号导入;导入后需逐项核对并开启顶部策略开关。
|
||||
|
||||
可用“绿色史莱姆金币预设(仅孵此蛋)”快速设置:只勾选绿色史莱姆、优先级1、孵出后派遣、低于1补至10、
|
||||
莉莉托斯市场。这个预设关闭喂养,保留4星以上/A资质魔物,仍需点击开始执行。
|
||||
莉莉托斯市场。这个预设关闭喂养,保留4星以上/A资质魔物,仍需开启顶部策略开关。
|
||||
“登录”页不再展示服务器地址、Token、密钥和请求编号,也不自动弹出调试窗;这些信息由程序内部处理。
|
||||
|
||||
莉莉托斯市场单次价格为100金币(本地客户端表),买到的蛋随机,不能指定全部为绿色史莱姆。
|
||||
@@ -133,8 +133,8 @@
|
||||
2. 每个账号首次在本版本正常登录一次;此前版本只保存在内存的 Token 不能从脱敏日志补回。
|
||||
3. 重启后在“登录”页点击“恢复选中会话”,或使用菜单“账号 → 恢复各页签的保存会话”。
|
||||
恢复会先读取角色并核对角色编号,成功后才显示为真实数据;不会自动开启消耗类策略。
|
||||
4. 各页签可分别开启监控和自动执行。菜单“监控 → 全部开始监控”只开启已连接账号的监控,
|
||||
自动执行仍由各账号的勾选决定;“全部停止”停止所有页签的监控和自动执行。
|
||||
4. 登录或恢复会话成功后自动刷新状态,各账号只有一个顶部策略开关。
|
||||
菜单“策略 → 开启全部账号策略 / 关闭全部账号策略”批量控制已连接账号;关闭策略后仍继续刷新。
|
||||
5. 关闭页签会停止该账号,并立即保存关闭状态;重启后不再自动打开。账号记录仍可用“账号 → 打开已保存账号”重新打开。
|
||||
退出整个程序时,会保留当时仍打开的页签;关闭所有页签后,下次启动保持空白。
|
||||
6. 彻底删除本地账号记录:右键账号页签选“移除此账号…”,或用“账号 → 移除当前账号…”。
|
||||
@@ -211,8 +211,8 @@
|
||||
孵化与幼体成长阶段显示“待成熟后生成”,不把服务端的零值算成 C 资质。
|
||||
登录后在两个阶段到期时自动请求成长结算,并使用结算响应中的阶段和四项成长值更新界面;
|
||||
成熟、资质确定后才决定派遣、喂养或保留,旧查询结果不会覆盖尚未确认回写的结算数据。
|
||||
培育室无需手动同步;阶段到期会在后台同步,即使未开启整体监控也会检查。服务器暂未确认时会限频等待,避免连续发送。
|
||||
“仅监控”可以同步成长;派遣、喂养等操作仍需点“开始执行勾选功能”。
|
||||
培育室无需手动同步;登录后阶段到期会在后台同步,关闭策略后仍会检查。服务器暂未确认时会限频等待,避免连续发送。
|
||||
派遣、喂养等自动操作由顶部策略开关统一控制。
|
||||
资质保留条件新增“四项全S(4S)才保留”,要求攻、防、生命、敏捷分别为S;综合评级为S不等于4S。
|
||||
锁定、队伍、保留星级、资料不完整等保护独立生效;若希望低星魔物仅按4S保留,请同时检查保留星级设置。
|
||||
保留原因会显示在培育室建议和日志中。
|
||||
@@ -222,7 +222,7 @@
|
||||
培育室魔物的 `roomId=null` 已兼容,统计牧场容量时不会再因空字段中断整轮策略。
|
||||
|
||||
- 魔物表可多选,使用按钮或右键锁定/解锁。派遣、指定喂养会列出将消耗的魔物并要求确认;
|
||||
这些手动操作会暂停自动执行。锁定、系统锁、羁绊、在队、探索、建筑中及已装备的魔物不能作为素材。
|
||||
这些手动操作会关闭策略,状态刷新继续。锁定、系统锁、羁绊、在队、探索、建筑中及已装备的魔物不能作为素材。
|
||||
- 喂养素材需已收取到牧场,目标不能是素材本身,且不能已满当前突破等级上限。
|
||||
- 参考属性按基础值、成长、等级、潜能、好感及升星计算,不含装备、羁绊和全局加成;完整实战面板以游戏为准。
|
||||
- 培育室按本地表列出11个坑位,并兼容服务器返回的更多位置。第4个为VIP专用,不走普通扩建接口。
|
||||
@@ -259,7 +259,7 @@
|
||||
它复用 `stageStart` → `battleEnd` → `recordBattleResult`,无需本地战斗演算或手机截图。
|
||||
此前只搜索英文 sweep 和中文“扫荡”漏掉了这个拼音方法;现已按该分支实现。
|
||||
|
||||
在“自动扫荡”展开地区,每关勾选“刷图”、选择难度、输入“本日上限”,再点击“开始扫荡”。
|
||||
在“自动扫荡”展开地区,每关勾选“刷图”、选择难度、输入“本日上限”,勾选该页功能,再开启顶部策略开关。
|
||||
星级是服务器通关进度计算出来的,只读。未解锁难度不能选;特殊关卡、未全通关、剧情任务、
|
||||
体力/金币/门票不足的关卡会显示原因并跳过。次数按角色、日期、关卡和难度保存,
|
||||
是本地已开始次数,不冒充服务器每日限制。
|
||||
@@ -269,9 +269,9 @@
|
||||
隐藏关卡需要游戏内实战;缺失事件状态或请求结果不明确时保持待处理,避免重复扣体力,在游戏内确认处理后可清除本地记录。
|
||||
|
||||
“每日事务”选择要处理的奖励类别,点“领取勾选项目”可立即领取;
|
||||
点“开始每日事务”会打开统一监控和自动执行,只处理符合状态的项目。
|
||||
勾选“启用每日奖励领取”并开启顶部策略开关后,只自动处理符合状态的项目。
|
||||
VIP奖励只对已有资格领取;不会购买VIP或升级礼包。邮件仅领取附件,不删除邮件。
|
||||
启动/重启默认不执行消耗类策略,成长到期自动同步;其他自动化需要手动开始。勾选项、战队、保留体力及刷图规则按角色保存。
|
||||
启动/重启默认关闭策略,登录后自动刷新并同步到期成长;自动操作由顶部策略开关统一开启。勾选项、战队、保留体力及刷图规则按角色保存。
|
||||
网络写请求发送前保存本地记录,异常不直接重试;本日已提交但服务器仍返回旧状态的奖励会明确提示。
|
||||
|
||||
资料包含此APK的1178个关卡、各难度奖励和2079种道具名称。
|
||||
|
||||
@@ -30,7 +30,7 @@ class AccountsWindow(W.QMainWindow):
|
||||
layout = W.QVBoxLayout(central)
|
||||
self.setCentralWidget(central)
|
||||
self.setup_menus()
|
||||
note = W.QLabel("每个页签独立登录、保存 Token 和运行。切换页签不会停止其他账号;自动执行需在各账号里分别开启。")
|
||||
note = W.QLabel("各账号独立登录并持续刷新状态,切换页签不影响其他账号;策略可分别开启或关闭。")
|
||||
note.setWordWrap(True)
|
||||
layout.addWidget(note)
|
||||
self.tabs = W.QTabWidget()
|
||||
@@ -62,9 +62,9 @@ class AccountsWindow(W.QMainWindow):
|
||||
accounts.aboutToShow.connect(self.update_account_actions)
|
||||
accounts.addSeparator()
|
||||
accounts.addAction("退出", self.close)
|
||||
monitoring = self.menuBar().addMenu("监控(&M)")
|
||||
monitoring.addAction("全部开始监控", self.monitor_all)
|
||||
monitoring.addAction("全部停止", self.stop_all)
|
||||
strategies_run = self.menuBar().addMenu("策略(&R)")
|
||||
strategies_run.addAction("开启全部账号策略", self.start_all_strategies)
|
||||
strategies_run.addAction("关闭全部账号策略", self.stop_all)
|
||||
strategies = self.menuBar().addMenu("策略配置(&S)")
|
||||
self.save_policy_action = strategies.addAction("保存当前账号策略", self.save_current_policies)
|
||||
self.save_policy_action.setShortcut("Ctrl+S")
|
||||
@@ -188,15 +188,14 @@ class AccountsWindow(W.QMainWindow):
|
||||
if window.engine.demo and not window.busy and window.saved_sessions.count():
|
||||
window.resume_session()
|
||||
|
||||
def monitor_all(self):
|
||||
def start_all_strategies(self):
|
||||
for window in self.windows.values():
|
||||
if not window.engine.demo:
|
||||
window.start_monitor.setChecked(True)
|
||||
if not window.engine.demo and not window.closed:
|
||||
window.start_workflow()
|
||||
|
||||
def stop_all(self):
|
||||
for window in self.windows.values():
|
||||
window.start_monitor.setChecked(False)
|
||||
window.execute.setChecked(False)
|
||||
window.stop_workflow()
|
||||
|
||||
def close_profile(self, index):
|
||||
window = self.tabs.widget(index)
|
||||
@@ -213,8 +212,8 @@ class AccountsWindow(W.QMainWindow):
|
||||
if profile.get("open", True):
|
||||
profile["open"] = False
|
||||
self.save_index()
|
||||
window.start_monitor.setChecked(False)
|
||||
window.execute.setChecked(False)
|
||||
window.monitoring = False
|
||||
window.stop_workflow()
|
||||
window.timer.stop()
|
||||
window.hatch_timer.stop()
|
||||
window.engine.auto = False
|
||||
@@ -314,6 +313,7 @@ class AccountsWindow(W.QMainWindow):
|
||||
self.stop_all()
|
||||
for window in self.windows.values():
|
||||
window.timer.stop()
|
||||
window.monitoring = False
|
||||
window.closed = True
|
||||
window.pending_refresh = None
|
||||
if any(window.busy for window in self.windows.values()):
|
||||
|
||||
@@ -44,14 +44,9 @@ class ActivityPages:
|
||||
line.addWidget(self.map_keep_ti)
|
||||
line.addWidget(W.QLabel("使用战队"))
|
||||
line.addWidget(self.map_team)
|
||||
start = W.QPushButton("开始扫荡")
|
||||
start.clicked.connect(lambda: self.start_activities("maps"))
|
||||
stop = W.QPushButton("停止扫荡")
|
||||
stop.clicked.connect(lambda: self.map_enabled.setChecked(False))
|
||||
reset = W.QPushButton("处理未完成记录…")
|
||||
reset.clicked.connect(self.clear_sweep_pending)
|
||||
for button in (start, stop, reset):
|
||||
line.addWidget(button)
|
||||
line.addWidget(reset)
|
||||
line.addStretch()
|
||||
layout.addLayout(line)
|
||||
self.maps_summary = W.QLabel("登录后读取实际解锁状态")
|
||||
@@ -223,7 +218,7 @@ class ActivityPages:
|
||||
pending = self.engine.sweeper.state.get("pending")
|
||||
self.maps_summary.setText(f"已解锁 {sum(s.unlocked for s in all_rows)} 个难度;显示 {len(visible)} 关;勾选 {sum(bool(r.get('enabled')) for r in self.map_rules.values())} 关。" +
|
||||
(f" 待处理:{pending['stage']} / {pending['phase']}" if pending else "") +
|
||||
(" 正在执行扫荡计划。" if self.map_enabled.isChecked() and self.execute.isChecked() and self.monitoring else " 扫荡已停止。"))
|
||||
(" 扫荡策略运行中。" if self.map_enabled.isChecked() and self.strategy_toggle.isChecked() else " 开启顶部策略开关后运行已勾选关卡。"))
|
||||
|
||||
def clear_sweep_pending(self):
|
||||
if self.busy:
|
||||
@@ -242,7 +237,7 @@ class ActivityPages:
|
||||
self.daily_page = W.QWidget()
|
||||
layout = W.QVBoxLayout(self.daily_page)
|
||||
line = W.QHBoxLayout()
|
||||
self.daily_enabled = W.QCheckBox("监控时自动领取勾选奖励")
|
||||
self.daily_enabled = W.QCheckBox("启用每日奖励领取")
|
||||
line.addWidget(self.daily_enabled)
|
||||
self.daily_checks = {}
|
||||
for key, label in (("gift", "每日签到礼包"), ("check", "七日签到"), ("loop", "累计奖励"), ("vip", "VIP日奖"), ("mail", "邮件附件")):
|
||||
@@ -254,8 +249,7 @@ class ActivityPages:
|
||||
line.addStretch()
|
||||
layout.addLayout(line)
|
||||
line = W.QHBoxLayout()
|
||||
for label, function in (("刷新状态", self.refresh), ("领取勾选项目", self.claim_daily),
|
||||
("开始每日事务", lambda: self.start_activities("daily")), ("停止每日事务", lambda: self.daily_enabled.setChecked(False))):
|
||||
for label, function in (("刷新状态", self.refresh), ("领取勾选项目", self.claim_daily)):
|
||||
button = W.QPushButton(label)
|
||||
button.clicked.connect(function)
|
||||
line.addWidget(button)
|
||||
@@ -269,7 +263,7 @@ class ActivityPages:
|
||||
self.daily_table.setColumnWidth(0, 280)
|
||||
self.daily_table.setColumnWidth(1, 230)
|
||||
layout.addWidget(self.daily_table, 1)
|
||||
note = W.QLabel("刷新只读取状态。“领取勾选项目”立即处理当前可领奖励;自动领取还需开启监控和“自动执行已启用策略”。邮件仅领取附件。")
|
||||
note = W.QLabel("刷新只更新状态。“领取勾选项目”立即处理当前可领奖励;勾选此页功能并开启顶部策略开关后,将自动领取。邮件仅领取附件。")
|
||||
note.setWordWrap(True)
|
||||
layout.addWidget(note)
|
||||
self.tabs.addTab(self.daily_page, "每日事务")
|
||||
@@ -296,29 +290,3 @@ class ActivityPages:
|
||||
self.stop_workflow()
|
||||
self.engine.daily_policy = self.read_daily_policy()
|
||||
self.submit("daily_claim", self.engine.claim_daily)
|
||||
|
||||
def start_activities(self, page):
|
||||
if page == "maps":
|
||||
if self.engine.demo:
|
||||
self.report("请先登录账号,再开始扫荡")
|
||||
return
|
||||
if not any(r.get("enabled") for r in self.map_rules.values()):
|
||||
self.report("请先勾选关卡,并设置难度和本日次数上限")
|
||||
return
|
||||
if not self.busy and self.engine.snapshot and not self.engine.sweeper.next(self.engine.snapshot, self.read_sweep_policy()):
|
||||
self.report("勾选关卡当前均不可扫荡;请查看每行扫荡状态、本日上限和已开始次数")
|
||||
return
|
||||
self.map_enabled.setChecked(True)
|
||||
else:
|
||||
if not any(c.isChecked() for c in self.daily_checks.values()):
|
||||
self.report("请先勾选需要领取的奖励")
|
||||
return
|
||||
self.daily_enabled.setChecked(True)
|
||||
self.save_config(quiet=True)
|
||||
self.start_monitor.setChecked(True)
|
||||
self.execute.setChecked(True)
|
||||
self.next_poll = 0
|
||||
if self.busy:
|
||||
self.pending_execute = True
|
||||
else:
|
||||
self.refresh(automated=True)
|
||||
|
||||
+68
-82
@@ -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))
|
||||
|
||||
|
||||
@@ -142,7 +142,7 @@ class RemovalTests(unittest.TestCase):
|
||||
self.remove(hub, "default")
|
||||
self.assertIn("default", hub.windows)
|
||||
self.assertIn("default", hub.pending_removals)
|
||||
self.assertFalse(window.execute.isChecked())
|
||||
self.assertFalse(window.strategy_toggle.isChecked())
|
||||
self.assertFalse(window.monitoring)
|
||||
release.set()
|
||||
self.wait(lambda: not hub.windows and not hub.pending_removals)
|
||||
|
||||
@@ -147,7 +147,7 @@ class AccountGuiTests(unittest.TestCase):
|
||||
saved = json.loads((selected.state / "settings.json").read_text(encoding="utf-8"))
|
||||
self.assertEqual(saved["policy"]["keep_money"], expected)
|
||||
self.assertEqual(selected.engine.policy.keep_money, expected)
|
||||
self.assertFalse(selected.execute.isChecked())
|
||||
self.assertFalse(selected.strategy_toggle.isChecked())
|
||||
finally:
|
||||
hub.close()
|
||||
|
||||
@@ -160,7 +160,7 @@ class AccountGuiTests(unittest.TestCase):
|
||||
try:
|
||||
self.wait(windows)
|
||||
self.assertEqual([action.text().split("(")[0] for action in hub.menuBar().actions()],
|
||||
["账号", "监控", "策略配置", "帮助"])
|
||||
["账号", "策略", "策略配置", "帮助"])
|
||||
for window in windows:
|
||||
self.assertIsNone(window.findChild(W.QMenuBar))
|
||||
labels = {button.text() for button in hub.findChildren(W.QPushButton)}
|
||||
@@ -250,7 +250,7 @@ class AccountGuiTests(unittest.TestCase):
|
||||
window.resume_session()
|
||||
self.wait([window])
|
||||
self.assertEqual(window.session_store.load(key).reqid, 1)
|
||||
self.assertFalse(window.execute.isChecked())
|
||||
self.assertFalse(window.strategy_toggle.isChecked())
|
||||
self.assertTrue(window.engine.demo)
|
||||
finally:
|
||||
window.close()
|
||||
@@ -277,10 +277,10 @@ class AccountGuiTests(unittest.TestCase):
|
||||
self.assertFalse(first.monsters.group_items)
|
||||
self.assertTrue(all(item.parent() is None for item in first.monsters.monster_items.values()))
|
||||
self.assertEqual(first.saved_sessions.count(), 1)
|
||||
first.start_monitor.setChecked(True)
|
||||
first.monitoring = True
|
||||
hub.tabs.setCurrentWidget(second)
|
||||
self.assertTrue(first.monitoring)
|
||||
hub.monitor_all()
|
||||
self.assertTrue(all(window.monitoring for window in windows))
|
||||
for window in windows:
|
||||
window.engine.last_heartbeat = time.monotonic()
|
||||
window.next_poll = 0
|
||||
@@ -291,7 +291,7 @@ class AccountGuiTests(unittest.TestCase):
|
||||
self.assertEqual(second.engine.client.session.token, "test-token-account-b")
|
||||
self.assertEqual(first.engine.snapshot.raw["master"]["id"], 101)
|
||||
self.assertEqual(second.engine.snapshot.raw["master"]["id"], 202)
|
||||
first.execute.setChecked(True)
|
||||
first.set_strategy_checked(True)
|
||||
before = len(calls)
|
||||
hub.tabs.setCurrentWidget(first)
|
||||
first.tabs.setCurrentWidget(first.egg_page)
|
||||
@@ -324,10 +324,90 @@ class AccountGuiTests(unittest.TestCase):
|
||||
self.wait(restarted)
|
||||
self.assertEqual({window.engine.snapshot.raw["master"]["id"] for window in restarted}, {101, 202},
|
||||
"\n".join(window.log.toPlainText() for window in restarted))
|
||||
self.assertTrue(all(not window.engine.demo and not window.execute.isChecked() and not window.monitoring for window in restarted))
|
||||
self.assertTrue(all(not window.engine.demo and not window.strategy_toggle.isChecked() and window.monitoring for window in restarted))
|
||||
finally:
|
||||
restored.close()
|
||||
|
||||
def test_login_refreshes_automatically_and_strategy_menu_only_controls_execution(self):
|
||||
with workspace_temp() as folder:
|
||||
hub = AccountsWindow(folder)
|
||||
hub.add_profile()
|
||||
windows = list(hub.windows.values())
|
||||
calls = []
|
||||
for window in windows:
|
||||
window.timer.stop()
|
||||
try:
|
||||
self.wait(windows)
|
||||
for number, window in enumerate(windows, 1):
|
||||
self.connect(window, f"account-{number}", number, number, calls)
|
||||
self.assertTrue(window.monitoring)
|
||||
self.assertFalse(window.strategy_toggle.isChecked())
|
||||
window.engine.last_heartbeat = time.monotonic()
|
||||
window.schedule()
|
||||
self.wait(windows)
|
||||
self.assertTrue(calls)
|
||||
self.assertTrue(all(url.endswith("masterService/masterQueryDetail") for _, url, _ in calls))
|
||||
for window in windows:
|
||||
window.ranch_enabled.setChecked(False)
|
||||
window.daily_enabled.setChecked(True)
|
||||
# Exercise real Qt menu actions with synthetic worker results.
|
||||
observed = []
|
||||
from contextlib import ExitStack
|
||||
with ExitStack() as stack:
|
||||
for window in windows:
|
||||
def poll(current=window, **kwargs):
|
||||
observed.append((current, current.engine.auto))
|
||||
return current.engine.snapshot, [], "synthetic refresh"
|
||||
stack.enter_context(patch.object(window.engine, "poll", side_effect=poll))
|
||||
menu = next(action.menu() for action in hub.menuBar().actions() if action.text() == "策略(&R)")
|
||||
menu.actions()[0].trigger()
|
||||
self.wait(windows)
|
||||
self.assertEqual(len(observed), 2)
|
||||
self.assertTrue(all(enabled for _, enabled in observed))
|
||||
self.assertTrue(all(w.strategy_toggle.text() == "关闭策略" for w in windows))
|
||||
# A manual refresh never executes, even with strategies on.
|
||||
windows[0].refresh()
|
||||
self.wait(windows)
|
||||
self.assertFalse(observed[-1][1])
|
||||
menu.actions()[1].trigger()
|
||||
self.assertTrue(all(w.monitoring and not w.strategy_toggle.isChecked() for w in windows))
|
||||
observed.clear()
|
||||
for window in windows:
|
||||
window.next_poll = 0
|
||||
window.schedule()
|
||||
self.wait(windows)
|
||||
self.assertEqual(len(observed), 2)
|
||||
self.assertFalse(any(enabled for _, enabled in observed))
|
||||
windows[0].demo()
|
||||
self.wait(windows)
|
||||
self.assertFalse(windows[0].monitoring)
|
||||
self.assertTrue(windows[1].monitoring)
|
||||
finally:
|
||||
hub.close()
|
||||
|
||||
def test_incomplete_policy_keeps_logged_in_account_refreshing_without_actions(self):
|
||||
with workspace_temp() as folder:
|
||||
window = gui.Window(folder)
|
||||
window.timer.stop()
|
||||
calls = []
|
||||
try:
|
||||
self.wait([window])
|
||||
self.connect(window, "account-a", 1, 101, calls)
|
||||
window.reserved_types.setText("incomplete-input")
|
||||
window.strategy_toggle.click()
|
||||
self.assertFalse(window.strategy_toggle.isChecked())
|
||||
self.assertTrue(window.monitoring)
|
||||
window.engine.last_heartbeat = time.monotonic()
|
||||
window.next_poll = 0
|
||||
window.schedule()
|
||||
self.wait([window])
|
||||
self.assertTrue(window.monitoring)
|
||||
self.assertFalse(window.engine.auto)
|
||||
self.assertTrue(calls)
|
||||
self.assertTrue(all(url.endswith("masterService/masterQueryDetail") for _, url, _ in calls))
|
||||
finally:
|
||||
window.close()
|
||||
|
||||
def test_role_switch_restores_own_strategy_and_heartbeat_uses_normal_api(self):
|
||||
with workspace_temp() as folder:
|
||||
window = gui.Window(folder)
|
||||
@@ -346,6 +426,7 @@ class AccountGuiTests(unittest.TestCase):
|
||||
self.assertEqual(window.strategy.currentData(), "gold")
|
||||
self.assertEqual(window.saved_sessions.count(), 2)
|
||||
window.engine.last_heartbeat = 0
|
||||
window.next_poll = float("inf")
|
||||
window.schedule()
|
||||
self.wait([window])
|
||||
self.assertTrue(calls[-1][1].endswith("heartBeatService/keepAlive"))
|
||||
|
||||
@@ -314,7 +314,7 @@ class ActivityGuiTests(unittest.TestCase):
|
||||
if not restored.busy:
|
||||
break
|
||||
self.assertEqual(restored.map_rules["0101"]["limit"], 12)
|
||||
self.assertFalse(restored.execute.isChecked())
|
||||
self.assertFalse(restored.strategy_toggle.isChecked())
|
||||
self.assertFalse(restored.monitoring)
|
||||
finally:
|
||||
restored.close()
|
||||
|
||||
@@ -314,7 +314,7 @@ class AutomationGuiTests(unittest.TestCase):
|
||||
return
|
||||
self.fail("Qt task did not finish")
|
||||
|
||||
def test_workflow_start_monitor_stop_and_settings_restore(self):
|
||||
def test_strategy_toggle_off_keeps_refreshing_and_settings_restore_with_strategy_off(self):
|
||||
with workspace_temp() as folder:
|
||||
window = gui.Window(folder)
|
||||
window.timer.stop()
|
||||
@@ -327,17 +327,24 @@ class AutomationGuiTests(unittest.TestCase):
|
||||
window.fill.setChecked(False)
|
||||
window.buy_eggs.setChecked(False)
|
||||
before = len(window.engine.snapshot.raw["monsters"])
|
||||
window.monitor_only()
|
||||
window.refresh()
|
||||
self.wait(window)
|
||||
self.assertEqual(len(window.engine.snapshot.raw["monsters"]), before)
|
||||
self.assertIn("仅监控", window.workflow_status.text())
|
||||
window.workflow_start.click()
|
||||
self.assertIn("策略已关闭", window.workflow_status.text())
|
||||
window.strategy_toggle.click()
|
||||
self.wait(window)
|
||||
self.assertEqual(len(window.engine.snapshot.raw["monsters"]), before - 1)
|
||||
self.assertIn("执行中", window.workflow_status.text())
|
||||
window.workflow_stop.click()
|
||||
self.assertIn("策略已开启", window.workflow_status.text())
|
||||
window.strategy_toggle.click()
|
||||
self.assertTrue(window.monitoring)
|
||||
self.assertFalse(window.engine.auto)
|
||||
self.assertEqual(window.strategy_toggle.text(), "开启策略")
|
||||
remaining = len(window.engine.snapshot.raw["monsters"])
|
||||
window.next_poll = 0
|
||||
window.schedule()
|
||||
self.wait(window)
|
||||
self.assertEqual(len(window.engine.snapshot.raw["monsters"]), remaining)
|
||||
self.assertFalse(window.engine.auto)
|
||||
window.buy_eggs.setChecked(True)
|
||||
window.market.setCurrentIndex(window.market.findData("sc_city2"))
|
||||
window.daily_buy_money.setValue(700)
|
||||
@@ -355,7 +362,7 @@ class AutomationGuiTests(unittest.TestCase):
|
||||
self.assertTrue(restored.buy_eggs.isChecked())
|
||||
self.assertEqual(restored.market.currentData(), "sc_city2")
|
||||
self.assertEqual(restored.daily_buy_money.value(), 700)
|
||||
self.assertFalse(restored.execute.isChecked())
|
||||
self.assertFalse(restored.strategy_toggle.isChecked())
|
||||
self.assertFalse(restored.yield_stars[5].isChecked())
|
||||
self.assertEqual(restored.hatch_max_star.currentData(), 3)
|
||||
finally:
|
||||
@@ -413,8 +420,8 @@ class AutomationGuiTests(unittest.TestCase):
|
||||
window.timer.stop()
|
||||
try:
|
||||
self.wait(window)
|
||||
window.execute.setChecked(True)
|
||||
window.start_monitor.setChecked(True)
|
||||
window.set_strategy_checked(True)
|
||||
window.monitoring = True
|
||||
before = len(window.engine.snapshot.raw["monsters"])
|
||||
def select(mid):
|
||||
window.tabs.setCurrentWidget(window.monster_page)
|
||||
@@ -425,7 +432,7 @@ class AutomationGuiTests(unittest.TestCase):
|
||||
window.lock_monsters.click()
|
||||
self.wait(window)
|
||||
self.assertEqual(window.engine.snapshot.monsters[101]["lock"], 1)
|
||||
self.assertFalse(window.execute.isChecked())
|
||||
self.assertFalse(window.strategy_toggle.isChecked())
|
||||
self.assertEqual(len(window.engine.snapshot.raw["monsters"]), before)
|
||||
select(101)
|
||||
with patch("PySide6.QtWidgets.QMenu.popup"):
|
||||
|
||||
@@ -168,7 +168,7 @@ class CultivationGuiTests(unittest.TestCase):
|
||||
window.engine.plans()
|
||||
window.tabs.setCurrentWidget(window.gift_page)
|
||||
self.assertGreater(window.gift_representatives.rowCount(), 0)
|
||||
self.assertFalse(window.execute.isChecked())
|
||||
self.assertFalse(window.strategy_toggle.isChecked())
|
||||
window.load_config()
|
||||
self.assertTrue(window.keep_better_quality.isChecked())
|
||||
self.assertTrue(window.gift_auto_representative.isChecked())
|
||||
|
||||
@@ -214,7 +214,7 @@ class GrowthGuiTests(unittest.TestCase):
|
||||
self.assertEqual(window.slots.item(row, 7).text(), "S/S/S/S")
|
||||
self.assertIn("资质", window.slots.item(row, 8).text())
|
||||
self.assertIn("S/S/S/S", window.monsters.monster_items[501].text(4))
|
||||
self.assertFalse(window.execute.isChecked())
|
||||
self.assertFalse(window.strategy_toggle.isChecked())
|
||||
self.assertFalse(any(name == "monsterService/monsterSell" for name, _ in client.calls))
|
||||
finally:
|
||||
window.close()
|
||||
|
||||
@@ -5,7 +5,7 @@ import json
|
||||
import unittest
|
||||
from unittest.mock import patch
|
||||
from PySide6.QtTest import QTest
|
||||
from PySide6.QtWidgets import QApplication
|
||||
from PySide6.QtWidgets import QApplication, QPushButton, QCheckBox
|
||||
from ranch_assistant import gui
|
||||
from ranch_assistant.tests.test_core import workspace_temp
|
||||
|
||||
@@ -38,17 +38,23 @@ class GuiTests(unittest.TestCase):
|
||||
self.assertLess(labels.index("自动孵蛋"), labels.index("自动扫荡"))
|
||||
self.assertEqual(window.yields.rowCount(), 749)
|
||||
self.assertEqual(window.styleSheet(), "")
|
||||
buttons = {button.text() for button in window.findChildren(QPushButton)}
|
||||
self.assertIn("开启策略", buttons)
|
||||
for removed in ("开始监控", "停止监控", "仅监控", "开始执行勾选功能", "停止执行",
|
||||
"开始执行勾选策略", "开始扫荡", "停止扫荡", "开始每日事务", "停止每日事务"):
|
||||
self.assertNotIn(removed, buttons)
|
||||
self.assertNotIn("自动执行已启用策略", {check.text() for check in window.findChildren(QCheckBox)})
|
||||
window.strategy.setCurrentIndex(window.strategy.findData("gold"))
|
||||
window.egg_rules = {str(m["typeId"]): {"enabled": True, "action": "sell"} for m in window.engine.snapshot.raw["monsters"][:2]}
|
||||
window.protect_star.setValue(6)
|
||||
window.protect_quality.setCurrentIndex(window.protect_quality.findData(5))
|
||||
window.fill.setChecked(False)
|
||||
window.execute.setChecked(True)
|
||||
window.set_strategy_checked(True)
|
||||
before = len(window.engine.snapshot.raw["monsters"])
|
||||
window.refresh()
|
||||
self.wait(window)
|
||||
self.assertEqual(len(window.engine.snapshot.raw["monsters"]), before)
|
||||
window.start_monitor.setChecked(True)
|
||||
window.monitoring = True
|
||||
window.refresh(automated=True)
|
||||
self.wait(window)
|
||||
self.assertEqual(len(window.engine.snapshot.raw["monsters"]), before - 1)
|
||||
|
||||
@@ -127,8 +127,8 @@ class HatchTimerGuiTests(unittest.TestCase):
|
||||
window.engine = Engine(window.catalog, client)
|
||||
window.engine.last_heartbeat = time.monotonic()
|
||||
window.egg_rules = policy_for(client).egg_rules
|
||||
window.start_monitor.setChecked(True)
|
||||
window.execute.setChecked(True)
|
||||
window.monitoring = True
|
||||
window.set_strategy_checked(True)
|
||||
with patch.object(window, "poll_delay", return_value=300), patch("ranch_assistant.gui.random.uniform", return_value=1.5) as draw:
|
||||
window.refresh(automated=True)
|
||||
self.wait(window)
|
||||
|
||||
@@ -155,8 +155,8 @@ class MasterSyncGuiTests(unittest.TestCase):
|
||||
self.assertEqual(window.engine.snapshot.raw["master"]["ti"], 6)
|
||||
self.assertEqual(client.calls, [(STAMINA, {})])
|
||||
self.assertEqual(window.next_poll, float("inf"))
|
||||
self.assertFalse(window.execute.isChecked())
|
||||
self.assertFalse(window.monitoring)
|
||||
self.assertFalse(window.strategy_toggle.isChecked())
|
||||
self.assertTrue(window.monitoring)
|
||||
finally:
|
||||
window.close()
|
||||
|
||||
|
||||
@@ -97,7 +97,7 @@ class MonitoringGuiTests(unittest.TestCase):
|
||||
self.wait(restored)
|
||||
self.assertEqual(restored.interval.currentData(), 300)
|
||||
self.assertEqual(restored.read_policy().protect_quality, 6)
|
||||
self.assertFalse(restored.execute.isChecked())
|
||||
self.assertFalse(restored.strategy_toggle.isChecked())
|
||||
finally:
|
||||
restored.close()
|
||||
|
||||
@@ -121,11 +121,12 @@ class MonitoringGuiTests(unittest.TestCase):
|
||||
self.assertFalse(window.monitoring)
|
||||
window.schedule()
|
||||
self.wait(window)
|
||||
self.assertTrue(window.monitoring)
|
||||
self.assertEqual(sum(name == "growth" for name, _ in client.calls), 1)
|
||||
self.assertEqual(window.engine.snapshot.monsters[501]["mode"], 2)
|
||||
self.assertEqual(window.catalog.quality_text(window.engine.snapshot.monsters[501]), "S/S/S/S")
|
||||
self.assertFalse(any(name == "monsterService/monsterSell" for name, _ in client.calls))
|
||||
self.assertFalse(window.execute.isChecked())
|
||||
self.assertFalse(window.strategy_toggle.isChecked())
|
||||
self.assertFalse(any("同步孵化" in button.text() for button in window.slot_page.findChildren(W.QPushButton)))
|
||||
finally:
|
||||
window.close()
|
||||
|
||||
@@ -89,7 +89,7 @@ class StrategyGuiTests(unittest.TestCase):
|
||||
path.write_text(json.dumps(value), encoding="utf-8")
|
||||
with patch("ranch_assistant.gui.W.QFileDialog.getOpenFileName", return_value=(str(path), "")):
|
||||
window.import_policies()
|
||||
self.assertFalse(window.execute.isChecked())
|
||||
self.assertFalse(window.strategy_toggle.isChecked())
|
||||
self.assertFalse(window.engine.auto)
|
||||
self.assertTrue(window.engine.policy.gift_enabled)
|
||||
self.assertEqual(window.engine.quest_policy.max_money, 100)
|
||||
@@ -119,6 +119,6 @@ class StrategyGuiTests(unittest.TestCase):
|
||||
window.gift_enabled.setChecked(True)
|
||||
with patch.object(window, "refresh"):
|
||||
window.start_workflow()
|
||||
self.assertTrue(window.execute.isChecked())
|
||||
self.assertTrue(window.strategy_toggle.isChecked())
|
||||
finally:
|
||||
window.close()
|
||||
|
||||
@@ -159,7 +159,7 @@ class RuleEditingTests(unittest.TestCase):
|
||||
self.assertEqual(saved["sweep_policy"]["keep_stamina"], 23)
|
||||
self.assertEqual(window.engine.policy.keep_money, 4321)
|
||||
self.assertFalse(window.monitoring)
|
||||
self.assertFalse(window.execute.isChecked())
|
||||
self.assertFalse(window.strategy_toggle.isChecked())
|
||||
window.reserve_eggs.setText("1001010:")
|
||||
self.wait(lambda: not window.auto_save_timer.isActive())
|
||||
self.assertEqual(json.loads((folder / "settings.json").read_text(encoding="utf-8")), saved)
|
||||
|
||||
@@ -209,7 +209,7 @@ class ManualGuiTests(unittest.TestCase):
|
||||
self.assertTrue(restored.egg_rules[key]["enabled"])
|
||||
self.assertEqual(restored.egg_rules[key]["action"], "feed")
|
||||
self.assertEqual(restored.feed_targets, {"900": 1})
|
||||
self.assertFalse(restored.execute.isChecked())
|
||||
self.assertFalse(restored.strategy_toggle.isChecked())
|
||||
finally:
|
||||
restored.close()
|
||||
|
||||
|
||||
@@ -206,7 +206,7 @@ class V11GuiTests(unittest.TestCase):
|
||||
path.write_text(json.dumps(portable_policy(policy, window.engine.snapshot)), encoding="utf-8")
|
||||
with patch("ranch_assistant.gui.W.QFileDialog.getOpenFileName", return_value=(str(path), "")):
|
||||
window.import_policies()
|
||||
self.assertFalse(window.execute.isChecked())
|
||||
self.assertFalse(window.strategy_toggle.isChecked())
|
||||
self.assertFalse(window.read_policy().gift_enabled)
|
||||
finally:
|
||||
window.close()
|
||||
|
||||
Reference in New Issue
Block a user