Prioritize commission rewards and fix built-in battle simulation flow

This commit is contained in:
AttilaNet
2026-11-08 20:07:26 +08:00
parent 1ee030a8e3
commit 001ed9d36d
12 changed files with 260 additions and 59 deletions
+57 -14
View File
@@ -318,9 +318,14 @@ class ProgressionGuiTests(unittest.TestCase):
self.assertEqual(window.progression_auto_farm.isChecked(), ProgressionPolicy().auto_farm)
else:
self.assertFalse(hasattr(window, "progression_auto_farm"))
self.assertEqual(window.progression_battle_mode.currentData(), "original")
self.assertIn("近似", window.progression_battle_mode.toolTip())
self.assertIn("委托", window.progression_battle_mode.toolTip())
self.assertEqual(window.progression_battle_mode.currentData(), "experimental")
self.assertEqual(window.engine.progression_policy.battle_mode, "experimental")
self.assertTrue(window.progression_battle_mode.isHidden())
settings = window.progression_tabs.widget(1).widget()
self.assertEqual(settings.layout().indexOf(window.progression_battle_mode), -1)
self.assertFalse(any("战斗模式" in label.text() for label in settings.findChildren(W.QLabel)))
for text in ("原始属性", "实验模拟", "战斗时长后提交", "近似", "实际记录"):
self.assertIn(text, window.progression_status.text())
self.assertFalse(window.strategy_toggle.isChecked())
for widget in (window.ranch_enabled, window.quest_enabled, window.daily_enabled, window.map_enabled, window.gift_enabled):
widget.setChecked(False)
@@ -364,7 +369,7 @@ class ProgressionGuiTests(unittest.TestCase):
self.wait(first)
self.wait(second)
self.assertEqual(asdict(first.read_progression_policy()), expected)
self.assertEqual(asdict(second.read_progression_policy()), asdict(ProgressionPolicy()))
self.assertEqual(asdict(second.read_progression_policy()), asdict(ProgressionPolicy()) | {"battle_mode": "experimental"})
self.assertFalse(first.strategy_toggle.isChecked())
self.assertFalse(second.strategy_toggle.isChecked())
finally:
@@ -396,15 +401,21 @@ class ProgressionGuiTests(unittest.TestCase):
finally:
window.close()
def test_battle_mode_autosaves_without_starting_and_reaches_worker_policy(self):
def test_legacy_original_mode_normalizes_for_autosave_and_worker_policy(self):
with workspace_temp() as folder:
window = gui.Window(folder)
window.timer.stop()
try:
self.wait(window)
window.engine.run_progression_once = Mock()
self.assertEqual(window.progression_battle_mode.currentData(), "original")
window.progression_battle_mode.setCurrentIndex(window.progression_battle_mode.findData("experimental"))
legacy = asdict(configured_policy()) | {"battle_mode": "original"}
window.load_config(window.config_value() | {"progression_policy": legacy})
self.assertEqual(window.progression_battle_mode.currentData(), "experimental")
self.assertEqual(asdict(window.read_progression_policy()), asdict(configured_policy()))
self.assertEqual(legacy["battle_mode"], "original")
# Older GUI glue can write the hidden field again after load_config.
window.progression_battle_mode.setCurrentIndex(window.progression_battle_mode.findData("original"))
self.assertEqual(window.read_progression_policy().battle_mode, "experimental")
QTest.qWait(350)
self.wait(window)
saved = json.loads((folder / "settings.json").read_text(encoding="utf-8"))
@@ -418,7 +429,7 @@ class ProgressionGuiTests(unittest.TestCase):
observations = []
def preview():
observations.append((window.engine.progression_policy.battle_mode, C.QThread.currentThread()))
return window.engine.snapshot, [], "已预览所选战斗模式"
return window.engine.snapshot, [], "已预览模拟战斗策略"
window.engine.refresh_progression = Mock(side_effect=preview)
window.refresh_progression()
self.wait(window)
@@ -428,6 +439,33 @@ class ProgressionGuiTests(unittest.TestCase):
finally:
window.close()
def test_saved_original_and_missing_modes_load_as_experimental_without_starting(self):
for mode in ("original", None):
with self.subTest(mode=mode), workspace_temp() as folder:
legacy = asdict(configured_policy())
if mode is None:
del legacy["battle_mode"]
else:
legacy["battle_mode"] = mode
path = folder / "settings.json"
path.write_text(json.dumps({"progression_policy": legacy}), encoding="utf-8")
window = gui.Window(folder)
window.timer.stop()
try:
window.engine.run_progression_once = Mock()
self.wait(window)
self.assertEqual(window.progression_battle_mode.currentData(), "experimental")
self.assertTrue(window.progression_battle_mode.isHidden())
self.assertEqual(asdict(window.read_progression_policy()), asdict(configured_policy()))
self.assertEqual(asdict(window.engine.progression_policy), asdict(configured_policy()))
window.persist_settings()
self.assertEqual(json.loads(path.read_text(encoding="utf-8"))["progression_policy"], asdict(configured_policy()))
self.assertFalse(window.strategy_toggle.isChecked())
self.assertFalse(window.engine.auto)
window.engine.run_progression_once.assert_not_called()
finally:
window.close()
def test_additional_and_unavailable_teams_round_trip_visibly_without_starting(self):
with workspace_temp() as folder:
window = gui.Window(folder)
@@ -710,17 +748,22 @@ class ProgressionGuiTests(unittest.TestCase):
def test_experimental_record_outcomes_keep_their_approximate_label(self):
records = [
{"battle_mode": "experimental", "faithful": False, "approximate": True, "outcome": "win"},
{"battle_mode": "experimental", "outcome": "loss"},
{"execution_mode": "experimental", "outcome": "unsupported", "reason": "能力检查未通过"},
{"battle_mode": "original", "outcome": "win"},
{"outcome": "win"},
]
original = copy.deepcopy(records)
engine = SimpleNamespace(snapshot=object(), progression_rows=lambda: [], progression_records=lambda: records)
rows = prepare_progression_views(engine).records
self.assertIn("实验近似", rows[0]["values"][4])
self.assertIn("近似,未完整验证", rows[0]["detail"])
self.assertEqual(rows[1]["values"][4], "胜利")
self.assertIn("原版运行时", rows[1]["detail"])
self.assertIn("记录未标明", rows[2]["detail"])
self.assertEqual(records[0]["outcome"], "win")
for row, outcome in zip(rows, ("胜利", "战败", "暂不支持")):
self.assertEqual(row["values"][4], outcome + "(实验近似)")
self.assertIn("近似,未完整验证", row["detail"])
self.assertIn("能力检查未通过", rows[2]["detail"])
self.assertEqual(rows[3]["values"][4], "胜利")
self.assertIn("原版运行时", rows[3]["detail"])
self.assertIn("记录未标明", rows[4]["detail"])
self.assertEqual(records, original)
def test_repeated_sorted_table_updates_do_not_reinsert_owned_items(self):
table = CachedTable(["编号", "名称"])