Continue 1.1.0 development with inventory tabs and refresh fix

This commit is contained in:
AttilaNet
2026-11-08 09:36:09 +08:00
parent 25ce032bd6
commit a37627b490
6 changed files with 161 additions and 41 deletions
+2 -2
View File
@@ -25,8 +25,8 @@ python -m unittest discover -s ranch_assistant/tests -v
| 辅助版本 | 《牧羊人之心》Android 客户端版本 | 状态 | | 辅助版本 | 《牧羊人之心》Android 客户端版本 | 状态 |
| --- | --- | --- | | --- | --- | --- |
| 1.1.0(`v1.1.0`) | 1.9.68 | 当前适配版本 | | 1.1.0(`develop/v1.1.0` 分支) | 1.9.68 | 开发中,合并后再发布标签 |
| 1.0.0(`v1.0.0`) | 1.9.68 | 历史版本 | | 1.0.0(`v1.0.0`) | 1.9.68 | 已发布版本 |
本表仅记录已经分析、测试的版本对应关系,不代表对其他客户端版本的兼容承诺。 本表仅记录已经分析、测试的版本对应关系,不代表对其他客户端版本的兼容承诺。
+3 -3
View File
@@ -14,9 +14,9 @@
- 登录与顶部信息:显示角色名、等级、累计经验/下一级经验、金币、氪金和体力。 - 登录与顶部信息:显示角色名、等级、累计经验/下一级经验、金币、氪金和体力。
“退出登录”保留登录记录;“退出登录并清除登录记录”经确认后只清除当前账号页签的凭据和会话。 “退出登录”保留登录记录;“退出登录并清除登录记录”经确认后只清除当前账号页签的凭据和会话。
- 培育室:已开启、未开启和VIP坑位分别显示;支持金币/氪金开普通坑位,先显示费用再确认。 - 培育室:已开启、未开启和VIP坑位分别显示;支持金币/氪金开普通坑位,先显示费用再确认。
- 背包:分为“魔物蛋”和“物品与装备”。魔物蛋逐种勾选孵化、设置优先级、选择孵出后派遣/喂养/保留,设置补货下限、目标和市场。 - 背包:按“魔物蛋、可使用、消耗品、材料、其他、装备”分别显示子标签。魔物蛋逐种勾选孵化、设置优先级、选择孵出后派遣/喂养/保留,设置补货下限、目标和市场。
数量归零后保留规则;可添加当前无库存的蛋。未勾选的蛋不会自动孵化或触发补货。 数量归零后保留规则;可添加当前无库存的蛋。未勾选的蛋不会自动孵化或触发补货。
物品与装备支持分类和名称筛选,显示数量、品质和售价;可为物品设置赠礼开关及至少保留数量。 各物品分类支持名称筛选,显示数量、品质和售价;可为物品设置赠礼开关及至少保留数量。只刷新当前打开的分类表格。
- 牧场:合并魔物与牧场列表,可按牧场筛选或查看全部魔物;按钮或右键可新建金币/氪金牧场,提交前确认费用。 - 牧场:合并魔物与牧场列表,可按牧场筛选或查看全部魔物;按钮或右键可新建金币/氪金牧场,提交前确认费用。
勾选喂养/赠礼目标并分别设置优先级;显示突破、当前等级上限、成长资质、参考属性、当前好感上限和喜欢的物品。 勾选喂养/赠礼目标并分别设置优先级;显示突破、当前等级上限、成长资质、参考属性、当前好感上限和喜欢的物品。
双击查看详情;右键可锁定、解锁、派遣、喂给指定魔物。 双击查看详情;右键可锁定、解锁、派遣、喂给指定魔物。
@@ -70,7 +70,7 @@
已经发送的请求会返回,停止后不发送下一项。重启或恢复会话后需重新点开始执行。 已经发送的请求会返回,停止后不发送下一项。重启或恢复会话后需重新点开始执行。
6. 需要经验时,在“牧场”勾选接收经验的喂养目标并设置优先级。优先级数字小的先喂,达到当前突破上限后换下一个; 6. 需要经验时,在“牧场”勾选接收经验的喂养目标并设置优先级。优先级数字小的先喂,达到当前突破上限后换下一个;
在“自动孵蛋 → 牧场与赠礼策略”可设全局停止等级、星级/资质保护和保留蛋数量。“收益资料”的星级勾选只筛选表格显示。 在“自动孵蛋 → 牧场与赠礼策略”可设全局停止等级、星级/资质保护和保留蛋数量。“收益资料”的星级勾选只筛选表格显示。
7. 需要提升好感时,在“背包 → 物品与装备”勾选物品并设置保留数量,在“牧场”勾选目标并设置赠礼优先级; 7. 需要提升好感时,在“背包”的对应物品分类中勾选物品并设置保留数量,在“牧场”勾选目标并设置赠礼优先级;
在“自动孵蛋 → 牧场与赠礼策略”启用自动赠礼。达到当前好感上限或仍在赠礼间隔时不会继续消耗物品。 在“自动孵蛋 → 牧场与赠礼策略”启用自动赠礼。达到当前好感上限或仍在赠礼间隔时不会继续消耗物品。
同页可导出策略供其他账号导入;导入后需逐项核对并手动开启自动执行。 同页可导出策略供其他账号导入;导入后需逐项核对并手动开启自动执行。
+29 -18
View File
@@ -283,21 +283,25 @@ class Window(ActivityPages, W.QMainWindow):
egg_buttons.addStretch() egg_buttons.addStretch()
egg_layout.addLayout(egg_buttons) egg_layout.addLayout(egg_buttons)
egg_layout.addWidget(self.eggs) egg_layout.addWidget(self.eggs)
self.inventory = InventoryTable(self.catalog)
self.inventory.gifts_changed.connect(self.gift_items_changed)
self.inventory_tabs = W.QTabWidget() self.inventory_tabs = W.QTabWidget()
self.inventory_tabs.addTab(self.egg_page, "魔物蛋") self.inventory_tabs.addTab(self.egg_page, "魔物蛋")
self.inventory_tables = {}
for category, label in ITEM_TYPES:
if category in (0, 6):
continue
item_page = W.QWidget() item_page = W.QWidget()
item_page.setProperty("inventory_category", category)
item_layout = W.QVBoxLayout(item_page) item_layout = W.QVBoxLayout(item_page)
item_tools = W.QHBoxLayout() search = W.QLineEdit()
self.item_search = W.QLineEdit() search.setPlaceholderText("按物品名称或类型编号筛选")
self.item_search.setPlaceholderText("按物品名称或类型编号筛选") inventory = InventoryTable(self.catalog)
self.item_category = combo([(label, value) for value, label in ITEM_TYPES]) inventory.set_filter(category=category)
item_tools.addWidget(self.item_category) inventory.gifts_changed.connect(self.gift_items_changed)
item_tools.addWidget(self.item_search, 1) search.textChanged.connect(lambda text, category=category: self.filter_inventory(category, text))
item_layout.addLayout(item_tools) item_layout.addWidget(search)
item_layout.addWidget(self.inventory) item_layout.addWidget(inventory)
self.inventory_tabs.addTab(item_page, "物品与装备") self.inventory_tables[category] = inventory
self.inventory_tabs.addTab(item_page, label)
self.tabs.addTab(self.inventory_tabs, "背包") self.tabs.addTab(self.inventory_tabs, "背包")
self.egg_page = self.inventory_tabs self.egg_page = self.inventory_tabs
self.egg_rules_page = self.inventory_tabs.widget(0) self.egg_rules_page = self.inventory_tabs.widget(0)
@@ -358,8 +362,6 @@ class Window(ActivityPages, W.QMainWindow):
self.tabs.addTab(page, self.tabs.tabText(self.tabs.indexOf(page))) self.tabs.addTab(page, self.tabs.tabText(self.tabs.indexOf(page)))
self.monster_view.currentIndexChanged.connect(self.monster_view_changed) self.monster_view.currentIndexChanged.connect(self.monster_view_changed)
self.monster_room.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.currentChanged.connect(self.render_current_page)
self.inventory_tabs.setCurrentIndex(0) self.inventory_tabs.setCurrentIndex(0)
self.log = W.QPlainTextEdit() self.log = W.QPlainTextEdit()
@@ -745,6 +747,10 @@ class Window(ActivityPages, W.QMainWindow):
self.update_workflow_status() self.update_workflow_status()
self.statusBar().showMessage("孵蛋规则已保存;下一轮按新规则执行", 5000) self.statusBar().showMessage("孵蛋规则已保存;下一轮按新规则执行", 5000)
def filter_inventory(self, category, text):
self.inventory_tables[category].set_filter(text, category)
self.render_current_page()
def gift_items_changed(self, rules, key): def gift_items_changed(self, rules, key):
self.gift_items = rules self.gift_items = rules
if rules[key]["enabled"]: if rules[key]["enabled"]:
@@ -1626,6 +1632,8 @@ class Window(ActivityPages, W.QMainWindow):
timer.stop() timer.stop()
if hasattr(self.eggs, "row_batch"): if hasattr(self.eggs, "row_batch"):
self.eggs.row_batch.stop() self.eggs.row_batch.stop()
for inventory in self.inventory_tables.values():
inventory.row_batch.stop()
elif self.latest_render: elif self.latest_render:
self.render_current_page() self.render_current_page()
@@ -1638,10 +1646,13 @@ class Window(ActivityPages, W.QMainWindow):
timer = getattr(self, name, None) timer = getattr(self, name, None)
if timer and page is not target: if timer and page is not target:
timer.stop() timer.stop()
if page is not self.egg_page and hasattr(self.eggs, "row_batch"): inventory_page = self.inventory_tabs.currentWidget() if page is self.inventory_tabs else None
active_inventory = self.inventory_tables.get(inventory_page.property("inventory_category")) if inventory_page else None
if inventory_page is not self.egg_rules_page and hasattr(self.eggs, "row_batch"):
self.eggs.row_batch.stop() self.eggs.row_batch.stop()
if page is not self.inventory_tabs and hasattr(self.inventory, "row_batch"): for inventory in self.inventory_tables.values():
self.inventory.row_batch.stop() if inventory is not active_inventory:
inventory.row_batch.stop()
try: try:
if page is self.monster_page: if page is self.monster_page:
self.render_rooms(snapshot) self.render_rooms(snapshot)
@@ -1649,8 +1660,8 @@ class Window(ActivityPages, W.QMainWindow):
elif page is self.inventory_tabs: elif page is self.inventory_tabs:
if self.inventory_tabs.currentWidget() is self.egg_rules_page: if self.inventory_tabs.currentWidget() is self.egg_rules_page:
self.render_egg_rules() self.render_egg_rules()
else: elif active_inventory is not None:
self.inventory.set_data(snapshot, self.gift_items) active_inventory.set_data(snapshot, self.gift_items)
elif page is self.egg_page: elif page is self.egg_page:
self.render_egg_rules() self.render_egg_rules()
elif page is self.room_page: elif page is self.room_page:
+4 -2
View File
@@ -57,11 +57,13 @@ class InventoryTable(W.QTableWidget):
values = [", ".join(item["inventoryIds"]), self.catalog.item_name(key), dict(ITEM_TYPES)[type_id], info.get("quality", info.get("star", "")), 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", ""), "", ""] item.get("num", 0), info.get("sellMoney", ""), "", ""]
for column, value in enumerate(values): for column, value in enumerate(values):
cell = self.item(index, column) or W.QTableWidgetItem() cell = self.item(index, column)
if cell is None:
cell = W.QTableWidgetItem()
self.setItem(index, column, cell)
cell.setData(C.Qt.ItemDataRole.DisplayRole, value) cell.setData(C.Qt.ItemDataRole.DisplayRole, value)
if column == 0: if column == 0:
cell.setData(C.Qt.ItemDataRole.UserRole, key) cell.setData(C.Qt.ItemDataRole.UserRole, key)
self.setItem(index, column, cell)
eligible = type_id not in (5, 6) and bool(info.get("sellable")) eligible = type_id not in (5, 6) and bool(info.get("sellable"))
check, reserve = self.cellWidget(index, 6), self.cellWidget(index, 7) check, reserve = self.cellWidget(index, 6), self.cellWidget(index, 7)
if check and check.property("item_type") == key: if check and check.property("item_type") == key:
@@ -0,0 +1,91 @@
import copy
import os
import unittest
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 demo_snapshot
from ranch_assistant.inventory_gui import InventoryTable
from ranch_assistant.model import Catalog
class InventoryRefreshTests(unittest.TestCase):
@classmethod
def setUpClass(cls):
cls.app = W.QApplication.instance() or W.QApplication([])
def drain(self, table):
for _ in range(200):
if not table.row_batch.running:
return
QTest.qWait(2)
self.fail("Inventory refresh did not finish")
def test_changed_inventory_reuses_cells_without_ownership_warnings(self):
catalog = Catalog()
snapshot = demo_snapshot(catalog)
table = InventoryTable(catalog)
messages = []
previous = C.qInstallMessageHandler(lambda kind, context, message: messages.append(message))
try:
table.set_data(snapshot, {})
self.drain(table)
table.sortItems(1, C.Qt.SortOrder.DescendingOrder)
cells = [table.item(row, 4) for row in range(table.rowCount())]
changed = copy.deepcopy(snapshot)
for item in changed.raw["items"]:
item["num"] += 7
table.set_data(changed, {})
self.drain(table)
counts = {str(item["typeId"]): item["num"] for item in changed.raw["items"]}
for row in range(table.rowCount()):
key = table.item(row, 0).data(C.Qt.ItemDataRole.UserRole)
self.assertEqual(table.item(row, 4).data(C.Qt.ItemDataRole.DisplayRole), counts[key])
self.assertIn(table.item(row, 4), cells)
self.assertEqual([message for message in messages if "already owned" in message], [])
finally:
C.qInstallMessageHandler(previous)
table.row_batch.stop()
table.close()
def test_two_accounts_filter_and_restart_partial_refresh(self):
catalog = Catalog()
snapshot = demo_snapshot(catalog)
keys = list(catalog.monsters)[:100]
snapshot.raw["items"] = [{"id": 1000 + i, "typeId": int(key), "num": i + 1}
for i, key in enumerate(keys)]
tables = [InventoryTable(catalog), InventoryTable(catalog)]
messages = []
previous = C.qInstallMessageHandler(lambda kind, context, message: messages.append(message))
try:
for table in tables:
table.set_data(snapshot, {})
table.set_filter(catalog.item_name(keys[-1]), 6)
table.set_data(snapshot, {})
self.drain(table)
self.assertGreater(table.rowCount(), 0)
table.set_filter()
table.set_data(snapshot, {})
self.drain(table)
table.sortItems(4, C.Qt.SortOrder.DescendingOrder)
changed = copy.deepcopy(snapshot)
changed.raw["items"].reverse()
table.set_data(changed, {})
self.drain(table)
self.assertEqual(table.rowCount(), 100)
for row in range(table.rowCount()):
key = table.item(row, 0).data(C.Qt.ItemDataRole.UserRole)
self.assertEqual(table.cellWidget(row, 6).property("item_type"), key)
self.assertIsNot(tables[0].item(0, 0), tables[1].item(0, 0))
self.assertEqual([message for message in messages if "already owned" in message], [])
finally:
C.qInstallMessageHandler(previous)
for table in tables:
table.row_batch.stop()
table.close()
if __name__ == "__main__":
unittest.main()
+29 -13
View File
@@ -122,25 +122,41 @@ class V11GuiTests(unittest.TestCase):
self.assertIn("经验", window.summary.text()) self.assertIn("经验", window.summary.text())
self.assertNotIn("真实", window.data_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))) self.assertIn("退出登录并清除登录记录", window.log.toPlainText() + " ".join(b.text() for b in window.tabs.widget(0).findChildren(W.QPushButton)))
self.assertEqual([window.inventory_tabs.tabText(i) for i in range(window.inventory_tabs.count())],
["魔物蛋", "可使用", "消耗品", "材料", "其他", "装备"])
for category in window.inventory_tables:
key = next(key for key in window.catalog.data["item_info"] if window.catalog.item_type(key) == category)
window.engine.snapshot.raw["items"].append({"id": 4000 + category, "typeId": int(key), "num": 2})
self.assertTrue(all(table.rowCount() == 0 for table in window.inventory_tables.values()))
window.tabs.setCurrentWidget(window.inventory_tabs) window.tabs.setCurrentWidget(window.inventory_tabs)
window.inventory_tabs.setCurrentIndex(1) for index, (category, inventory) in enumerate(window.inventory_tables.items(), 1):
self.wait(window) window.inventory_tabs.setCurrentIndex(index)
for _ in range(80): while inventory.row_batch.running:
self.app.processEvents()
QTest.qWait(2) QTest.qWait(2)
self.assertGreater(window.inventory.rowCount(), 1) self.assertGreater(inventory.rowCount(), 0)
egg = window.engine.snapshot.eggs(window.catalog)[0] for row in range(inventory.rowCount()):
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"])) key = inventory.item(row, 0).data(C.Qt.ItemDataRole.UserRole)
self.assertEqual(window.inventory.item(egg_row, 1).text(), window.catalog.monster(egg["typeId"])["name"]) self.assertEqual(window.catalog.item_type(key), category)
key = str(window.catalog.monster(window.engine.snapshot.monsters[900]["typeId"])["like"].keys().__iter__().__next__()) 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.engine.snapshot.raw["items"].append({"id": 3000, "typeId": int(key), "num": 3})
window.inventory.set_data(window.engine.snapshot, {}) category = window.catalog.item_type(key)
for _ in range(100): inventory = window.inventory_tables[category]
self.app.processEvents() window.inventory_tabs.setCurrentIndex(list(window.inventory_tables).index(category) + 1)
while inventory.row_batch.running:
QTest.qWait(2) 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) row = next(i for i in range(inventory.rowCount()) if inventory.item(i, 0).data(C.Qt.ItemDataRole.UserRole) == key)
window.inventory.cellWidget(row, 6).setChecked(True) inventory.cellWidget(row, 6).setChecked(True)
self.assertTrue(window.read_policy().gift_items[key]["enabled"]) self.assertTrue(window.read_policy().gift_items[key]["enabled"])
search = window.inventory_tabs.currentWidget().findChild(W.QLineEdit)
search.setText("no-such-inventory-item")
while inventory.row_batch.running:
QTest.qWait(2)
self.assertEqual(inventory.rowCount(), 0)
search.clear()
while inventory.row_batch.running:
QTest.qWait(2)
row = next(i for i in range(inventory.rowCount()) if inventory.item(i, 0).data(C.Qt.ItemDataRole.UserRole) == key)
self.assertTrue(inventory.cellWidget(row, 6).isChecked())
window.tabs.setCurrentWidget(window.room_page) window.tabs.setCurrentWidget(window.room_page)
for _ in range(100): for _ in range(100):
self.app.processEvents() self.app.processEvents()