Add v1.2 development quest progression and experimental battle runtime
This commit is contained in:
+271
-50
@@ -19,7 +19,9 @@ from .login import PasswordLogin, device_id, server_labels
|
||||
from .quests import QuestPolicy
|
||||
from .daily import DailyPolicy
|
||||
from .sweeping import SweepPolicy
|
||||
from .progression import ProgressionPolicy
|
||||
from .activity_gui import ActivityPages
|
||||
from .progression_gui import ProgressionPages, prepare_progression_views
|
||||
from .presentation import Presented, prepare_views, monster_rows
|
||||
from .credentials import CredentialStore
|
||||
from .debug import TraceLog
|
||||
@@ -27,13 +29,13 @@ from .debug_window import DebugWindow
|
||||
from .sessions import SessionStore, identity
|
||||
from .inventory_gui import ITEM_TYPES, InventoryTable
|
||||
from .ranch_gui import RanchView
|
||||
from .policy_io import portable_config, import_config
|
||||
from .policy_io import portable_config, import_config, checked_progression_policy
|
||||
from .table_widgets import table_item
|
||||
from .stage_cache import StageCache
|
||||
from .drop_statistics import SweepStatistics
|
||||
from .statistics_gui import StatisticsPage
|
||||
|
||||
APP_VERSION = "1.1.1"
|
||||
APP_VERSION = "1.2.0.dev1"
|
||||
GAME_VERSION = "1.9.68"
|
||||
|
||||
ROOT = Path(sys.executable).parent if getattr(sys, "frozen", False) else Path(__file__).resolve().parent.parent
|
||||
@@ -109,7 +111,7 @@ def fill_table(widget, rows, sorting=True):
|
||||
widget.setSortingEnabled(sorting)
|
||||
|
||||
|
||||
class Window(ActivityPages, W.QMainWindow):
|
||||
class Window(ProgressionPages, ActivityPages, W.QMainWindow):
|
||||
network_event = C.Signal(object)
|
||||
profile_changed = C.Signal(str)
|
||||
|
||||
@@ -148,7 +150,15 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.busy, self.monitoring = False, False
|
||||
self.active_job = None
|
||||
self.pending_preview = False
|
||||
self.pending_policy = None
|
||||
self.logout_phase = None
|
||||
self.pending_monster_view = False
|
||||
self.monster_data_pending = False
|
||||
self.pending_schedule = False
|
||||
self.monster_view_visible = False
|
||||
self.presentation_active = True
|
||||
self.engine.presentation_active = True
|
||||
self.engine.progression_view_active = False
|
||||
self.latest_render = None
|
||||
self.prepared_views = None
|
||||
self.next_poll = 0
|
||||
@@ -293,6 +303,8 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.policy_page = self.policy_tab(embedded=True)
|
||||
self.gifting_tab()
|
||||
self.automation_tab()
|
||||
self.progression_tab()
|
||||
self.battle_records_tab()
|
||||
self.yield_tab()
|
||||
self.quests_tab()
|
||||
self.maps_tab()
|
||||
@@ -303,7 +315,8 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.plans = table(["操作", "下一步计划(每轮只执行一项,并重新读取状态)"])
|
||||
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.gift_page, self.quests_table.parentWidget(), self.map_page, self.analysis_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.plans, self.yields.parentWidget()]
|
||||
for page in order:
|
||||
self.tabs.addTab(page, self.tabs.tabText(self.tabs.indexOf(page)))
|
||||
@@ -614,9 +627,13 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
del blocker
|
||||
|
||||
def start_workflow(self):
|
||||
if self.closed or self.logout_phase is not None:
|
||||
return
|
||||
try:
|
||||
policy = self.read_policy()
|
||||
other = self.quest_enabled.isChecked() or self.daily_enabled.isChecked() or self.map_enabled.isChecked() or policy.gift_enabled
|
||||
progression = self.read_progression_policy()
|
||||
other = (self.quest_enabled.isChecked() or self.daily_enabled.isChecked() or self.map_enabled.isChecked()
|
||||
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("请先勾选至少一项功能,并启用对应策略")
|
||||
self.stop_workflow()
|
||||
@@ -627,8 +644,8 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.tabs.setCurrentWidget(self.egg_page)
|
||||
self.stop_workflow()
|
||||
return
|
||||
except ValueError:
|
||||
self.report("请先修正牧场策略中的保留编号和数量")
|
||||
except ValueError as error:
|
||||
self.report("请先修正策略输入:" + str(error))
|
||||
self.stop_workflow()
|
||||
return
|
||||
self.save_config(quiet=True)
|
||||
@@ -646,6 +663,7 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
def stop_workflow(self):
|
||||
self.set_strategy_checked(False)
|
||||
self.engine.auto = False
|
||||
self.cancel_progression()
|
||||
self.pending_execute = False
|
||||
self.next_gift = float("inf")
|
||||
self.update_gift_clock()
|
||||
@@ -687,6 +705,13 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
state = "策略已开启" if active else "策略已关闭"
|
||||
state += " · 状态自动刷新" if self.monitoring else ""
|
||||
self.workflow_status.setText(("演示 · " if self.engine.demo else "已登录 · ") + state)
|
||||
if hasattr(self, "progression_enabled"):
|
||||
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.progression_enabled.isChecked(), "主线推进")) if checked]
|
||||
self.workflow_status.setText(self.workflow_status.text() + ";已选功能:" + ("、".join(enabled) or "无"))
|
||||
self.update_progression_status()
|
||||
market = self.catalog.data.get("markets", {}).get(self.market.currentData(), {})
|
||||
snapshot = self.engine.snapshot
|
||||
if snapshot:
|
||||
@@ -1047,6 +1072,10 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.refresh_maps()
|
||||
elif tab is self.analysis_page:
|
||||
self.refresh_analysis()
|
||||
elif tab is self.progression_page:
|
||||
self.refresh_progression()
|
||||
elif tab is self.battle_records_page:
|
||||
self.refresh_progression_records()
|
||||
else:
|
||||
self.refresh()
|
||||
|
||||
@@ -1128,16 +1157,55 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.render_catalog()
|
||||
|
||||
def logout_and_clear(self):
|
||||
if self.busy:
|
||||
self.report("请等待当前操作完成,再清除登录记录")
|
||||
if self.closed or self.logout_phase is not None:
|
||||
return
|
||||
keys = [entry["session_id"] for entry in self.session_store.entries()]
|
||||
engine = self.engine
|
||||
resume_monitoring, resume_heartbeat = self.monitoring, engine.heartbeat_enabled
|
||||
resume_timer = self.timer.isActive()
|
||||
self.logout_phase = "confirming"
|
||||
self.timer.stop()
|
||||
self.monitoring = False
|
||||
engine.heartbeat_enabled = False
|
||||
self.stop_workflow()
|
||||
self.pending_refresh = self.pending_policy = None
|
||||
self.pending_preview = self.pending_monster_view = self.pending_progression_view = False
|
||||
self.pending_schedule = False
|
||||
text = "将退出登录,并删除当前账号页签保存的会话和账号密码。\n培养策略、日志及其他账号的记录不受影响。"
|
||||
if W.QMessageBox.question(self, "清除登录记录", text, W.QMessageBox.StandardButton.Yes | W.QMessageBox.StandardButton.No,
|
||||
W.QMessageBox.StandardButton.No) != W.QMessageBox.StandardButton.Yes:
|
||||
return
|
||||
self.demo()
|
||||
try:
|
||||
confirmed = W.QMessageBox.question(self, "清除登录记录", text,
|
||||
W.QMessageBox.StandardButton.Yes | W.QMessageBox.StandardButton.No,
|
||||
W.QMessageBox.StandardButton.No) == W.QMessageBox.StandardButton.Yes
|
||||
except Exception:
|
||||
self.logout_phase = None
|
||||
if resume_timer and not self.closed:
|
||||
self.timer.start(500)
|
||||
raise
|
||||
if self.closed:
|
||||
return
|
||||
if not confirmed:
|
||||
self.logout_phase = None
|
||||
if self.engine is engine:
|
||||
self.monitoring, engine.heartbeat_enabled = resume_monitoring, resume_heartbeat
|
||||
if resume_timer:
|
||||
self.timer.start(500)
|
||||
return
|
||||
self.logout_phase = "waiting"
|
||||
self.statusBar().showMessage("正在退出登录;当前请求完成后清除登录记录" if self.busy else "正在退出登录")
|
||||
if not self.busy:
|
||||
self.finish_logout()
|
||||
|
||||
def finish_logout(self):
|
||||
if self.busy or self.logout_phase != "waiting":
|
||||
return
|
||||
self.logout_phase = "finishing"
|
||||
try:
|
||||
self.pending_refresh = self.pending_policy = None
|
||||
self.pending_execute = self.pending_preview = self.pending_schedule = False
|
||||
self.pending_monster_view = self.pending_progression_view = False
|
||||
self.demo()
|
||||
if not self.engine.demo or self.engine.client is not None:
|
||||
raise ValueError("原登录连接尚未释放")
|
||||
keys = [entry["session_id"] for entry in self.session_store.entries()]
|
||||
for key in keys:
|
||||
self.session_store.remove(key)
|
||||
self.credentials.save("", "", False)
|
||||
@@ -1148,19 +1216,50 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.reload_saved_sessions()
|
||||
self.login_status.setText("已退出登录并清除当前账号页签的登录记录")
|
||||
self.report("已清除当前账号页签的登录记录")
|
||||
except (OSError, ValueError, KeyError):
|
||||
self.report("部分登录记录未能删除,请检查本地状态目录")
|
||||
except (OSError, ValueError, KeyError, RuntimeError) as error:
|
||||
self.report("退出登录或清除记录未完成:" + str(error) + ";策略保持停止")
|
||||
finally:
|
||||
self.logout_phase = None
|
||||
self.monitoring = False
|
||||
self.engine.auto = self.engine.heartbeat_enabled = False
|
||||
if not self.closed:
|
||||
self.timer.start(500)
|
||||
if self.engine.demo:
|
||||
self.refresh()
|
||||
elif self.close_after_job:
|
||||
C.QTimer.singleShot(0, self.close)
|
||||
|
||||
def run_job(self, kind, function):
|
||||
"""All task requests share the account's existing serial worker."""
|
||||
return self.submit(kind, function)
|
||||
|
||||
def update_policy(self, value=None):
|
||||
"""Apply a whole policy set between requests, never during a worker call."""
|
||||
if value is None:
|
||||
value = self.config_value()
|
||||
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", {}))
|
||||
if self.busy:
|
||||
self.pending_policy = policies
|
||||
return False
|
||||
for key, policy in policies.items():
|
||||
setattr(self.engine, key, policy)
|
||||
return True
|
||||
|
||||
def submit(self, kind, function):
|
||||
if self.busy or self.closed:
|
||||
if self.busy or self.closed or self.logout_phase is not None:
|
||||
return
|
||||
self.busy = True
|
||||
self.update_monster_actions()
|
||||
catalog, engine = self.catalog, self.engine
|
||||
self.sync_presentation_visibility()
|
||||
progression_visible = self.presentation_active and self.tabs.currentWidget() is self.progression_page
|
||||
records_visible = self.presentation_active and self.tabs.currentWidget() is self.battle_records_page
|
||||
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"):
|
||||
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"):
|
||||
snapshot = value[1] if kind == "connected" else value[0]
|
||||
managed = set() if kind == "connected" else set(engine.planner.managed)
|
||||
preparing = time.perf_counter()
|
||||
@@ -1174,7 +1273,12 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
statistics = SweepStatistics(catalog, folder / "sweep_rewards.sqlite3")
|
||||
client = value[0]
|
||||
statistics.import_log(snapshot.raw["master"]["id"], getattr(getattr(client, "trace", None), "path", None))
|
||||
views = prepare_views(catalog, snapshot, managed, cache, statistics)
|
||||
views = prepare_views(catalog, snapshot, managed, cache, statistics,
|
||||
include_monsters=self.presentation_active and not self.closed and (self.monster_view_visible or kind == "connected"))
|
||||
explicit_progression = kind in ("progression_refresh", "progression_run")
|
||||
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)
|
||||
return Presented(value, views, (time.perf_counter() - preparing) * 1000, (time.perf_counter() - started) * 1000)
|
||||
return value
|
||||
job = Job(kind, background)
|
||||
@@ -1189,6 +1293,30 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.busy = False
|
||||
self.update_monster_actions()
|
||||
self.active_job = None
|
||||
if self.logout_phase is not None:
|
||||
if self.logout_phase == "waiting":
|
||||
C.QTimer.singleShot(0, self.finish_logout)
|
||||
elif self.close_after_job:
|
||||
C.QTimer.singleShot(0, self.close)
|
||||
return
|
||||
if not self.presentation_active or self.tabs.currentWidget() not in (self.progression_page, self.battle_records_page):
|
||||
self.pending_progression_view = False
|
||||
if not self.monster_view_visible:
|
||||
self.pending_monster_view = False
|
||||
if self.pending_policy is not None and not self.closed:
|
||||
policies, self.pending_policy = self.pending_policy, None
|
||||
progression_changed = asdict(getattr(self.engine, "progression_policy", ProgressionPolicy())) != asdict(policies["progression_policy"])
|
||||
for key, policy in policies.items():
|
||||
setattr(self.engine, key, policy)
|
||||
if progression_changed:
|
||||
self.progression_views = None
|
||||
if self.presentation_active and self.tabs.currentWidget() in (self.progression_page, self.battle_records_page):
|
||||
self.pending_progression_view = True
|
||||
if self.pending_schedule and not self.closed and not self.close_after_job:
|
||||
self.pending_schedule = False
|
||||
self.schedule()
|
||||
if self.busy:
|
||||
return
|
||||
if self.close_after_job:
|
||||
C.QTimer.singleShot(0, self.close)
|
||||
elif self.pending_refresh is not None:
|
||||
@@ -1196,6 +1324,10 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
C.QTimer.singleShot(0, lambda: self.refresh_page(tab))
|
||||
elif self.pending_preview and not self.closed:
|
||||
C.QTimer.singleShot(0, self.preview_cultivation)
|
||||
elif self.pending_monster_view and not self.closed:
|
||||
self.request_monster_views()
|
||||
elif self.pending_progression_view and not self.closed:
|
||||
C.QTimer.singleShot(0, lambda: self.request_progression_views(force=True))
|
||||
elif self.pending_execute and self.monitoring and self.strategy_toggle.isChecked() and not self.closed:
|
||||
self.pending_execute = False
|
||||
C.QTimer.singleShot(0, lambda: self.refresh(automated=True))
|
||||
@@ -1205,6 +1337,8 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
metrics = None
|
||||
if isinstance(value, Presented):
|
||||
self.prepared_views = value.views
|
||||
if value.views.progression is not None:
|
||||
self.accept_progression_views(value.views.progression)
|
||||
metrics = value
|
||||
value = value.value
|
||||
started = time.perf_counter()
|
||||
@@ -1219,9 +1353,9 @@ class Window(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"):
|
||||
if kind in ("poll", "hatch", "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:
|
||||
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)
|
||||
@@ -1240,6 +1374,13 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.prepared_views.drop_statistics = value
|
||||
self.analysis_page.set_data(self.catalog, value)
|
||||
self.report("已从本地刷新掉落统计")
|
||||
elif kind == "progression_view":
|
||||
self.accept_progression_views(value)
|
||||
self.render_progression()
|
||||
elif kind == "monster_view":
|
||||
if value.snapshot is self.engine.snapshot:
|
||||
self.prepared_views = value
|
||||
self.render_current_page()
|
||||
elif kind == "connected":
|
||||
client, snapshot = value
|
||||
if self.connection_guard and not self.connection_guard(client.session):
|
||||
@@ -1251,6 +1392,8 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
if self.engine.client and self.engine.client is not client:
|
||||
self.engine.client.close()
|
||||
self.engine = Engine(self.catalog, client, self.state / "purchase_budget.json")
|
||||
self.sync_presentation_visibility()
|
||||
self.clear_progression_views()
|
||||
self.engine.snapshot = snapshot
|
||||
if self.prepared_views and self.prepared_views.snapshot is snapshot and self.prepared_views.stage_cache:
|
||||
self.engine.stage_cache = self.prepared_views.stage_cache
|
||||
@@ -1274,16 +1417,15 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.mode.setText("已登录")
|
||||
self.login_status.setText("已进入所选区服并读取角色")
|
||||
self.stop_workflow()
|
||||
self.monitoring = not self.closed
|
||||
self.monitoring = not self.closed and self.logout_phase is None
|
||||
if self.logout_phase is not None:
|
||||
self.engine.heartbeat_enabled = False
|
||||
self.next_poll = 0
|
||||
self.account.setReadOnly(True)
|
||||
self.render(snapshot, [])
|
||||
try:
|
||||
self.engine.policy = self.read_policy()
|
||||
self.engine.quest_policy = self.read_quest_policy()
|
||||
self.engine.daily_policy = self.read_daily_policy()
|
||||
self.engine.sweep_policy = self.read_sweep_policy()
|
||||
fill_table(self.plans, [[action.kind, action.description] for action in self.engine.plans()])
|
||||
self.update_policy()
|
||||
self.pending_preview = True
|
||||
except (ValueError, TypeError, KeyError, AttributeError) as error:
|
||||
self.report("状态已显示;策略暂不可用:" + str(error))
|
||||
self.profile_changed.emit(self.session_label or snapshot.raw["master"].get("roleName", "已连接"))
|
||||
@@ -1326,6 +1468,9 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
|
||||
@C.Slot(str)
|
||||
def error(self, message):
|
||||
self.pending_monster_view = False
|
||||
self.monster_data_pending = False
|
||||
self.monster_render_timer.stop()
|
||||
last = self.trace.events[-1] if self.trace.events else {}
|
||||
if last.get("kind") != "error" or last.get("message") != self.trace.redact(message):
|
||||
self.trace.emit("error", "界面 / 任务处理", scope="local", message=message)
|
||||
@@ -1369,23 +1514,21 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
battle_tasks=self.quest_battles.isChecked(), item_reserves=reserves)
|
||||
|
||||
def refresh(self, checked=False, *, automated=False, hatch_only=False):
|
||||
if self.busy or self.closed:
|
||||
if self.busy or self.closed or self.logout_phase is not None:
|
||||
return
|
||||
try:
|
||||
self.engine.policy = self.read_policy()
|
||||
self.engine.quest_policy = self.read_quest_policy()
|
||||
self.engine.daily_policy = self.read_daily_policy()
|
||||
self.engine.sweep_policy = self.read_sweep_policy()
|
||||
self.update_policy()
|
||||
self.engine.auto = self.strategy_toggle.isChecked() and automated and self.monitoring
|
||||
if hatch_only:
|
||||
self.hatch_timer.stop()
|
||||
self.next_hatch = float("inf")
|
||||
self.submit("hatch" if hatch_only else "poll", lambda: self.engine.poll(hatch_only=hatch_only, defer_hatch=not hatch_only))
|
||||
except ValueError:
|
||||
self.run_job("hatch" if hatch_only else "poll", lambda: self.engine.poll(hatch_only=hatch_only, defer_hatch=not hatch_only))
|
||||
except ValueError as error:
|
||||
self.stop_workflow()
|
||||
self.engine.policy = Policy(enabled=False)
|
||||
self.engine.quest_policy = QuestPolicy()
|
||||
self.report("策略输入尚未完整,已关闭策略;本次继续刷新角色数据")
|
||||
self.engine.progression_policy = ProgressionPolicy()
|
||||
self.report("策略输入尚未完整,已关闭策略;本次继续刷新角色数据:" + str(error))
|
||||
self.submit("poll", self.engine.poll)
|
||||
|
||||
def poll_delay(self):
|
||||
@@ -1435,7 +1578,11 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
|
||||
def schedule(self):
|
||||
self.update_gift_clock()
|
||||
if self.busy or self.closed:
|
||||
if self.closed or self.logout_phase is not None:
|
||||
return
|
||||
if self.busy:
|
||||
if self.active_job and self.active_job.kind == "monster_view":
|
||||
self.pending_schedule = True
|
||||
return
|
||||
now = time.monotonic()
|
||||
if not self.engine.demo and self.engine.heartbeat_enabled and now - self.engine.last_heartbeat >= 240:
|
||||
@@ -1455,6 +1602,7 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
def render(self, snapshot, plans):
|
||||
self.latest_render = (snapshot, plans)
|
||||
self.engine.snapshot = snapshot
|
||||
self.refresh_progression_teams(snapshot)
|
||||
master = snapshot.raw["master"]
|
||||
self.summary.setText(f"{master.get('roleName', '')} | Lv.{master.get('level', '?')} | 经验 {self.catalog.master_experience(master)} | 金币 {master.get('money', '?')} | 氪金 {master.get('ke', '?')} | 体力 {master.get('ti', '?')}")
|
||||
decisions = {int((a.payload.get('monsterId') or a.payload.get('monsterIds') or a.payload.get('foods') or [0])[0]): a.description for a in plans if a.kind in ('sell', 'feed')}
|
||||
@@ -1496,10 +1644,23 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
if self.presentation_active:
|
||||
self.render_current_page()
|
||||
|
||||
def sync_presentation_visibility(self):
|
||||
page = self.tabs.currentWidget()
|
||||
self.engine.presentation_active = bool(self.presentation_active)
|
||||
self.engine.progression_view_active = bool(self.presentation_active and page is self.progression_page)
|
||||
self.monster_view_visible = bool(self.presentation_active and page is self.monster_page)
|
||||
|
||||
def set_presentation_active(self, active):
|
||||
self.presentation_active = active
|
||||
self.presentation_active = bool(active)
|
||||
self.sync_presentation_visibility()
|
||||
if not active:
|
||||
self.pending_monster_view = False
|
||||
if self.prepared_views:
|
||||
self.prepared_views.monsters = self.prepared_views.monster_source = None
|
||||
self.pending_progression_view = False
|
||||
self.analysis_page.row_batch.stop()
|
||||
self.progression_table.row_batch.stop()
|
||||
self.battle_records_table.row_batch.stop()
|
||||
for name in ("map_render_timer", "monster_render_timer"):
|
||||
timer = getattr(self, name, None)
|
||||
if timer:
|
||||
@@ -1512,10 +1673,19 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.render_current_page()
|
||||
|
||||
def render_current_page(self, *args):
|
||||
self.sync_presentation_visibility()
|
||||
if self.closed or not self.presentation_active or not self.latest_render:
|
||||
return
|
||||
snapshot, plans = self.latest_render
|
||||
page = self.tabs.currentWidget()
|
||||
if page not in (self.progression_page, self.battle_records_page):
|
||||
self.pending_progression_view = False
|
||||
if page is not self.monster_page:
|
||||
self.pending_monster_view = False
|
||||
for target, widget in ((self.progression_page, self.progression_table),
|
||||
(self.battle_records_page, self.battle_records_table)):
|
||||
if page is not target:
|
||||
widget.row_batch.stop()
|
||||
if page is not self.analysis_page:
|
||||
self.analysis_page.row_batch.stop()
|
||||
for name, target in (("map_render_timer", self.map_page), ("monster_render_timer", self.monster_page)):
|
||||
@@ -1557,6 +1727,8 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.render_daily()
|
||||
elif page is self.gift_page:
|
||||
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:
|
||||
self.refresh_target_choices(snapshot)
|
||||
except (ValueError, TypeError, KeyError, AttributeError) as error:
|
||||
@@ -1565,11 +1737,35 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
def render_monsters(self, snapshot):
|
||||
views = self.prepared_views
|
||||
managed = self.engine.planner.managed
|
||||
if views and views.snapshot is snapshot and views.monster_source == repr(snapshot.raw["monsters"]) and views.managed == managed:
|
||||
rows = views.monsters
|
||||
if views and views.snapshot is snapshot and views.monsters is not None and views.managed == managed:
|
||||
self.pending_monster_view = False
|
||||
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)
|
||||
else:
|
||||
rows = monster_rows(self.catalog, snapshot, managed)
|
||||
self.monsters.set_data(snapshot, rows, self.feed_targets, self.gift_targets)
|
||||
self.request_monster_views(snapshot)
|
||||
|
||||
def request_monster_views(self, snapshot=None):
|
||||
if self.closed or self.logout_phase is not None or not self.monster_view_visible:
|
||||
return
|
||||
# Rendering is still pending while the serial worker prepares its data.
|
||||
self.monster_render_timer.stop()
|
||||
self.monster_render_timer.running = True
|
||||
self.monster_data_pending = True
|
||||
if self.busy:
|
||||
self.pending_monster_view = True
|
||||
return
|
||||
snapshot = snapshot or self.engine.snapshot
|
||||
if snapshot is None:
|
||||
self.monster_render_timer.stop()
|
||||
self.monster_data_pending = False
|
||||
return
|
||||
self.pending_monster_view = False
|
||||
engine, catalog = self.engine, self.catalog
|
||||
self.run_job("monster_view", lambda: prepare_views(catalog, snapshot, engine.planner.managed,
|
||||
engine.stage_cache, engine.sweeper.statistics,
|
||||
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])
|
||||
@@ -1659,7 +1855,7 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.submit("connected", lambda: (client, client.snapshot()))
|
||||
|
||||
def demo(self):
|
||||
if self.busy:
|
||||
if self.busy or self.logout_phase not in (None, "finishing"):
|
||||
return
|
||||
self.monitoring = False
|
||||
self.stop_workflow()
|
||||
@@ -1669,6 +1865,8 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.engine.client.persist_session()
|
||||
self.engine.client.close()
|
||||
self.engine = Engine(self.catalog)
|
||||
self.sync_presentation_visibility()
|
||||
self.clear_progression_views()
|
||||
self.reset_map_view()
|
||||
self.analysis_page.set_data(self.catalog, {"owner": "", "totals": {}, "drops": {}})
|
||||
self.active_identity = None
|
||||
@@ -1755,6 +1953,7 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
def config_value(self):
|
||||
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()),
|
||||
"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()],
|
||||
@@ -1777,6 +1976,14 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
signal.connect(self.settings_changed)
|
||||
for widget in self.yield_stars.values():
|
||||
widget.toggled.connect(self.settings_changed)
|
||||
for key in asdict(ProgressionPolicy()):
|
||||
if key == "enabled":
|
||||
continue
|
||||
widget = getattr(self, "progression_" + key)
|
||||
signal = (widget.toggled if isinstance(widget, W.QAbstractButton) else
|
||||
widget.currentIndexChanged if isinstance(widget, W.QComboBox) else
|
||||
widget.valueChanged if hasattr(widget, "valueChanged") else widget.textChanged)
|
||||
signal.connect(self.progression_settings_changed)
|
||||
|
||||
def settings_changed(self, *args):
|
||||
if not self.closed and not self.loading_config and hasattr(self, "auto_save_timer"):
|
||||
@@ -1790,12 +1997,15 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
return
|
||||
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
|
||||
local_selection_changed = any(getattr(self.engine.policy, key) != value["policy"][key]
|
||||
for key in ("gift_auto_representative", "keep_better_quality"))
|
||||
self.engine.policy = Policy(**value["policy"])
|
||||
self.engine.quest_policy = QuestPolicy(**value["quest_policy"])
|
||||
self.engine.daily_policy = DailyPolicy(**value["daily_policy"])
|
||||
self.engine.sweep_policy = SweepPolicy(**value["sweep_policy"])
|
||||
self.update_policy(value)
|
||||
if progression_changed:
|
||||
self.progression_views = None
|
||||
if self.presentation_active and self.tabs.currentWidget() in (self.progression_page, self.battle_records_page):
|
||||
self.request_progression_views(force=True)
|
||||
if local_selection_changed:
|
||||
self.pending_preview = True
|
||||
self.preview_cultivation()
|
||||
@@ -1806,7 +2016,7 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.next_poll = 0
|
||||
self.arm_hatching()
|
||||
self.arm_gifting()
|
||||
self.statusBar().showMessage("规则已自动保存并应用", 3000)
|
||||
self.statusBar().showMessage("规则已保存,当前请求完成后应用" if self.pending_policy else "规则已自动保存并应用", 3000)
|
||||
return value
|
||||
|
||||
def preview_cultivation(self):
|
||||
@@ -1837,7 +2047,7 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.statusBar().showMessage("设置尚未保存,请检查输入格式及本地目录", 5000)
|
||||
|
||||
def export_policies(self):
|
||||
path, _ = W.QFileDialog.getSaveFileName(self, "导出全部策略", "ranch-policies-1.1.1.json", "策略文件 (*.json)")
|
||||
path, _ = W.QFileDialog.getSaveFileName(self, "导出全部策略", f"ranch-policies-{APP_VERSION}.json", "策略文件 (*.json)")
|
||||
if not path:
|
||||
return
|
||||
try:
|
||||
@@ -1875,6 +2085,7 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
try:
|
||||
if value is None:
|
||||
value = json.loads(path.read_text(encoding="utf-8"))
|
||||
progression = checked_progression_policy(value.get("progression_policy", {}))
|
||||
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
|
||||
@@ -1894,6 +2105,7 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.map_enabled.setChecked(sweep.enabled)
|
||||
self.map_keep_ti.setValue(sweep.keep_stamina)
|
||||
self.map_team.setCurrentIndex(max(0, self.map_team.findData(sweep.team)))
|
||||
self.load_progression_policy(progression)
|
||||
self.egg_rules = copy.deepcopy(policy.egg_rules)
|
||||
self.feed_targets = copy.deepcopy(policy.feed_targets)
|
||||
self.gift_targets = copy.deepcopy(policy.gift_targets)
|
||||
@@ -1938,16 +2150,23 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.monsters.render_signature = None
|
||||
if self.latest_render:
|
||||
self.render_current_page()
|
||||
except Exception:
|
||||
self.report("旧设置无法读取,已使用默认设置")
|
||||
except (OSError, ValueError, TypeError, KeyError, AttributeError) as error:
|
||||
self.report("设置无法完整读取,请检查输入:" + str(error))
|
||||
finally:
|
||||
self.loading_config = False
|
||||
|
||||
def closeEvent(self, event):
|
||||
self.closed = True
|
||||
self.cancel_progression()
|
||||
self.timer.stop()
|
||||
self.hatch_timer.stop()
|
||||
self.analysis_page.row_batch.stop()
|
||||
self.progression_table.row_batch.stop()
|
||||
self.battle_records_table.row_batch.stop()
|
||||
self.pending_progression_view = False
|
||||
self.pending_monster_view = False
|
||||
self.pending_schedule = False
|
||||
self.pending_policy = None
|
||||
if hasattr(self, "auto_save_timer"):
|
||||
self.auto_save_timer.stop()
|
||||
if hasattr(self.eggs, "row_batch"):
|
||||
@@ -1964,6 +2183,8 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.setEnabled(False)
|
||||
event.ignore()
|
||||
return
|
||||
if self.logout_phase == "waiting":
|
||||
self.finish_logout()
|
||||
self.save_login_info(quiet=True)
|
||||
self.save_config(quiet=True)
|
||||
if self.engine.client:
|
||||
|
||||
Reference in New Issue
Block a user