From e191226ca0774eacf05955f8fdb3fa78567834fb Mon Sep 17 00:00:00 2001 From: AttilaNet Date: Sun, 8 Nov 2026 10:07:47 +0800 Subject: [PATCH] Show all monsters by default on the ranch page --- ranch_assistant/README.md | 2 +- ranch_assistant/gui.py | 1 + ranch_assistant/tests/test_accounts.py | 3 ++- ranch_assistant/tests/test_ranch_tree.py | 6 ++++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ranch_assistant/README.md b/ranch_assistant/README.md index 02a418d..ec73f46 100644 --- a/ranch_assistant/README.md +++ b/ranch_assistant/README.md @@ -20,7 +20,7 @@ - 背包:按“魔物蛋、可使用、消耗品、材料、其他、装备”分别显示子标签。魔物蛋逐种勾选孵化、设置优先级、选择孵出后派遣/喂养/保留,设置补货下限、目标和市场。 数量归零后保留规则;可添加当前无库存的蛋。未勾选的蛋不会自动孵化或触发补货。 各物品分类支持名称筛选,显示数量、品质和售价;可为物品设置赠礼开关及至少保留数量。只刷新当前打开的分类表格。 -- 牧场:合并魔物与牧场列表,可按牧场筛选或查看全部魔物;按钮或右键可新建金币/氪金牧场,提交前确认费用。 +- 牧场:默认显示全部魔物,可手动切换为按牧场分组;按钮或右键可新建金币/氪金牧场,提交前确认费用。 “按牧场分组”使用可折叠树形:牧场标题显示数量、容量和空位,下方直接列出所属魔物;空牧场也保留显示,培育室魔物单独分组。 勾选喂养/赠礼目标并分别设置优先级;显示突破、当前等级上限、成长资质、参考属性、当前好感上限和喜欢的物品。 双击查看详情;右键可锁定、解锁、派遣、喂给指定魔物。 diff --git a/ranch_assistant/gui.py b/ranch_assistant/gui.py index 2045ba8..7760451 100644 --- a/ranch_assistant/gui.py +++ b/ranch_assistant/gui.py @@ -285,6 +285,7 @@ class Window(ActivityPages, W.QMainWindow): 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.monster_view.setCurrentIndex(self.monster_view.findData(0)) self.inventory_tabs.currentChanged.connect(self.render_current_page) self.inventory_tabs.setCurrentIndex(0) self.log = W.QPlainTextEdit() diff --git a/ranch_assistant/tests/test_accounts.py b/ranch_assistant/tests/test_accounts.py index 1dc2189..bebfcb9 100644 --- a/ranch_assistant/tests/test_accounts.py +++ b/ranch_assistant/tests/test_accounts.py @@ -173,7 +173,8 @@ class AccountGuiTests(unittest.TestCase): for page in (first.egg_page, first.monster_page, first.room_page): first.tabs.setCurrentWidget(page) self.assertEqual([first.slots.rowCount(), first.eggs.rowCount(), len(first.monsters.monster_items)], [11, 4, 4]) - self.assertIn("room:1", first.monsters.group_items) + 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) hub.tabs.setCurrentWidget(second) diff --git a/ranch_assistant/tests/test_ranch_tree.py b/ranch_assistant/tests/test_ranch_tree.py index c43f664..26cf756 100644 --- a/ranch_assistant/tests/test_ranch_tree.py +++ b/ranch_assistant/tests/test_ranch_tree.py @@ -120,6 +120,12 @@ class RanchTreeTests(unittest.TestCase): window.tabs.setCurrentWidget(window.monster_page) tree = window.monsters self.drain(tree) + self.assertEqual(window.monster_view.currentData(), 0) + self.assertFalse(window.monster_room.isEnabled()) + self.assertTrue(all(item.parent() is None for item in tree.monster_items.values())) + window.monster_view.setCurrentIndex(window.monster_view.findData(1)) + self.drain(tree) + self.assertIs(tree.monster_items[900].parent(), tree.group_items["room:1"]) item = tree.monster_items[900] tree.itemWidget(item, 8).setChecked(True) tree.itemWidget(item, 9).setValue(4)