diff --git a/README.md b/README.md index 8b32a61..e6eb725 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ | 自动委托 | 根据每日剩余次数、城市与库存接取委托,推进已支持的步骤并领奖;显示金币和氪金奖励,金币、道具及魔物提交可分别限制。实战委托已接入任务战斗调度,须开启对应选项并通过所选模式的能力检查;设置仍在“自动委托”。 | | 战斗模式与记录 | “自动主线 → 推进策略”显式选择原版运行时(默认)或实验模拟(近似);按普通地图、任务专属战斗、任务通关战斗分别编排。记录胜负、模式、地图奖励事件和待核对原因,支持停止与中断恢复;局部能力不代表全部关卡可用。 | | 自动扫荡与挑战 | 按地区折叠显示关卡、难度、通关星级及可能掉落;账号地图本地缓存,手动刷新或挑战结束后同步进度。逐关勾选、选择已解锁难度和本日次数上限,配置保留体力与战队;满足扫荡条件时扫荡,未满星时可自动模拟挑战,战败显示“打不过”,支持探索奖励事件。 | -| 掉落数据分析 | 按账号、关卡与难度在本地保存扫荡记录,分别统计普通扫荡、奖励事件或合计;展示样本数、出现次数、总数量、实测掉落率、平均数量和95%区间。支持掉落率/每点体力获得数量的条形图,不额外请求游戏服务器。 | +| 掉落数据分析 | 按账号、关卡与难度在本地保存扫荡记录,默认合计扫荡和奖励事件,也可切换查看单一来源;展示合计样本拆分、出现次数、总数量、实测掉落率、平均数量和95%区间,事件独有产物一并展示。支持掉落率/每点体力获得数量的条形图,不额外请求游戏服务器。 | | 收益资料与执行计划 | 内置749种魔物的培育时间、派遣金币、强化经验及每小时收益,支持名称/星级筛选和CSV/XLSX覆盖;执行计划显示下一步操作与等待原因。 | | 统一策略配置 | 规则修改后自动保存并应用;通过原生菜单保存、导入或导出当前账号的孵蛋、牧场、喂养、突破、赠礼、委托、每日事务、探险、扫荡、主线推进、战斗模式、刷新间隔及自定义收益资料。跨账号按魔物种类匹配培养/突破目标,探险按队序重新绑定并匹配队员,隐藏页不丢规则;不复制原账号实例ID,不包含凭据或服务器进度。 | | 界面与调试 | 原生Qt菜单、可调整和隐藏的日志区、各页右键刷新;数字与勾选项可排序,数字框获得焦点后才响应滚轮,下拉框按内容扩宽。独立调试窗口查看请求、响应、耗时与错误,支持复制、导出和本地脱敏日志。 | diff --git a/ranch_assistant/README.md b/ranch_assistant/README.md index ff75300..0e3c44b 100644 --- a/ranch_assistant/README.md +++ b/ranch_assistant/README.md @@ -77,7 +77,8 @@ - 战斗记录:按上下文筛选普通地图、主线、任务与委托战斗、扫荡和地图奖励事件;实验模型结果标明“实验近似”,未知结果保留待核对原因。 - 扫荡奖励:普通扫荡读取 `battleEnd.reward`,奖励事件读取 `stageEvent.result`,日志列出本次实际获得的物品、魔物蛋、金币和经验。 - 数据分析:紧邻“自动扫荡”的独立页签。左侧按地区选择关卡和难度,右侧显示条形图与掉落明细;关卡和可能掉落来自本地静态配置。 - 可分别查看普通扫荡、奖励事件或合计,显示样本数、出现次数、获得总数量、实测掉落率、每次平均数量及95%区间。 + 默认“扫荡+奖励事件”合并统计,也可切换只查看普通扫荡或奖励事件;合计样本会标明扫荡与事件的各自数量,事件独有产物一并展示。 + 表格和图表的样本数、出现次数、获得总数量、实测掉落率、每次平均数量及95%区间均按当前来源计算。 “每点体力数量”按已知消耗样本的获得数量除以实际扣除体力计算,图表可切换到该指标;未知消耗样本不参与,体力奖励返还单独列出。 无样本显示“—”;同次获得多件物品只计一次出现,实测掉落率为出现次数除以已确认样本数。 数据按账号/角色保存在本地 `sweep_rewards.sqlite3`,重启保留;首次后台补录现有调试日志中能匹配角色、关卡和成功结算的记录,重复响应不重复计数。 diff --git a/ranch_assistant/statistics_gui.py b/ranch_assistant/statistics_gui.py index e2a058b..697c794 100644 --- a/ranch_assistant/statistics_gui.py +++ b/ranch_assistant/statistics_gui.py @@ -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": "魔物"} diff --git a/ranch_assistant/tests/test_combined_drop_statistics.py b/ranch_assistant/tests/test_combined_drop_statistics.py new file mode 100644 index 0000000..1829ebd --- /dev/null +++ b/ranch_assistant/tests/test_combined_drop_statistics.py @@ -0,0 +1,156 @@ +import json +from types import SimpleNamespace +import unittest + +from ranch_assistant.drop_statistics import SweepStatistics, analyze +from ranch_assistant.sweeping import SweepPolicy, SweepRunner +from ranch_assistant.tests.test_activities import FakeClient, scenario +from ranch_assistant.tests.test_core import workspace_temp + + +UNKNOWN_COST = object() + + +def reward(number, **extra): + return {"money": 32, "exp": 64, "items": [ + {"typeId": 30005, "num": number}], "monsters": [], **extra} + + +class OfflineRewardClient(FakeClient): + """Successful wire-shaped replies; no transport or external configuration.""" + + def __init__(self, snapshot, events): + super().__init__(snapshot) + self.events = iter(events) + self.trace = SimpleNamespace(events=[]) + self.first_start = True + + def call(self, operation, payload=None): + self.calls.append((operation, payload)) + identifier = f"offline-{len(self.calls)}" + if operation == "stageService/stageStart": + if self.first_start: + self.first_start = False + body = {"resCode": 0, "triggerEvent": False} + else: + result, cost = next(self.events) + event = {"resCode": 0, "hideStageId": None, "result": result} + if cost is not UNKNOWN_COST: + event["costTi"] = cost + body = {"resCode": 0, "triggerEvent": True, "stageEvent": event} + elif operation == "battleService/battleEnd": + body = {"resCode": 0, "costTi": 16, "reward": reward(2)} + else: + body = {"resCode": 0} + self.trace.events.append({"operation": operation, "kind": "response", + "request_id": identifier, "http_status": 200, "body": body}) + return body + + +class CombinedDropStatisticsTests(unittest.TestCase): + def setUp(self): + self.catalog, self.snapshot = scenario() + self.owner = self.snapshot.raw["master"]["id"] + + def test_runner_combines_settled_sweep_and_event_rewards(self): + events = [ + (reward(3), 16), + (reward(0, items=[{"typeId": 99999999, "num": 4}]), 16), + ({"money": 0, "exp": 0, "items": [], "monsters": []}, 16), + (reward(5), 0), + (reward(7), UNKNOWN_COST), + ] + runner = SweepRunner(self.catalog) + client = OfflineRewardClient(self.snapshot, events) + policy = SweepPolicy(True, {"0101": {"enabled": True, "level": "3", "limit": 6}}) + for expected in ("sweep", "event", "event", "event", "event", "event"): + stage = runner.next(self.snapshot, policy) + self.assertIsNotNone(stage) + runner.run(client, self.snapshot, stage, policy) + self.assertEqual(runner.last_outcome, expected) + self.assertEqual(runner.statistics_error, "") + + data = runner.statistics.snapshot(self.owner) + totals, rows = analyze(self.catalog, data, "0101", "3", "all") + self.assertEqual({key: totals[key] for key in ("n", "money", "exp", "spent", "known")}, + {"n": 6, "money": 160, "exp": 320, "spent": 64, "known": 5}) + common = next(row for row in rows if row["key"] == "item:30005") + self.assertEqual((common["hits"], common["units"], common["cost_units"], common["rate"]), (4, 17, 10, 4 / 6)) + self.assertEqual(common["average"], 17 / 6) + self.assertEqual(common["per_stamina"], 10 / 64) + event_only = next(row for row in rows if row["key"] == "item:99999999") + self.assertEqual((event_only["configured"], event_only["hits"], event_only["units"], event_only["rate"]), + (False, 1, 4, 1 / 6)) + self.assertEqual(event_only["per_stamina"], 4 / 64) + + # Existing filters remain isolated, and zero/unknown-cost events still count as samples. + self.assertEqual(analyze(self.catalog, data, "0101", "3")[0]["n"], 1) + self.assertEqual(analyze(self.catalog, data, "0101", "3", "event")[0]["n"], 5) + self.assertEqual(analyze(self.catalog, data, "0101", "3", "event")[1][0]["samples"], 5) + + def test_combined_scope_keeps_source_difficulty_and_owner_separate(self): + store = SweepStatistics(self.catalog) + self.assertTrue(store.record(self.owner, "0101", "3", "sweep", "shared", 1, reward(2), spent=16)) + self.assertFalse(store.record(self.owner, "0101", "3", "sweep", "shared", 1, reward(2), spent=16)) + store.record(self.owner, "0101", "3", "event", "event", 2, reward(3), spent=0) + store.record(self.owner, "0101", "1", "event", "other-level", 3, reward(11), spent=16) + store.record(2, "0101", "3", "event", "other-owner", 4, reward(13), spent=16) + + totals, rows = analyze(self.catalog, store.snapshot(self.owner), "0101", "3", "all") + common = next(row for row in rows if row["key"] == "item:30005") + self.assertEqual((totals["n"], totals["known"], totals["spent"]), (2, 2, 16)) + self.assertEqual((common["units"], common["cost_units"], common["rate"]), (5, 5, 1)) + self.assertEqual(common["per_stamina"], 5 / 16) + self.assertEqual(analyze(self.catalog, store.snapshot(self.owner), "0101", "1", "all")[0]["n"], 1) + self.assertEqual(analyze(self.catalog, store.snapshot(2), "0101", "3", "all")[0]["n"], 1) + + def test_history_import_adds_event_reward_and_deduplicates_live_request(self): + battle = {"win": True, "leftTime": 0, "killNum": 0, "totalDamage": 0, "cheatNum": 0, + "battlePosition": {"battleType": "stage", "stageId": "0101", "stageLevel": "3"}} + entries = [ + {"operation": "读取角色", "kind": "response", "body": {"master": {"id": self.owner}}}, + {"operation": "battleService/battleEnd", "kind": "request", "request_id": "live-normal", "body": {"battleData": battle}}, + {"operation": "battleService/battleEnd", "kind": "response", "request_id": "live-normal", "http_status": 200, + "time": "2026-11-10T12:00:00+08:00", "body": {"resCode": 0, "costTi": 16, "reward": reward(2)}}, + {"operation": "stageService/stageStart", "kind": "request", "request_id": "historic-event", + "body": {"stageTypeId": "0101", "stageLevel": "3"}}, + {"operation": "stageService/stageStart", "kind": "response", "request_id": "historic-event", "http_status": 200, + "time": "2026-11-10T12:00:01+08:00", "body": {"resCode": 0, "triggerEvent": True, + "stageEvent": {"resCode": 0, "hideStageId": None, "costTi": 0, "result": reward(3)}}}, + ] + with workspace_temp() as folder: + trace = folder / "network_debug.jsonl" + text = "\n".join(json.dumps(entry) for entry in entries) + trace.write_text(text, encoding="utf-8") + trace.with_name("network_debug.previous.jsonl").write_text(text, encoding="utf-8") + store = SweepStatistics(self.catalog) + store.record(self.owner, "0101", "3", "sweep", "request:live-normal", 1, reward(2), spent=16) + store.import_log(self.owner, trace) + + totals, rows = analyze(self.catalog, store.snapshot(self.owner), "0101", "3", "all") + common = next(row for row in rows if row["key"] == "item:30005") + self.assertEqual((totals["n"], totals["spent"], totals["known"]), (2, 16, 2)) + self.assertEqual((common["units"], common["cost_units"], common["per_stamina"]), (5, 5, 5 / 16)) + store.import_log(2, trace) + self.assertEqual(store.snapshot(2)["totals"], {}) + + def test_reported_stage_scale_combines_all_rows_and_currency_totals(self): + # Mirrors the read-only SQLite check without opening a user's database. + store = SweepStatistics(self.catalog) + for index in range(30): + store.record(1, "0211", "3", "sweep", f"sweep-{index}", index, reward(0), spent=16) + amounts = [26, 26, 26, 26, 26, 26, 26, 27] + for index in range(42): + items = [{"typeId": 30005 + offset, "num": amounts[offset]} for offset in range(8)] if index == 0 else [] + store.record(1, "0211", "3", "event", f"event-{index}", 100 + index, + {"money": 32, "exp": 64, "items": items}, spent=16) + + totals, rows = analyze(self.catalog, store.snapshot(1), "0211", "3", "all") + self.assertEqual({key: totals[key] for key in ("n", "money", "exp", "spent", "known")}, + {"n": 72, "money": 2304, "exp": 4608, "spent": 1152, "known": 72}) + observed = [row for row in rows if row["units"]] + self.assertEqual((len(observed), sum(row["units"] for row in observed)), (8, 209)) + + +if __name__ == "__main__": + unittest.main() diff --git a/ranch_assistant/tests/test_drop_statistics.py b/ranch_assistant/tests/test_drop_statistics.py index 95bb37d..3d45a6b 100644 --- a/ranch_assistant/tests/test_drop_statistics.py +++ b/ranch_assistant/tests/test_drop_statistics.py @@ -195,21 +195,45 @@ class AnalysisGuiTests(unittest.TestCase): store = SweepStatistics(catalog) store.record(1, "0101", "3", "sweep", "one", 1, REWARD, spent=10) store.record(1, "0101", "3", "sweep", "two", 2, {"items": []}, spent=10) - store.record(1, "0101", "3", "event", "three", 3, {"items": []}) + store.record(1, "0101", "3", "event", "three", 3, + {"money": 16, "exp": 32, "items": [{"typeId": 99999999, "num": 3}]}, spent=8) + store.record(1, "0101", "3", "event", "event-two", 4, + {"money": 0, "exp": 0, "items": [{"typeId": 99999999, "num": 1}]}, spent=8) page = StatisticsPage(catalog) try: page.set_data(catalog, store.snapshot(1)) self.wait(lambda: not page.row_batch.running) self.assertEqual(page.current_key, ("0101", "3")) - self.assertIn("2 个已确认样本", page.summary.text()) + self.assertEqual(page.source.currentData(), "all") + self.assertEqual(page.source.currentText(), "扫荡+奖励事件") + self.assertIn("合计 4 个已确认样本(扫荡 2 + 奖励事件 2)", page.summary.text()) + self.assertIn("累计金币 48、经验 96", page.summary.text()) + self.assertIn("已知体力消耗样本 4/4;消耗体力 36", page.summary.text()) self.assertTrue(page.chart_view.chart().series()) row = next(i for i in range(page.table.rowCount()) if page.table.item(i, 0).text() == catalog.data["item_names"]["30005"]) - self.assertEqual(page.table.item(row, 5).text(), "50.00%") - self.assertEqual(page.table.item(row, 7).text(), "0.25") + self.assertEqual([page.table.item(row, column).text() for column in (2, 3, 4, 5, 7)], + ["1", "5", "4", "25.00%", "0.138889"]) + event_row = next(i for i in range(page.table.rowCount()) if page.table.item(i, 0).text() == "物品 #99999999") + self.assertEqual([page.table.item(event_row, column).text() for column in (2, 3, 4, 5, 7, 9)], + ["2", "4", "4", "50.00%", "0.111111", "实际观测"]) + series = page.chart_view.chart().series()[0] + categories = series.attachedAxes()[1].categories() + self.assertEqual(series.barSets()[0].at(categories.index(catalog.data["item_names"]["30005"])), 25) + self.assertEqual(series.barSets()[0].at(categories.index("物品 #99999999")), 50) page.chart_metric.setCurrentIndex(page.chart_metric.findData("per_stamina")) self.assertEqual(page.chart_view.chart().title(), "每点体力数量") + page.source.setCurrentIndex(page.source.findData("sweep")) + self.assertIn("普通扫荡:2 个已确认样本", page.summary.text()) + row = next(i for i in range(page.table.rowCount()) if page.table.item(i, 0).text() == catalog.data["item_names"]["30005"]) + self.assertEqual([page.table.item(row, column).text() for column in (4, 5, 7)], ["2", "50.00%", "0.25"]) + self.assertNotIn("物品 #99999999", [page.table.item(i, 0).text() for i in range(page.table.rowCount())]) page.source.setCurrentIndex(page.source.findData("event")) - self.assertIn("1 个已确认样本", page.summary.text()) + self.assertIn("奖励事件:2 个已确认样本", page.summary.text()) + self.assertIn("累计金币 16、经验 32", page.summary.text()) + event_row = next(i for i in range(page.table.rowCount()) if page.table.item(i, 0).text() == "物品 #99999999") + self.assertEqual([page.table.item(event_row, column).text() for column in (4, 5, 7)], ["2", "100.00%", "0.25"]) + row = next(i for i in range(page.table.rowCount()) if page.table.item(i, 0).text() == catalog.data["item_names"]["30005"]) + self.assertEqual([page.table.item(row, column).text() for column in (4, 5, 7)], ["2", "0.00%", "0"]) page.tree.setCurrentItem(page.level_items["0102", "1"]) self.assertIn("尚无此范围的样本", page.summary.text()) self.assertTrue(all(page.table.item(i, 5).text() == "—" for i in range(page.table.rowCount())))