Release ranch assistant 1.1.0
This commit is contained in:
@@ -25,7 +25,8 @@ python -m unittest discover -s ranch_assistant/tests -v
|
||||
|
||||
| 辅助版本 | 《牧羊人之心》Android 客户端版本 | 状态 |
|
||||
| --- | --- | --- |
|
||||
| 1.0.0(`v1.0.0`) | 1.9.68 | 当前适配版本 |
|
||||
| 1.1.0(`v1.1.0`) | 1.9.68 | 当前适配版本 |
|
||||
| 1.0.0(`v1.0.0`) | 1.9.68 | 历史版本 |
|
||||
|
||||
本表仅记录已经分析、测试的版本对应关系,不代表对其他客户端版本的兼容承诺。
|
||||
|
||||
|
||||
+22
-11
@@ -11,17 +11,24 @@
|
||||
|
||||
## 当前功能
|
||||
|
||||
- 登录与顶部信息:显示角色名、等级、累计经验/下一级经验、金币、氪金和体力。
|
||||
“退出登录”保留登录记录;“退出登录并清除登录记录”经确认后只清除当前账号页签的凭据和会话。
|
||||
- 培育室:已开启、未开启和VIP坑位分别显示;支持金币/氪金开普通坑位,先显示费用再确认。
|
||||
- 背包魔物蛋:逐种勾选孵化、设置优先级、选择孵出后派遣/喂养/保留,设置补货下限、目标和市场。
|
||||
- 背包:分为“魔物蛋”和“物品与装备”。魔物蛋逐种勾选孵化、设置优先级、选择孵出后派遣/喂养/保留,设置补货下限、目标和市场。
|
||||
数量归零后保留规则;可添加当前无库存的蛋。未勾选的蛋不会自动孵化或触发补货。
|
||||
- 魔物:勾选喂养目标、设置喂养优先级;显示突破、当前等级上限、成长资质、参考属性、好感和喜欢的物品。
|
||||
物品与装备支持分类和名称筛选,显示数量、品质和售价;可为物品设置赠礼开关及至少保留数量。
|
||||
- 牧场:合并魔物与牧场列表,可按牧场筛选或查看全部魔物;按钮或右键可新建金币/氪金牧场,提交前确认费用。
|
||||
勾选喂养/赠礼目标并分别设置优先级;显示突破、当前等级上限、成长资质、参考属性、当前好感上限和喜欢的物品。
|
||||
双击查看详情;右键可锁定、解锁、派遣、喂给指定魔物。
|
||||
- 牧场概况:名称、魔物数量、容量和空位;按钮或右键可新建金币/氪金牧场,提交前确认费用。
|
||||
- 每个页面的表格和空白处可右键“刷新本页”;刷新只读取状态,不执行派遣、喂养等策略。
|
||||
- 多账号:同一程序内多个独立账号页签,各自监控、自动执行、记录日志;切换页签不停止其他账号。
|
||||
- 会话保存:成功读取角色后自动加密保存 Token、账号/区服/角色和请求编号,重启后可恢复。
|
||||
- 自动孵蛋:按手动规则执行,提供开始执行、仅监控、停止按钮;支持十连优先、金币保留和每日购蛋额度。
|
||||
5/10/30/60 秒刷新;喂养遵守当前突破上限,满级后转到下一喂养目标。
|
||||
原“牧场策略”并入此页的“牧场与赠礼策略”子页;可导出、导入培养策略,跨账号按魔物种类匹配目标。
|
||||
导入后所有自动执行开关保持关闭,文件不包含账号、密码、Token、会话或本机路径。
|
||||
- 自动赠礼:在背包勾选可用物品,在牧场勾选目标并设置优先级,再到“牧场与赠礼策略”启用。
|
||||
每次消耗一件物品,默认只使用目标喜欢的物品;遵守当前羁绊好感上限、赠礼间隔、物品保留数量及委托保留。
|
||||
- 收益资料:749 种魔物数据来自用户提供的 APK 1.9.68,支持名称搜索和1–5星分别筛选,
|
||||
可导入 CSV/XLSX 覆盖价格、经验和时间。
|
||||
- 账号密码登录:第一弹渠道密码验证 → 官方区服列表 → 选择区服并读取角色。
|
||||
@@ -46,8 +53,7 @@
|
||||
|
||||
## 连接真实角色
|
||||
|
||||
默认进入离线演示,示例角色不是手机上的真实数据。
|
||||
顶部账号页签用于切换账号,“新增账号页签”用于登录另一账号。每个页签顶部明确标注演示或真实数据。
|
||||
默认未登录,使用本地示例数据。顶部账号页签用于切换账号,“新增账号页签”用于登录另一账号。
|
||||
|
||||
1. 在“登录”页填写第一弹渠道账号和密码,点击“账号密码登录并获取区服”。
|
||||
默认勾选“记住账号和密码”;编辑完、点击登录或关闭窗口时自动保存,也可点击“保存登录信息”。
|
||||
@@ -62,8 +68,11 @@
|
||||
点“刷新 / 预览”查看下一步,再点“开始执行勾选功能”。页面会显示“执行中”、
|
||||
下一步操作或等待原因。“仅监控”和手动刷新不会执行策略;“停止执行”保留只读监控。
|
||||
已经发送的请求会返回,停止后不发送下一项。重启或恢复会话后需重新点开始执行。
|
||||
6. 需要经验时,在“魔物”勾选接收经验的喂养目标并设置优先级。优先级数字小的先喂,达到当前突破上限后换下一个;
|
||||
在“牧场策略”可设全局停止等级、星级/资质保护和保留蛋数量。“收益资料”的星级勾选只筛选表格显示。
|
||||
6. 需要经验时,在“牧场”勾选接收经验的喂养目标并设置优先级。优先级数字小的先喂,达到当前突破上限后换下一个;
|
||||
在“自动孵蛋 → 牧场与赠礼策略”可设全局停止等级、星级/资质保护和保留蛋数量。“收益资料”的星级勾选只筛选表格显示。
|
||||
7. 需要提升好感时,在“背包 → 物品与装备”勾选物品并设置保留数量,在“牧场”勾选目标并设置赠礼优先级;
|
||||
在“自动孵蛋 → 牧场与赠礼策略”启用自动赠礼。达到当前好感上限或仍在赠礼间隔时不会继续消耗物品。
|
||||
同页可导出策略供其他账号导入;导入后需逐项核对并手动开启自动执行。
|
||||
|
||||
可用“绿色史莱姆金币预设(仅孵此蛋)”快速设置:只勾选绿色史莱姆、优先级1、孵出后派遣、低于1补至10、
|
||||
莉莉托斯市场。这个预设关闭喂养,保留4星以上/A资质魔物,仍需点击开始执行。
|
||||
@@ -105,14 +114,15 @@
|
||||
账号工作区各自保存凭据、会话和日志;区服/角色各自保存策略、喂养目标、截图和刷图次数。
|
||||
切换区服时不沿用其他角色的策略。相同账号区服不会在两个页签重复运行。
|
||||
会话的请求编号在发送前保存,包括超时未确认的请求;写请求不会自动重发。
|
||||
删除保存会话需先切回离线演示,再点击“删除选中保存会话”。“记住账号和密码”只控制密码,独立于会话保存。
|
||||
删除保存会话需先退出登录,再点击“删除选中保存会话”;也可使用“退出登录并清除登录记录”一次清理当前账号页签。
|
||||
“记住账号和密码”只控制密码,独立于会话保存。
|
||||
|
||||
正常会话心跳按客户端的 240 秒周期运行。ADB 刷图中,同一台手机同时只允许一个账号页签控制;
|
||||
不同手机可分别配置。未实现脚本检测规避,也不保证服务端无法识别自动化。
|
||||
|
||||
## 页面数据与刷新
|
||||
|
||||
“培育室”“背包魔物蛋”“魔物”“牧场概况”可直接查看状态,顶部显示坑位、蛋数量、魔物数量和更新时间。
|
||||
“培育室”“背包”“牧场”可直接查看状态,顶部显示坑位、蛋数量、物品、魔物、牧场数量和更新时间。
|
||||
表格或页面空白处右键选择“刷新本页”,保持当前页面;请求进行中再次刷新会排队。
|
||||
收益资料和截图配置页刷新本地资料。自动刷新的 5/10/30/60 秒间隔继续保留。
|
||||
|
||||
@@ -235,7 +245,7 @@
|
||||
- 自定义表:`typeId, sell_money, sell_exp, time_total`(秒),可只提供部分
|
||||
覆盖列;中文列名“编号、派遣金币、强化经验、孵化秒数”也支持。
|
||||
- 测试:`python -m unittest discover -s ranch_assistant/tests -v`。
|
||||
- 113 项测试通过,包含双账号慢网络与大量库存的界面响应、后台账号不重建表格、控件复用、
|
||||
- 122 项测试通过,包含双账号慢网络与大量库存的界面响应、后台账号不重建表格、控件复用、
|
||||
批量喂养和培育室派遣997的加密HTTP回归;覆盖难度列表解析、扫荡条件/请求顺序/异常暂停/跨角色每日额度、
|
||||
签到与邮件JSON/空VIP/时间单位/失败不重试、树形规则恢复和截图页不重叠;以及
|
||||
加密HTTP十连→实际赠蛋→负数空坑孵化→成长结算→派遣→余额刷新、逐种优先级和补货、
|
||||
@@ -245,7 +255,8 @@
|
||||
Windows 密码加密保存/恢复、登录失败保留密码、调试窗与脱敏日志,
|
||||
以及 Qt 截图按钮只读、不点击手机、配置恢复、图片变更失效、
|
||||
设备/分辨率检查、两种区服编号下密码登录及选二区的 loopback HTTP 链路、
|
||||
缺失/冲突编号停止、Qt 登录回调错误处理、委托、地图和牧场策略。
|
||||
缺失/冲突编号停止、Qt 登录回调错误处理、委托、地图和牧场策略;
|
||||
另覆盖物品分类、赠礼上限/间隔/保留、策略脱敏导入导出及两种退出登录行为。
|
||||
开发测试未向官方服务提交真实账号凭据,未对真实库存执行购蛋、派遣、喂养、委托或刷图。
|
||||
用户已验证登录和角色读取;本次买蛋循环及多账号并行由本地模拟服务验证,真实账号效果仍需用户启动后验证。按钮配置需当前页面样本。
|
||||
- 网络写请求发生异常后不会直接重试,以免重复消耗魔物或物品。
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -9,12 +9,14 @@ from .sweeping import SweepPolicy, SweepRunner
|
||||
from .quests import QuestPolicy, TaskPlanner
|
||||
from .market import PurchaseBudget
|
||||
from .management import expansion_quote, manual_monster_actions
|
||||
from .gifts import GiftPlanner
|
||||
|
||||
|
||||
class Engine:
|
||||
def __init__(self, catalog, client=None, budget_path=None):
|
||||
self.catalog, self.client = catalog, client
|
||||
self.planner = Planner(catalog)
|
||||
self.gift_planner = GiftPlanner(catalog)
|
||||
self.policy = Policy()
|
||||
self.quest_policy = QuestPolicy()
|
||||
self.tasks = TaskPlanner(catalog)
|
||||
@@ -194,7 +196,7 @@ class Engine:
|
||||
daily = [row.action for row in selected_entries(self.catalog, self.snapshot, self.daily_policy, self.daily_ledger)] if self.daily_policy.enabled else []
|
||||
sweep = self.sweeper.next(self.snapshot, self.sweep_policy) if self.sweep_policy.enabled and not self.demo else None
|
||||
sweep_actions = [Action(kind="sweep", path="", payload={}, description=f"扫荡 {sweep.number} {sweep.name} / 难度{sweep.level}")] if sweep else []
|
||||
return daily + quests + self.planner.plan(self.snapshot, policy, left) + sweep_actions
|
||||
return daily + quests + self.gift_planner.plan(self.snapshot, policy, self.quest_policy) + self.planner.plan(self.snapshot, policy, left) + sweep_actions
|
||||
|
||||
def claim_daily_entry(self, entry):
|
||||
self.daily_ledger.record(self.snapshot, entry.key)
|
||||
@@ -340,6 +342,14 @@ class Engine:
|
||||
target = self.snapshot.monsters[action.payload["targetId"]]
|
||||
target["exp"] = target.get("exp", 0) + self.catalog.feed_exp(mon)
|
||||
raw["monsters"] = [m for m in raw["monsters"] if m["id"] != mid]
|
||||
elif action.kind == "gift":
|
||||
target = self.snapshot.monsters[action.payload["monsterId"]]
|
||||
item = next(i for i in raw["items"] if int(i["typeId"]) == action.payload["itemId"])
|
||||
gain = int(self.catalog.monster(target.get("typeId")).get("like", {}).get(str(item["typeId"]), 0))
|
||||
target["feel"] = max(0, min(self.catalog.max_feel(target), int(target.get("feel") or 0) + gain))
|
||||
target["giftTime"] = int(time.time())
|
||||
item["num"] -= 1
|
||||
return
|
||||
else:
|
||||
egg = action.payload["eggs"][0]
|
||||
item = next(i for i in raw["items"] if i["id"] == egg["itemId"])
|
||||
@@ -408,8 +418,8 @@ def demo_snapshot(catalog):
|
||||
monsters.append(mon)
|
||||
target = dict(monsters[0]) | {"id": 900, "process": 3, "mode": 2, "level": 20, "potentialLevel": 7, "roomId": 1, "lock": 1}
|
||||
room_type = next(k for k, row in catalog.data["room_info"].items() if row.get("maxNum", 0) >= 10)
|
||||
return Snapshot({"master": {"id": 1, "roleName": "离线演示", "level": 62, "money": 12345, "ke": 2000, "ti": 100},
|
||||
return Snapshot({"master": {"id": 1, "roleName": "离线演示", "level": 62, "exp": 456789, "money": 12345, "ke": 2000, "ti": 100},
|
||||
"stacks": [{"id": i + 1, "position": i, "monsterId": 101 + i if i < 4 else 0, "openType": 3} for i in range(6)],
|
||||
"monsters": monsters + [target], "items": [{"id": 501 + i, "typeId": t, "num": 8} for i, t in enumerate(types)] + [{"id": 600, "typeId": 20047, "num": 3}],
|
||||
"rooms": [{"id": 1, "typeId": int(room_type), "openType": 3}], "teams": [{"monsters": [900]}], "activityHistory": {},
|
||||
"rooms": [{"id": 1, "typeId": int(room_type), "openType": 3, "name": "主牧场"}], "teams": [{"monsters": [900]}], "activityHistory": {},
|
||||
"history": {"unlockCity": {"1": True}, "openFarmBuild": True, "numAddStack": 0, "numKeAddStack": 0, "numAddRoom": 0, "numKeAddRoom": 0}})
|
||||
|
||||
@@ -0,0 +1,66 @@
|
||||
"""Conservative item gifting, using the original client's caps and cooldown."""
|
||||
from .model import Action, seconds
|
||||
|
||||
|
||||
def item_reserve(item_type, ranch, quests):
|
||||
return max(int(ranch.reserved_eggs.get(item_type, 0)), int(quests.item_reserves.get(item_type, 0)))
|
||||
|
||||
|
||||
class GiftPlanner:
|
||||
def __init__(self, catalog):
|
||||
self.catalog = catalog
|
||||
self.notes = []
|
||||
|
||||
def target(self, snapshot, policy):
|
||||
for key, _ in sorted(policy.gift_targets.items(), key=lambda pair: pair[1]):
|
||||
mon = snapshot.monsters.get(int(key))
|
||||
if not mon or mon.get("process") != 3:
|
||||
continue
|
||||
limit = self.catalog.max_feel(mon)
|
||||
if int(mon.get("feel") or 0) < limit:
|
||||
return mon, limit
|
||||
return None, 0
|
||||
|
||||
def plan(self, snapshot, policy, quest_policy=None):
|
||||
self.notes = []
|
||||
if not policy.gift_enabled:
|
||||
return []
|
||||
if not any(rule.get("enabled") for rule in policy.gift_items.values()):
|
||||
self.notes.append("自动赠礼:请先在“背包”勾选允许使用的物品")
|
||||
return []
|
||||
target, limit = self.target(snapshot, policy)
|
||||
if not target:
|
||||
self.notes.append("自动赠礼:未选择目标,或目标已达到当前好感上限")
|
||||
return []
|
||||
cooldown = int(self.catalog.data["game_setting"].get("monGiftTime", 7200))
|
||||
elapsed = snapshot.now - seconds(target.get("giftTime"))
|
||||
if elapsed < cooldown:
|
||||
self.notes.append(f"自动赠礼:{self.catalog.monster_label(target)} 还需等待 {int(cooldown - elapsed)} 秒")
|
||||
return []
|
||||
likes = self.catalog.monster(target.get("typeId")).get("like") or {}
|
||||
totals, blocked = {}, set()
|
||||
for item in snapshot.raw["items"]:
|
||||
key = str(item.get("typeId"))
|
||||
totals[key] = totals.get(key, 0) + int(item.get("num") or 0)
|
||||
if item.get("lock") or item.get("feedLock"):
|
||||
blocked.add(key)
|
||||
stocks = {}
|
||||
for key, rule in policy.gift_items.items():
|
||||
if not rule.get("enabled") or totals.get(key, 0) <= 0:
|
||||
continue
|
||||
if self.catalog.item_type(key) in (5, 6) or key in blocked:
|
||||
continue
|
||||
if not self.catalog.item(key).get("sellable"):
|
||||
continue
|
||||
reserve = item_reserve(key, policy, quest_policy) if quest_policy else int(rule.get("reserve", 0))
|
||||
available = max(0, totals[key] - max(int(rule.get("reserve", 0)), reserve))
|
||||
if available and (not policy.gift_liked_only or int(likes.get(key, 0)) > 0):
|
||||
stocks[key] = available
|
||||
if not stocks:
|
||||
self.notes.append("自动赠礼:背包中没有符合开关、保留数量和偏好规则的物品")
|
||||
return []
|
||||
key = max(stocks, key=lambda k: (int(likes.get(k, 0)), stocks[k], -int(k)))
|
||||
gain = int(likes.get(key, 0))
|
||||
name = self.catalog.item_name(key)
|
||||
return [Action("gift", f"赠礼 {self.catalog.monster_label(target)} ← {name}(好感 {target.get('feel', 0)}/{limit},预计 {gain:+d})",
|
||||
"monsterService/monsterSendGift", {"monsterId": int(target["id"]), "itemId": int(key)})]
|
||||
+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("旧设置无法读取,已使用默认设置")
|
||||
|
||||
|
||||
@@ -0,0 +1,111 @@
|
||||
"""Native, incremental inventory and combined ranch/monster views."""
|
||||
import copy
|
||||
from dataclasses import asdict
|
||||
from PySide6 import QtCore as C, QtWidgets as W
|
||||
|
||||
from .native_widgets import IntegerInput, RowBatch
|
||||
|
||||
ITEM_TYPES = [(0, "全部物品"), (6, "魔物蛋"), (1, "可使用"), (2, "消耗品"), (3, "材料"), (4, "其他"), (5, "装备")]
|
||||
|
||||
|
||||
class InventoryTable(W.QTableWidget):
|
||||
gifts_changed = C.Signal(object, str)
|
||||
|
||||
def __init__(self, catalog):
|
||||
super().__init__(0, 8)
|
||||
self.catalog, self.snapshot, self.rules = catalog, None, {}
|
||||
self.setHorizontalHeaderLabels(["物品ID", "名称", "分类", "品质", "数量", "售价", "允许赠礼", "至少保留"])
|
||||
self.setEditTriggers(W.QAbstractItemView.EditTrigger.NoEditTriggers)
|
||||
self.setSelectionBehavior(W.QAbstractItemView.SelectionBehavior.SelectRows)
|
||||
self.horizontalHeader().setSectionResizeMode(W.QHeaderView.ResizeMode.Interactive)
|
||||
for column, width in enumerate((170, 170, 75, 55, 70, 80, 90, 90)):
|
||||
self.setColumnWidth(column, width)
|
||||
self.verticalHeader().setDefaultSectionSize(24)
|
||||
self.row_batch = RowBatch(self)
|
||||
self.search, self.category = "", 0
|
||||
|
||||
def set_filter(self, text="", category=0):
|
||||
self.search, self.category = text.strip().lower(), category
|
||||
self.render_signature = None
|
||||
|
||||
def set_data(self, snapshot, rules):
|
||||
self.snapshot, self.rules = snapshot, copy.deepcopy(rules)
|
||||
rows = [i for i in snapshot.raw["items"] if int(i.get("num") or 0) > 0]
|
||||
if self.category:
|
||||
rows = [i for i in rows if self.catalog.item_type(i.get("typeId")) == self.category]
|
||||
if self.search:
|
||||
rows = [i for i in rows if self.search in str(i.get("typeId")) or self.search in self.catalog.item_name(i.get("typeId")).lower()]
|
||||
groups = {}
|
||||
for item in rows:
|
||||
key = str(item.get("typeId"))
|
||||
group = groups.setdefault(key, {"item": item, "count": 0, "ids": []})
|
||||
group["count"] += int(item.get("num") or 0)
|
||||
group["ids"].append(str(item.get("id")))
|
||||
rows = [group["item"] | {"num": group["count"], "inventoryIds": group["ids"]} for group in groups.values()]
|
||||
signature = (repr(rows), self.rules, self.category, self.search)
|
||||
if getattr(self, "render_signature", None) == signature:
|
||||
return
|
||||
self.setSortingEnabled(False)
|
||||
self.setRowCount(len(rows))
|
||||
def apply(entry):
|
||||
index, item = entry
|
||||
key = str(item["typeId"])
|
||||
info, rule = self.catalog.item(key), self.rules.get(key, {})
|
||||
if str(key) in self.catalog.monsters:
|
||||
info = self.catalog.monster(key) | {"itemType": 6}
|
||||
type_id = self.catalog.item_type(key)
|
||||
values = [", ".join(item["inventoryIds"]), self.catalog.item_name(key), dict(ITEM_TYPES)[type_id], info.get("quality", info.get("star", "")),
|
||||
item.get("num", 0), info.get("sellMoney", ""), "", ""]
|
||||
for column, value in enumerate(values):
|
||||
cell = self.item(index, column) or W.QTableWidgetItem()
|
||||
cell.setData(C.Qt.ItemDataRole.DisplayRole, value)
|
||||
if column == 0:
|
||||
cell.setData(C.Qt.ItemDataRole.UserRole, key)
|
||||
self.setItem(index, column, cell)
|
||||
eligible = type_id not in (5, 6) and bool(info.get("sellable"))
|
||||
check, reserve = self.cellWidget(index, 6), self.cellWidget(index, 7)
|
||||
if check and check.property("item_type") == key:
|
||||
blockers = [C.QSignalBlocker(check), C.QSignalBlocker(reserve)]
|
||||
check.setChecked(bool(rule.get("enabled")))
|
||||
reserve.setValue(int(rule.get("reserve", 0)))
|
||||
check.setEnabled(eligible)
|
||||
reserve.setEnabled(eligible)
|
||||
return
|
||||
check, reserve = W.QCheckBox(), IntegerInput()
|
||||
check.setProperty("item_type", key)
|
||||
check.setEnabled(eligible)
|
||||
check.setChecked(bool(rule.get("enabled")))
|
||||
check.setToolTip("只有勾选的非装备、非魔物蛋物品才可能用于赠礼" if eligible else "此类物品不进入自动赠礼")
|
||||
reserve.setRange(0, 1000000000)
|
||||
reserve.setValue(int(rule.get("reserve", 0)))
|
||||
reserve.setEnabled(eligible)
|
||||
def commit(*args, key=key, check=check, reserve=reserve):
|
||||
self.rules[key] = {"enabled": check.isChecked(), "reserve": reserve.value()}
|
||||
self.gifts_changed.emit(copy.deepcopy(self.rules), key)
|
||||
check.toggled.connect(commit)
|
||||
reserve.valueChanged.connect(commit)
|
||||
self.setCellWidget(index, 6, check)
|
||||
self.setCellWidget(index, 7, reserve)
|
||||
def finish():
|
||||
self.setSortingEnabled(True)
|
||||
self.render_signature = copy.deepcopy(signature)
|
||||
self.row_batch.start(enumerate(rows), apply, finish)
|
||||
|
||||
|
||||
class RanchView(W.QSplitter):
|
||||
def __init__(self, rooms, monsters):
|
||||
super().__init__(C.Qt.Orientation.Vertical)
|
||||
self.rooms, self.monsters = rooms, monsters
|
||||
self.grouped = True
|
||||
self.room_id = 0
|
||||
self.setChildrenCollapsible(False)
|
||||
self.addWidget(rooms)
|
||||
self.addWidget(monsters)
|
||||
self.setStretchFactor(0, 0)
|
||||
self.setStretchFactor(1, 1)
|
||||
self.setSizes([100, 440])
|
||||
|
||||
def set_view(self, grouped, room_id=0):
|
||||
self.grouped, self.room_id = grouped, room_id
|
||||
self.rooms.setVisible(grouped)
|
||||
self.setSizes([100, 440] if grouped else [0, 540])
|
||||
@@ -135,6 +135,27 @@ class Catalog:
|
||||
names = self.data.get("item_names", {})
|
||||
return "、".join(f"{names.get(str(key), str(key))}(+{value})" for key, value in sorted(likes.items(), key=lambda pair: pair[1], reverse=True) if value > 0) or "无已知偏好"
|
||||
|
||||
def master_experience(self, master):
|
||||
level = int(master.get("level") or 1)
|
||||
table = self.data.get("farm_level", {})
|
||||
current, following = table.get(str(level)), table.get(str(level + 1))
|
||||
if following is None:
|
||||
return f"{master.get('exp', '?')} / 已满级"
|
||||
return f"{master.get('exp', 0)} / {following}"
|
||||
|
||||
def max_feel(self, mon):
|
||||
table = self.data.get("entangle_info", {}).get("haoganMax", {})
|
||||
return int(table.get(str(int(mon.get("entangleLevel") or 0)), 100))
|
||||
|
||||
def item(self, type_id):
|
||||
return self.data.get("item_info", {}).get(str(type_id), {})
|
||||
|
||||
def item_name(self, type_id):
|
||||
return self.monster(type_id).get("name") or self.item(type_id).get("name") or self.data.get("item_names", {}).get(str(type_id), str(type_id))
|
||||
|
||||
def item_type(self, type_id):
|
||||
return 6 if str(type_id) in self.monsters else int(self.item(type_id).get("itemType") or 4)
|
||||
|
||||
|
||||
@dataclass
|
||||
class Snapshot:
|
||||
@@ -274,10 +295,17 @@ class Policy:
|
||||
manual_eggs: bool = False
|
||||
egg_rules: dict[str, dict] = field(default_factory=dict)
|
||||
feed_targets: dict[str, int] = field(default_factory=dict)
|
||||
gift_enabled: bool = False
|
||||
gift_targets: dict[str, int] = field(default_factory=dict)
|
||||
gift_items: dict[str, dict] = field(default_factory=dict)
|
||||
gift_liked_only: bool = True
|
||||
|
||||
def __post_init__(self):
|
||||
self.egg_rules = {str(int(key)): asdict(EggRule(**rule)) for key, rule in self.egg_rules.items()}
|
||||
self.feed_targets = {str(int(key)): int(priority) for key, priority in self.feed_targets.items() if int(key) > 0 and 1 <= int(priority) <= 999}
|
||||
self.gift_targets = {str(int(key)): int(priority) for key, priority in self.gift_targets.items() if int(key) > 0 and 1 <= int(priority) <= 999}
|
||||
self.gift_items = {str(int(key)): {"enabled": bool(rule.get("enabled")), "reserve": max(0, int(rule.get("reserve", 0)))}
|
||||
for key, rule in self.gift_items.items()}
|
||||
|
||||
|
||||
@dataclass
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
"""Portable rule sets; credentials, sessions and local paths never enter files."""
|
||||
from dataclasses import asdict
|
||||
from .model import Policy
|
||||
|
||||
FORMAT = "ranch-helper-policies"
|
||||
VERSION = 1
|
||||
|
||||
|
||||
def portable_policy(policy, snapshot=None):
|
||||
value = asdict(policy)
|
||||
value["enabled"] = False
|
||||
for field in ("buy", "collect", "dispatch", "feed", "fill", "gift_enabled"):
|
||||
value[field] = False
|
||||
targets = {}
|
||||
for kind, field in (("feed", "feed_targets"), ("gift", "gift_targets")):
|
||||
targets[kind] = []
|
||||
for key, priority in sorted(value.pop(field).items(), key=lambda pair: pair[1]):
|
||||
mon = snapshot.monsters.get(int(key)) if snapshot else None
|
||||
targets[kind].append({"typeId": str(mon.get("typeId")) if mon else "", "priority": priority})
|
||||
return {"format": FORMAT, "schema": VERSION, "assistantVersion": "1.1.0", "gameVersion": "1.9.68",
|
||||
"policy": value, "targetSpecies": targets}
|
||||
|
||||
|
||||
def import_policy(value, snapshot=None):
|
||||
if not isinstance(value, dict) or value.get("format") != FORMAT or value.get("schema") != VERSION or not isinstance(value.get("policy"), dict):
|
||||
raise ValueError("不是受支持的辅助策略文件")
|
||||
policy = Policy(**value["policy"])
|
||||
if snapshot:
|
||||
used = {"feed": set(), "gift": set()}
|
||||
for kind, field in (("feed", "feed_targets"), ("gift", "gift_targets")):
|
||||
result = {}
|
||||
for rule in value.get("targetSpecies", {}).get(kind, []):
|
||||
key = str(rule.get("typeId", ""))
|
||||
for mon in sorted(snapshot.raw["monsters"], key=lambda m: int(m["id"])):
|
||||
if str(mon.get("typeId")) == key and mon.get("process") == 3 and int(mon["id"]) not in used[kind]:
|
||||
result[str(mon["id"])] = int(rule["priority"])
|
||||
used[kind].add(int(mon["id"]))
|
||||
break
|
||||
setattr(policy, field, result)
|
||||
else:
|
||||
policy.feed_targets, policy.gift_targets = {}, {}
|
||||
return policy
|
||||
@@ -3,13 +3,14 @@ from dataclasses import dataclass
|
||||
from .maps import stages
|
||||
|
||||
|
||||
def monster_rows(catalog, snapshot, managed):
|
||||
def monster_rows(catalog, snapshot, managed, room_id=0):
|
||||
return [[m["id"], m.get("nicName") or catalog.monster(m["typeId"]).get("name", "未知"), catalog.monster(m["typeId"]).get("star", "?"),
|
||||
f"{m.get('level', 1)} / {catalog.max_level(m) or '?'}", catalog.quality_text(m),
|
||||
"培育室 · " + snapshot.phase_text(m, catalog) if m.get("process") == 2 else f"牧场 {m.get('roomId', 0)}",
|
||||
"系统锁定" if m.get("sysLock") else "是" if m.get("lock") else "否",
|
||||
"本次培育" if int(m["id"]) in managed else "已有:不自动处理", "", "", m.get("potentialLevel", "?"),
|
||||
*catalog.reference_stats(m), m.get("feel", "?"), catalog.likes_text(m["typeId"])] for m in snapshot.raw["monsters"]]
|
||||
*catalog.reference_stats(m), f"{m.get('feel', 0)} / {catalog.max_feel(m)}", catalog.likes_text(m["typeId"]), "", ""] for m in snapshot.raw["monsters"]
|
||||
if not room_id or m.get("process") == 3 and int(m.get("roomId") or 0) == room_id]
|
||||
|
||||
|
||||
def map_source(snapshot):
|
||||
|
||||
@@ -0,0 +1,199 @@
|
||||
import copy
|
||||
from dataclasses import asdict
|
||||
import json
|
||||
import os
|
||||
from pathlib import Path
|
||||
import unittest
|
||||
from unittest.mock import patch
|
||||
|
||||
os.environ.setdefault("QT_QPA_PLATFORM", "offscreen")
|
||||
from PySide6 import QtCore as C, QtWidgets as W
|
||||
from PySide6.QtTest import QTest
|
||||
|
||||
from ranch_assistant.engine import Engine, demo_snapshot
|
||||
from ranch_assistant.api import Session
|
||||
from ranch_assistant.gifts import GiftPlanner
|
||||
from ranch_assistant.gui import Window
|
||||
from ranch_assistant.model import Action, Catalog, Policy
|
||||
from ranch_assistant.policy_io import import_policy, portable_policy
|
||||
from ranch_assistant.quests import QuestPolicy
|
||||
from ranch_assistant.sessions import SessionStore
|
||||
from ranch_assistant.tests.test_core import workspace_temp
|
||||
|
||||
|
||||
class GiftTests(unittest.TestCase):
|
||||
def setUp(self):
|
||||
self.catalog = Catalog()
|
||||
self.snapshot = demo_snapshot(self.catalog)
|
||||
self.target = self.snapshot.monsters[900]
|
||||
self.target.update(feel=0, entangleLevel=0, giftTime=0)
|
||||
self.liked = next(key for key, value in self.catalog.monster(self.target["typeId"])["like"].items() if value > 0)
|
||||
self.disliked = next(key for key, value in self.catalog.monster(self.target["typeId"])["like"].items() if value < 0)
|
||||
self.snapshot.raw["items"] += [{"id": 2000, "typeId": int(self.liked), "num": 3},
|
||||
{"id": 2001, "typeId": int(self.disliked), "num": 30}]
|
||||
self.policy = Policy(gift_enabled=True, gift_targets={"900": 1},
|
||||
gift_items={self.liked: {"enabled": True, "reserve": 2}, self.disliked: {"enabled": True, "reserve": 0}})
|
||||
self.planner = GiftPlanner(self.catalog)
|
||||
|
||||
def test_defaults_never_consume_items(self):
|
||||
self.assertEqual(self.planner.plan(self.snapshot, Policy()), [])
|
||||
self.policy.gift_items[self.liked]["enabled"] = False
|
||||
self.policy.gift_items[self.disliked]["enabled"] = False
|
||||
self.assertEqual(self.planner.plan(self.snapshot, self.policy), [])
|
||||
|
||||
def test_liked_item_respects_reserve_cap_and_cooldown(self):
|
||||
action = self.planner.plan(self.snapshot, self.policy)[0]
|
||||
self.assertEqual(action.payload, {"monsterId": 900, "itemId": int(self.liked)})
|
||||
self.snapshot.raw["items"][-2]["num"] = 2
|
||||
self.assertEqual(self.planner.plan(self.snapshot, self.policy), [])
|
||||
self.snapshot.raw["items"][-2]["num"] = 3
|
||||
self.target["giftTime"] = int(self.snapshot.now * 1000)
|
||||
self.assertEqual(self.planner.plan(self.snapshot, self.policy), [])
|
||||
self.target.update(feel=100, entangleLevel=0)
|
||||
self.assertEqual(self.planner.plan(self.snapshot, self.policy), [])
|
||||
self.target.update(entangleLevel=1)
|
||||
self.target["giftTime"] = 0
|
||||
self.assertTrue(self.planner.plan(self.snapshot, self.policy))
|
||||
|
||||
def test_optional_neutral_or_disliked_requires_disabling_preference_guard(self):
|
||||
self.policy.gift_items[self.liked]["enabled"] = False
|
||||
self.assertEqual(self.planner.plan(self.snapshot, self.policy), [])
|
||||
self.policy.gift_liked_only = False
|
||||
self.assertEqual(self.planner.plan(self.snapshot, self.policy)[0].payload["itemId"], int(self.disliked))
|
||||
|
||||
def test_quest_reserves_take_precedence(self):
|
||||
self.assertEqual(self.planner.plan(self.snapshot, self.policy, QuestPolicy(item_reserves={self.liked: 3})), [])
|
||||
|
||||
def test_demo_consumes_one_item_and_clamps_feel(self):
|
||||
engine = Engine(self.catalog)
|
||||
engine.snapshot = self.snapshot
|
||||
action = self.planner.plan(self.snapshot, self.policy)[0]
|
||||
engine.apply_demo(action)
|
||||
self.assertEqual(self.snapshot.raw["items"][-2]["num"], 2)
|
||||
self.assertEqual(self.target["feel"], int(self.catalog.monster(self.target["typeId"])["like"][self.liked]))
|
||||
self.assertGreater(self.target["giftTime"], 0)
|
||||
|
||||
|
||||
class PolicyFileTests(unittest.TestCase):
|
||||
def test_export_has_no_instance_ids_or_credentials_and_import_matches_species(self):
|
||||
snapshot = demo_snapshot(Catalog())
|
||||
snapshot.monsters[900]["feel"] = 0
|
||||
policy = Policy(feed_targets={"900": 2}, gift_targets={"900": 3},
|
||||
gift_items={"30001": {"enabled": True, "reserve": 4}})
|
||||
exported = portable_policy(policy, snapshot)
|
||||
text = json.dumps(exported)
|
||||
self.assertNotIn("900", text)
|
||||
self.assertNotIn("token", text.lower())
|
||||
imported = import_policy(exported, snapshot)
|
||||
self.assertFalse(imported.enabled)
|
||||
self.assertFalse(imported.gift_enabled)
|
||||
self.assertEqual(imported.feed_targets, {"900": 2})
|
||||
self.assertEqual(imported.gift_targets, {"900": 3})
|
||||
self.assertEqual(imported.gift_items["30001"]["reserve"], 4)
|
||||
with self.assertRaises(ValueError):
|
||||
import_policy({"policy": {}})
|
||||
|
||||
|
||||
class V11GuiTests(unittest.TestCase):
|
||||
@classmethod
|
||||
def setUpClass(cls):
|
||||
cls.app = W.QApplication.instance() or W.QApplication([])
|
||||
|
||||
def wait(self, window):
|
||||
for _ in range(400):
|
||||
self.app.processEvents()
|
||||
QTest.qWait(3)
|
||||
if not window.busy:
|
||||
return
|
||||
self.fail("Offline job did not finish")
|
||||
|
||||
def test_layout_inventory_gifts_and_master_exp(self):
|
||||
with workspace_temp() as folder:
|
||||
window = Window(folder)
|
||||
window.timer.stop()
|
||||
try:
|
||||
self.wait(window)
|
||||
labels = [window.tabs.tabText(i) for i in range(window.tabs.count())]
|
||||
self.assertLess(labels.index("背包"), labels.index("牧场"))
|
||||
self.assertLess(labels.index("牧场"), labels.index("自动孵蛋"))
|
||||
self.assertNotIn("魔物", labels)
|
||||
self.assertNotIn("牧场策略", labels)
|
||||
self.assertIn("Lv.62", window.summary.text())
|
||||
self.assertIn("经验", window.summary.text())
|
||||
self.assertNotIn("真实", window.data_summary.text())
|
||||
self.assertIn("退出登录并清除登录记录", window.log.toPlainText() + " ".join(b.text() for b in window.tabs.widget(0).findChildren(W.QPushButton)))
|
||||
window.tabs.setCurrentWidget(window.inventory_tabs)
|
||||
window.inventory_tabs.setCurrentIndex(1)
|
||||
self.wait(window)
|
||||
for _ in range(80):
|
||||
self.app.processEvents()
|
||||
QTest.qWait(2)
|
||||
self.assertGreater(window.inventory.rowCount(), 1)
|
||||
egg = window.engine.snapshot.eggs(window.catalog)[0]
|
||||
egg_row = next(i for i in range(window.inventory.rowCount()) if window.inventory.item(i, 0).data(C.Qt.ItemDataRole.UserRole) == str(egg["typeId"]))
|
||||
self.assertEqual(window.inventory.item(egg_row, 1).text(), window.catalog.monster(egg["typeId"])["name"])
|
||||
key = str(window.catalog.monster(window.engine.snapshot.monsters[900]["typeId"])["like"].keys().__iter__().__next__())
|
||||
window.engine.snapshot.raw["items"].append({"id": 3000, "typeId": int(key), "num": 3})
|
||||
window.inventory.set_data(window.engine.snapshot, {})
|
||||
for _ in range(100):
|
||||
self.app.processEvents()
|
||||
QTest.qWait(2)
|
||||
row = next(i for i in range(window.inventory.rowCount()) if window.inventory.item(i, 0).data(C.Qt.ItemDataRole.UserRole) == key)
|
||||
window.inventory.cellWidget(row, 6).setChecked(True)
|
||||
self.assertTrue(window.read_policy().gift_items[key]["enabled"])
|
||||
window.tabs.setCurrentWidget(window.room_page)
|
||||
for _ in range(100):
|
||||
self.app.processEvents()
|
||||
QTest.qWait(2)
|
||||
target_row = next(i for i in range(window.monsters.rowCount()) if window.monsters.item(i, 0).text() == "900")
|
||||
window.monsters.cellWidget(target_row, 17).setChecked(True)
|
||||
self.assertIn("900", window.read_policy().gift_targets)
|
||||
window.monster_view.setCurrentIndex(1)
|
||||
self.assertTrue(window.rooms_table.isHidden())
|
||||
finally:
|
||||
window.close()
|
||||
|
||||
def test_logout_keeps_records_and_clear_only_removes_current_profile(self):
|
||||
with workspace_temp() as folder, workspace_temp() as other:
|
||||
for root in (folder, other):
|
||||
path = Path(root)
|
||||
SessionStore(path).save(Session(server_url="https://example.invalid/", token="local-test", role_id=1), "本地测试")
|
||||
(path / "roles" / "role").mkdir(parents=True)
|
||||
(path / "roles" / "role" / "settings.json").write_text("{}", encoding="utf-8")
|
||||
window = Window(folder)
|
||||
window.timer.stop()
|
||||
try:
|
||||
self.wait(window)
|
||||
window.demo()
|
||||
self.wait(window)
|
||||
self.assertEqual(len(list((Path(folder) / "sessions").glob("*.json"))), 1)
|
||||
self.assertTrue((Path(folder) / "roles" / "role" / "settings.json").exists())
|
||||
with patch("ranch_assistant.gui.W.QMessageBox.question", return_value=W.QMessageBox.StandardButton.Yes):
|
||||
window.logout_and_clear()
|
||||
self.assertEqual(list((Path(folder) / "sessions").glob("*.json")), [])
|
||||
self.assertTrue((Path(folder) / "roles" / "role" / "settings.json").exists())
|
||||
self.assertEqual(len(list((Path(other) / "sessions").glob("*.json"))), 1)
|
||||
self.assertEqual(window.account.text(), "")
|
||||
self.assertEqual(window.password.text(), "")
|
||||
finally:
|
||||
window.close()
|
||||
|
||||
def test_policy_import_keeps_auto_execution_stopped(self):
|
||||
with workspace_temp() as folder:
|
||||
window = Window(folder)
|
||||
window.timer.stop()
|
||||
try:
|
||||
self.wait(window)
|
||||
policy = Policy(gift_enabled=True)
|
||||
path = Path(folder) / "import.json"
|
||||
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.read_policy().gift_enabled)
|
||||
finally:
|
||||
window.close()
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
@@ -10,11 +10,25 @@ root = Path(__file__).resolve().parent.parent
|
||||
sys.path.insert(0, str(root))
|
||||
from ranch_assistant.amf import Reader
|
||||
|
||||
|
||||
def repair_names(value):
|
||||
"""Recover legacy GBK text decoded with the wrong single-byte codec."""
|
||||
if isinstance(value, dict):
|
||||
return {key: repair_names(item) for key, item in value.items()}
|
||||
if isinstance(value, list):
|
||||
return [repair_names(item) for item in value]
|
||||
if isinstance(value, str):
|
||||
try:
|
||||
return value.encode("latin1").decode("gbk")
|
||||
except (UnicodeEncodeError, UnicodeDecodeError):
|
||||
return value
|
||||
return value
|
||||
|
||||
apk = next(p for p in root.glob("*.apk") if p.name.endswith("_1.9.68.apk"))
|
||||
tables = {}
|
||||
with zipfile.ZipFile(apk) as archive:
|
||||
tables["tjchannel"] = json.loads(archive.read("assets/tjchannel.json")) if "assets/tjchannel.json" in archive.namelist() else {"tjchannel": "unknow"}
|
||||
for name in ("monster_info", "monster_level", "room_info", "game_setting", "stage_info", "stage_sp", "activity_info", "server_info", "task_info", "gacha_machine", "potential_info", "stack_price", "room_price", "item_info"):
|
||||
for name in ("monster_info", "monster_level", "farm_level", "entangle_info", "room_info", "game_setting", "stage_info", "stage_sp", "activity_info", "server_info", "task_info", "gacha_machine", "potential_info", "stack_price", "room_price", "item_info"):
|
||||
path = "data/table/" + name + ".json"
|
||||
raw = zlib.decompress(archive.read("assets/codes/" + hashlib.md5(path.encode()).hexdigest()))
|
||||
reader = Reader(raw)
|
||||
@@ -28,7 +42,11 @@ with zipfile.ZipFile(apk) as archive:
|
||||
fields = {"type", "name", "star", "time_1", "time_2", "sell_money", "sell_exp", "hideLib", "npc", "atk", "def", "hp", "dex", "like"}
|
||||
fields |= {p + "_grow_" + bound for p in ("atk", "def", "hp", "dex") for bound in ("min", "max")}
|
||||
tables["monster_info"] = {str(k): {f: v for f, v in row.items() if f in fields} for k, row in tables["monster_info"].items()}
|
||||
tables["item_names"] = {str(key): row.get("name", str(key)) for key, row in tables.pop("item_info").items()}
|
||||
tables = repair_names(tables)
|
||||
tables["item_names"] = {str(key): row.get("name", str(key)) for key, row in tables["item_info"].items()}
|
||||
tables["item_info"] = {str(key): {k: row.get(k) for k in ("name", "itemType", "quality", "sellMoney", "sellable", "useable")}
|
||||
for key, row in tables["item_info"].items()}
|
||||
tables["entangle_info"] = {"haoganMax": tables["entangle_info"]["haoganMax"]}
|
||||
|
||||
# The market button uses sc_city + the selected city ID, even where the table's
|
||||
# legacy city field still says 4. Exclude tavern/premium/event egg machines.
|
||||
@@ -43,7 +61,7 @@ tables["activity_info"] = {k: v for k, v in tables["activity_info"].items() if k
|
||||
# Only positions are needed to avoid starting a sweep through an active story task.
|
||||
tables["stage_task_positions"] = {str(k): [s.get("position", "") for s in r.get("steps", [])] for k, r in tables["task_info"].items()
|
||||
if any(str(s.get("position", "")).startswith("city") for s in r.get("steps", []))}
|
||||
tables["game_setting"] = {k: v for k, v in tables["game_setting"].items() if k in ("monExpScale", "xyz", "xyz1", "cityInfo", "upStarAdd", "maxLike", "vipReward") or k.startswith("loopTask") or k.endswith("_xyz")}
|
||||
tables["game_setting"] = {k: v for k, v in tables["game_setting"].items() if k in ("monExpScale", "xyz", "xyz1", "cityInfo", "upStarAdd", "maxLike", "vipReward", "monGiftTime", "monGiftMax", "masterMaxLevel") or k.startswith("loopTask") or k.endswith("_xyz")}
|
||||
task_fields = {"type", "typeId", "name", "des", "city", "closed", "condition", "startStep", "reward"}
|
||||
step_fields = {"statusType", "statusValue", "condition", "des", "position", "npc", "afterStory", "auto"}
|
||||
tables["task_info"] = {str(k): {f: v for f, v in row.items() if f in task_fields} |
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
"""Add v1.1 item and progression tables using the supplied local APK."""
|
||||
import hashlib
|
||||
import json
|
||||
from pathlib import Path
|
||||
import sys
|
||||
import zipfile
|
||||
import zlib
|
||||
|
||||
root = Path(__file__).resolve().parent.parent
|
||||
sys.path.insert(0, str(root))
|
||||
sys.path.insert(0, str(root / "tools"))
|
||||
from ranch_assistant.amf import Reader
|
||||
from extract_ranch_catalog import repair_names
|
||||
|
||||
|
||||
path = root / "ranch_assistant" / "data" / "catalog.json"
|
||||
data = json.loads(path.read_text(encoding="utf-8"))
|
||||
apk = next(root.glob("*_1.9.68.apk"))
|
||||
with zipfile.ZipFile(apk) as archive:
|
||||
for name in ("item_info", "farm_level", "entangle_info", "game_setting"):
|
||||
table = "data/table/" + name + ".json"
|
||||
raw = zlib.decompress(archive.read("assets/codes/" + hashlib.md5(table.encode()).hexdigest()))
|
||||
value = Reader(raw).read()
|
||||
data[name] = value.get("datas", value)
|
||||
data["item_names"] = {str(key): row.get("name", str(key)) for key, row in data["item_info"].items()}
|
||||
data["item_info"] = {str(key): {k: row.get(k) for k in ("name", "itemType", "quality", "sellMoney", "sellable", "useable")}
|
||||
for key, row in data["item_info"].items()}
|
||||
data["entangle_info"] = {"haoganMax": data["entangle_info"]["haoganMax"]}
|
||||
data["game_setting"] = {k: v for k, v in data["game_setting"].items() if k in ("monExpScale", "xyz", "xyz1", "cityInfo", "upStarAdd", "maxLike", "vipReward", "monGiftTime", "monGiftMax", "masterMaxLevel") or k.startswith("loopTask") or k.endswith("_xyz")}
|
||||
data = repair_names(data)
|
||||
path.write_text(json.dumps(data, ensure_ascii=False, separators=(",", ":")), encoding="utf-8")
|
||||
print("Updated item, level and gift-cap tables from the local 1.9.68 APK.")
|
||||
Reference in New Issue
Block a user