Add hatch retention, automatic breakthroughs and exploration
This commit is contained in:
+76
-10
@@ -20,6 +20,7 @@ from .quests import QuestPolicy
|
||||
from .daily import DailyPolicy
|
||||
from .sweeping import SweepPolicy
|
||||
from .progression import ProgressionPolicy
|
||||
from .exploration import ExplorePolicy
|
||||
from .activity_gui import ActivityPages
|
||||
from .progression_gui import ProgressionPages, prepare_progression_views
|
||||
from .battle_messages import battle_message
|
||||
@@ -35,6 +36,7 @@ from .table_widgets import table_item
|
||||
from .stage_cache import StageCache
|
||||
from .drop_statistics import SweepStatistics
|
||||
from .statistics_gui import StatisticsPage
|
||||
from .exploration_gui import ExplorationPages, prepare_exploration_rows, prepare_exploration_members
|
||||
|
||||
APP_VERSION = "1.2.0.dev1"
|
||||
GAME_VERSION = "1.9.68"
|
||||
@@ -112,7 +114,7 @@ def fill_table(widget, rows, sorting=True):
|
||||
widget.setSortingEnabled(sorting)
|
||||
|
||||
|
||||
class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
class Window(ExplorationPages, ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
network_event = C.Signal(object)
|
||||
profile_changed = C.Signal(str)
|
||||
|
||||
@@ -154,8 +156,11 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
self.pending_policy = None
|
||||
self.logout_phase = None
|
||||
self.pending_monster_view = False
|
||||
self.pending_exploration_view = False
|
||||
self.monster_data_pending = False
|
||||
self.pending_schedule = False
|
||||
self.next_explore = float("inf")
|
||||
self.next_breakthrough = float("inf")
|
||||
self.monster_view_visible = False
|
||||
self.presentation_active = True
|
||||
self.engine.presentation_active = True
|
||||
@@ -174,6 +179,7 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
self.egg_rules = {}
|
||||
self.feed_targets = {}
|
||||
self.gift_targets = {}
|
||||
self.breakthrough_targets = {}
|
||||
self.gift_items = {}
|
||||
central = W.QWidget()
|
||||
layout = W.QVBoxLayout(central)
|
||||
@@ -290,7 +296,7 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
monster_tools.addWidget(button)
|
||||
monster_tools.addStretch()
|
||||
monster_layout.addLayout(monster_tools)
|
||||
detail_note = W.QLabel("勾选“喂养目标”并设置优先级(数字小的先喂);当前突破上限满级后转下一个目标。参考属性含等级、潜能、好感和升星,不含装备、羁绊或全局加成。")
|
||||
detail_note = W.QLabel("喂养与赠礼分别设置目标及优先级(数字小的先执行)。同种突破最高4级,每只同种素材增加1点突破经验;普通经验等级与潜能阶段分别计算。勾选“自动突破目标”即授权先补满四项潜能、再提升潜能阶段,消耗对应元素材料并遵守物品/委托保留量;不购买材料,不消耗金币或氪金。参考属性不含装备、羁绊或全局加成。")
|
||||
detail_note.setWordWrap(True)
|
||||
monster_layout.addWidget(detail_note)
|
||||
self.ranch_view = self.monsters
|
||||
@@ -299,6 +305,7 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
self.monsters.monster_activated.connect(self.show_monster_detail)
|
||||
self.monsters.feed_changed.connect(self.monster_feed_changed)
|
||||
self.monsters.gift_changed.connect(self.monster_gift_changed)
|
||||
self.monsters.breakthrough_changed.connect(self.monster_breakthrough_changed)
|
||||
self.room_page = self.monster_page
|
||||
self.tabs.addTab(self.room_page, "牧场")
|
||||
self.policy_page = self.policy_tab(embedded=True)
|
||||
@@ -309,6 +316,7 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
self.yield_tab()
|
||||
self.quests_tab()
|
||||
self.maps_tab()
|
||||
self.exploration_tab()
|
||||
self.analysis_page = StatisticsPage(self.catalog)
|
||||
self.analysis_page.refresh_requested.connect(self.refresh_analysis)
|
||||
self.tabs.addTab(self.analysis_page, "数据分析")
|
||||
@@ -317,7 +325,7 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
self.tabs.addTab(self.plans, "执行计划")
|
||||
order = [self.tabs.widget(0), self.slot_page, self.inventory_tabs, self.room_page,
|
||||
self.daily_page, self.automation_page, self.progression_page, self.battle_records_page, self.gift_page,
|
||||
self.quests_table.parentWidget(), self.map_page, self.analysis_page,
|
||||
self.quests_table.parentWidget(), self.exploration_page, self.map_page, self.analysis_page,
|
||||
self.plans, self.yields.parentWidget()]
|
||||
for page in order:
|
||||
self.tabs.addTab(page, self.tabs.tabText(self.tabs.indexOf(page)))
|
||||
@@ -442,7 +450,7 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
self.protect_quality.setToolTip("4S要求攻、防、生命、敏捷分别为S;锁定、队伍、保留星级等保护仍单独生效。")
|
||||
self.protect_quality.setCurrentIndex(1)
|
||||
self.keep_better_quality = W.QCheckBox("保留资质高于牧场同种培养代表的新魔物")
|
||||
self.keep_better_quality.setToolTip("独立于S/A/B/C及4S条件:按四项成长范围归一化后的平均值比较,严格更高才算提升;牧场没有同种魔物时保留首只。")
|
||||
self.keep_better_quality.setToolTip("独立于S/A/B/C及4S条件:新魔物与牧场已保留的同种最高资质比较,依次按S项数、A项数、B项数、四项成长各自归一化后的平均值排序,严格更高才额外保留,同分不额外保留。")
|
||||
self.room = combo([("自动选择有空位的牧场", 0)])
|
||||
self.coin_exp = spin(0, 10000, 5, True)
|
||||
self.reserved_types = W.QLineEdit()
|
||||
@@ -632,6 +640,7 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
policy = self.read_policy()
|
||||
progression = self.read_progression_policy()
|
||||
other = (self.quest_enabled.isChecked() or self.daily_enabled.isChecked() or self.map_enabled.isChecked()
|
||||
or self.explore_enabled.isChecked() or bool(policy.breakthrough_targets)
|
||||
or policy.gift_enabled or progression.enabled)
|
||||
if not (policy.enabled and any((policy.buy, policy.fill, policy.dispatch, policy.collect, policy.feed))) and not other:
|
||||
self.report("请先勾选至少一项功能,并启用对应策略")
|
||||
@@ -665,6 +674,7 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
self.cancel_progression()
|
||||
self.pending_execute = False
|
||||
self.next_gift = float("inf")
|
||||
self.next_explore = self.next_breakthrough = float("inf")
|
||||
self.update_gift_clock()
|
||||
self.arm_hatching()
|
||||
self.update_workflow_status()
|
||||
@@ -709,6 +719,7 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
enabled = [label for checked, label in ((self.ranch_enabled.isChecked(), "牧场 / 孵蛋"),
|
||||
(self.gift_enabled.isChecked(), "赠礼"), (self.quest_enabled.isChecked(), "委托"),
|
||||
(self.map_enabled.isChecked(), "扫荡"), (self.daily_enabled.isChecked(), "每日事务"),
|
||||
(self.explore_enabled.isChecked(), "探险"), (bool(self.breakthrough_targets), "突破"),
|
||||
(self.progression_enabled.isChecked(), "主线推进")) if checked]
|
||||
self.workflow_status.setText(self.workflow_status.text() + ";已选功能:" + ("、".join(enabled) or "无"))
|
||||
self.update_progression_status()
|
||||
@@ -800,6 +811,13 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
self.settings_changed()
|
||||
self.update_gift_status()
|
||||
|
||||
def monster_breakthrough_changed(self, mid, enabled, priority):
|
||||
if enabled:
|
||||
self.breakthrough_targets[str(mid)] = priority
|
||||
else:
|
||||
self.breakthrough_targets.pop(str(mid), None)
|
||||
self.settings_changed()
|
||||
|
||||
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}
|
||||
@@ -1240,9 +1258,12 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
policies = {key: cls(**value[key]) for key, cls in (("policy", Policy), ("quest_policy", QuestPolicy),
|
||||
("daily_policy", DailyPolicy), ("sweep_policy", SweepPolicy))}
|
||||
policies["progression_policy"] = checked_progression_policy(value.get("progression_policy", {}))
|
||||
policies["explore_policy"] = ExplorePolicy.from_dict(value.get("explore_policy", {}))
|
||||
if self.busy:
|
||||
self.pending_policy = policies
|
||||
return False
|
||||
explore = policies.pop("explore_policy")
|
||||
self.apply_explore_policy(explore)
|
||||
for key, policy in policies.items():
|
||||
setattr(self.engine, key, policy)
|
||||
return True
|
||||
@@ -1259,7 +1280,7 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
def background():
|
||||
started = time.perf_counter()
|
||||
value = function()
|
||||
if kind in ("poll", "hatch", "monster_lock", "manual_monsters", "expansion", "growth_sync", "master_sync", "map_refresh", "daily_claim", "connected", "policy_preview", "progression_refresh", "progression_run"):
|
||||
if kind in ("poll", "hatch", "automation", "monster_lock", "manual_monsters", "expansion", "growth_sync", "master_sync", "map_refresh", "daily_claim", "connected", "policy_preview", "progression_refresh", "progression_run"):
|
||||
snapshot = value[1] if kind == "connected" else value[0]
|
||||
managed = set() if kind == "connected" else set(engine.planner.managed)
|
||||
preparing = time.perf_counter()
|
||||
@@ -1279,6 +1300,8 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
if kind != "connected" and (progression_visible or records_visible or explicit_progression):
|
||||
views.progression = prepare_progression_views(engine,
|
||||
tasks=progression_visible or explicit_progression, records=records_visible or explicit_progression)
|
||||
if kind != "connected" and self.presentation_active and not self.closed and self.tabs.currentWidget() is self.exploration_page:
|
||||
views.exploration = prepare_exploration_rows(engine)
|
||||
return Presented(value, views, (time.perf_counter() - preparing) * 1000, (time.perf_counter() - started) * 1000)
|
||||
return value
|
||||
job = Job(kind, background)
|
||||
@@ -1305,6 +1328,8 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
self.pending_monster_view = False
|
||||
if self.pending_policy is not None and not self.closed:
|
||||
policies, self.pending_policy = self.pending_policy, None
|
||||
explore = policies.pop("explore_policy", self.engine.explore_policy)
|
||||
self.apply_explore_policy(explore)
|
||||
progression_changed = asdict(getattr(self.engine, "progression_policy", ProgressionPolicy())) != asdict(policies["progression_policy"])
|
||||
for key, policy in policies.items():
|
||||
setattr(self.engine, key, policy)
|
||||
@@ -1317,6 +1342,11 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
self.schedule()
|
||||
if self.busy:
|
||||
return
|
||||
if self.pending_exploration_view and not self.closed and self.presentation_active and self.tabs.currentWidget() is self.exploration_page:
|
||||
self.pending_exploration_view = False
|
||||
self.refresh_exploration()
|
||||
if self.busy:
|
||||
return
|
||||
if self.close_after_job:
|
||||
C.QTimer.singleShot(0, self.close)
|
||||
elif self.pending_refresh is not None:
|
||||
@@ -1353,13 +1383,15 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
note="worker总耗时包含网络;大列表在后续短批次更新")
|
||||
|
||||
def apply_result(self, kind, value):
|
||||
if kind in ("poll", "hatch", "monster_lock", "manual_monsters", "expansion", "growth_sync", "master_sync", "map_refresh", "daily_claim", "policy_preview", "progression_refresh", "progression_run"):
|
||||
if kind in ("poll", "hatch", "automation", "monster_lock", "manual_monsters", "expansion", "growth_sync", "master_sync", "map_refresh", "daily_claim", "policy_preview", "progression_refresh", "progression_run"):
|
||||
snapshot, plans, message = value
|
||||
if kind != "policy_preview" and not self.engine.demo and not self.closed and self.logout_phase is None:
|
||||
self.monitoring = True
|
||||
self.engine.heartbeat_enabled = True
|
||||
self.render(snapshot, plans)
|
||||
self.report(message)
|
||||
if kind in ("poll", "automation") and self.engine.pending_recovery_due():
|
||||
self.next_poll = min(self.next_poll, time.monotonic() + 120)
|
||||
self.reload_saved_sessions()
|
||||
if kind == "poll":
|
||||
self.next_poll = time.monotonic() + self.poll_delay()
|
||||
@@ -1367,6 +1399,11 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
self.stop_workflow()
|
||||
self.arm_hatching()
|
||||
self.arm_gifting()
|
||||
self.arm_extended_automation()
|
||||
elif kind == "exploration_view":
|
||||
self.accept_exploration_view(value)
|
||||
elif kind.startswith("exploration_members:"):
|
||||
self.accept_exploration_members(*value)
|
||||
elif kind == "heartbeat":
|
||||
self.report(value)
|
||||
elif kind == "analysis":
|
||||
@@ -1508,6 +1545,7 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
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(),
|
||||
gift_auto_representative=self.gift_auto_representative.isChecked(), keep_better_quality=self.keep_better_quality.isChecked(),
|
||||
breakthrough_targets=copy.deepcopy(self.breakthrough_targets),
|
||||
keep_money=self.keep_money.value(), daily_buy_money=self.daily_buy_money.value())
|
||||
|
||||
def read_quest_policy(self):
|
||||
@@ -1538,6 +1576,20 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
self.report("策略输入尚未完整,已关闭策略;本次继续刷新角色数据:" + str(error))
|
||||
self.submit("poll", self.engine.poll)
|
||||
|
||||
def run_extended_automation(self):
|
||||
if self.busy or not self.engine.auto or not self.engine.snapshot:
|
||||
return
|
||||
self.submit("automation", self.engine.poll)
|
||||
|
||||
def arm_extended_automation(self):
|
||||
active = self.monitoring and self.strategy_toggle.isChecked() and not self.closed and self.engine.snapshot is not None
|
||||
plans = self.latest_render[1] if self.latest_render else []
|
||||
explore = active and self.explore_enabled.isChecked() and any(
|
||||
action.kind in ("explore_start", "explore_finish") and action.path for action in plans)
|
||||
breakthrough = active and any(action.kind in ("potential", "breakthrough") for action in plans)
|
||||
self.next_explore = time.monotonic() + 1 if explore else float("inf")
|
||||
self.next_breakthrough = time.monotonic() + 1 if breakthrough else float("inf")
|
||||
|
||||
def poll_delay(self):
|
||||
return random.uniform(0, self.interval.currentData())
|
||||
|
||||
@@ -1607,6 +1659,8 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
self.refresh(automated=True)
|
||||
elif self.monitoring and self.strategy_toggle.isChecked() and now >= self.next_gift:
|
||||
self.refresh(automated=True)
|
||||
elif self.monitoring and self.strategy_toggle.isChecked() and now >= min(self.next_explore, self.next_breakthrough):
|
||||
self.run_extended_automation()
|
||||
|
||||
def render(self, snapshot, plans):
|
||||
self.latest_render = (snapshot, plans)
|
||||
@@ -1697,6 +1751,8 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
widget.row_batch.stop()
|
||||
if page is not self.analysis_page:
|
||||
self.analysis_page.row_batch.stop()
|
||||
if page is not self.exploration_page:
|
||||
self.exploration_table.row_batch.stop()
|
||||
for name, target in (("map_render_timer", self.map_page), ("monster_render_timer", self.monster_page)):
|
||||
timer = getattr(self, name, None)
|
||||
if timer and page is not target:
|
||||
@@ -1722,6 +1778,11 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
self.render_quests(snapshot)
|
||||
elif page is self.map_page:
|
||||
self.render_maps()
|
||||
elif page is self.exploration_page:
|
||||
if self.prepared_views and self.prepared_views.snapshot is snapshot and self.prepared_views.exploration is not None:
|
||||
self.accept_exploration_view(self.prepared_views.exploration)
|
||||
elif not self.busy:
|
||||
self.refresh_exploration()
|
||||
elif page is self.analysis_page:
|
||||
views = self.prepared_views
|
||||
owner = str(snapshot.raw["master"]["id"])
|
||||
@@ -1751,7 +1812,7 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
if self.monster_data_pending:
|
||||
self.monster_render_timer.stop()
|
||||
self.monster_data_pending = False
|
||||
self.monsters.set_data(snapshot, views.monsters, self.feed_targets, self.gift_targets)
|
||||
self.monsters.set_data(snapshot, views.monsters, self.feed_targets, self.gift_targets, self.breakthrough_targets)
|
||||
else:
|
||||
self.request_monster_views(snapshot)
|
||||
|
||||
@@ -1971,6 +2032,7 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
return {"policy": asdict(self.read_policy()), "quest_policy": asdict(self.read_quest_policy()),
|
||||
"daily_policy": asdict(self.read_daily_policy()), "sweep_policy": asdict(self.read_sweep_policy()),
|
||||
"progression_policy": asdict(self.read_progression_policy()),
|
||||
"explore_policy": self.read_explore_policy().to_dict(),
|
||||
"overrides": copy.deepcopy(self.catalog.overrides),
|
||||
"log_visible": self.show_log.isChecked(), "log_sizes": self.log_splitter.sizes() if self.show_log.isChecked() else self.log_sizes,
|
||||
"yield_stars": [star for star, check in self.yield_stars.items() if check.isChecked()],
|
||||
@@ -1984,6 +2046,7 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
"coin_exp", "reserved_types", "reserve_eggs", "fill", "egg_order", "min_gold", "min_exp", "buy_eggs",
|
||||
"buy_ten", "allow_single_draw", "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",
|
||||
"explore_enabled", "explore_reserve_ti",
|
||||
"quest_monsters", "quest_money", "quest_battles", "quest_reserves", "keep_better_quality", "gift_auto_representative")
|
||||
for name in names:
|
||||
widget = getattr(self, name)
|
||||
@@ -2015,7 +2078,7 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
changed = any(asdict(getattr(self.engine, key)) != value[key]
|
||||
for key in ("policy", "quest_policy", "daily_policy", "sweep_policy"))
|
||||
progression_changed = asdict(getattr(self.engine, "progression_policy", ProgressionPolicy())) != value["progression_policy"]
|
||||
changed = changed or progression_changed
|
||||
changed = changed or progression_changed or self.engine.explore_policy.to_dict() != value["explore_policy"]
|
||||
local_selection_changed = any(getattr(self.engine.policy, key) != value["policy"][key]
|
||||
for key in ("gift_auto_representative", "keep_better_quality"))
|
||||
self.update_policy(value)
|
||||
@@ -2087,8 +2150,8 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
self.load_config(self.config_value() | config)
|
||||
self.persist_settings()
|
||||
policy = self.read_policy()
|
||||
matched = len(policy.feed_targets) + len(policy.gift_targets)
|
||||
self.report(f"已导入并保存策略;已匹配 {matched} 个当前账号的喂养/赠礼目标;顶部策略开关保持关闭")
|
||||
matched = len(policy.feed_targets) + len(policy.gift_targets) + len(policy.breakthrough_targets)
|
||||
self.report(f"已导入并保存策略;已匹配 {matched} 个当前账号的喂养/赠礼/突破目标;探险队伍按队序重绑定;顶部策略开关保持关闭")
|
||||
except (OSError, ValueError, TypeError, KeyError) as error:
|
||||
self.report("策略导入失败:" + str(error))
|
||||
|
||||
@@ -2103,6 +2166,8 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
if value is None:
|
||||
value = json.loads(path.read_text(encoding="utf-8"))
|
||||
progression = checked_progression_policy(value.get("progression_policy", {}))
|
||||
explore = ExplorePolicy.from_dict(value.get("explore_policy", self.read_explore_policy().to_dict()))
|
||||
self.apply_explore_policy(explore)
|
||||
sizes = value.get("log_sizes", [420, 140])
|
||||
if isinstance(sizes, list) and len(sizes) == 2 and all(isinstance(v, int) and v >= 0 for v in sizes) and sum(sizes) > 0:
|
||||
self.log_sizes = sizes
|
||||
@@ -2129,6 +2194,7 @@ class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
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.breakthrough_targets = copy.deepcopy(policy.breakthrough_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)
|
||||
|
||||
Reference in New Issue
Block a user