Revert ranch retention, breakthroughs and exploration

This commit is contained in:
AttilaNet
2026-11-09 09:20:53 +08:00
parent 9abc0a3de0
commit 26be820ff2
28 changed files with 67 additions and 4324 deletions
+3 -26
View File
@@ -35,8 +35,6 @@ 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
from .exploration import ExplorePolicy
APP_VERSION = "1.2.0.dev1"
GAME_VERSION = "1.9.68"
@@ -114,7 +112,7 @@ def fill_table(widget, rows, sorting=True):
widget.setSortingEnabled(sorting)
class Window(ExplorationPages, ProgressionPages, ActivityPages, W.QMainWindow):
class Window(ProgressionPages, ActivityPages, W.QMainWindow):
network_event = C.Signal(object)
profile_changed = C.Signal(str)
@@ -176,7 +174,6 @@ class Window(ExplorationPages, 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)
@@ -295,7 +292,6 @@ class Window(ExplorationPages, ProgressionPages, ActivityPages, W.QMainWindow):
monster_layout.addLayout(monster_tools)
detail_note = W.QLabel("勾选“喂养目标”并设置优先级(数字小的先喂);当前突破上限满级后转下一个目标。参考属性含等级、潜能、好感和升星,不含装备、羁绊或全局加成。")
detail_note.setWordWrap(True)
detail_note.setText(detail_note.text() + "\n自动突破按突破优先级处理:四项潜能达到当前阶段上限且材料充足才执行;不满足时跳过。")
monster_layout.addWidget(detail_note)
self.ranch_view = self.monsters
monster_layout.addWidget(self.ranch_view)
@@ -303,7 +299,6 @@ class Window(ExplorationPages, 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)
@@ -314,7 +309,6 @@ class Window(ExplorationPages, 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, "数据分析")
@@ -323,7 +317,7 @@ class Window(ExplorationPages, 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.exploration_page, self.analysis_page,
self.quests_table.parentWidget(), 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)))
@@ -806,14 +800,6 @@ class Window(ExplorationPages, ProgressionPages, ActivityPages, W.QMainWindow):
self.settings_changed()
self.update_gift_status()
def monster_breakthrough_changed(self, mid, enabled, priority):
if enabled:
self.breakthrough_targets[mid] = priority
self.feed.setChecked(True)
else:
self.breakthrough_targets.pop(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}
@@ -1254,7 +1240,6 @@ class Window(ExplorationPages, 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
@@ -1389,8 +1374,6 @@ class Window(ExplorationPages, ProgressionPages, ActivityPages, W.QMainWindow):
self.prepared_views.drop_statistics = value
self.analysis_page.set_data(self.catalog, value)
self.report("已从本地刷新掉落统计")
elif kind == "exploration_view":
self.render_exploration(value)
elif kind == "progression_view":
self.accept_progression_views(value)
self.render_progression()
@@ -1525,7 +1508,6 @@ class Window(ExplorationPages, 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):
@@ -1738,8 +1720,6 @@ class Window(ExplorationPages, ProgressionPages, ActivityPages, W.QMainWindow):
self.render_egg_rules()
elif page is self.quests_table.parentWidget():
self.render_quests(snapshot)
elif page is self.exploration_page:
self.refresh_exploration()
elif page is self.map_page:
self.render_maps()
elif page is self.analysis_page:
@@ -1771,7 +1751,7 @@ class Window(ExplorationPages, 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.breakthrough_targets)
self.monsters.set_data(snapshot, views.monsters, self.feed_targets, self.gift_targets)
else:
self.request_monster_views(snapshot)
@@ -1989,7 +1969,6 @@ class Window(ExplorationPages, ProgressionPages, ActivityPages, W.QMainWindow):
def config_value(self):
return {"policy": asdict(self.read_policy()), "quest_policy": asdict(self.read_quest_policy()),
"explore_policy": self.read_explore_policy().to_dict(),
"daily_policy": asdict(self.read_daily_policy()), "sweep_policy": asdict(self.read_sweep_policy()),
"progression_policy": asdict(self.read_progression_policy()),
"overrides": copy.deepcopy(self.catalog.overrides),
@@ -2150,13 +2129,11 @@ class Window(ExplorationPages, 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)
self.gift_auto_representative.setChecked(policy.gift_auto_representative)
self.keep_better_quality.setChecked(policy.keep_better_quality)
self.apply_explore_policy(ExplorePolicy.from_dict(value.get("explore_policy", {})))
blocker = C.QSignalBlocker(self.interval)
self.interval.setCurrentIndex(max(0, self.interval.findData(value.get("interval", 30))))
del blocker