Include event rewards by default in drop analysis
Default statistics to combined sweep and event samples, show the source counts, and verify merged rewards and stamina efficiency across live-shaped and imported settlements.
This commit is contained in:
@@ -24,7 +24,7 @@ class StatisticsPage(W.QWidget):
|
||||
self.search = W.QLineEdit()
|
||||
self.search.setPlaceholderText("搜索关卡编号或名称")
|
||||
self.source = ComboBox()
|
||||
for label, value in (("普通扫荡", "sweep"), ("奖励事件", "event"), ("合计", "all")):
|
||||
for label, value in (("扫荡+奖励事件", "all"), ("普通扫荡", "sweep"), ("奖励事件", "event")):
|
||||
self.source.addItem(label, value)
|
||||
self.chart_metric = ComboBox()
|
||||
self.chart_metric.addItem("实测掉落率", "rate")
|
||||
@@ -72,7 +72,7 @@ class StatisticsPage(W.QWidget):
|
||||
self.splitter.setSizes([320, 740])
|
||||
self.splitter.setStretchFactor(1, 1)
|
||||
layout.addWidget(self.splitter, 1)
|
||||
note = W.QLabel("实测掉落率 = 出现次数 ÷ 已确认样本数;同次多件只记一次出现。每点体力数量 = 已知消耗样本的物品数量 ÷ 实际扣除体力,不扣减奖励返还的体力。\n不同难度、扫荡和事件分别统计;未知消耗样本不参与体力效率计算,消耗为0时不计算比值。无样本显示“—”;95%区间反映样本不确定性,实测结果不是官方掉率。")
|
||||
note = W.QLabel("实测掉落率 = 出现次数 ÷ 已确认样本数;同次多件只记一次出现。每点体力数量 = 已知消耗样本的物品数量 ÷ 实际扣除体力,不扣减奖励返还的体力。\n默认“扫荡+奖励事件”合并两类样本,表格、图表、样本数、金币经验和体力效率均按合计口径;切换到普通扫荡或奖励事件则只计该来源。不同难度仍分别统计;未知消耗样本不参与体力效率计算,消耗为0时不计算比值。无样本显示“—”;95%区间反映样本不确定性,实测结果不是官方掉率。")
|
||||
note.setWordWrap(True)
|
||||
layout.addWidget(note)
|
||||
self.tree.currentItemChanged.connect(self.selection_changed)
|
||||
@@ -187,10 +187,15 @@ class StatisticsPage(W.QWidget):
|
||||
if self.current_key:
|
||||
stage_id, level = self.current_key
|
||||
stage = self.catalog.data["stage_info"][stage_id]
|
||||
totals, rows = analyze(self.catalog, self.data, stage_id, level, self.source.currentData())
|
||||
source = self.source.currentData()
|
||||
totals, rows = analyze(self.catalog, self.data, stage_id, level, source)
|
||||
counts = f"扫荡 {self.count(stage_id, level, 'sweep')} 次 / 事件 {self.count(stage_id, level, 'event')} 次"
|
||||
if source == "all":
|
||||
samples = f"合计 {totals['n']} 个已确认样本(扫荡 {self.count(stage_id, level, 'sweep')} + 奖励事件 {self.count(stage_id, level, 'event')})"
|
||||
else:
|
||||
samples = f"{self.source.currentText()}:{totals['n']} 个已确认样本"
|
||||
average = f";平均金币 {totals['money']/totals['n']:.2f}、经验 {totals['exp']/totals['n']:.2f}" if totals["n"] else ";尚无此范围的样本,完成结算后自动记录"
|
||||
self.summary.setText(f"{stage.get('tagname') or stage_id} {stage.get('name') or stage_id} / 难度 {level} | {counts}\n{self.source.currentText()}:{totals['n']} 个已确认样本;累计金币 {totals['money']}、经验 {totals['exp']}{average}\n已知体力消耗样本 {totals['known']}/{totals['n']};消耗体力 {totals['spent']};奖励返还体力 {totals['ti']}" + ("\n" + self.data["error"] if self.data.get("error") else ""))
|
||||
self.summary.setText(f"{stage.get('tagname') or stage_id} {stage.get('name') or stage_id} / 难度 {level} | {counts}\n{samples};累计金币 {totals['money']}、经验 {totals['exp']}{average}\n已知体力消耗样本 {totals['known']}/{totals['n']};消耗体力 {totals['spent']};奖励返还体力 {totals['ti']}" + ("\n" + self.data["error"] if self.data.get("error") else ""))
|
||||
chart.setTitle(self.chart_metric.currentText() if totals["n"] else "尚无样本")
|
||||
self.table.setRowCount(len(rows))
|
||||
kinds = {"item": "物品", "egg": "魔物蛋", "monster": "魔物"}
|
||||
|
||||
Reference in New Issue
Block a user