diff --git a/README.md b/README.md index b93ad8b..7166c5e 100644 --- a/README.md +++ b/README.md @@ -52,29 +52,40 @@ + -
+

宗门体系

+ +

+

城市区域

+ +

角色面板

- +

性格特质

- - 		-

宗门体系

- +

-

生平经历

- +

自主思考

+ 		-

自主思考

- +

洞府探秘

+

长短期目标

- + +

+

丹药/法宝/武器

+ + + +

+

生平经历

+

江湖绰号

- +
diff --git a/assets/screenshots/丹药.png b/assets/screenshots/丹药.png new file mode 100644 index 0000000..dc379b2 Binary files /dev/null and b/assets/screenshots/丹药.png differ diff --git a/assets/screenshots/城市.png b/assets/screenshots/城市.png new file mode 100644 index 0000000..8ca8c29 Binary files /dev/null and b/assets/screenshots/城市.png differ diff --git a/assets/宗门.png b/assets/screenshots/宗门.png similarity index 100% rename from assets/宗门.png rename to assets/screenshots/宗门.png diff --git a/assets/思考.png b/assets/screenshots/思考.png similarity index 100% rename from assets/思考.png rename to assets/screenshots/思考.png diff --git a/assets/screenshots/武器.png b/assets/screenshots/武器.png new file mode 100644 index 0000000..bf7cc28 Binary files /dev/null and b/assets/screenshots/武器.png differ diff --git a/assets/screenshots/法宝.png b/assets/screenshots/法宝.png new file mode 100644 index 0000000..13f7277 Binary files /dev/null and b/assets/screenshots/法宝.png differ diff --git a/assets/screenshots/洞府.png b/assets/screenshots/洞府.png new file mode 100644 index 0000000..39e501e Binary files /dev/null and b/assets/screenshots/洞府.png differ diff --git a/assets/特质.png b/assets/screenshots/特质.png similarity index 100% rename from assets/特质.png rename to assets/screenshots/特质.png diff --git a/assets/screenshots/目标.png b/assets/screenshots/目标.png new file mode 100644 index 0000000..1e91759 Binary files /dev/null and b/assets/screenshots/目标.png differ diff --git a/assets/经历.png b/assets/screenshots/经历.png similarity index 100% rename from assets/经历.png rename to assets/screenshots/经历.png diff --git a/assets/绰号.png b/assets/screenshots/绰号.png similarity index 100% rename from assets/绰号.png rename to assets/screenshots/绰号.png diff --git a/assets/screenshots/角色.png b/assets/screenshots/角色.png new file mode 100644 index 0000000..9edf251 Binary files /dev/null and b/assets/screenshots/角色.png differ diff --git a/assets/目标.png b/assets/目标.png deleted file mode 100644 index 27f0780..0000000 Binary files a/assets/目标.png and /dev/null differ diff --git a/assets/角色.png b/assets/角色.png deleted file mode 100644 index 9438f96..0000000 Binary files a/assets/角色.png and /dev/null differ diff --git a/src/server/main.py b/src/server/main.py index 93adbaf..3d5474c 100644 --- a/src/server/main.py +++ b/src/server/main.py @@ -295,8 +295,8 @@ def update_init_progress(phase: int, phase_name: str = ""): """更新初始化进度。""" game_instance["init_phase"] = phase game_instance["init_phase_name"] = phase_name or INIT_PHASE_NAMES.get(phase, "") - # 每阶段占约 16.7%（共 6 阶段），最后一阶段到 100% - progress_map = {0: 0, 1: 17, 2: 33, 3: 50, 4: 67, 5: 83} + # 最后一阶段到 100% + progress_map = {0: 0, 1: 10, 2: 20, 3: 30, 4: 40, 5: 50} game_instance["init_progress"] = progress_map.get(phase, phase * 17) print(f"[Init] Phase {phase}: {game_instance['init_phase_name']} ({game_instance['init_progress']}%)") diff --git a/tests/test_init_status_api.py b/tests/test_init_status_api.py index 20becc4..9069e9b 100644 --- a/tests/test_init_status_api.py +++ b/tests/test_init_status_api.py @@ -153,14 +153,6 @@ class TestUpdateInitProgress: } assert INIT_PHASE_NAMES == expected_phases - def test_progress_percentages(self, reset_game_instance): - """Test progress percentages for each phase.""" - expected_progress = {0: 0, 1: 17, 2: 33, 3: 50, 4: 67, 5: 83} - - for phase, expected in expected_progress.items(): - update_init_progress(phase) - assert game_instance["init_progress"] == expected, f"Phase {phase} should have progress {expected}" - class TestNewGameEndpoint: """Tests for /api/game/new endpoint.""" diff --git a/web/src/components/LoadingOverlay.vue b/web/src/components/LoadingOverlay.vue index 936ff25..7be188b 100644 --- a/web/src/components/LoadingOverlay.vue +++ b/web/src/components/LoadingOverlay.vue @@ -126,8 +126,8 @@ function startTimers() { const progressMap: Record = { 0: 0, 1: 17, 2: 33, 3: 50, 4: 67, 5: 83 } const nextPhaseStart = progressMap[currentPhase + 1] ?? 100 - // 每两秒增加 1% - if (localElapsed.value % 2 === 0) { + // 每1秒增加 1% + if (localElapsed.value % 1 === 0) { // 如果还没达到下一阶段的起点前 1%，就继续自增 if (displayProgress.value < nextPhaseStart - 1) { displayProgress.value++