diff --git a/ranch_assistant/README.md b/ranch_assistant/README.md index 1dbf26a..2697427 100644 --- a/ranch_assistant/README.md +++ b/ranch_assistant/README.md @@ -133,7 +133,7 @@ 点击红色“停止”后仍会刷新状态、同步到期成长,但不再自动派遣、喂养、购蛋或领奖。手动刷新只更新状态。 已经发送的请求会正常返回,关闭后不发送下一项自动操作。重启或恢复会话后自动刷新,策略开关默认关闭。 6. 需要经验时,在“牧场”勾选接收经验的喂养目标并设置优先级。优先级数字小的先喂,达到当前突破上限后换下一个; - 在“自动孵蛋 → 喂养策略”设置全局停止等级,在“牧场策略”设置星级/资质保护和保留蛋数量。“收益资料”的星级勾选只筛选表格显示。 + “自动孵蛋 → 喂养策略”只显示当前喂养状态,不重复选择魔物或设置停止等级;目标统一采用牧场中的勾选和优先级。在“牧场策略”设置星级/资质保护和保留蛋数量。“收益资料”的星级勾选只筛选表格显示。 7. 需要提升好感时,在“背包”的对应物品分类中勾选物品并设置保留数量,在“牧场”勾选目标并设置赠礼优先级; 在独立的“自动赠礼”页启用。达到当前好感上限或仍在赠礼间隔时不会继续消耗物品。 菜单“策略配置”可导出全部策略供其他账号导入;导入后需逐项核对并开启顶部策略开关。 @@ -236,10 +236,10 @@ 在队、探索中、携带装备和资质数据不完整的魔物。 - 自动派遣/喂养只处理本次运行在培育室观察到的魔物,不扫描并消耗已有 牧场魔物。未指定可用喂养目标时不消耗素材;手动右键操作可选择已有牧场魔物。 -- 非 VIP 不使用客户端标识的第 4 个 VIP 坑。牧场满了停止收取;喂养停止等级为 - 用户目标和当前突破上限的较小值。客户端上限公式为 `potentialLevel × 10`, - 例如突破等级2的上限是20,即使设置70级也会在20级停止;上限未知时停止喂养。 - “魔物”和喂养目标下拉框显示等级/当前上限。每轮执行一项计划操作,随后重新读取状态; +- 非 VIP 不使用客户端标识的第 4 个 VIP 坑。牧场满了停止收取;喂养到当前突破上限后, + 按牧场中设置的优先级继续喂下一只。客户端上限公式为 `potentialLevel × 10`, + 例如突破等级2的上限是20;上限未知或经验已经达到上限的目标会跳过。 + “牧场”魔物列表显示等级/当前上限,未勾选目标时不自动喂养。每轮执行一项计划操作,随后重新读取状态; 成熟计时结束时会先结算成长并重新读取,再决定收取或派遣。 - 游戏对蛋的 `feedLock` 存在手机本地存档中,服务器会话看不到这项本地 偏好。需要保留某类蛋时,在策略页填写“编号:保留数量”。 @@ -329,7 +329,7 @@ VIP奖励只对已有资格领取;不会购买VIP或升级礼包。邮件仅 不是所有电脑的耗时承诺。调试记录新增“刷新耗时”,分别记录后台总时间、资料整理时间和界面回调时间。 自动收取会按牧场剩余容量合并提交;自动喂养把同一目标的合格素材放入一次`foods`数组请求, -按照喂养目标优先级执行,数字越小越优先。当前目标达到停止等级/突破上限后换下一个目标。 +按照牧场中勾选的喂养目标优先级执行,数字越小越优先。当前目标达到突破上限后换下一个目标;旧版停止等级配置不再影响自动喂养。 批量素材按升级经验表计算,达到需要的经验后停止添加;最后一只素材可能有少量溢出。 锁定、在队、高星、资质保护及委托保留仍参与每只素材的筛选。 有连续动作时自动推进;设置的监控间隔用于等待新状态,不再要求每收取或喂养一只都等待完整间隔。 diff --git a/ranch_assistant/gui.py b/ranch_assistant/gui.py index 6441d07..c8ce896 100644 --- a/ranch_assistant/gui.py +++ b/ranch_assistant/gui.py @@ -442,8 +442,6 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow): self.protect_quality.setCurrentIndex(1) self.keep_better_quality = W.QCheckBox("保留资质高于牧场同种培养代表的新魔物") self.keep_better_quality.setToolTip("独立于S/A/B/C及4S条件:按四项成长范围归一化后的平均值比较,严格更高才算提升;牧场没有同种魔物时保留首只。") - self.target = combo([("未设置:不自动喂养", 0)]) - self.target_level = spin(1, 100, 70) self.room = combo([("自动选择有空位的牧场", 0)]) self.coin_exp = spin(0, 10000, 5, True) self.reserved_types = W.QLineEdit() @@ -463,14 +461,12 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow): 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("孵蛋开关、优先级和去向在“背包 → 魔物蛋”逐项配置。")) - self.target_status = W.QLabel("选择喂养目标后显示当前突破上限") + self.target_status = W.QLabel("在“牧场”勾选喂养目标并设置优先级") self.target_status.setWordWrap(True) feed_page = W.QWidget() self.feed_form = W.QFormLayout(feed_page) - self.feed_form.addRow("默认喂养目标", self.target) - self.feed_form.addRow("喂养达到此等级后停止", self.target_level) - self.feed_form.addRow("实际喂养上限", self.target_status) - feed_note = W.QLabel("在“牧场”勾选喂养目标并设置优先级,优先采用这些目标。达到当前突破等级上限后转向下一只;用于喂养的魔物由蛋规则指定。") + self.feed_form.addRow("当前喂养状态", self.target_status) + feed_note = W.QLabel("喂养目标统一在“牧场”勾选并设置优先级,数字越小越先喂。达到当前突破等级上限后自动喂下一只;未勾选目标时不喂养。用于喂养的素材由魔物蛋规则指定。") feed_note.setWordWrap(True) self.feed_form.addRow(feed_note) self.feed_form.setSizeConstraint(W.QLayout.SizeConstraint.SetMinimumSize) @@ -478,8 +474,6 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow): self.feed_scroll.setWidgetResizable(True) self.feed_scroll.setFrameShape(W.QFrame.Shape.NoFrame) self.feed_scroll.setWidget(feed_page) - self.target.currentIndexChanged.connect(self.update_target_status) - self.target_level.valueChanged.connect(self.update_target_status) form.addRow(W.QLabel("仅处理本次运行观察到的培育室魔物;已有牧场魔物不作为自动派遣/喂养素材。\n锁定、羁绊、已装备、队伍/探索中的魔物会保留。蛋的手机本地锁定无法从服务器读取,请设置保留蛋数量。")) for label in tab.findChildren(W.QLabel): label.setWordWrap(True) @@ -1490,7 +1484,7 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow): type_id, count = item.split(":") eggs[str(int(type_id))] = max(0, int(count)) return Policy(enabled=self.ranch_enabled.isChecked(), strategy=self.strategy.currentData(), protect_star=self.protect_star.value(), protect_quality=self.protect_quality.currentData(), - feed_target=getattr(self, "restore_target", self.target.currentData() or 0), target_level=self.target_level.value(), room_id=getattr(self, "restore_room", self.room.currentData() or 0), + feed_target=0, room_id=getattr(self, "restore_room", self.room.currentData() or 0), coins_per_exp=self.coin_exp.value(), fill=self.fill.isChecked(), egg_order=self.egg_order.currentData(), reserved_types=reserved, reserved_eggs=eggs, min_gold_per_hour=self.min_gold.value(), min_exp_per_hour=self.min_exp.value(), collect=self.collect.isChecked(), dispatch=self.dispatch.isChecked(), feed=self.feed.isChecked(), hatch_max_star=self.hatch_max_star.currentData(), @@ -1729,7 +1723,7 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow): self.render_gift_representatives(snapshot) elif page in (self.progression_page, self.battle_records_page): self.render_progression() - elif page is self.target.parentWidget() or page is self.automation_page: + elif page is self.automation_page: self.refresh_target_choices(snapshot) except (ValueError, TypeError, KeyError, AttributeError) as error: self.report("页面数据暂不可用:" + str(error)) @@ -1768,12 +1762,9 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow): include_monsters=self.monster_view_visible and self.presentation_active and not self.closed)) 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]) self.update_combo(self.room, [("自动选择有空位的牧场", 0)] + [(f"牧场 {r['id']}", int(r["id"])) for r in snapshot.raw["rooms"]]) - if hasattr(self, "restore_target"): - self.target.setCurrentIndex(max(0, self.target.findData(self.restore_target))) + if hasattr(self, "restore_room"): self.room.setCurrentIndex(max(0, self.room.findData(self.restore_room))) - 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"]]) @@ -1963,7 +1954,7 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow): self.auto_save_timer = C.QTimer(self) self.auto_save_timer.setSingleShot(True) self.auto_save_timer.timeout.connect(self.persist_settings) - names = ("ranch_enabled", "strategy", "protect_star", "protect_quality", "target", "target_level", "room", + names = ("ranch_enabled", "strategy", "protect_star", "protect_quality", "room", "coin_exp", "reserved_types", "reserve_eggs", "fill", "egg_order", "min_gold", "min_exp", "buy_eggs", "buy_ten", "dispatch", "collect", "feed", "market", "egg_stock", "buy_batch", "keep_money", "daily_buy_money", "hatch_max_star", "gift_enabled", "gift_liked_only", "quest_enabled", "quest_accept", "quest_city", "quest_items", @@ -2108,6 +2099,8 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow): self.load_progression_policy(progression) self.egg_rules = copy.deepcopy(policy.egg_rules) self.feed_targets = copy.deepcopy(policy.feed_targets) + if not self.feed_targets and policy.feed_target: + self.feed_targets[str(policy.feed_target)] = 1 self.gift_targets = copy.deepcopy(policy.gift_targets) self.gift_items = copy.deepcopy(policy.gift_items) self.gift_enabled.setChecked(policy.gift_enabled) @@ -2120,7 +2113,7 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow): for widget, data in ((self.strategy, policy.strategy), (self.protect_quality, policy.protect_quality), (self.egg_order, policy.egg_order), (self.market, policy.market_id), (self.hatch_max_star, policy.hatch_max_star)): widget.setCurrentIndex(max(0, widget.findData(data))) - for widget, number in ((self.protect_star, policy.protect_star), (self.target_level, policy.target_level), (self.coin_exp, policy.coins_per_exp), (self.min_gold, policy.min_gold_per_hour), (self.min_exp, policy.min_exp_per_hour)): + for widget, number in ((self.protect_star, policy.protect_star), (self.coin_exp, policy.coins_per_exp), (self.min_gold, policy.min_gold_per_hour), (self.min_exp, policy.min_exp_per_hour)): widget.setValue(number) self.fill.setChecked(policy.fill) for widget, checked in ((self.buy_eggs, policy.buy), (self.collect, policy.collect), (self.dispatch, policy.dispatch), (self.feed, policy.feed)): @@ -2142,7 +2135,7 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow): self.quest_reserves.setText(",".join(f"{k}:{v}" for k, v in quest.item_reserves.items())) self.reserved_types.setText(",".join(map(str, policy.reserved_types))) self.reserve_eggs.setText(",".join(f"{k}:{v}" for k, v in policy.reserved_eggs.items())) - self.restore_target, self.restore_room = policy.feed_target, policy.room_id + self.restore_room = policy.room_id self.catalog.overrides = value.get("overrides", {}) self.render_egg_rules() self.render_catalog() diff --git a/ranch_assistant/model.py b/ranch_assistant/model.py index 804d365..50058ba 100644 --- a/ranch_assistant/model.py +++ b/ranch_assistant/model.py @@ -274,8 +274,8 @@ class Policy: protect_quality: int = 3 reserved_types: list[int] = field(default_factory=list) reserved_eggs: dict[str, int] = field(default_factory=dict) - feed_target: int = 0 - target_level: int = 70 + feed_target: int = 0 # Legacy single-target policies; the GUI migrates to feed_targets. + target_level: int = 70 # Legacy file compatibility; automatic feeding uses the current cap. room_id: int = 0 coins_per_exp: float = 5.0 fill: bool = True @@ -388,12 +388,12 @@ class Planner: if cap is None: reason = "目标突破上限未知,暂停喂养" continue - limit = min(policy.target_level, cap) + limit = cap level = int(target.get("level", 1)) - reason = f"目标 #{mid} Lv.{level};当前突破上限 {cap};喂养停止等级 {limit}" + reason = f"目标 {self.catalog.monster_label(target)} Lv.{level};当前突破上限 {cap}" if level < limit: if self.catalog.feed_remaining(target, limit) == 0: - reason = f"目标 #{mid} 经验已达到停止等级,等待服务器同步" + reason = f"目标 {self.catalog.monster_label(target)} 经验已达到当前突破上限,等待服务器同步" continue return target, reason return None, reason @@ -597,7 +597,7 @@ class Planner: return actions target_id = feeds[0].payload["targetId"] target = monsters[target_id] - stop_level = min(policy.target_level, self.catalog.max_level(target)) + stop_level = self.catalog.max_level(target) need = self.catalog.feed_remaining(target, stop_level) ids, experience = [], 0 for action in feeds: diff --git a/ranch_assistant/tests/test_automation.py b/ranch_assistant/tests/test_automation.py index 416cf05..5389523 100644 --- a/ranch_assistant/tests/test_automation.py +++ b/ranch_assistant/tests/test_automation.py @@ -140,7 +140,7 @@ class AutomationTests(unittest.TestCase): target["level"] = 19 self.assertTrue(any(a.kind == "feed" for a in self.planner.plan(snapshot, policy))) policy.target_level = 19 - self.assertFalse(any(a.kind == "feed" for a in self.planner.plan(snapshot, policy))) + self.assertTrue(any(a.kind == "feed" for a in self.planner.plan(snapshot, policy))) policy.target_level = 70 del target["potentialLevel"] self.assertFalse(any(a.kind == "feed" for a in self.planner.plan(snapshot, policy))) @@ -402,9 +402,9 @@ class AutomationGuiTests(unittest.TestCase): snapshot = window.engine.snapshot snapshot.raw["currentTasks"] = [{"id": 88, "typeId": key, "curStep": 1}] snapshot.monsters[900].update(level=20, potentialLevel=2) + window.feed_targets = {"900": 1} window.render(snapshot, []) window.refresh_target_choices(snapshot) - window.target.setCurrentIndex(window.target.findData(900)) self.assertIn("上限 20", window.target_status.text()) reward = window.catalog.data["task_info"][key]["reward"] window.tabs.setCurrentWidget(window.quests_table.parentWidget()) diff --git a/ranch_assistant/tests/test_batch_feeding.py b/ranch_assistant/tests/test_batch_feeding.py index cc7f41f..8afcbf4 100644 --- a/ranch_assistant/tests/test_batch_feeding.py +++ b/ranch_assistant/tests/test_batch_feeding.py @@ -43,6 +43,24 @@ class BatchFeedingTests(unittest.TestCase): self.policy.feed_targets = {"900": 1, "901": 2} self.assertEqual(self.planner.plan(self.snapshot, self.policy)[0].payload["targetId"], 901) + def test_priority_target_uses_current_cap_instead_of_legacy_stop_level(self): + target = self.snapshot.monsters[900] + target.update(level=19, potentialLevel=2, exp=self.catalog.data["monster_level"]["20"] - 1) + self.policy.feed_targets = {"900": 1} + self.policy.target_level = 19 + action = self.planner.plan(self.snapshot, self.policy)[0] + self.assertEqual(action.payload, {"targetId": 900, "foods": [101]}) + + def test_priority_skips_experience_at_cap_and_unknown_breakthrough(self): + first = self.snapshot.monsters[900] + first.update(level=19, potentialLevel=2, exp=self.catalog.data["monster_level"]["20"]) + self.snapshot.raw["monsters"].extend([ + copy.deepcopy(first) | {"id": 901, "potentialLevel": None}, + copy.deepcopy(first) | {"id": 902, "level": 1, "exp": 0}, + ]) + self.policy.feed_targets = {"902": 3, "901": 2, "900": 1} + self.assertEqual(self.planner.plan(self.snapshot, self.policy)[0].payload["targetId"], 902) + def test_collect_then_feed_all_in_two_batches(self): for mid in (101, 102, 103, 104): self.snapshot.monsters[mid].update(process=2, roomId=None) diff --git a/ranch_assistant/tests/test_policy_config.py b/ranch_assistant/tests/test_policy_config.py index 2eb48d9..32511c2 100644 --- a/ranch_assistant/tests/test_policy_config.py +++ b/ranch_assistant/tests/test_policy_config.py @@ -84,6 +84,8 @@ class StrategyGuiTests(unittest.TestCase): self.assertEqual(window.tabs.tabText(window.tabs.indexOf(window.gift_page)), "自动赠礼") self.assertTrue(window.gift_page.isAncestorOf(window.gift_enabled)) self.assertTrue(window.feed_scroll.isAncestorOf(window.feed)) + self.assertFalse(hasattr(window, "target")) + self.assertFalse(hasattr(window, "target_level")) value = portable_config(UnifiedPolicyTests().config(), window.engine.snapshot) path = folder / "portable.json" path.write_text(json.dumps(value), encoding="utf-8") @@ -109,6 +111,25 @@ class StrategyGuiTests(unittest.TestCase): finally: window.close() + def test_legacy_feeding_target_migrates_and_unchecking_removes_it(self): + with workspace_temp() as folder: + window = Window(folder) + window.timer.stop() + try: + self.wait(window) + window.load_config({"policy": asdict(Policy(feed_target=900, target_level=10))}) + self.assertEqual(window.read_policy().feed_targets, {"900": 1}) + self.assertEqual(window.read_policy().feed_target, 0) + window.monster_feed_changed("900", False, 1) + self.assertEqual(window.read_policy().feed_targets, {}) + self.assertFalse(window.engine.planner.feed_status(window.engine.snapshot, window.read_policy())[0]) + window.save_config() + saved = json.loads((folder / "settings.json").read_text(encoding="utf-8")) + self.assertEqual(saved["policy"]["feed_targets"], {}) + self.assertEqual(saved["policy"]["feed_target"], 0) + finally: + window.close() + def test_gift_only_workflow_does_not_require_hatch_rules(self): with workspace_temp() as folder: window = Window(folder)