Record sweep rewards and add local drop and stamina analysis
This commit is contained in:
+46
-2
@@ -30,6 +30,8 @@ from .ranch_gui import RanchView
|
||||
from .policy_io import portable_config, import_config
|
||||
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.0"
|
||||
GAME_VERSION = "1.9.68"
|
||||
@@ -281,11 +283,14 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.yield_tab()
|
||||
self.quests_tab()
|
||||
self.maps_tab()
|
||||
self.analysis_page = StatisticsPage(self.catalog)
|
||||
self.analysis_page.refresh_requested.connect(self.refresh_analysis)
|
||||
self.tabs.addTab(self.analysis_page, "数据分析")
|
||||
self.daily_tab()
|
||||
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.daily_page, self.automation_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)))
|
||||
@@ -1004,9 +1009,21 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.report("收益资料已从本地表刷新")
|
||||
elif tab is self.map_page:
|
||||
self.refresh_maps()
|
||||
elif tab is self.analysis_page:
|
||||
self.refresh_analysis()
|
||||
else:
|
||||
self.refresh()
|
||||
|
||||
def refresh_analysis(self):
|
||||
if self.closed or self.engine.snapshot is None:
|
||||
return
|
||||
if self.busy:
|
||||
self.pending_refresh = self.analysis_page
|
||||
return
|
||||
engine = self.engine
|
||||
owner = engine.snapshot.raw["master"]["id"]
|
||||
self.submit("analysis", lambda: engine.sweeper.statistics.snapshot(owner))
|
||||
|
||||
def reload_saved_sessions(self):
|
||||
previous = self.saved_sessions.currentData()
|
||||
self.saved_sessions.clear()
|
||||
@@ -1112,11 +1129,16 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
managed = set() if kind == "connected" else set(engine.planner.managed)
|
||||
preparing = time.perf_counter()
|
||||
cache = engine.stage_cache
|
||||
statistics = engine.sweeper.statistics
|
||||
client = engine.client
|
||||
if kind == "connected":
|
||||
session = value[0].session
|
||||
folder = self.profile_root / "roles" / identity(session) if isinstance(session, Session) and session.role_id else self.state
|
||||
cache = StageCache(catalog, folder / "maps.json")
|
||||
views = prepare_views(catalog, snapshot, managed, cache)
|
||||
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)
|
||||
return Presented(value, views, (time.perf_counter() - preparing) * 1000, (time.perf_counter() - started) * 1000)
|
||||
return value
|
||||
job = Job(kind, background)
|
||||
@@ -1171,6 +1193,11 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.arm_hatching()
|
||||
elif kind == "heartbeat":
|
||||
self.report(value)
|
||||
elif kind == "analysis":
|
||||
if self.prepared_views:
|
||||
self.prepared_views.drop_statistics = value
|
||||
self.analysis_page.set_data(self.catalog, value)
|
||||
self.report("已从本地刷新掉落统计")
|
||||
elif kind == "connected":
|
||||
client, snapshot = value
|
||||
if self.connection_guard and not self.connection_guard(client.session):
|
||||
@@ -1185,6 +1212,8 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
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
|
||||
if self.prepared_views.statistics_store:
|
||||
self.engine.sweeper.statistics = self.prepared_views.statistics_store
|
||||
self.reset_map_view()
|
||||
if isinstance(client.session, Session):
|
||||
if client.session.account_name and client.session.account_name != self.account.text().strip():
|
||||
@@ -1411,6 +1440,7 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
def set_presentation_active(self, active):
|
||||
self.presentation_active = active
|
||||
if not active:
|
||||
self.analysis_page.row_batch.stop()
|
||||
for name in ("map_render_timer", "monster_render_timer"):
|
||||
timer = getattr(self, name, None)
|
||||
if timer:
|
||||
@@ -1427,6 +1457,8 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
return
|
||||
snapshot, plans = self.latest_render
|
||||
page = self.tabs.currentWidget()
|
||||
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)):
|
||||
timer = getattr(self, name, None)
|
||||
if timer and page is not target:
|
||||
@@ -1452,6 +1484,16 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.render_quests(snapshot)
|
||||
elif page is self.map_page:
|
||||
self.render_maps()
|
||||
elif page is self.analysis_page:
|
||||
views = self.prepared_views
|
||||
owner = str(snapshot.raw["master"]["id"])
|
||||
if views and views.snapshot is snapshot and views.drop_statistics is not None and views.drop_statistics.get("owner") == owner:
|
||||
data = views.drop_statistics
|
||||
elif self.analysis_page.data.get("owner") == owner:
|
||||
data = self.analysis_page.data
|
||||
else:
|
||||
data = {"owner": owner, "totals": {}, "drops": {}}
|
||||
self.analysis_page.set_data(self.catalog, data)
|
||||
elif page is self.daily_page:
|
||||
self.render_daily()
|
||||
elif page is self.target.parentWidget() or page is self.automation_page:
|
||||
@@ -1566,6 +1608,7 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.engine.client.close()
|
||||
self.engine = Engine(self.catalog)
|
||||
self.reset_map_view()
|
||||
self.analysis_page.set_data(self.catalog, {"owner": "", "totals": {}, "drops": {}})
|
||||
self.active_identity = None
|
||||
self.state = self.profile_root
|
||||
self.load_config(copy.deepcopy(self.default_config))
|
||||
@@ -1818,6 +1861,7 @@ class Window(ActivityPages, W.QMainWindow):
|
||||
self.closed = True
|
||||
self.timer.stop()
|
||||
self.hatch_timer.stop()
|
||||
self.analysis_page.row_batch.stop()
|
||||
if hasattr(self, "auto_save_timer"):
|
||||
self.auto_save_timer.stop()
|
||||
if hasattr(self.eggs, "row_batch"):
|
||||
|
||||
Reference in New Issue
Block a user