Compare commits

...
14 Commits
Author SHA1 Message Date
xuyueandClaude Opus 5.5 f6f7a0c3af fix(看板娘): 把看板娘拖到右上角时,成就弹框会压在她头上,现在弹框让到她左边
Deploy / deploy (push) Successful in 1m5s
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-03 16:52:00 +08:00
xuyueandClaude Opus 5.5 cccf7a37be feat(成就): 多了 9 个好拿的档和「挑战成功」一条线,比赛里做的题也算,这学期八成学生多拿到成就
- 补档:做对 20 道、第一道中等题、交满 30 次、5 天交过题、一次就对 5 道、错 3 次后做对、一天做对 5 道;
  新线「挑战成功」1 次 / 5 次
- 比赛里的提交也计入成就(比赛其实是单班测验,2612 班整班在比赛里做题,原来一个成就都没有);
  参加过几场比赛改成判题时就更新,以前只在后台重扫时刷新
- 奖杯收藏家从 15 个提到 20 个
- 0044 迁移:按新口径从提交记录重数指标,给达标的人补发(已经拿到的不收回)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-03 16:52:00 +08:00
xuyueandClaude Opus 5.5 1fdee94812 docs(部署): 记下 runner 会「假在线」以及看门狗兜底
gitea-runner 5.2.4 拉任务超时一次后就不再拉,Gitea 显示没有在线的运行器。开发机上
fetch_timeout 放到 30s,另加用户级 gitea-runner-watchdog.timer 每 5 分钟检查、卡住就重启。

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-03 16:36:48 +08:00
xuyueandClaude Opus 5.5 aa7e0a6eb8 feat(看板娘): 接上全班进度、难度、提示、知识点、排名等数据,说的话更贴每个人
Deploy / deploy (push) Successful in 50s
- 题目页:这节课同班做对的人多就说「全班已经 N 个人做对了」、都卡着就安慰、第一个做对的夸一句;
  通过率不到三成的题错了说「本来就难」、高于七成的说「再看看题」;AI 提示开了没用就提一句;
  做对了还有挑战就问敢不敢;流程图分低、拿 S 各有话
- 常点「太难了」的学生错了换软话;这周交得多、例子跑得少的念一句;卡住却从不举手的劝举手;
  这周要提示多的劝先自己想
- 首页(这节课没要做的时)每次戳随机说一件:知识点差几道升级、周榜差几道超过前一名、
  今天明天的比赛、三天内的新公告;两周以上没来说「好久不见」,只说一回
- 排名页第一名、差前一名几道;成就页差一点的;自学没全对的练一练;专题差最后一道拿奖章
- 运行例子、自己输入、举手也记进 mascot_event(trial、help),GET /mascot/profile
  多给「太难了」次数和这一周交、跑例子、举手、要提示的次数

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-03 16:33:35 +08:00
xuyueandClaude Opus 5.5 81ef4dca6b feat(看板娘): 记得你常错在哪,题目页上会主动开口,互动都记下来
Deploy / deploy (push) Successful in 51s
- 按学生的行为挑话:最近 20 次提交里某类错特别多(运行出错细到 NameError、TypeError、
  ValueError、EOFError),再错这一类时点名说;今天做对第 3 道起偶尔数一数;
  第一次戳她有见面的话,戳得多了说「又是你」
- 题目页上主动开口:同一题错到第 5 次、连着 3 次没跑例子就交还错了、又犯老毛病、
  15 分钟没交没跑。比赛里不说,至少隔 3 分钟,同一件事一题一次,10 秒后收起
- 互动记进新表 mascot_event(0043):点开、点按钮、主动开口、摸头、点烦、被拖走;
  只记看板娘这边的事,每人每分钟最多 30 条
- GET /mascot/profile 给最近的错类、今天做对几道、点过几次;门槛按本机生产快照定
  (266 人里运行出错 ≥3 的 87 人、答案错误 ≥5 的 82 人)
- 编辑过程(粘贴)数据学生侧不用,免得冤枉人

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-03 16:22:58 +08:00
xuyueandClaude Opus 5.5 ef3c53c671 feat(看板娘): 点她会按页面说一句傲娇的话,再给两三个能直接办事的按钮
Deploy / deploy (push) Successful in 49s
- 她从不主动开口,点一下才冒气泡;比赛里不弹。台词 326 句(shared/mascot/lines.ts),
  口吻照「小鲸鱼」角色卡,学校里舍掉英文、粗口,「用户」改叫「同学」
- 按情况换话:题目页分没写、没交、例子没对上/对上、答错、编译错误、运行出错、超时、
  错很多次、做对、一次就对、终于对了、以前做过;首页、题目列表、提交、专题、自学、排名等各有一组
- 按钮真的去办:运行例子、我错在哪(切到结果里出错的那一段)、举手、输题号、随便来一道、
  下一道、选题……
- 老师也看得到:有学生举手时任何页面先说这件事;首页、课堂任务、统计、题目页各有一组
- 页面用 useMascotGuide 告诉她现在的情况(shared/mascot/guide.ts),以后按学生行为调整也接在这一层
- 修:连点时像卡住了(快点时按压过渡来不及显示,改成每下播一遍压扁回弹);
  一打开从左上角飞到右下角;去掉单击的摆动

设计稿与台词表:https://claude.ai/artifact/Qz2zPCfq2zCrqmxyms1UGx

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-03 16:12:23 +08:00
xuyueandClaude Opus 5.5 15966ceb0d feat(看板娘): 前台右下角多了一个能拖、能点的看板娘,连点偶尔会被摸摸头
Deploy / deploy (push) Successful in 50s
形象和交互参照 MeteorNOX/DeepSeek-Balance-Whale-Widget,图片取自它的 assets/
(DSniang1.png 转 webp、rua.gif 原样)。那个仓库的图不在 MIT 范围内,见它的 PROVENANCE.md。

- 拖到哪停哪,靠近四边的四分之一就贴边;在左半边时镜像,脸朝页面中间
- 按下压扁、松手回弹,点一下蹦一下
- 彩蛋:连点时每轮三分之一的机会,在第 4~8 下随机一下被摸头
- 只在电脑宽度显示;位置存本机浏览器

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-03 14:57:59 +08:00
xuyueandClaude Opus 5.5 0c94f2db87 perf(暗色): 每次打开页面不再白白强制重算两次整页样式
Deploy / deploy (push) Successful in 49s
上一版全站共用一个 useDark 之后,它一进页面仍要把 <html> 的 class 同步两遍,每遍都插
style + getComputedStyle 逼整页重算。class 已经对了就跳过,只有真要切换时才走原来那套。
CPU 降速 6 倍下每页省约 25ms;切换暗色、暗色下刷新、切回亮色都核过。

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-03 14:36:11 +08:00
xuyueandClaude Opus 5.5 f01870c072 fix(烟花): 「表情包」那一种在机房电脑上卡成幻灯片
canvas-confetti 画位图粒子是每帧按「位图边长 × scalar」填一个图案矩形,和表情实际多大
无关。原来位图 64px、scalar 5,表情显示 50px,每个粒子每帧却填 320×320,两团 32 个
粒子一帧三百多万像素。改成位图直接画成 50px、scalar 1、矩阵不缩放:显示大小和轨迹
不变(scalar 只管大小不管运动),填的正好是 50×50。

同样画法在无 GPU 的 Chrome 里复现一帧:17ms → 0.5ms(快的 CPU 核上,旧的已经吃满一帧)。
其余九种是圆点、星星、对勾、爱心这类路径,只填图形本身,没有这个问题。

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-03 14:22:42 +08:00
xuyueandClaude Opus 5.5 95dc2f24e6 perf(提交列表): 按 ↑ ↓ 换到没看过的一条也不卡了 —— 右栏预取上一条、下一条
Deploy / deploy (push) Successful in 48s
原来换到没缓存的一条要先卸掉代码区、转圈、再整个挂回来,CPU 降速 6 倍下每次卡
60–100ms;走缓存的只换内容不卡。现在这一条加载完顺手把上下两条也拉回来,同一条
只发一次请求(预取还在路上时按到它就接着等),按住 ↓ 划过去的那些行不预取。

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-03 13:57:34 +08:00
xuyueandClaude Opus 5.5 e511d82f3b perf(暗色): 提交列表、排名首屏卡掉的一秒多回来了 —— 全站共用一个 useDark
VueUse 的 useDark 每个实例挂载时都插一段 style、getComputedStyle 逼整页重算样式,
亮色下它的「没东西要改就跳过」永远不成立。提交列表每行的结果胶囊(useTone)都调它,
一页 30 行就是 30 次整页重算,翻页、换条再来。

改成 shared/composables/dark.ts 的 createGlobalState,auto-import 用 priority 盖掉
@vueuse/core 的同名项,显式 import 的 7 处一并换掉。

生产构建、CPU 降速 6 倍实测:提交列表首屏主线程 2015 → 1092ms(列表出来 1.34 → 0.85 秒),
排名 1950 → 850ms,比赛 1060 → 757ms;右栏换到没看过的一条不再每次卡 100ms。

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-03 13:55:33 +08:00
xuyueandClaude Opus 5.5 55bdf317f1 fix(语法要求): 「自定义函数」不再把 main 算进去,运算符不再把取地址、指针、模板尖括号当成用了
Deploy / deploy (push) Successful in 55s
- C / C++ 的函数定义排掉 main,下拉改叫「自定义函数」。原来「必须使用」永远通过、「不能使用」永远失败,
  出题页挑战候选里 C 的「用自定义函数再写一遍」也因此一直挖不出来
- 运算符只认二元运算 / 复合赋值 / 自增自减里的 token,一元只认取反。scanf 的 &、int *p、vector<int>、
  *args、import *、**kw、not in、is not、case 1 | 2 不再算「用了」
- Python 的 math.sqrt(4) 算调用了 sqrt()(只认 import 进来的模块)
- Python 的「赋值语句」连 s += 1 一起算,和 C 一个口径
- 保存时拦下负数次数、至少比至多还多的次数规则

现有 19 道题的规则都不受影响:1265 条真实提交重判,结论和改之前一致。

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-03 13:29:57 +08:00
xuyueandClaude Opus 5.5 1b730da401 docs(格式化): 补上 learn.css 也会被 vp fmt 和 bun fmt 来回改,以及怎么列出受影响的文件
Deploy / deploy (push) Successful in 55s
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-03 13:07:14 +08:00
xuyueandClaude Opus 5.5 8c5399755e feat(相似题): 做对中等、困难题后不再只推一串简单题,每道推荐写出和原题共同的标签
- 共同标签一样多时先给难度最接近的,再并列才先简单的(原来一律简单的在前,
  做对困难题时五条里三条多是简单题)
- 每行第二行写共同的标签(知识点在前、主题在后)和做对人数;带类型标签、
  做过没对的红「−」,写法照题目列表
- 题面里的标题和「提示」「来源」一样,结果页签里的和「还能挑战」对齐

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-03 13:06:49 +08:00
65 changed files with 10823 additions and 107 deletions

No files matched your search

+2 -1
View File
@@ -62,7 +62,8 @@ cd apps/web && bun run build # 前端构建(不在 verify 里
配置都只在根目录的 `vite.config.ts` 一份:`fmt` 块(Oxfmt 的写法,`bun fmt` 直接读它; 配置都只在根目录的 `vite.config.ts` 一份:`fmt` 块(Oxfmt 的写法,`bun fmt` 直接读它;
`semi: false`、`singleQuote: true`、`printWidth: 160`)、`lint` 块(Oxlint,`denyWarnings`)、`run.tasks` `semi: false`、`singleQuote: true`、`printWidth: 160`)、`lint` 块(Oxlint,`denyWarnings`)、`run.tasks`
(`verify` 和它依赖的四个检查)。**别用 `vp fmt` / `vp check`**:Oxfmt 和 `bun fmt` 只在 (`verify` 和它依赖的四个检查)。**别用 `vp fmt` / `vp check`**:Oxfmt 和 `bun fmt` 只在
长 CSS 值列表的折行上不一样,混着跑会把 `apps/web/public/style.css` 来回改。前端自己的构建 长 CSS 值列表的折行上不一样,混着跑会把 `apps/web/public/style.css`、`apps/web/src/oj/learn/learn.css` 来回改
(`vp fmt --list-different` 能列出当前受影响的文件)。前端自己的构建
配置在 `apps/web/vite.config.ts`,和根目录那份无关。 配置在 `apps/web/vite.config.ts`,和根目录那份无关。
- 格式化只管代码:`.md` / `.yml` / `.json` / `.toml` 在 `fmt.ignorePatterns` 里排掉了 - 格式化只管代码:`.md` / `.yml` / `.json` / `.toml` 在 `fmt.ignorePatterns` 里排掉了
+14
View File
@@ -0,0 +1,14 @@
CREATE TABLE "mascot_event" (
"id" integer PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY (sequence name "mascot_event_id_seq" INCREMENT BY 1 MINVALUE 1 MAXVALUE 2147483647 START WITH 1 CACHE 1),
"user_id" integer NOT NULL,
"kind" text NOT NULL,
"situation" text,
"line" text,
"action" text,
"path" text NOT NULL,
"created_at" timestamp with time zone DEFAULT now() NOT NULL
);
--> statement-breakpoint
ALTER TABLE "mascot_event" ADD CONSTRAINT "mascot_event_user_id_fk_user_id" FOREIGN KEY ("user_id") REFERENCES "public"."user"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
CREATE INDEX "mascot_event_user_kind_idx" ON "mascot_event" USING btree ("user_id","kind");--> statement-breakpoint
CREATE INDEX "mascot_event_created_at_idx" ON "mascot_event" USING btree ("created_at");
@@ -0,0 +1,184 @@
-- 成就惠及更多学生(2026-11-03)。已经拿到的一个不收回。
--
-- 这学期 375 个交过题的学生,成就数中位数 5 个、三分之一只有 0–2 个。三件事:
--
-- 1. 比赛里的提交也算成就(判题结算同步改了,见 services/achievements.ts 的 solvedCounts)。
-- 这里的比赛其实是单班测验,2612 班整个班都在比赛里做题,人均做对 17 道却一个成就也没有;
-- 「参加过几场比赛」以前判题时也不更新,只在后台重扫时刷新,所以连「初入赛场」都没拿到。
-- 2. 几条线补上低一档(10 道和 50 道之间、一次就对 1 次和 20 次之间……),外加一条新线
-- 「挑战成功」。括号里是这学期学生已经达到的比例。
-- 3. 档多了,「奖杯收藏家」从 15 个提到 20 个,不然人人都有。
--
-- 然后从提交记录把含比赛的指标重数一遍,按新配置给所有达标的人补发(backfilled,不显示日期)。
-- 编译错误次数和按天的连续不重数:前者上线前的历史本来就没有,后者已经下架。
INSERT INTO "achievement" ("name", "description", "icon", "rarity", "hidden", "metric", "operator", "threshold", "visible", "unlock_count", "order", "create_time") VALUES
('稳扎稳打', '通过 20 道题目', 'noto:orange-book', 'bronze', false, 'accepted_count', 'gte', 20, true, 0, 2, now()), -- 44%
('初露锋芒', '通过 1 道中等难度题目', 'noto:sunrise-over-mountains', 'bronze', false, 'mid_ac_count', 'gte', 1, true, 0, 6, now()), -- 21%
('迎难而上', '挑战成功 1 次', 'noto:puzzle-piece', 'bronze', false, 'challenge_count', 'gte', 1, true, 0, 10, now()), -- 60%
('精益求精', '挑战成功 5 次', 'noto:gem-stone', 'silver', false, 'challenge_count', 'gte', 5, true, 0, 10, now()), -- 12%
('勤学苦练', '累计提交 30 次', 'noto:pencil', 'bronze', false, 'submission_count', 'gte', 30, true, 0, 11, now()), -- 48%
('渐成习惯', '累计 5 天有提交记录', 'noto:spiral-calendar', 'bronze', false, 'active_days', 'gte', 5, true, 0, 15, now()), -- 59%
('手感火热', '累计 5 次首次提交即通过', 'noto:glowing-star', 'bronze', true, 'first_try_ac_count', 'gte', 5, true, 0, 25, now()), -- 67%
('再试一次', '同一道题失败 3 次后终于通过', 'noto:counterclockwise-arrows-button', 'bronze', true, 'max_wa_before_ac', 'gte', 3, true, 0, 32, now()), -- 54%
('一鼓作气', '一天之内通过 5 道题', 'noto:dashing-away', 'bronze', true, 'max_ac_in_one_day', 'gte', 5, true, 0, 34, now()); -- 57%
--> statement-breakpoint
UPDATE "achievement" SET "threshold" = 20, "description" = '解锁 20 个成就(不含白金)'
WHERE "metric" = 'achievement_unlocked_count' AND "threshold" = 15;
--> statement-breakpoint
-- 交过题、还没有 user_stat 的人先建一行(2612 班大多是这样:比赛提交以前根本不进结算)
INSERT INTO "user_stat" ("user_id", "metrics", "update_time")
SELECT DISTINCT s."user_id", '{}'::jsonb, now()
FROM "submission" s
JOIN "user" u ON u."id" = s."user_id"
ON CONFLICT ("user_id") DO NOTHING;
--> statement-breakpoint
-- 按判题结算的口径从提交记录重数(services/achievements.ts):含比赛;在判的(6/7)不算,
-- 它们判完时结算会自己加;做对 = ACCEPTED(0) / AST_CHECK_FAILED(10);日历按东八区。
-- 「新做对」= 这道题第一次做对的那条提交。
UPDATE "user_stat" AS target
SET "metrics" = target."metrics" || fresh.metrics, "update_time" = now()
FROM (
WITH subs AS (
SELECT s."id", s."user_id", s."problem_id", s."contest_id", s."result", s."language", s."code", s."create_time",
(s."create_time" AT TIME ZONE 'Asia/Shanghai') AS local, p."difficulty",
s."result" IN (0, 10) AS ac,
-- 这道题在这条之前交过几次(同一时刻的不算「之前」,和结算里的 create_time < 一致)
rank() OVER (PARTITION BY s."user_id", s."problem_id" ORDER BY s."create_time") - 1 AS before
FROM "submission" s
JOIN "user" u ON u."id" = s."user_id"
JOIN "problem" p ON p."id" = s."problem_id"
WHERE s."result" NOT IN (6, 7)
),
totals AS (
SELECT "user_id",
count(DISTINCT "problem_id") FILTER (WHERE ac)::int AS accepted,
count(DISTINCT "problem_id") FILTER (WHERE ac AND "difficulty" = 'Mid')::int AS mid,
count(DISTINCT "problem_id") FILTER (WHERE ac AND "difficulty" = 'High')::int AS hard,
count(*)::int AS submissions,
count(DISTINCT "contest_id")::int AS contests,
count(*) FILTER (WHERE extract(hour FROM local) < 5)::int AS midnight,
count(*) FILTER (WHERE extract(hour FROM local) >= 5 AND extract(hour FROM local) < 7)::int AS early,
jsonb_agg(DISTINCT "language") AS languages,
jsonb_agg(DISTINCT to_char(local, 'YYYY-MM-DD')) AS dates
FROM subs GROUP BY "user_id"
),
first_try AS (
SELECT "user_id", count(*) FILTER (WHERE ac)::int AS n
FROM (SELECT DISTINCT ON ("user_id", "problem_id") "user_id", ac FROM subs ORDER BY "user_id", "problem_id", "create_time", "id") f
GROUP BY "user_id"
),
code_lines AS (
SELECT "user_id", max((
SELECT count(*) FROM regexp_split_to_table("code", E'\n') AS line WHERE btrim(line, E' \t\r') <> ''
))::int AS n
FROM subs WHERE ac GROUP BY "user_id"
),
first_ac AS (
SELECT DISTINCT ON ("user_id", "problem_id") "user_id", "problem_id", local, before
FROM subs WHERE ac ORDER BY "user_id", "problem_id", "create_time", "id"
),
wa_before AS (
SELECT "user_id", max(before)::int AS n FROM first_ac GROUP BY "user_id"
),
per_day AS (
SELECT "user_id", jsonb_object_agg(day, n) AS days, max(n)::int AS best
FROM (SELECT "user_id", to_char(local, 'YYYY-MM-DD') AS day, count(*)::int AS n FROM first_ac GROUP BY 1, 2) d
GROUP BY "user_id"
),
weeks AS (
SELECT DISTINCT "user_id", date_trunc('week', local)::date AS w FROM first_ac
),
runs AS (
SELECT "user_id", count(*)::int AS len, max(w) AS last_w
FROM (SELECT "user_id", w, w - (row_number() OVER (PARTITION BY "user_id" ORDER BY w))::int * 7 AS g FROM weeks) i
GROUP BY "user_id", g
),
streak AS (
SELECT "user_id", max(len) AS best, (array_agg(len ORDER BY last_w DESC))[1] AS current, max(last_w) AS last_w
FROM runs GROUP BY "user_id"
),
challenges AS (
SELECT "user_id", count(*)::int AS n FROM "challenge_success" GROUP BY "user_id"
)
SELECT t."user_id",
jsonb_build_object(
'accepted_count', t.accepted,
'mid_ac_count', t.mid,
'hard_ac_count', t.hard,
'first_try_ac_count', coalesce(ft.n, 0),
'submission_count', t.submissions,
'contest_joined', t.contests,
'midnight_submissions', t.midnight,
'early_bird_submissions', t.early,
'_languages', t.languages,
'languages_used', jsonb_array_length(t.languages),
'_active_dates', t.dates,
'active_days', jsonb_array_length(t.dates),
'max_code_lines', coalesce(cl.n, 0),
'max_wa_before_ac', coalesce(wb.n, 0),
'_ac_per_day', coalesce(pd.days, '{}'::jsonb),
'max_ac_in_one_day', coalesce(pd.best, 0),
'challenge_count', coalesce(ch.n, 0)
) || CASE WHEN st."user_id" IS NULL THEN '{}'::jsonb ELSE jsonb_build_object(
'max_ac_week_streak', st.best,
'_current_ac_week_streak', st.current,
'_last_ac_week', to_char(st.last_w, 'YYYY-MM-DD')
) END AS metrics
FROM totals t
LEFT JOIN first_try ft ON ft."user_id" = t."user_id"
LEFT JOIN code_lines cl ON cl."user_id" = t."user_id"
LEFT JOIN wa_before wb ON wb."user_id" = t."user_id"
LEFT JOIN per_day pd ON pd."user_id" = t."user_id"
LEFT JOIN streak st ON st."user_id" = t."user_id"
LEFT JOIN challenges ch ON ch."user_id" = t."user_id"
) fresh
WHERE target."user_id" = fresh."user_id";
--> statement-breakpoint
-- 挑战成功了、却一条提交都没有的(不会有,保险)也给个数
UPDATE "user_stat" AS target
SET "metrics" = jsonb_set(target."metrics", '{challenge_count}', to_jsonb(c.n))
FROM (SELECT "user_id", count(*)::int AS n FROM "challenge_success" GROUP BY "user_id") c
WHERE target."user_id" = c."user_id" AND (target."metrics" -> 'challenge_count') IS DISTINCT FROM to_jsonb(c.n);
--> statement-breakpoint
-- 补发:上架的、非元成就,达标没发的都发(口径同 rescanAchievement:backfilled、待通知)
INSERT INTO "user_achievement" ("user_id", "achievement_id", "unlock_time", "backfilled", "notified")
SELECT st."user_id", a."id", now(), true, false
FROM "user_stat" st
JOIN "achievement" a ON a."visible" AND a."metric" <> 'achievement_unlocked_count'
WHERE jsonb_typeof(st."metrics" -> a."metric") = 'number'
AND CASE WHEN a."operator" = 'gte' THEN (st."metrics" ->> a."metric")::numeric >= a."threshold"
ELSE (st."metrics" ->> a."metric")::numeric <= a."threshold" END
ON CONFLICT ("user_id", "achievement_id") DO NOTHING;
--> statement-breakpoint
-- 已解锁数(上架的非白金)重数,口径同 refreshUnlockedCount
UPDATE "user_stat" AS target
SET "metrics" = jsonb_set(target."metrics", '{achievement_unlocked_count}', to_jsonb(fresh.value))
FROM (
SELECT s."id", coalesce(c.value, 0) AS value
FROM "user_stat" s
LEFT JOIN (
SELECT ua."user_id", count(*)::int AS value
FROM "user_achievement" ua
JOIN "achievement" a ON a."id" = ua."achievement_id"
WHERE a."rarity" <> 'platinum' AND a."visible"
GROUP BY ua."user_id"
) c ON c."user_id" = s."user_id"
) fresh
WHERE target."id" = fresh."id"
AND (target."metrics" -> 'achievement_unlocked_count') IS DISTINCT FROM to_jsonb(fresh.value);
--> statement-breakpoint
-- 第二轮:元成就(奖杯收藏家)
INSERT INTO "user_achievement" ("user_id", "achievement_id", "unlock_time", "backfilled", "notified")
SELECT st."user_id", a."id", now(), true, false
FROM "user_stat" st
JOIN "achievement" a ON a."visible" AND a."metric" = 'achievement_unlocked_count'
WHERE jsonb_typeof(st."metrics" -> a."metric") = 'number'
AND CASE WHEN a."operator" = 'gte' THEN (st."metrics" ->> a."metric")::numeric >= a."threshold"
ELSE (st."metrics" ->> a."metric")::numeric <= a."threshold" END
ON CONFLICT ("user_id", "achievement_id") DO NOTHING;
--> statement-breakpoint
UPDATE "achievement" AS a
SET "unlock_count" = coalesce(c.n, 0)
FROM (SELECT "achievement_id", count(*)::int AS n FROM "user_achievement" GROUP BY "achievement_id") c
WHERE c."achievement_id" = a."id" AND a."unlock_count" IS DISTINCT FROM c.n;
File diff suppressed because it is too large. Load diff
File diff suppressed because it is too large. Load diff
+14
View File
@@ -302,6 +302,20 @@
"when": 1793632543220, "when": 1793632543220,
"tag": "0042_class_name_cleanup", "tag": "0042_class_name_cleanup",
"breakpoints": true "breakpoints": true
},
{
"idx": 43,
"version": "7",
"when": 1793693911394,
"tag": "0043_mascot_event",
"breakpoints": true
},
{
"idx": 44,
"version": "7",
"when": 1793695621303,
"tag": "0044_achievement_more_tiers",
"breakpoints": true
} }
] ]
} }
+43
View File
@@ -46,6 +46,7 @@ import type {
JudgeStatus, JudgeStatus,
LessonLanguage, LessonLanguage,
LessonMode, LessonMode,
MascotEventKind,
ProblemChallenges, ProblemChallenges,
ProblemDifficulty, ProblemDifficulty,
ProblemLanguage, ProblemLanguage,
@@ -1411,3 +1412,45 @@ export const challengeSuccess = pgTable(
}).onDelete('cascade'), }).onDelete('cascade'),
], ],
) )
/**
* 看板娘的互动记录:点开气泡、点气泡里的按钮、她主动开口、摸头彩蛋、被拖走(种类见契约
* mascotEventSchema)。拿来看她说的话、给的按钮学生用不用,以后按学生的行为调整她也读这里;
* 「点过几次」(熟悉程度)直接按 user_id 数 open。
*
* 不是「学生做过什么」的证据,账号没了就没意义,user 外键 CASCADE(外键分档见 CLAUDE.md「数据库」)。
*/
export const mascotEvent = pgTable(
'mascot_event',
{
id: integer().primaryKey().generatedByDefaultAsIdentity({
name: 'mascot_event_id_seq',
startWith: 1,
increment: 1,
minValue: 1,
maxValue: 2147483647,
cache: 1,
}),
userId: integer('user_id').notNull(),
kind: text().$type<MascotEventKind>().notNull(),
situation: text(),
line: text(),
action: text(),
path: text().notNull(),
createdAt: timestamp('created_at', {
withTimezone: true,
mode: 'string',
})
.notNull()
.defaultNow(),
},
(table) => [
index('mascot_event_user_kind_idx').on(table.userId, table.kind),
index('mascot_event_created_at_idx').on(table.createdAt),
foreignKey({
columns: [table.userId],
foreignColumns: [user.id],
name: 'mascot_event_user_id_fk_user_id',
}).onDelete('cascade'),
],
)
+2
View File
@@ -21,6 +21,7 @@ import { problemRoutes } from './routes/problem'
import { problemStatsRoutes } from './routes/problem-stats' import { problemStatsRoutes } from './routes/problem-stats'
import { submissionRoutes } from './routes/submission' import { submissionRoutes } from './routes/submission'
import { trialRunRoutes } from './routes/trial-run' import { trialRunRoutes } from './routes/trial-run'
import { mascotRoutes } from './routes/mascot'
import { siteRoutes } from './routes/site' import { siteRoutes } from './routes/site'
import { scanPendingChallenges } from './services/challenge' import { scanPendingChallenges } from './services/challenge'
import { bridgeSubmissionEvents, isAllowedWebSocketOrigin, startSessionSweep, submissionWebSocketHandler, type SubmissionSocketData } from './websocket' import { bridgeSubmissionEvents, isAllowedWebSocketOrigin, startSessionSweep, submissionWebSocketHandler, type SubmissionSocketData } from './websocket'
@@ -44,6 +45,7 @@ app.route('/api', problemRoutes)
app.route('/api', problemStatsRoutes) app.route('/api', problemStatsRoutes)
app.route('/api', submissionRoutes) app.route('/api', submissionRoutes)
app.route('/api', trialRunRoutes) app.route('/api', trialRunRoutes)
app.route('/api', mascotRoutes)
app.route('/api/admin', adminRoutes) app.route('/api/admin', adminRoutes)
// 没有这条的话,打错的接口地址回的是 Hono 默认的纯文本「404 Not Found」,前端 utils/api.ts 读不出 // 没有这条的话,打错的接口地址回的是 Hono 默认的纯文本「404 Not Found」,前端 utils/api.ts 读不出
+99 -17
View File
@@ -63,15 +63,74 @@ async function loadLanguage(language: string) {
return loaded return loaded
} }
function collectNodes(root: Node, type: string, result: Node[] = []) { type Match = (node: Node) => boolean
if (root.type === type) result.push(root)
for (const child of root.children) collectNodes(child, type, result) function collectNodes(root: Node, match: Match, result: Node[] = []) {
if (match(root)) result.push(root)
for (const child of root.children) collectNodes(child, match, result)
return result return result
} }
function hasNode(root: Node, type: string): boolean { function hasNode(root: Node, match: Match): boolean {
if (root.type === type) return true if (match(root)) return true
return root.children.some((child) => hasNode(child, type)) return root.children.some((child) => hasNode(child, match))
}
const ofType =
(type: string): Match =>
(node) =>
node.type === type
/** C / C++ 函数定义的函数名:`int *f()` 的名字在 pointer_declarator 里面一层,沿着 declarator 往里找 */
function functionName(definition: Node) {
let declarator = definition.childForFieldName('declarator')
while (declarator && declarator.type !== 'function_declarator') declarator = declarator.childForFieldName('declarator')
return declarator?.childForFieldName('declarator')?.text
}
/**
* 语法 target 认哪些节点。多数就是比节点类型,例外:
*
* C / C++ 的「函数定义」不算 `main` —— 每个 C 程序都有 main,算进去的话「必须使用函数定义」
* 永远通过、「不能使用」永远失败,老师选它要的是「自己写了函数」。所以 C 那边叫「自定义函数」。
*
* Python 的「赋值语句」连 `s += 1` 一起算 —— 和 C 一个口径(C 的 assignment_expression
* 本来就包括 `+=`),学生也是这么理解的。tree-sitter-python 里 `+=` 是单独的 augmented_assignment。
*/
function nodeMatch(target: string, language: string): Match {
const type = astTargetNodeType(target, language)
if (target === 'function_definition' && language !== 'Python') {
return (node) => node.type === type && functionName(node) !== 'main'
}
if (target === 'assignment' && language === 'Python') {
return (node) => node.type === type || node.type === 'augmented_assignment'
}
return ofType(type)
}
/**
* 运算符只认真在做运算的那一个 token。光比 token 的话,下面这些全都算「用了」:
* C 的 `scanf("%d", &n)` 算 `&`、`int *p` 算 `*`,C++ 的 `vector<int>` 算 `>`,
* Python 的 `*args` / `from m import *` 算 `*`、`**kw` 算 `**`、`not in` / `is not` 算 `not`、
* `case 1 | 2` 算 `|`。所以看它的父节点:二元运算、复合赋值、自增自减。
*
* 一元的只认取反(`!x` / `not x`)。负号 `-x` 不算「用了减号」,同理 `*p` 不算乘、`&n` 不算按位与。
*/
const OPERATOR_PARENTS: Record<string, string[]> = {
C: ['binary_expression', 'assignment_expression', 'update_expression'],
'C++': ['binary_expression', 'assignment_expression', 'update_expression'],
Python: ['binary_operator', 'boolean_operator', 'comparison_operator', 'augmented_assignment'],
}
const NOT_PARENTS: Record<string, string[]> = {
C: ['unary_expression'],
'C++': ['unary_expression'],
Python: ['not_operator'],
}
function operatorMatch(target: string, language: string): Match {
const type = astTargetNodeType(target, language)
const parents = (target === 'not' ? NOT_PARENTS : OPERATOR_PARENTS)[language] ?? []
return (node) => node.type === type && node.parent !== null && parents.includes(node.parent.type)
} }
function targetName(rule: AstRule, language?: string) { function targetName(rule: AstRule, language?: string) {
@@ -201,6 +260,10 @@ export function astRulesError(astRules: AstRules | null): string | null {
if (!rule.keyword?.trim()) return `${at}:参数名不能为空` if (!rule.keyword?.trim()) return `${at}:参数名不能为空`
} }
if (!astRuleIsMeaningful(rule)) return `${at}:次数检查至少要填一个数字` if (!astRuleIsMeaningful(rule)) return `${at}:次数检查至少要填一个数字`
if ([rule.exact, rule.min, rule.max].some((n) => n !== undefined && n < 0)) return `${at}:次数不能是负数`
if (rule.min !== undefined && rule.max !== undefined && rule.min > rule.max) {
return `${at}:至少 ${rule.min} 次比至多 ${rule.max} 次还多,怎么写都过不了`
}
} }
} }
return null return null
@@ -238,12 +301,32 @@ const CALL_NODE_TYPES: Record<string, string> = {
Python: 'call', Python: 'call',
} }
/** `import math` / `import numpy as np` 引进来的模块名。`import os.path` 绑定的是 `os` */
function importedModules(root: Node) {
const names = new Set<string>()
for (const statement of collectNodes(root, ofType('import_statement'))) {
for (const item of statement.namedChildren) {
const name = item.type === 'aliased_import' ? item.childForFieldName('alias') : item.type === 'dotted_name' ? item.namedChildren[0] : null
if (name) names.add(name.text)
}
}
return names
}
function functionCalls(root: Node, target: string, language: string) { function functionCalls(root: Node, target: string, language: string) {
const callType = CALL_NODE_TYPES[language] ?? 'call' const callType = CALL_NODE_TYPES[language] ?? 'call'
return collectNodes(root, callType).filter((call) => { // Python 的 `math.sqrt(4)` 也算调用了 sqrt() —— 和 `from math import sqrt` 后写 `sqrt(4)`
// 是一回事,老师配「必须调用 sqrt()」时想的就是它。只认 import 进来的模块,
// `s.count()` 这种对象上的方法还是归「调用方法」
const modules = language === 'Python' ? importedModules(root) : null
return collectNodes(root, ofType(callType)).filter((call) => {
const fn = call.childForFieldName('function') const fn = call.childForFieldName('function')
if (!fn) return false if (!fn) return false
if (fn.type === 'identifier') return fn.text === target if (fn.type === 'identifier') return fn.text === target
if (modules && fn.type === 'attribute') {
const object = fn.childForFieldName('object')
return object?.type === 'identifier' && modules.has(object.text) && fn.childForFieldName('attribute')?.text === target
}
// `std::sort(...)` 是 qualified_identifier。学生写 sort 还是 std::sort 取决于 // `std::sort(...)` 是 qualified_identifier。学生写 sort 还是 std::sort 取决于
// 有没有 using namespace std,两种都得认,所以末段也比一次 // 有没有 using namespace std,两种都得认,所以末段也比一次
if (language === 'C++' && fn.type === 'qualified_identifier') { if (language === 'C++' && fn.type === 'qualified_identifier') {
@@ -265,13 +348,13 @@ function methodCalls(root: Node, target: string, language: string) {
// 和 Python 的 attribute 不是一回事 —— 少了这个分支,C++ 的「必须调用 .push_back()」 // 和 Python 的 attribute 不是一回事 —— 少了这个分支,C++ 的「必须调用 .push_back()」
// 会静默地永远失败 // 会静默地永远失败
if (language === 'C++') { if (language === 'C++') {
return collectNodes(root, 'call_expression').filter((call) => { return collectNodes(root, ofType('call_expression')).filter((call) => {
const fn = call.childForFieldName('function') const fn = call.childForFieldName('function')
return fn?.type === 'field_expression' && fn.childForFieldName('field')?.text === target return fn?.type === 'field_expression' && fn.childForFieldName('field')?.text === target
}) })
} }
if (language !== 'Python') return [] if (language !== 'Python') return []
return collectNodes(root, 'call').filter((call) => { return collectNodes(root, ofType('call')).filter((call) => {
const fn = call.childForFieldName('function') const fn = call.childForFieldName('function')
return fn?.type === 'attribute' && fn.childForFieldName('attribute')?.text === target return fn?.type === 'attribute' && fn.childForFieldName('attribute')?.text === target
}) })
@@ -279,20 +362,20 @@ function methodCalls(root: Node, target: string, language: string) {
function evaluateRule(root: Node, rule: AstRule, language: string): AstResult | null { function evaluateRule(root: Node, rule: AstRule, language: string): AstResult | null {
const target = rule.target ?? '' const target = rule.target ?? ''
const nodeType = astTargetNodeType(target, language) const match = rule.engine === 'must_use_operator' ? operatorMatch(target, language) : nodeMatch(target, language)
switch (rule.engine) { switch (rule.engine) {
case 'must_exist_node': case 'must_exist_node':
return { return {
description: describeAstRule(rule, language), description: describeAstRule(rule, language),
passed: hasNode(root, nodeType), passed: hasNode(root, match),
} }
case 'must_not_exist_node': { case 'must_not_exist_node': {
const nodes = collectNodes(root, nodeType) const nodes = collectNodes(root, match)
return withLines({ description: describeAstRule(rule, language), passed: nodes.length === 0 }, nodes) return withLines({ description: describeAstRule(rule, language), passed: nodes.length === 0 }, nodes)
} }
case 'count_node': { case 'count_node': {
const nodes = collectNodes(root, nodeType) const nodes = collectNodes(root, match)
return withLines( return withLines(
{ {
description: describeAstRule(rule, language), description: describeAstRule(rule, language),
@@ -335,7 +418,7 @@ function evaluateRule(root: Node, rule: AstRule, language: string): AstResult |
case 'must_use_operator': case 'must_use_operator':
return { return {
description: describeAstRule(rule, language), description: describeAstRule(rule, language),
passed: hasNode(root, nodeType), passed: hasNode(root, match),
} }
case 'must_use_keyword': case 'must_use_keyword':
return { return {
@@ -345,9 +428,8 @@ function evaluateRule(root: Node, rule: AstRule, language: string): AstResult |
case 'must_have_nesting': { case 'must_have_nesting': {
const outer = rule.outer ?? '' const outer = rule.outer ?? ''
const inner = rule.inner ?? '' const inner = rule.inner ?? ''
const outerType = astTargetNodeType(outer, language) const innerMatch = nodeMatch(inner, language)
const innerType = astTargetNodeType(inner, language) const passed = collectNodes(root, nodeMatch(outer, language)).some((node) => node.children.some((child) => hasNode(child, innerMatch)))
const passed = collectNodes(root, outerType).some((node) => node.children.some((child) => hasNode(child, innerType)))
return { description: describeAstRule(rule, language), passed } return { description: describeAstRule(rule, language), passed }
} }
default: default:
+114
View File
@@ -0,0 +1,114 @@
import { mascotEventSchema, type MascotProfile } from '@oj2/contract'
import { and, count, countDistinct, desc, eq, gte, inArray, isNull, sql } from 'drizzle-orm'
import { Hono } from 'hono'
import { requireAuth, type AppEnv } from '../auth/middleware'
import { db, schema } from '../db'
import { parseBody, success } from '../http'
import { dayStart, weekStart } from '../time'
export const mascotRoutes = new Hono<AppEnv>()
/**
* 每人每分钟最多记这么多条。正常点她一分钟到不了十条(连点只记开头、彩蛋和嫌烦那几下),
* 拿脚本刷的才会撞上;撞上了就静默丢掉,不报错 —— 前台本来也不等这个结果
*/
const EVENTS_PER_MINUTE = 30
const windows = new Map<number, { start: number; count: number }>()
function allow(userId: number) {
const now = Date.now()
const entry = windows.get(userId)
if (!entry || now - entry.start >= 60_000) {
windows.set(userId, { start: now, count: 1 })
// 顺手清掉过期的,免得 Map 跟着在线人数一直涨
if (windows.size > 2000) for (const [id, it] of windows) if (now - it.start >= 60_000) windows.delete(id)
return true
}
entry.count++
return entry.count <= EVENTS_PER_MINUTE
}
/** 记一条看板娘互动(种类见契约 mascotEventSchema) */
mascotRoutes.post('/mascot/events', requireAuth, async (c) => {
const parsed = await parseBody(c, mascotEventSchema, '看板娘记录的格式不对')
if (!parsed.success) return parsed.response
const user = c.get('user')!
if (allow(user.id)) {
const { kind, situation, line, action, path } = parsed.data
await db.insert(schema.mascotEvent).values({ userId: user.id, kind, situation, line, action, path })
}
return success(c, null)
})
/** 最近多少次题库提交拿来看学生常犯哪类错 */
const RECENT_SUBMISSIONS = 20
/** 看板娘按学生的行为挑话用的那几个数(契约 mascotProfileSchema) */
mascotRoutes.get('/mascot/profile', requireAuth, async (c) => {
const userId = c.get('user')!.id
const s = schema.submission
const week = weekStart()
const e = schema.mascotEvent
const [pokes, today, recent, tooHard, weekSubmits, weekEvents, weekHints] = await Promise.all([
db
.select({ value: count() })
.from(schema.mascotEvent)
.where(and(eq(schema.mascotEvent.userId, userId), eq(schema.mascotEvent.kind, 'open'))),
db
.select({ value: countDistinct(s.problemId) })
.from(s)
.where(and(eq(s.userId, userId), eq(s.result, 0), gte(s.createTime, dayStart()))),
db
.select({ result: s.result, errorType: sql<string | null>`${s.statisticInfo}->'runtime_error'->>'type'` })
.from(s)
.where(and(eq(s.userId, userId), isNull(s.contestId)))
.orderBy(desc(s.createTime))
.limit(RECENT_SUBMISSIONS),
db
.select({ value: count() })
.from(schema.reaction)
.where(and(eq(schema.reaction.userId, userId), eq(schema.reaction.type, 'too_hard'))),
db
.select({ value: count() })
.from(s)
.where(and(eq(s.userId, userId), isNull(s.contestId), gte(s.createTime, week))),
db
.select({ kind: e.kind, value: count() })
.from(e)
.where(and(eq(e.userId, userId), inArray(e.kind, ['trial', 'help']), gte(e.createdAt, week)))
.groupBy(e.kind),
db
.select({ value: count() })
.from(schema.aiHint)
.innerJoin(s, eq(s.id, schema.aiHint.submissionId))
.where(and(eq(s.userId, userId), gte(schema.aiHint.createTime, week))),
])
const eventCount = (kind: string) => weekEvents.find((row) => row.kind === kind)?.value ?? 0
const types = new Map<string, number>()
for (const row of recent) if (row.result === 4 && row.errorType) types.set(row.errorType, (types.get(row.errorType) ?? 0) + 1)
const topType = [...types.entries()].sort((a, b) => b[1] - a[1])[0]?.[0] ?? null
const tally = (...results: number[]) => recent.filter((row) => results.includes(row.result)).length
return success(c, {
pokes: pokes[0]?.value ?? 0,
todaySolved: today[0]?.value ?? 0,
tooHard: tooHard[0]?.value ?? 0,
week: {
submits: weekSubmits[0]?.value ?? 0,
trials: eventCount('trial'),
helps: eventCount('help'),
aiHints: weekHints[0]?.value ?? 0,
},
recent: {
total: recent.length,
wrongAnswer: tally(-1),
compileError: tally(-2),
runtimeError: tally(4, 3),
timeout: tally(1, 2),
runtimeErrorType: topType,
},
} satisfies MascotProfile)
})
+26 -5
View File
@@ -12,6 +12,7 @@ import {
type ProblemListItem, type ProblemListItem,
type ProblemProgress, type ProblemProgress,
type ProblemTypeFilter, type ProblemTypeFilter,
type SimilarProblem,
type Tag, type Tag,
} from '@oj2/contract' } from '@oj2/contract'
import { and, asc, count, countDistinct, desc, eq, ilike, inArray, isNull, ne, notInArray, or, sql } from 'drizzle-orm' import { and, asc, count, countDistinct, desc, eq, ilike, inArray, isNull, ne, notInArray, or, sql } from 'drizzle-orm'
@@ -327,13 +328,25 @@ problemRoutes.get('/challenges', requireAuth, async (c) => {
problemRoutes.get('/problems/:displayId/similar', optionalAuth, async (c) => { problemRoutes.get('/problems/:displayId/similar', optionalAuth, async (c) => {
const [target] = await db const [target] = await db
.select({ id: schema.problem.id }) .select({ id: schema.problem.id, difficulty: schema.problem.difficulty })
.from(schema.problem) .from(schema.problem)
.where(and(sql`lower(${schema.problem.displayId}) = lower(${c.req.param('displayId')})`, isNull(schema.problem.contestId))) .where(and(sql`lower(${schema.problem.displayId}) = lower(${c.req.param('displayId')})`, isNull(schema.problem.contestId)))
.limit(1) .limit(1)
if (!target) return failure(c, 404, 'problem-not-found', 'Problem not found') if (!target) return failure(c, 404, 'problem-not-found', 'Problem not found')
const targetTags = await db.select({ id: schema.problemTags.problemtagId }).from(schema.problemTags).where(eq(schema.problemTags.problemId, target.id)) // 知识点和主题标签一样算(用户 2026-11-03 定:同一套题材也算相似)。知识点排在前面
if (targetTags.length === 0) return success(c, []) // 只是为了「共同的标签」那行先写练的是什么
const targetTags = await db
.select({ id: schema.problemTags.problemtagId, name: schema.problemTag.name })
.from(schema.problemTags)
.innerJoin(schema.problemTag, eq(schema.problemTags.problemtagId, schema.problemTag.id))
.where(eq(schema.problemTags.problemId, target.id))
// 同一类里大的在前,和题目列表「知识点」那列一样
.orderBy(
sql`${schema.problemTag.category} = 'knowledge' desc`,
sql`(select count(*) from ${schema.problemTags} pt where pt.problemtag_id = ${schema.problemTag.id}) desc`,
asc(schema.problemTag.name),
)
if (targetTags.length === 0) return success(c, [] satisfies SimilarProblem[])
// 「已 AC 的不再推荐」必须下推到 SQL。早先是先 limit(5) 再在内存里筛,刷题多的 // 「已 AC 的不再推荐」必须下推到 SQL。早先是先 limit(5) 再在内存里筛,刷题多的
// 学生 5 条候选能被筛到只剩一两条、甚至清零(前端 v-if 一空整块就不渲染)—— // 学生 5 条候选能被筛到只剩一两条、甚至清零(前端 v-if 一空整块就不渲染)——
// 而这个接口恰好只在**刚 AC** 或**连挂三次**时才被调用,正是候选最容易全中的时候。 // 而这个接口恰好只在**刚 AC** 或**连挂三次**时才被调用,正是候选最容易全中的时候。
@@ -343,7 +356,12 @@ problemRoutes.get('/problems/:displayId/similar', optionalAuth, async (c) => {
const solvedIds = states ? [...states.solved] : [] const solvedIds = states ? [...states.solved] : []
// difficulty 是 text(Low / Mid / High),直接 order by 走的是字典序 —— // difficulty 是 text(Low / Mid / High),直接 order by 走的是字典序 ——
// High 排在 Low 前面,「由易到难」会变成「最难的先上」。按语义显式排。 // High 排在 Low 前面,「由易到难」会变成「最难的先上」。按语义显式排。
// 共同标签一样多时先给和原题难度最接近的:原来一律简单的在前,做对一道困难题,
// 五条推荐里三条多是简单题(本地库 35 道困难题:119 / 175)。再并列才先简单的,
// 照顾连错三次的人
const rankOf = (difficulty: string) => (difficulty === 'Low' ? 0 : difficulty === 'Mid' ? 1 : 2)
const difficultyRank = sql`case ${schema.problem.difficulty} when 'Low' then 0 when 'Mid' then 1 else 2 end` const difficultyRank = sql`case ${schema.problem.difficulty} when 'Low' then 0 when 'Mid' then 1 else 2 end`
const difficultyGap = sql`abs(${difficultyRank} - ${sql.raw(String(rankOf(target.difficulty)))})`
const sharedTags = count(schema.problemTags.problemtagId) const sharedTags = count(schema.problemTags.problemtagId)
const rows = await db const rows = await db
.select({ .select({
@@ -376,13 +394,16 @@ problemRoutes.get('/problems/:displayId/similar', optionalAuth, async (c) => {
) )
.groupBy(schema.problem.id, schema.user.id, schema.userProfile.realName) .groupBy(schema.problem.id, schema.user.id, schema.userProfile.realName)
// 末尾的 id 是稳定排序用的:并列时没有它,同一道题两次请求能返回不同的 5 条 // 末尾的 id 是稳定排序用的:并列时没有它,同一道题两次请求能返回不同的 5 条
.orderBy(desc(sharedTags), asc(difficultyRank), desc(schema.problem.acceptedNumber), asc(schema.problem.id)) .orderBy(desc(sharedTags), asc(difficultyGap), asc(difficultyRank), desc(schema.problem.acceptedNumber), asc(schema.problem.id))
.limit(5) .limit(5)
const ids = rows.map((row) => row.problem.id) const ids = rows.map((row) => row.problem.id)
const [tags, counts] = await Promise.all([getProblemTags(ids), problemUserCounts(ids)]) const [tags, counts] = await Promise.all([getProblemTags(ids), problemUserCounts(ids)])
return success( return success(
c, c,
rows.map((row) => listItem(row, tags, statuses, states, counts)), rows.map((row) => {
const own = new Set(tags.get(row.problem.id))
return { ...listItem(row, tags, statuses, states, counts), sharedTags: targetTags.map((tag) => tag.name).filter((name) => own.has(name)) }
}) satisfies SimilarProblem[],
) )
}) })
+12 -7
View File
@@ -17,22 +17,22 @@ export const ACHIEVEMENT_METRICS: AchievementMetric[] = [
{ {
key: 'accepted_count', key: 'accepted_count',
name: '做对的题数', name: '做对的题数',
helpText: '去重后通过的题目数量(不含比赛)', helpText: '去重后通过的题目数量(含比赛题)',
}, },
{ {
key: 'mid_ac_count', key: 'mid_ac_count',
name: '做对的中等题', name: '做对的中等题',
helpText: '去重后通过的中等难度题目数(不含比赛)', helpText: '去重后通过的中等难度题目数(含比赛题)',
}, },
{ {
key: 'hard_ac_count', key: 'hard_ac_count',
name: '做对的困难题', name: '做对的困难题',
helpText: '去重后通过的困难题目数(不含比赛)', helpText: '去重后通过的困难题目数(含比赛题)',
}, },
{ {
key: 'submission_count', key: 'submission_count',
name: '提交次数', name: '提交次数',
helpText: '提交次数(不含比赛)', helpText: '提交次数(含比赛)',
}, },
{ key: 'active_days', name: '有提交的天数', helpText: '有过提交的累计天数' }, { key: 'active_days', name: '有提交的天数', helpText: '有过提交的累计天数' },
{ {
@@ -45,13 +45,13 @@ export const ACHIEVEMENT_METRICS: AchievementMetric[] = [
{ {
key: 'max_ac_week_streak', key: 'max_ac_week_streak',
name: '连续有新做对的周数', name: '连续有新做对的周数',
helpText: '连续几个自然周(周一起)每周都至少新通过一道题(不含比赛)', helpText: '连续几个自然周(周一起)每周都至少新通过一道题(含比赛题)',
}, },
{ key: 'languages_used', name: '用过几种语言', helpText: '用过多少种编程语言' }, { key: 'languages_used', name: '用过几种语言', helpText: '用过多少种编程语言' },
{ {
key: 'contest_joined', key: 'contest_joined',
name: '参加比赛', name: '参加比赛',
helpText: '参加过的比赛数量(本指标是比赛维度,不受比赛提交不计入的限制)', helpText: '交过题的比赛数量',
}, },
{ key: 'badge_count', name: '专题奖章', helpText: '获得的专题奖章数量' }, { key: 'badge_count', name: '专题奖章', helpText: '获得的专题奖章数量' },
{ {
@@ -59,6 +59,11 @@ export const ACHIEVEMENT_METRICS: AchievementMetric[] = [
name: '做完的专题', name: '做完的专题',
helpText: '完成的专题数量', helpText: '完成的专题数量',
}, },
{
key: 'challenge_count',
name: '挑战成功',
helpText: '做对之后的挑战,做到了几条(每道题的每条挑战算一次)',
},
{ {
key: 'first_try_ac_count', key: 'first_try_ac_count',
name: '一次就对的题', name: '一次就对的题',
@@ -92,7 +97,7 @@ export const ACHIEVEMENT_METRICS: AchievementMetric[] = [
{ {
key: 'max_code_lines', key: 'max_code_lines',
name: '最长的代码行数', name: '最长的代码行数',
helpText: '做对的提交里最长的代码有多少行(空行不算,不含比赛)', helpText: '做对的提交里最长的代码有多少行(空行不算,含比赛)',
}, },
{ {
key: 'achievement_unlocked_count', key: 'achievement_unlocked_count',
+20 -10
View File
@@ -1,4 +1,4 @@
import { and, count, countDistinct, eq, inArray, isNotNull, isNull, lt, ne, notInArray, sql } from 'drizzle-orm' import { and, count, countDistinct, eq, inArray, isNotNull, lt, ne, notInArray, sql } from 'drizzle-orm'
import { db, schema, type DbOrTx } from '../db' import { db, schema, type DbOrTx } from '../db'
import { publishAchievementNotification } from '../events' import { publishAchievementNotification } from '../events'
@@ -82,12 +82,17 @@ const ACCEPTED_RESULTS = sql.join([sql`${JudgeStatus.ACCEPTED}`, sql`${JudgeStat
/** /**
* 「做对几道 / 中等几道 / 困难几道 / 一次就对几道」按定义从提交表现数,不再逐次 +1。 * 「做对几道 / 中等几道 / 困难几道 / 一次就对几道」按定义从提交表现数,不再逐次 +1。
* 参加过几场比赛、挑战成功几次也在这里一起数。
* *
* 原来是读一遍这道题之前的提交、判断「是不是第一次做对」再 +1,两处漏:同一个人同一道题 * 原来是读一遍这道题之前的提交、判断「是不是第一次做对」再 +1,两处漏:同一个人同一道题
* 两条提交挨着判完,两边都看见对方已经做对(都不加)或都还没做对(加两次);重判一条 * 两条提交挨着判完,两边都看见对方已经做对(都不加)或都还没做对(加两次);重判一条
* 做对的提交又会再加一次。2026-10 的库里 372 人的做对题数比实际多 1–4 道。 * 做对的提交又会再加一次。2026-10 的库里 372 人的做对题数比实际多 1–4 道。
* 现数是幂等的,怎么并发、怎么重判都是同一个答案。走 submission_public_metrics_idx, * 现数是幂等的,怎么并发、怎么重判都是同一个答案。走 submission_public_metrics_idx,
* 一个人的提交也就几百条。 * 一个人的提交也就几百条。
*
* **比赛里的提交也算**(2026-11-03 起):这里的比赛其实是单班测验,有的班整学期都在
* 比赛里做题,不算的话一个成就都拿不到。比赛题是单独的题目行,不会和题库里同一道题重复数。
* 个人主页 / 排名的做对题数(user_profile.accepted_number)仍然不含比赛,两边对不上是有意的。
*/ */
async function solvedCounts(tx: DbOrTx, userId: number) { async function solvedCounts(tx: DbOrTx, userId: number) {
const [row] = await tx.execute<{ const [row] = await tx.execute<{
@@ -95,13 +100,15 @@ async function solvedCounts(tx: DbOrTx, userId: number) {
mid: number mid: number
hard: number hard: number
first_try: number first_try: number
contests: number
challenges: number
}>( }>(
sql` sql`
with mine as ( with mine as (
select s.problem_id, s.result, s.create_time, s.id, p.difficulty select s.problem_id, s.contest_id, s.result, s.create_time, s.id, p.difficulty
from ${schema.submission} s from ${schema.submission} s
join ${schema.problem} p on p.id = s.problem_id join ${schema.problem} p on p.id = s.problem_id
where s.user_id = ${userId} and s.contest_id is null where s.user_id = ${userId}
) )
select select
count(distinct problem_id) filter (where result in (${ACCEPTED_RESULTS}))::int as accepted, count(distinct problem_id) filter (where result in (${ACCEPTED_RESULTS}))::int as accepted,
@@ -111,11 +118,13 @@ async function solvedCounts(tx: DbOrTx, userId: number) {
select count(*)::int from ( select count(*)::int from (
select distinct on (problem_id) result from mine order by problem_id, create_time, id select distinct on (problem_id) result from mine order by problem_id, create_time, id
) first where result in (${ACCEPTED_RESULTS}) ) first where result in (${ACCEPTED_RESULTS})
) as first_try ) as first_try,
count(distinct contest_id)::int as contests,
(select count(*)::int from ${schema.challengeSuccess} where user_id = ${userId}) as challenges
from mine from mine
`, `,
) )
return row ?? { accepted: 0, mid: 0, hard: 0, first_try: 0 } return row ?? { accepted: 0, mid: 0, hard: 0, first_try: 0, contests: 0, challenges: 0 }
} }
/** /**
@@ -130,7 +139,7 @@ export async function updateAchievementsForSubmission(submissionId: string, coun
.innerJoin(schema.problem, eq(schema.submission.problemId, schema.problem.id)) .innerJoin(schema.problem, eq(schema.submission.problemId, schema.problem.id))
.where(eq(schema.submission.id, submissionId)) .where(eq(schema.submission.id, submissionId))
.limit(1) .limit(1)
if (!row || row.submission.contestId !== null) return [] if (!row) return []
const rejudged = countedAs !== null const rejudged = countedAs !== null
const accepted = isAccepted(row.submission.result) const accepted = isAccepted(row.submission.result)
@@ -157,6 +166,8 @@ export async function updateAchievementsForSubmission(submissionId: string, coun
value.mid_ac_count = solved.mid value.mid_ac_count = solved.mid
value.hard_ac_count = solved.hard value.hard_ac_count = solved.hard
value.first_try_ac_count = solved.first_try value.first_try_ac_count = solved.first_try
value.contest_joined = solved.contests
value.challenge_count = solved.challenges
if (!rejudged) value.submission_count = numberMetric(value, 'submission_count') + 1 if (!rejudged) value.submission_count = numberMetric(value, 'submission_count') + 1
if (firstAc) { if (firstAc) {
// 只数这条之前的:重判一条老提交时,它后面的提交不算「做对之前错的」 // 只数这条之前的:重判一条老提交时,它后面的提交不算「做对之前错的」
@@ -167,7 +178,6 @@ export async function updateAchievementsForSubmission(submissionId: string, coun
and( and(
eq(schema.submission.userId, row.submission.userId), eq(schema.submission.userId, row.submission.userId),
eq(schema.submission.problemId, row.submission.problemId), eq(schema.submission.problemId, row.submission.problemId),
isNull(schema.submission.contestId),
lt(schema.submission.createTime, row.submission.createTime), lt(schema.submission.createTime, row.submission.createTime),
), ),
) )
@@ -301,7 +311,7 @@ export async function rescanAchievement(achievementId: number) {
const metric = findMetric(achievement.metric) const metric = findMetric(achievement.metric)
if (!metric) return { scanned: 0, unlocked: 0 } if (!metric) return { scanned: 0, unlocked: 0 }
// contest_joined 不由判题结算维护,扫之前先把它刷新一遍,否则永远读到旧值(或没有值) // contest_joined 判题结算从 2026-11-03 起才维护,那之后没再交过题的人还是旧值,扫之前刷新一遍
if (achievement.metric === 'contest_joined') await refreshContestJoinedForAll() if (achievement.metric === 'contest_joined') await refreshContestJoinedForAll()
// max_ac_week_streak 是后加的指标,判题结算只从上线那天起累计,存量用户要从提交记录补算 // max_ac_week_streak 是后加的指标,判题结算只从上线那天起累计,存量用户要从提交记录补算
if (achievement.metric === 'max_ac_week_streak') await refreshAcWeekStreakForAll() if (achievement.metric === 'max_ac_week_streak') await refreshAcWeekStreakForAll()
@@ -482,7 +492,7 @@ async function refreshContestJoinedForAll() {
* `_last_ac_week` / `_current_ac_week_streak` 一起写回 user_stat(jsonb 浅合并, * `_last_ac_week` / `_current_ac_week_streak` 一起写回 user_stat(jsonb 浅合并,
* 其余指标不动,写法同 refreshContestJoinedForAll)。 * 其余指标不动,写法同 refreshContestJoinedForAll)。
* *
* 「新通过」= 这道题(不含比赛)第一次通过的那次,和判题结算里 firstAc 同一个口径; * 「新通过」= 这道题(含比赛题)第一次通过的那次,和判题结算里 firstAc 同一个口径;
* 周按东八区自然周(周一起),SQL 里用 localTime 取墙上时间再 date_trunc。 * 周按东八区自然周(周一起),SQL 里用 localTime 取墙上时间再 date_trunc。
*/ */
async function refreshAcWeekStreakForAll() { async function refreshAcWeekStreakForAll() {
@@ -495,7 +505,7 @@ async function refreshAcWeekStreakForAll() {
// 只算还在的用户:库里有提交的 user_id 已经对不上任何用户(submission.user_id 上没有 // 只算还在的用户:库里有提交的 user_id 已经对不上任何用户(submission.user_id 上没有
// 外键,是历史遗留),直接写 user_stat 会撞 user_stat 的外键,整次重算失败 // 外键,是历史遗留),直接写 user_stat 会撞 user_stat 的外键,整次重算失败
.innerJoin(schema.user, eq(schema.user.id, schema.submission.userId)) .innerJoin(schema.user, eq(schema.user.id, schema.submission.userId))
.where(and(isNull(schema.submission.contestId), inArray(schema.submission.result, [JudgeStatus.ACCEPTED, JudgeStatus.AST_CHECK_FAILED]))) .where(inArray(schema.submission.result, [JudgeStatus.ACCEPTED, JudgeStatus.AST_CHECK_FAILED]))
.groupBy(schema.submission.userId, schema.submission.problemId) .groupBy(schema.submission.userId, schema.submission.problemId)
.as('first_accepted') .as('first_accepted')
const week = sql<string>`to_char(date_trunc('week', ${localTime(firstAccepted.firstAt)}), 'YYYY-MM-DD')` const week = sql<string>`to_char(date_trunc('week', ${localTime(firstAccepted.firstAt)}), 'YYYY-MM-DD')`
+10
View File
@@ -6,6 +6,7 @@ import { useBreakpoints } from 'shared/composables/breakpoints'
import UserName from 'shared/components/UserName.vue' import UserName from 'shared/components/UserName.vue'
import AdminLink from 'shared/components/AdminLink.vue' import AdminLink from 'shared/components/AdminLink.vue'
import { useUserStore } from 'shared/store/user' import { useUserStore } from 'shared/store/user'
import { useMascotGuide } from 'shared/mascot/guide'
import { RARITY_COLOR, RARITY_LABEL } from 'utils/constants' import { RARITY_COLOR, RARITY_LABEL } from 'utils/constants'
import type { AchievementList, AchievementRarity, UserBadge } from 'utils/types' import type { AchievementList, AchievementRarity, UserBadge } from 'utils/types'
import ClassCard from './components/ClassCard.vue' import ClassCard from './components/ClassCard.vue'
@@ -59,6 +60,15 @@ async function load() {
onMounted(load) onMounted(load)
watch(name, load) watch(name, load)
// 看板娘:只在看自己的成就时说话。「快拿到了」里最近的一个能说成「再做对 3 道」的,报它的名字;
// 「还差 3 次」「一天做对 5 道」这种前面加不了「再」,往后找
useMascotGuide(() => {
if (!data.value || other.value || userStore.isTeacherOrAbove) return null
const item = near.value.find((it) => it.remain.startsWith('再'))
if (!item) return { situation: 'achievement' }
return { situation: 'achievement.near', vars: { name: item.achievement.name, need: item.remain.slice(1) } }
})
</script> </script>
<template> <template>
+6
View File
@@ -34,6 +34,12 @@ const METRICS: Record<string, MetricInfo> = {
unit: '道', unit: '道',
remain: (r) => `再做对 ${r} 道困难题`, remain: (r) => `再做对 ${r} 道困难题`,
}, },
challenge_count: {
group: '做题',
label: '挑战成功',
unit: '次',
remain: (r) => `再挑战成功 ${r} 次`,
},
max_ac_week_streak: { max_ac_week_streak: {
group: '坚持', group: '坚持',
label: '连着几周有做对', label: '连着几周有做对',
+4
View File
@@ -5,6 +5,7 @@ import AdminLink from 'shared/components/AdminLink.vue'
import NotFound from 'shared/components/NotFound.vue' import NotFound from 'shared/components/NotFound.vue'
import { useBreakpoints } from 'shared/composables/breakpoints' import { useBreakpoints } from 'shared/composables/breakpoints'
import { useUserStore } from 'shared/store/user' import { useUserStore } from 'shared/store/user'
import { useMascotGuide } from 'shared/mascot/guide'
import { errorCode } from 'utils/api' import { errorCode } from 'utils/api'
import { parseTime, zonedParts, zonedYear } from 'utils/functions' import { parseTime, zonedParts, zonedYear } from 'utils/functions'
import type { Announcement, AnnouncementListItem } from 'utils/types' import type { Announcement, AnnouncementListItem } from 'utils/types'
@@ -27,6 +28,9 @@ const { isDesktop } = useBreakpoints()
const announcements = ref<AnnouncementListItem[]>([]) const announcements = ref<AnnouncementListItem[]>([])
const loaded = ref(false) const loaded = ref(false)
// 看板娘:只念叨一句,不给按钮
useMascotGuide(() => ({ situation: 'announcement' }))
onMounted(async () => { onMounted(async () => {
const res = await getAnnouncementList(0, LIMIT) const res = await getAnnouncementList(0, LIMIT)
announcements.value = res.results announcements.value = res.results
+4 -1
View File
@@ -41,6 +41,7 @@ import {
type ProblemRank, type ProblemRank,
type CreateSubmissionResponse, type CreateSubmissionResponse,
type ProblemListItem, type ProblemListItem,
type SimilarProblem,
type ProblemStats, type ProblemStats,
type ProblemProgress, type ProblemProgress,
type CreateFlowchartResponse, type CreateFlowchartResponse,
@@ -412,7 +413,9 @@ export function submitHintFeedback(hintId: number, helpful: boolean) {
// ==================== 相似题目推荐 ==================== // ==================== 相似题目推荐 ====================
export function getSimilarProblems(problemId: string) { export function getSimilarProblems(problemId: string) {
return api.get<ProblemListItem[]>(`problems/${encodeURIComponent(problemId)}/similar`).then((response) => response.map(toProblemRow)) return api
.get<SimilarProblem[]>(`problems/${encodeURIComponent(problemId)}/similar`)
.then((response) => response.map((item) => ({ ...toProblemRow(item), sharedTags: item.sharedTags })))
} }
// ==================== 挑战 ==================== // ==================== 挑战 ====================
+9
View File
@@ -12,6 +12,7 @@ import { usePagination } from 'shared/composables/pagination'
import AdminLink from 'shared/components/AdminLink.vue' import AdminLink from 'shared/components/AdminLink.vue'
import { useBreakpoints } from 'shared/composables/breakpoints' import { useBreakpoints } from 'shared/composables/breakpoints'
import { useUserStore } from 'shared/store/user' import { useUserStore } from 'shared/store/user'
import { goAction, useMascotGuide } from 'shared/mascot/guide'
import { ContestStatus } from 'utils/constants' import { ContestStatus } from 'utils/constants'
import ContestBadge from './components/ContestBadge.vue' import ContestBadge from './components/ContestBadge.vue'
@@ -115,6 +116,14 @@ function open(contest: Contest) {
router.push(userStore.isTeacherOrAbove ? `/contest/${contest.id}/class` : `/contest/${contest.id}`) router.push(userStore.isTeacherOrAbove ? `/contest/${contest.id}/class` : `/contest/${contest.id}`)
} }
// 看板娘:有正在比的就带进去
useMascotGuide(() => {
if (userStore.isTeacherOrAbove) return null
const live = active.value.find((c) => c.status === ContestStatus.underway)
if (!live) return { situation: 'contests.none' }
return { situation: 'contests.live', actions: [goAction(router, '进比赛', `/contest/${live.id}`)] }
})
function mineText(contest: Contest) { function mineText(contest: Contest) {
const mine = contest.mine const mine = contest.mine
if (!mine) return '' if (!mine) return ''
+87 -3
View File
@@ -5,12 +5,13 @@ import { Icon } from '@iconify/vue'
import { getAnnouncementList, getKnowledgeMap, getContestList, getLastVisit, getLearnProgress, getSubmissions, getTutorials, getWeeklyRank } from 'oj/api' import { getAnnouncementList, getKnowledgeMap, getContestList, getLastVisit, getLearnProgress, getSubmissions, getTutorials, getWeeklyRank } from 'oj/api'
import { getClassActivity } from 'shared/api' import { getClassActivity } from 'shared/api'
import SubmissionResultTag from 'shared/components/SubmissionResultTag.vue' import SubmissionResultTag from 'shared/components/SubmissionResultTag.vue'
import { pickHeadline, type Headline } from 'oj/user/knowledge' import { levelName, MAX_LEVEL, pickHeadline, remainingToNext, tagLink, type Headline } from 'oj/user/knowledge'
import { useUserStore } from 'shared/store/user' import { useUserStore } from 'shared/store/user'
import { activityMode } from 'shared/store/lesson' import { activityMode } from 'shared/store/lesson'
import { focusJumpAction, goAction, randomProblemAction, useMascotGuide, type MascotAction, type MascotGuide } from 'shared/mascot/guide'
import { ContestStatus, CONTEST_STATUS, JUDGE_STATUS, LANGUAGE_SHOW_VALUE } from 'utils/constants' import { ContestStatus, CONTEST_STATUS, JUDGE_STATUS, LANGUAGE_SHOW_VALUE } from 'utils/constants'
import { duration, parseTime, zonedParts, zonedYear } from 'utils/functions' import { duration, parseTime, zonedParts, zonedYear } from 'utils/functions'
import type { AnnouncementListItem, ClassActivity, ClassActivityProblem, Contest, LastVisit, SubmissionListItem, WeeklyRank } from 'utils/types' import type { AnnouncementListItem, ClassActivity, ClassActivityProblem, Contest, KnowledgeMap, LastVisit, SubmissionListItem, WeeklyRank } from 'utils/types'
interface Track { interface Track {
type: TutorialType type: TutorialType
@@ -36,6 +37,8 @@ const classActivity = ref<ClassActivity | null>(null)
const lastVisit = ref<LastVisit | null>(null) const lastVisit = ref<LastVisit | null>(null)
/** 知识点地图挑出来的那一句(本周升级 / 再做几道升档 / 去点亮一个),见 oj/user/knowledge.ts */ /** 知识点地图挑出来的那一句(本周升级 / 再做几道升档 / 去点亮一个),见 oj/user/knowledge.ts */
const knowledgeHeadline = ref<Headline | null>(null) const knowledgeHeadline = ref<Headline | null>(null)
/** 地图原样留着给看板娘:她要知识点名、档位名、还差几道,不是拼好的那句话 */
const knowledge = ref<KnowledgeMap | null>(null)
const loaded = ref(false) const loaded = ref(false)
/** 头一回登录、还没交过:问候换成「欢迎」,告诉他题在哪找 */ /** 头一回登录、还没交过:问候换成「欢迎」,告诉他题在哪找 */
@@ -123,7 +126,8 @@ async function loadAnnouncements() {
} }
async function loadKnowledge() { async function loadKnowledge() {
knowledgeHeadline.value = pickHeadline(await getKnowledgeMap()) knowledge.value = await getKnowledgeMap()
knowledgeHeadline.value = pickHeadline(knowledge.value)
} }
async function loadClassActivity() { async function loadClassActivity() {
@@ -244,6 +248,86 @@ watch(
{ immediate: true }, { immediate: true },
) )
// 看板娘:今天有课(和「这节课」那张卡同一个条件)就催今天的题,没课就随便做一道
let greetedBack = false
useMascotGuide(() => {
if (!loaded.value) return null
const random = randomProblemAction(router)
const learn = goAction(router, '自学', '/learn')
const lesson = classToday.value && !!classActivity.value?.problems.length
const next = nextProblem.value
if (lesson && next)
return { situation: 'home.assigned', actions: [goAction(router, '今天的题', `/problem/${next.problemDisplayId}`), focusJumpAction(), random] }
const base: MascotGuide = lesson
? { situation: 'home.done', actions: [random, learn] }
: { situation: 'home.free', actions: [focusJumpAction(), random, learn] }
// 好久没来:只在这次进来后第一次点她时说,之后照常
if (awayDays.value >= 14 && !greetedBack) {
greetedBack = true
return { ...base, situation: 'home.back', n: awayDays.value }
}
// 这节课做完了或者没课:从别的数据里挑能说的,每点一次随机说一件,点几下听到的不一样
const extras = extraGuides(random)
return extras.length ? extras[Math.floor(Math.random() * extras.length)]! : base
})
const DAY_MS = 864e5
function extraGuides(random: MascotAction): MascotGuide[] {
const list: MascotGuide[] = []
// 比赛:进行中,或者 24 小时内开始(那就只可能是今天或明天)
const now = Date.now()
const contest = contests.value.find((it) => it.status === ContestStatus.underway || Date.parse(it.startTime) - now < DAY_MS)
if (contest) {
const when = contest.status === ContestStatus.underway ? '现在' : dayKey(contest.startTime) === dayKey(new Date()) ? '今天' : '明天'
list.push({ situation: 'home.contestSoon', vars: { when }, actions: [goAction(router, '去看看', `/contest/${contest.id}`), random] })
}
// 公告:三天内发的,挑最新那条
const fresh = announcements.value.filter((it) => now - Date.parse(it.createTime) < 3 * DAY_MS).sort((a, b) => b.createTime.localeCompare(a.createTime))[0]
if (fresh) {
list.push({
situation: 'home.newAnnouncement',
actions: [{ label: '去看看', run: () => router.push({ path: '/announcement', query: { id: fresh.id } }) }, random],
})
}
// 知识点:和首页那一行同一个先后(本周升级 > 离下一档最近 > 班里在学、自己还没碰过),只说一件
const map = knowledge.value
if (map) {
const touched = new Set(map.classTouched)
const go = (name: string) => ({ label: '去做', run: () => router.push(tagLink(name)) })
const upgraded = map.tags.filter((tag) => tag.level > tag.levelAtWeekStart).sort((a, b) => b.level - a.level)[0]
const learning = map.tags
.filter((tag) => tag.level >= 1 && tag.level < MAX_LEVEL)
.sort((a, b) => Number(touched.has(b.name)) - Number(touched.has(a.name)) || remainingToNext(a)! - remainingToNext(b)!)[0]
const untouched = map.tags.find((tag) => tag.level === 0 && touched.has(tag.name))
if (upgraded)
list.push({ situation: 'home.knowledgeUp', vars: { tag: upgraded.name, level: levelName(upgraded.level) }, actions: [go(upgraded.name), random] })
else if (learning)
list.push({
situation: 'home.knowledgeNext',
n: remainingToNext(learning)!,
vars: { tag: learning.name, level: levelName(learning.level + 1) },
actions: [go(learning.name), random],
})
else if (untouched) list.push({ situation: 'home.knowledgeFresh', vars: { tag: untouched.name }, actions: [go(untouched.name), random] })
}
// 本周进步榜:第一就说第一;前一名在榜面上(只回前几名)、差得不多就报还要几道。
// 同分时提交少的在前,追平不一定超得过,所以按多做 1 道算
const me = weekly.value?.me
if (me) {
const rank = goAction(router, '去排名', '/rank?period=week')
const ahead = weekly.value!.results.find((row) => row.rank === me.rank - 1)
if (me.rank === 1) list.push({ situation: 'rank.top', actions: [rank, random] })
else if (ahead && ahead.solvedCount - me.solvedCount <= 5)
list.push({ situation: 'rank.gap', n: ahead.solvedCount - me.solvedCount + 1, actions: [rank, random] })
}
return list
}
function learnLink(track: Track) { function learnLink(track: Track) {
return tutorialPath(track.type, track.step) return tutorialPath(track.type, track.step)
} }
+20
View File
@@ -6,6 +6,7 @@ import { useThemeVars } from 'naive-ui'
import { getAnnouncementList, getClassToday } from 'oj/api' import { getAnnouncementList, getClassToday } from 'oj/api'
import { classLabel } from 'utils/classes' import { classLabel } from 'utils/classes'
import { useUserStore } from 'shared/store/user' import { useUserStore } from 'shared/store/user'
import { goAction, useMascotGuide } from 'shared/mascot/guide'
import { parseTime, zonedParts, zonedYear } from 'utils/functions' import { parseTime, zonedParts, zonedYear } from 'utils/functions'
/** /**
@@ -66,6 +67,25 @@ function openTask(row: ClassRow) {
router.push({ name: 'task', query: { className: row.className } }) router.push({ name: 'task', query: { className: row.className } })
} }
/**
* 看板娘:今天有班布置了题,就带去那个班这节课的提交(和提交列表「这节课」同一组筛选:班、这几道题、今天),
* 有好几个班时挑正在上课的那个
*/
useMascotGuide(() => {
if (!today.value) return null
const assigned = today.value.classes.filter((row) => row.source === 'teacher' && row.problems.length)
const row = assigned.find((it) => stateOf(it).live) ?? assigned[0]
if (!row) return { situation: 'teacher.home.unassigned', actions: [goAction(router, '布置题目', '/task')] }
const query = { className: row.className, problem: row.problems.map((problem) => problem.problemDisplayId).join(','), today: '1' }
return {
situation: 'teacher.home.assigned',
actions: [
{ label: '这节课的提交', run: () => router.push({ name: 'submissions', query }) },
{ label: '课堂任务', run: () => openTask(row) },
],
}
})
const shortcuts = computed(() => const shortcuts = computed(() =>
[ [
{ label: '课堂任务', to: '/task', show: true }, { label: '课堂任务', to: '/task', show: true },
+18
View File
@@ -6,6 +6,7 @@ import { useBreakpoints } from 'shared/composables/breakpoints'
import { useAuthModalStore } from 'shared/store/authModal' import { useAuthModalStore } from 'shared/store/authModal'
import AdminLink from 'shared/components/AdminLink.vue' import AdminLink from 'shared/components/AdminLink.vue'
import { useUserStore } from 'shared/store/user' import { useUserStore } from 'shared/store/user'
import { goAction, useMascotGuide } from 'shared/mascot/guide'
import { COURSES, continueStep, doneCount, groupByProject, tutorialPath, tutorialState, splitProject, splitTitle, type TutorialType } from './utils' import { COURSES, continueStep, doneCount, groupByProject, tutorialPath, tutorialState, splitProject, splitTitle, type TutorialType } from './utils'
import TutorialRow from './components/TutorialRow.vue' import TutorialRow from './components/TutorialRow.vue'
import ProjectTile from './components/ProjectTile.vue' import ProjectTile from './components/ProjectTile.vue'
@@ -94,6 +95,23 @@ function doneIn(course: Course, ids: number[]) {
return ids.filter((id) => tutorialState(course.progress[id]) === 'done').length return ids.filter((id) => tutorialState(course.progress[id]) === 'done').length
} }
// 看板娘:学过就带去「接着学」那一课,一课没学过就从当前页签那门课的第 1 课开始
useMascotGuide(() => {
if (!loaded.value || userStore.isTeacherOrAbove) return null
const it = resume.value
if (it) {
const next = goAction(router, '接着学', tutorialPath(it.course.type, it.step))
// 接着学的那课之前,离它最近的一课打开过、练一练却没全对(「在学」那一态):先叫回去看看
const { titles, progress } = it.course
for (let step = it.step - 1; step >= 1; step--) {
if (tutorialState(progress[titles[step - 1]!.id]) !== 'started') continue
return { situation: 'learn.wrongExercise', n: step, actions: [goAction(router, '去看看', tutorialPath(it.course.type, step)), next] }
}
return { situation: 'learn.continue', n: it.step, actions: [next] }
}
return { situation: 'learn.fresh', actions: [goAction(router, '第 1 课', tutorialPath(tab.value, 1))] }
})
watch(() => userStore.isAuthed, load) watch(() => userStore.isAuthed, load)
onMounted(load) onMounted(load)
</script> </script>
+11
View File
@@ -10,6 +10,7 @@ import { useBackClose } from 'shared/composables/backClose'
import { useBreakpoints } from 'shared/composables/breakpoints' import { useBreakpoints } from 'shared/composables/breakpoints'
import AdminLink from 'shared/components/AdminLink.vue' import AdminLink from 'shared/components/AdminLink.vue'
import { useUserStore } from 'shared/store/user' import { useUserStore } from 'shared/store/user'
import { useMascotGuide, type MascotAction } from 'shared/mascot/guide'
import { COURSES, doneCount, groupByProject, tutorialPath, tutorialState, splitTitle, type TutorialType } from './utils' import { COURSES, doneCount, groupByProject, tutorialPath, tutorialState, splitTitle, type TutorialType } from './utils'
import TutorialBody from './components/TutorialBody.vue' import TutorialBody from './components/TutorialBody.vue'
import TutorialEnd from './components/TutorialEnd.vue' import TutorialEnd from './components/TutorialEnd.vue'
@@ -233,6 +234,16 @@ function jump(id: string) {
function jumpExercise(id: number) { function jumpExercise(id: number) {
jump(`exercise-${id}`) jump(`exercise-${id}`)
} }
// 看板娘:练一练没做完就带去第一道没做对的;做完了(或这课没有练一练)就去下一课
useMascotGuide(() => {
if (!tutorial.value || userStore.isTeacherOrAbove) return null
const to = next.value?.to
const nextLesson: MascotAction[] = to ? [{ label: '下一课', run: () => router.push(to) }] : []
const unsolved = firstUnsolved.value
if (!unsolved) return { situation: 'tutorial.passed', actions: nextLesson }
return { situation: 'tutorial', actions: [{ label: '练一练', run: () => jumpExercise(unsolved.id) }, ...nextLesson] }
})
</script> </script>
<template> <template>
+5
View File
@@ -6,6 +6,7 @@ import { classLabel, groupClassOptions } from 'utils/classes'
import { useAIStream } from 'shared/composables/aiStream' import { useAIStream } from 'shared/composables/aiStream'
import { useBreakpoints } from 'shared/composables/breakpoints' import { useBreakpoints } from 'shared/composables/breakpoints'
import { useUserStore } from 'shared/store/user' import { useUserStore } from 'shared/store/user'
import { useMascotGuide } from 'shared/mascot/guide'
import PkDuel from './components/PkDuel.vue' import PkDuel from './components/PkDuel.vue'
import PkGrid from './components/PkGrid.vue' import PkGrid from './components/PkGrid.vue'
import PkRace from './components/PkRace.vue' import PkRace from './components/PkRace.vue'
@@ -31,6 +32,10 @@ const { isDesktop } = useBreakpoints()
const MAX_CLASSES = 8 const MAX_CLASSES = 8
const teacher = computed(() => userStore.isTeacherOrAbove) const teacher = computed(() => userStore.isTeacherOrAbove)
// 看板娘:学生念叨一句班级对决,老师只打招呼
useMascotGuide(() => (teacher.value ? null : { situation: 'pk' }))
const pk = ref<ClassPk | null>(null) const pk = ref<ClassPk | null>(null)
const loading = ref(false) const loading = ref(false)
const battle = ref<ClassBattleItem[]>([]) const battle = ref<ClassBattleItem[]>([])
@@ -333,7 +333,7 @@ const astRequirements = computed(() => Object.entries(problem.value?.astRequirem
<Markdown html :content="problem.source" /> <Markdown html :content="problem.source" />
</section> </section>
<SimilarProblems v-if="showSimilar" title="相似题目推荐" /> <SimilarProblems v-if="showSimilar" title="相似题目推荐" place="content" />
</div> </div>
</template> </template>
@@ -1,11 +1,13 @@
<script lang="ts"> <script lang="ts">
import type { ProblemRow } from 'utils/types' import type { ProblemRow } from 'utils/types'
type SimilarRow = ProblemRow & { sharedTags: string[] }
/** /**
* 同一道题两处(题面末尾、结果页签)都挂着时只拉一次。放在模块级:写在 setup 里就成了 * 同一道题两处(题面末尾、结果页签)都挂着时只拉一次。放在模块级:写在 setup 里就成了
* 每个实例各一份 * 每个实例各一份
*/ */
const cache = new Map<string, Promise<ProblemRow[]>>() const cache = new Map<string, Promise<SimilarRow[]>>()
</script> </script>
<script setup lang="ts"> <script setup lang="ts">
@@ -13,17 +15,26 @@ import { storeToRefs } from 'pinia'
import { useThemeVars } from 'naive-ui' import { useThemeVars } from 'naive-ui'
import { getSimilarProblems } from 'oj/api' import { getSimilarProblems } from 'oj/api'
import { useProblemStore } from 'oj/store/problem' import { useProblemStore } from 'oj/store/problem'
import { useTone } from 'shared/composables/tone'
import { problemTypes } from '../utils/problemType'
import ProblemStatus from './ProblemStatus.vue'
import ProblemTypeTag from './ProblemTypeTag.vue'
/** /**
* 相似题推荐。题面末尾(做对了、或者错了 3 次以上)和结果页签(不在课堂里的题做对之后) * 相似题推荐。题面末尾(做对了、或者错了 3 次以上)和结果页签(不在课堂里的题做对之后)
* 两处用:原来只在题面最底下,学生交完不会再滚回去看。什么时候出现由调用方的 v-if 决定。 * 两处用:原来只在题面最底下,学生交完不会再滚回去看。什么时候出现由调用方的 v-if 决定。
* `place` 只管标题的样子:题面里和「提示」「来源」一样带绿竖条,结果页签里和「还能挑战」对齐。
*
* 每行第二行写和这道题共同的标签:不点开就知道练的是什么。行的写法照题目列表
* (灰题号、淡底难度、做对人数、类型标签、做过没对的红「−」)
*/ */
const props = defineProps<{ title: string }>() const props = defineProps<{ title: string; place: 'content' | 'result' }>()
const theme = useThemeVars() const theme = useThemeVars()
const tone = useTone()
const { problem } = storeToRefs(useProblemStore()) const { problem } = storeToRefs(useProblemStore())
const list = ref<ProblemRow[]>([]) const list = ref<SimilarRow[]>([])
watch( watch(
() => problem.value?._id, () => problem.value?._id,
@@ -41,30 +52,36 @@ watch(
{ immediate: true }, { immediate: true },
) )
// getSimilarProblems 已经过 toProblemRow,难度是中文,不是 Low/Mid/High // 做对了的接口已经筛掉,剩下的只有「没做过」和「做过没对」两种;一道都没做过就不留这一列
function difficultyType(difficulty: string) { const showStatus = computed(() => list.value.some((row) => row.status === 'failed'))
if (difficulty === '简单') return 'success'
if (difficulty === '困难') return 'error' const DIFFICULTY_TONE = { 简单: 'success', 中等: 'warning', 困难: 'error' } as const
return 'warning'
function difficultyStyle(row: SimilarRow) {
if (!row.difficulty) return {}
const t = tone(DIFFICULTY_TONE[row.difficulty])
return { color: t.color, background: t.background }
} }
</script> </script>
<template> <template>
<section v-if="list.length" class="similar"> <section v-if="list.length" class="similar" :class="props.place">
<h3 class="title">{{ props.title }}</h3> <h3 class="heading">{{ props.title }}</h3>
<n-list bordered> <div class="rows">
<n-list-item v-for="sp in list" :key="sp._id"> <router-link v-for="sp in list" :key="sp._id" :to="{ name: 'problem', params: { problemID: sp._id } }" class="row" :class="{ 'with-status': showStatus }">
<n-flex align="center" justify="space-between" :wrap="false"> <span v-if="showStatus" class="status"><ProblemStatus :status="sp.status" /></span>
<router-link :to="{ name: 'problem', params: { problemID: sp._id } }" class="link"> <span class="id">{{ sp._id }}</span>
<n-tag size="small" :bordered="false">{{ sp._id }}</n-tag> <span class="name">
<span class="name">{{ sp.title }}</span> <span class="text">{{ sp.title }}</span>
</router-link> <ProblemTypeTag v-for="kind in problemTypes(sp)" :key="kind" :kind="kind" />
<n-tag v-if="sp.difficulty" size="small" :type="difficultyType(sp.difficulty)"> </span>
{{ sp.difficulty }} <span v-if="sp.difficulty" class="difficulty" :style="difficultyStyle(sp)">{{ sp.difficulty }}</span>
</n-tag> <span class="shared">{{ sp.sharedTags.join(' · ') }}</span>
</n-flex> <span class="people"
</n-list-item> ><b>{{ sp.solvedUsers }}</b> 人做对</span
</n-list> >
</router-link>
</div>
</section> </section>
</template> </template>
@@ -73,34 +90,135 @@ function difficultyType(difficulty: string) {
margin-top: 20px; margin-top: 20px;
} }
.title { .similar.result {
font-size: 16px; margin-top: 14px;
font-weight: 600; }
.heading {
margin: 0 0 8px; margin: 0 0 8px;
} }
/* 列表项的内容区默认按内容撑宽,长标题会把难度挤出屏幕,省略号也不出来 */ /* 和 ProblemContent 的小节标题(提示 / 来源)一样 */
.similar :deep(.n-list-item__main) { .content .heading {
min-width: 0; font-size: 16px;
font-weight: 700;
line-height: 1.4;
padding-left: 9px;
border-left: 3px solid v-bind('theme.primaryColor');
} }
.link { /* 和结果页签里的「还能挑战」一样 */
display: inline-flex; .result .heading {
font-size: 15px;
font-weight: 700;
}
.rows {
border: 1px solid v-bind('theme.dividerColor');
border-radius: 6px;
overflow: hidden;
}
/*
* 两行:题号 | 题目名 + 类型标签 | 难度
* | 共同的标签 | 做对人数
* 做过没对的题最前面多一列红「−」
*/
.row {
display: grid;
grid-template-columns: auto minmax(0, 1fr) auto;
grid-template-areas:
'id name difficulty'
'. shared people';
align-items: center; align-items: center;
gap: 8px; gap: 4px 12px;
min-width: 0; padding: 10px 16px;
color: inherit; color: v-bind('theme.textColor1');
text-decoration: none; text-decoration: none;
} }
.link:hover .name { .row.with-status {
grid-template-columns: 16px auto minmax(0, 1fr) auto;
grid-template-areas:
'status id name difficulty'
'. . shared people';
}
.row + .row {
border-top: 1px solid v-bind('theme.dividerColor');
}
.row:hover {
background: v-bind('theme.hoverColor');
}
.row:hover .text {
text-decoration: underline; text-decoration: underline;
} }
.status {
grid-area: status;
display: flex;
justify-content: center;
}
.id {
grid-area: id;
min-width: 36px;
font-size: 14px;
color: v-bind('theme.textColor3');
font-variant-numeric: tabular-nums;
}
.name { .name {
grid-area: name;
min-width: 0;
display: flex;
align-items: center;
gap: 8px;
}
.text {
min-width: 0;
font-size: 15px;
color: v-bind('theme.primaryColor'); color: v-bind('theme.primaryColor');
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
} }
.difficulty {
grid-area: difficulty;
justify-self: end;
height: 22px;
padding: 0 7px;
border-radius: 4px;
font-size: 13px;
display: inline-flex;
align-items: center;
}
.shared {
grid-area: shared;
min-width: 0;
font-size: 13px;
color: v-bind('theme.textColor3');
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.people {
grid-area: people;
justify-self: end;
font-size: 13px;
color: v-bind('theme.textColor3');
font-variant-numeric: tabular-nums;
white-space: nowrap;
}
.people b {
font-weight: 600;
color: v-bind('theme.textColor2');
}
</style> </style>
@@ -357,7 +357,7 @@ const columns: DataTableColumn<JudgeCaseResult>[] = [
:language="submission.language" :language="submission.language"
:refresh-key="submission.id" :refresh-key="submission.id"
/> />
<SimilarProblems v-if="showSimilar" title="再练几道相似的" /> <SimilarProblems v-if="showSimilar" title="再练几道相似的" place="result" />
</div> </div>
</template> </template>
<div v-show="!waitingReveal"> <div v-show="!waitingReveal">
@@ -0,0 +1,271 @@
import { useBreakpoints } from 'shared/composables/breakpoints'
import { useMascotGuide, type MascotAction, type MascotGuide } from 'shared/mascot/guide'
import { HINT_MIN_FAILURES, isFlowchartPass } from '@oj2/contract'
import { habitSituation, logMascotEvent, refreshMascotProfile, requestSpeech } from 'shared/mascot/behavior'
import { useChallengeStore } from 'oj/store/challenge'
import { useFlowchartStore } from 'oj/store/flowchart'
import type { MascotSituation } from 'shared/mascot/lines'
import { useCollabStore } from 'shared/store/collab'
import { useLessonStore } from 'shared/store/lesson'
import { useUserStore } from 'shared/store/user'
import { useCodeStore } from 'oj/store/code'
import { useProblemStore } from 'oj/store/problem'
import { useSubmissionStore, type ResultSegment } from 'oj/store/submission'
import { SubmissionStatus } from 'utils/constants'
import type { ProblemDetail } from 'utils/types'
import { useProblemPageContext } from './problemPageContext'
import { useTeacherCollab } from './teacherCollab'
/** 同一道题错到这么多次,她就不怼了,劝去举手 */
const STUCK_FAILS = 5
/** 错过这么多次以后做对,算「终于」 */
const FINALLY_FAILS = 2
const RESULT_SITUATION: Partial<Record<SubmissionStatus, MascotSituation>> = {
[SubmissionStatus.wrong_answer]: 'problem.wrong',
[SubmissionStatus.partial_accepted]: 'problem.wrong',
[SubmissionStatus.ast_check_failed]: 'problem.wrong',
[SubmissionStatus.compile_error]: 'problem.compileError',
[SubmissionStatus.runtime_error]: 'problem.runtimeError',
[SubmissionStatus.memory_limit_exceeded]: 'problem.runtimeError',
[SubmissionStatus.cpu_time_limit_exceeded]: 'problem.timeout',
[SubmissionStatus.real_time_limit_exceeded]: 'problem.timeout',
}
/** 一道题上这么久没交、没跑例子,她就来问一句(主动开口) */
const IDLE_MS = 15 * 60_000
/** 连着这么多次没跑例子就交,而且错了,她就念一句 */
const UNSAMPLED_SUBMITS = 3
/** 同班做对这么多人,就拿出来说「全班已经 N 个人做对了」 */
const CLASS_MANY = 5
/** 同班交过这么多人、做对的不超过 CLASS_FEW 个,算「全班都卡着」 */
const CLASS_TRIED = 5
const CLASS_FEW = 2
/** 全站交过这么多次,通过率才有意义 */
const RATE_MIN_SUBMISSIONS = 30
const HARD_RATE = 0.3
const EASY_RATE = 0.7
/** 几种「换个说法」各自的机会:不是每次都说同一件事 */
const CHANCE = { classMany: 0.3, classFew: 0.5, rate: 0.4, hint: 0.5, challenge: 0.4 } as const
const roll = (chance: number) => Math.random() < chance
const FINISHED = (result: number | undefined) =>
result !== undefined && result !== SubmissionStatus.pending && result !== SubmissionStatus.judging && result !== SubmissionStatus.submitting
/**
* 题目页上看板娘说什么、给哪几个按钮。看的是这一页上最近的那件事:刚交的结果、刚跑的例子,
* 都没有就看写没写代码。比赛入口不用管(Mascot.vue 在比赛里不弹)。
*
* 另外几件事她会主动开口(只对学生,频率上限在 Mascot.vue):同一道题错到第 5 次、连着 3 次
* 没跑例子就交还错了、又犯了自己的老毛病(behavior.ts 的 habitSituation)、15 分钟没交没跑。
*
* `showResult` 是「我错在哪」:把左栏切到「结果」页签的那一段(提交结果 / 运行例子),页签归页面管。
*/
export function useProblemMascotGuide(showResult: (segment: ResultSegment) => void) {
const router = useRouter()
const userStore = useUserStore()
const problemStore = useProblemStore()
const submissionStore = useSubmissionStore()
const codeStore = useCodeStore()
const collabStore = useCollabStore()
const lessonStore = useLessonStore()
const ctx = useProblemPageContext()
const teacherCollab = useTeacherCollab()
const { isDesktop } = useBreakpoints()
const flowchartStore = useFlowchartStore()
const challengeStore = useChallengeStore()
/** 学生在这道题上能用的几个按钮,点她和她主动开口共用 */
function studentActions(problem: ProblemDetail) {
const language = codeStore.code.language
const entry = ctx.value
const runSamples: MascotAction | null =
problem.samples.length && language !== 'Flowchart' && language !== 'SQL' ? { label: '运行例子', run: submissionStore.runSamples } : null
// 和工具栏的「举手求助」同一个条件;已经举着手、老师在帮的时候不给
const help: MascotAction | null =
entry.help && isDesktop.value && !userStore.demoMode && language !== 'Flowchart' && collabStore.helpStatus === 'idle'
? { label: '举手求助', run: () => collabStore.requestHelp(problem._id, language) }
: null
const why: MascotAction = { label: '我错在哪', run: () => showResult('submit') }
const whySamples: MascotAction = { label: '我错在哪', run: () => showResult('samples') }
const busy = submissionStore.isFormatting || submissionStore.isSubmittingRequest || submissionStore.judging || submissionStore.isCooldown
const submit: MascotAction | null = busy
? null
: { label: '提交', run: () => submissionStore.submit({ contestId: entry.contestId, problemSetId: entry.problemSetId }) }
return { runSamples, help, why, whySamples, submit }
}
const guide = (situation: MascotSituation, ...actions: (MascotAction | null)[]): MascotGuide => ({
situation,
actions: actions.filter((it): it is MascotAction => !!it),
})
useMascotGuide(() => {
const problem = problemStore.problem
if (!problem) return null
if (userStore.isTeacherOrAbove) {
// 协作中别把老师带离这一页:跳走协作就断了
if (teacherCollab.value) return null
const actions: MascotAction[] = [{ label: '全班这题的提交', run: () => router.push({ name: 'submissions', query: { problem: problem._id } }) }]
if (isDesktop.value && userStore.canEditProblem(problem)) {
actions.push({ label: '编辑这道题', run: () => window.open(router.resolve(`/admin/problem/edit/${problem.id}`).href, '_blank') })
}
return { situation: 'teacher.problem', actions }
}
const entry = ctx.value
const { runSamples, help, why, whySamples, submit } = studentActions(problem)
if (codeStore.code.language === 'Flowchart') {
// 画过、评过分了:分低就说分低,拿了 S 夸一句
const grade = flowchartStore.latestRating.grade
if (grade === 'S') return guide('flowchart.good', help)
if (grade && !isFlowchartPass(grade)) return guide('flowchart.low', help)
return guide('problem.flowchart', help)
}
// 正在判、正在跑例子:没什么好说的,打个招呼
if (submissionStore.judging || submissionStore.pending || submissionStore.trial.samplesRunning.value) return null
const stuck = problemStore.failCount >= STUCK_FAILS
if (submissionStore.syntaxErrorInfo) return stuck ? guide('problem.stuck', help, why) : guide('problem.compileError', why, help)
const runs = submissionStore.trial.sampleRuns.value
if (submissionStore.resultSegment === 'samples' && runs.length) {
return runs.every((run) => run.result === SubmissionStatus.accepted)
? guide('problem.samplesPassed', submit)
: guide('problem.samplesFailed', whySamples, help)
}
const result = submissionStore.submission?.result
const lesson = lessonStore.find(problem._id)
if (result === SubmissionStatus.accepted) {
const next = nextAction()
// 课堂条的数是拉的时候的,刚做对重拉回来可能已经把自己算进去了
if (lesson && lesson.acceptedCount <= (lesson.myStatus === 'accepted' ? 1 : 0)) return guide('class.firstSolver', next)
if (entry.challenges && challengeStore.current?.challenges.length && roll(CHANCE.challenge)) return guide('problem.challenge', next)
const fails = problemStore.failCount
return guide(fails === 0 ? 'problem.firstTry' : fails >= FINALLY_FAILS ? 'problem.finally' : 'problem.accepted', next)
}
const failed = result === undefined ? undefined : RESULT_SITUATION[result as SubmissionStatus]
if (failed) {
if (stuck) return guide('problem.stuck', help, why)
const actions = [why, failed === 'problem.wrong' ? runSamples : null, help]
// AI 提示开了还没要:提一句,按钮带去结果里(提示在那儿)
const hintOpen = !problem.contestId && problemStore.failCount >= HINT_MIN_FAILURES && !submissionStore.hint.hintContent.value
if (hintOpen && roll(CHANCE.hint)) return guide('problem.hintReady', ...actions)
const classGuide = classSituation(lesson)
if (classGuide) return { ...guide(classGuide.situation, ...actions), n: classGuide.n }
const rate = problem.submissionNumber >= RATE_MIN_SUBMISSIONS ? problem.acceptedNumber / problem.submissionNumber : null
if (rate !== null && rate < HARD_RATE && roll(CHANCE.rate)) return guide('problem.hardWrong', ...actions)
if (rate !== null && rate > EASY_RATE && failed === 'problem.wrong' && roll(CHANCE.rate)) return guide('problem.easyWrong', ...actions)
return guide(failed, ...actions)
}
if (problem.myStatus === SubmissionStatus.accepted) return guide('problem.solvedBefore', nextAction())
if (codeStore.code.value.trim().length < 10) return guide(entry.entry === 'problemset' ? 'problem.inSet' : 'problem.blank', runSamples, help)
const classGuide = classSituation(lesson)
if (classGuide?.situation === 'class.manyDone') return { ...guide('class.manyDone', runSamples, help), n: classGuide.n }
return guide('problem.unsubmitted', runSamples, help)
/** 这节课的题:同班多少人做对了(课堂条那份数),不在这节课里就没有 */
function classSituation(item: typeof lesson) {
if (!item || item.myStatus === 'accepted') return null
if (item.acceptedCount >= CLASS_MANY && roll(CHANCE.classMany)) return { situation: 'class.manyDone' as const, n: item.acceptedCount }
if (item.userCount >= CLASS_TRIED && item.acceptedCount <= CLASS_FEW && roll(CHANCE.classFew))
return { situation: 'class.fewDone' as const, n: item.acceptedCount }
return null
}
/** 做对之后去哪:专题里回专题,这节课里去下一道还没做的 */
function nextAction(): MascotAction | null {
if (entry.entry === 'problemset') return { label: '回专题', run: () => router.push(`/problemset/${entry.problemSetId}`) }
const next = lessonStore.nextAfter(problem!._id)?.next
return next ? { label: '下一道', run: () => router.push(`/problem/${next.problemDisplayId}`) } : null
}
})
// ---- 主动开口(只对学生;比赛里 Mascot.vue 不弹)----
const student = () => userStore.isAuthed && !userStore.isTeacherOrAbove && ctx.value.entry !== 'contest'
/** 这道题上连着几次没跑例子就交了。跑过一次例子就清零 */
let unsampledSubmits = 0
let sampledSinceSubmit = false
/** 上一次「动静」(进题、交、跑例子)的时刻,给「盯了好久」用 */
let lastActivity = Date.now()
watch(
() => problemStore.problem?.id,
() => {
unsampledSubmits = 0
sampledSinceSubmit = false
lastActivity = Date.now()
},
)
watch(
() => submissionStore.trial.samplesRunAt.value,
(at) => {
if (!at) return
sampledSinceSubmit = true
lastActivity = Date.now()
if (student()) logMascotEvent({ kind: 'trial', action: 'samples' })
},
)
// 「运行例子」「自己输入」「举手」别处都不存,记下来给她看一周的习惯(behavior.ts)
watch(
() => submissionStore.trial.customRunning.value,
(running) => {
if (!running) return
lastActivity = Date.now()
if (student()) logMascotEvent({ kind: 'trial', action: 'custom' })
},
)
watch(
() => collabStore.helpStatus,
(status, previous) => {
if (status === 'pending' && previous === 'idle' && student()) logMascotEvent({ kind: 'help' })
},
)
watch(
() => submissionStore.submission?.id,
(id) => {
if (!id) return
unsampledSubmits = sampledSinceSubmit ? 0 : unsampledSubmits + 1
sampledSinceSubmit = false
lastActivity = Date.now()
},
)
// 判完了:错了就看要不要说一句;不管对错都刷新行为数(最近的错、今天做对几道)
watch(
() => [submissionStore.submission?.id, submissionStore.submission?.result] as const,
([id, result]) => {
const problem = problemStore.problem
if (!id || !FINISHED(result) || !problem || !student()) return
refreshMascotProfile(true)
const failed = RESULT_SITUATION[result as SubmissionStatus]
if (!failed) return
const { runSamples, help, why } = studentActions(problem)
if (problemStore.failCount >= STUCK_FAILS) {
requestSpeech({ key: `stuck:${problem.id}`, ...guide('problem.stuck', help, why) })
} else if (unsampledSubmits >= UNSAMPLED_SUBMITS && runSamples) {
requestSpeech({ key: `unsampled:${problem.id}`, ...guide('habit.noSamples', runSamples) })
} else {
const habit = habitSituation(failed)
if (habit) requestSpeech({ key: `habit:${habit}`, ...guide(habit, why) })
}
},
)
// 盯着一道没做对的题 15 分钟,没交也没跑:问一句
useIntervalFn(() => {
const problem = problemStore.problem
if (!problem || !student() || Date.now() - lastActivity < IDLE_MS) return
if (problem.myStatus === SubmissionStatus.accepted || submissionStore.submission?.result === SubmissionStatus.accepted) return
if (codeStore.code.language === 'Flowchart') return
const { runSamples, help } = studentActions(problem)
requestSpeech({ key: `idle:${problem.id}`, ...guide('idle.stuck', help, runSamples) })
}, 30_000)
}
@@ -14,28 +14,36 @@ const EMOJI_SVGS = [
// 将 emoji SVG 转成 confetti 可用的彩色位图 Shape,缓存后供重复调用复用 // 将 emoji SVG 转成 confetti 可用的彩色位图 Shape,缓存后供重复调用复用
let emojiShapesPromise: Promise<confetti.Shape[]> | null = null let emojiShapesPromise: Promise<confetti.Shape[]> | null = null
/**
* 表情在屏幕上的边长(px)。位图就按这个大小画,放的时候 `scalar: 1`、矩阵不缩放。
*
* **别改回「位图画大、矩阵缩小、scalar 放大」**:canvas-confetti 画位图粒子是每帧
* `fillRect(位图边长 × scalar)` 再用图案填,填的矩形和表情实际多大无关。原来位图 64、
* scalar 5,表情显示 50px,每个粒子每帧却要填 320×320 —— 两团 32 个粒子一帧三百多万像素,
* 机房电脑(显卡弱、Chrome 常走软件渲染)放到这一种就卡(用户 2026-11 反馈)。
* 现在填的正好是 50×50,同样大小、同样轨迹,像素少到四十分之一。
*/
const EMOJI_PX = 50
function svgToBitmapShape(svg: string): Promise<confetti.Shape> { function svgToBitmapShape(svg: string): Promise<confetti.Shape> {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const blob = new Blob([svg], { type: 'image/svg+xml' }) const blob = new Blob([svg], { type: 'image/svg+xml' })
const url = URL.createObjectURL(blob) const url = URL.createObjectURL(blob)
const img = new Image() const img = new Image()
img.onload = async () => { img.onload = async () => {
const renderSize = 64
const baseUnit = 10
const canvas = document.createElement('canvas') const canvas = document.createElement('canvas')
canvas.width = renderSize canvas.width = EMOJI_PX
canvas.height = renderSize canvas.height = EMOJI_PX
const ctx = canvas.getContext('2d')! const ctx = canvas.getContext('2d')!
ctx.drawImage(img, 0, 0, renderSize, renderSize) ctx.drawImage(img, 0, 0, EMOJI_PX, EMOJI_PX)
URL.revokeObjectURL(url) URL.revokeObjectURL(url)
try { try {
const bitmap = await createImageBitmap(canvas) const bitmap = await createImageBitmap(canvas)
const scale = baseUnit / renderSize
resolve({ resolve({
type: 'bitmap', type: 'bitmap',
bitmap, bitmap,
matrix: [scale, 0, 0, scale, (-renderSize * scale) / 2, (-renderSize * scale) / 2], matrix: [1, 0, 0, 1, -EMOJI_PX / 2, -EMOJI_PX / 2],
} as unknown as confetti.Shape) } as unknown as confetti.Shape)
} catch (e) { } catch (e) {
reject(e) reject(e)
@@ -415,7 +423,8 @@ export function useFireworks() {
const options: confetti.Options = { const options: confetti.Options = {
shapes: emojiShapes, shapes: emojiShapes,
flat: true, flat: true,
scalar: 5, // 大小在位图里(EMOJI_PX),这里放大的话填的矩形跟着放大,见 EMOJI_PX
scalar: 1,
particleCount: 16, particleCount: 16,
spread: 360, spread: 360,
startVelocity: 40, startVelocity: 40,
+8
View File
@@ -19,6 +19,7 @@ import ContextBar from './components/ContextBar.vue'
import { useEditorMenu } from './composables/editorMenu' import { useEditorMenu } from './composables/editorMenu'
import { DRAWER_TITLE, useProblemPageContext, type ProblemDrawer as DrawerKey } from './composables/problemPageContext' import { DRAWER_TITLE, useProblemPageContext, type ProblemDrawer as DrawerKey } from './composables/problemPageContext'
import { useCollabHere, useTeacherCollab } from './composables/teacherCollab' import { useCollabHere, useTeacherCollab } from './composables/teacherCollab'
import { useProblemMascotGuide } from './composables/mascotGuide'
// 抽成具名 loader,便于进页面时与接口并行预取编辑器 chunk。 // 抽成具名 loader,便于进页面时与接口并行预取编辑器 chunk。
// 题库、比赛、专题三种入口用的是同一个编辑器:原来比赛和专题用的是另一个精简版, // 题库、比赛、专题三种入口用的是同一个编辑器:原来比赛和专题用的是另一个精简版,
@@ -208,6 +209,13 @@ watch(
}, },
) )
// 看板娘气泡里的「我错在哪」:切到「结果」页签里出错的那一段
useProblemMascotGuide((segment) => {
drawer.value = null
currentTab.value = 'result'
submissionStore.resultSegment = segment
})
// 结果页签的标题带状态图标(ResultTabLabel),n-tab-pane 的 tab 接受渲染函数 // 结果页签的标题带状态图标(ResultTabLabel),n-tab-pane 的 tab 接受渲染函数
const resultTab = () => h(ResultTabLabel, { active: currentTab.value === 'result' }) const resultTab = () => h(ResultTabLabel, { active: currentTab.value === 'result' })
+13
View File
@@ -18,6 +18,7 @@ import { usePagination } from 'shared/composables/pagination'
import { useAuthModalStore } from 'shared/store/authModal' import { useAuthModalStore } from 'shared/store/authModal'
import AdminLink from 'shared/components/AdminLink.vue' import AdminLink from 'shared/components/AdminLink.vue'
import { useUserStore } from 'shared/store/user' import { useUserStore } from 'shared/store/user'
import { focusJumpAction, useMascotGuide, type MascotAction } from 'shared/mascot/guide'
import ProblemStatus from './components/ProblemStatus.vue' import ProblemStatus from './components/ProblemStatus.vue'
import ProblemTypeTag from './components/ProblemTypeTag.vue' import ProblemTypeTag from './components/ProblemTypeTag.vue'
import ProgressRow from './components/ProgressRow.vue' import ProgressRow from './components/ProgressRow.vue'
@@ -272,6 +273,18 @@ async function pickRandom() {
} }
} }
// 看板娘:学生给找题的几条路(「随便来一道」按这页选着的知识点和类型挑),老师给新建题目
useMascotGuide(() => {
if (teacher.value) {
return {
situation: 'teacher.problems',
actions: userStore.hasProblemPermission ? [{ label: '新建题目', run: () => router.push('/admin/problem/create') }] : [],
}
}
const undone: MascotAction | null = userStore.isAuthed && !undoneOn.value ? { label: '只看没做完', run: () => (undoneOn.value = true) } : null
return { situation: 'problems', actions: [focusJumpAction(), ...(undone ? [undone] : []), { label: '随便来一道', run: pickRandom }] }
})
// ---- 「只看没做完」下一道都没有了:说清楚为什么是空的,给两条路 ---- // ---- 「只看没做完」下一道都没有了:说清楚为什么是空的,给两条路 ----
const nextTag = computed(() => { const nextTag = computed(() => {
const p = mine.value const p = mine.value
+15
View File
@@ -8,6 +8,7 @@ import { parseTime } from 'utils/functions'
import type { ProblemSet, ProblemSetProblem } from 'utils/types' import type { ProblemSet, ProblemSetProblem } from 'utils/types'
import { useAuthModalStore } from 'shared/store/authModal' import { useAuthModalStore } from 'shared/store/authModal'
import { useUserStore } from 'shared/store/user' import { useUserStore } from 'shared/store/user'
import { goAction, useMascotGuide } from 'shared/mascot/guide'
import { useFireworks } from '../problem/composables/useFireworks' import { useFireworks } from '../problem/composables/useFireworks'
import NotFound from 'shared/components/NotFound.vue' import NotFound from 'shared/components/NotFound.vue'
import BadgeLadder from './components/BadgeLadder.vue' import BadgeLadder from './components/BadgeLadder.vue'
@@ -122,6 +123,20 @@ async function join() {
} }
} }
// 看板娘:老师看全班,学生还差几道必做题、带去下一道;没加入就只打招呼
useMascotGuide(() => {
if (!set.value) return null
if (userStore.isTeacherOrAbove) return { situation: 'teacher.problemset', actions: [{ label: '全班情况', run: () => (tab.value = 'class') }] }
if (!joined.value) return null
const todo = problems.value.filter((item) => item.isRequired && !item.isCompleted)
const next = todo[0]
if (progress.value?.isCompleted || !next) return { situation: 'problemset.done', actions: [goAction(router, '专题列表', '/problemset')] }
const actions = [{ label: '去做下一道', run: () => router.push(problemLink(next)) }]
// 只剩最后一道、做完还有奖章没拿:说「就差最后 1 道」比「还差 1 道」更想让人做完
if (todo.length === 1 && set.value.badges.some((badge) => !badge.isEarned)) return { situation: 'problemset.lastOne', actions }
return { situation: 'problemset.unfinished', n: todo.length, actions }
})
/** 编辑只给出题人和超管(后台按归属校验,别人点进去是 404) */ /** 编辑只给出题人和超管(后台按归属校验,别人点进去是 404) */
const canEdit = computed(() => !!set.value && (userStore.isSuperAdmin || set.value.createdBy.id === userStore.user?.id)) const canEdit = computed(() => !!set.value && (userStore.isSuperAdmin || set.value.createdBy.id === userStore.user?.id))
+11
View File
@@ -3,6 +3,7 @@ import { useThemeVars } from 'naive-ui'
import AdminLink from 'shared/components/AdminLink.vue' import AdminLink from 'shared/components/AdminLink.vue'
import { useBreakpoints } from 'shared/composables/breakpoints' import { useBreakpoints } from 'shared/composables/breakpoints'
import { useUserStore } from 'shared/store/user' import { useUserStore } from 'shared/store/user'
import { goAction, useMascotGuide } from 'shared/mascot/guide'
import { getProblemSetList } from 'oj/api' import { getProblemSetList } from 'oj/api'
import { rgba, useTone } from 'shared/composables/tone' import { rgba, useTone } from 'shared/composables/tone'
import { parseTime } from 'utils/functions' import { parseTime } from 'utils/functions'
@@ -55,6 +56,16 @@ const others = computed(() =>
}), }),
) )
// 看板娘:加入了还没做完的专题,布置中的优先,其次最近加入的
useMascotGuide(() => {
if (userStore.isTeacherOrAbove) return null
const pending = sets.value.filter((set) => set.userProgress.isJoined && !set.userProgress.isCompleted)
const latest = (set: ProblemSet) => Date.parse(set.userProgress.joinTime ?? '') || 0
const target = pending.find((set) => set.assigning) ?? [...pending].sort((a, b) => latest(b) - latest(a))[0]
if (!target) return null
return { situation: 'problemsets.unfinished', actions: [goAction(router, '接着做', `/problemset/${target.id}`)] }
})
function description(set: ProblemSet) { function description(set: ProblemSet) {
// 简介大多就是把标题再抄一遍,一样的就不重复显示 // 简介大多就是把标题再抄一遍,一样的就不重复显示
return set.description && set.description !== set.title ? set.description : '' return set.description && set.description !== set.title ? set.description : ''
+18
View File
@@ -7,6 +7,7 @@ import UserName from 'shared/components/UserName.vue'
import { useBreakpoints } from 'shared/composables/breakpoints' import { useBreakpoints } from 'shared/composables/breakpoints'
import { useConfigStore } from 'shared/store/config' import { useConfigStore } from 'shared/store/config'
import { useUserStore } from 'shared/store/user' import { useUserStore } from 'shared/store/user'
import { useMascotGuide } from 'shared/mascot/guide'
import { errorCode } from 'utils/api' import { errorCode } from 'utils/api'
import { displayName } from '@oj2/contract' import { displayName } from '@oj2/contract'
import { STORAGE_KEY } from 'utils/constants' import { STORAGE_KEY } from 'utils/constants'
@@ -271,6 +272,23 @@ function openDetail(className: string) {
showDetail.value = true showDetail.value = true
} }
// 看板娘:自己在榜上就把自己那一行滚到眼前(领奖台上是「你」那个标签,赛道上是高亮的那一行)
useMascotGuide(() => {
if (teacher.value || !board.value) return null
const listed = rows.value.some((row) => row.user.id === meId.value)
const findMe = () => {
const el = document.querySelector('.track-card .entry.me, .track-card .prow.me, .track-card .tag.me')
el?.scrollIntoView({ behavior: 'smooth', block: 'center' })
}
const actions = listed ? [{ label: '我在哪', run: findMe }] : []
const { me: mine, ahead } = board.value
if (mine?.solved && mine.rank === 1) return { situation: 'rank.top', actions }
// 同分按先做到排,追平还在后面,所以要比前一名多做 1 道
const gap = mine && ahead ? ahead.solved - mine.solved : null
if (gap !== null && gap <= 5) return { situation: 'rank.gap', n: gap + 1, actions }
return { situation: 'rank', actions }
})
function open(username: string) { function open(username: string) {
router.push({ path: '/user', query: { name: username } }) router.push({ path: '/user', query: { name: username } })
} }
+1 -1
View File
@@ -1,4 +1,4 @@
import { useDark } from '@vueuse/core' import { useDark } from 'shared/composables/dark'
/** /**
* 排名页的几种颜色(设计稿「排名重设计」G1)。用户说「颜色可以保留」:你绿、前一名蓝、 * 排名页的几种颜色(设计稿「排名重设计」G1)。用户说「颜色可以保留」:你绿、前一名蓝、
+3
View File
@@ -1,5 +1,6 @@
<script setup lang="ts"> <script setup lang="ts">
import { useRouteQuery } from '@vueuse/router' import { useRouteQuery } from '@vueuse/router'
import { useMascotGuide } from 'shared/mascot/guide'
import StatisticsView from './components/StatisticsView.vue' import StatisticsView from './components/StatisticsView.vue'
import { DEFAULT_PERIOD } from './period' import { DEFAULT_PERIOD } from './period'
@@ -19,6 +20,8 @@ const period = useRouteQuery<string>('period', DEFAULT_PERIOD, { mode: 'replace'
const from = useRouteQuery<string>('from', '', { mode: 'replace' }) const from = useRouteQuery<string>('from', '', { mode: 'replace' })
const to = useRouteQuery<string>('to', '', { mode: 'replace' }) const to = useRouteQuery<string>('to', '', { mode: 'replace' })
useMascotGuide(() => ({ situation: 'teacher.statistics' }))
function openList(query: Record<string, string>) { function openList(query: Record<string, string>) {
window.open(router.resolve({ name: 'submissions', query }).href, '_blank') window.open(router.resolve({ name: 'submissions', query }).href, '_blank')
} }
@@ -1,6 +1,6 @@
<script setup lang="ts"> <script setup lang="ts">
import { useThemeVars } from 'naive-ui' import { useThemeVars } from 'naive-ui'
import { useDark } from '@vueuse/core' import { useDark } from 'shared/composables/dark'
/** /**
* 只读的代码区:行号 + 高亮 + 可选地标红一行(编译失败 / 运行时错误报了行号时)。 * 只读的代码区:行号 + 高亮 + 可选地标红一行(编译失败 / 运行时错误报了行号时)。
@@ -23,6 +23,8 @@ import UserName from 'shared/components/UserName.vue'
*/ */
const props = defineProps<{ const props = defineProps<{
row: SubmissionListItem row: SubmissionListItem
/** 按 ↑ ↓ 会落到的上一条、下一条:这条加载完顺手把它们也拉回来,换条时不用等网络 */
neighbors?: SubmissionListItem[]
/** 老师那套:重新判题、逐个测试点、复制两项收进「⋯」 */ /** 老师那套:重新判题、逐个测试点、复制两项收进「⋯」 */
teacher: boolean teacher: boolean
/** 在比赛的提交列表里(不能重判,题目链接走比赛) */ /** 在比赛的提交列表里(不能重判,题目链接走比赛) */
@@ -61,7 +63,42 @@ const detail = ref<Submission | null>(null)
const loading = ref(false) const loading = ref(false)
const failed = ref(false) const failed = ref(false)
const judging = computed(() => props.row.result === SubmissionStatus.pending || props.row.result === SubmissionStatus.judging) function isJudging(row: SubmissionListItem) {
return row.result === SubmissionStatus.pending || row.result === SubmissionStatus.judging
}
const judging = computed(() => isJudging(props.row))
/**
* 同一条只发一次请求:预取的还在路上时按到了它,接着等那一个,不再发第二个
*/
const inflight = new Map<string, Promise<Submission>>()
function fetchDetail(id: string) {
let request = inflight.get(id)
if (!request) {
request = getSubmission(id).finally(() => inflight.delete(id))
inflight.set(id, request)
}
return request
}
/**
* 预取上一条、下一条。只在这一条落定之后才做(按住 ↓ 一路划过去的那些行不预取),
* 进缓存的口径和 load() 一样:还在判的不要,列表和详情的结果对不上也不要。
*
* 没预取的时候,换到没看过的一条要先把代码区卸掉、转圈、再整个重新挂上 ——
* 2026-11 实测(生产构建、CPU 降速 6 倍)每次卡 60–100ms;走缓存的只换内容,不卡。
*/
function prefetch() {
for (const row of props.neighbors ?? []) {
if (!row.showLink || isJudging(row) || cache.get(row.id)?.result === row.result) continue
fetchDetail(row.id).then(
(res) => {
if (res.result === row.result) cache.set(row.id, res)
},
() => {},
)
}
}
// 每次加载一个序号:同一条先按「判题中」拉了一次、判完又拉一次时,晚回来的旧请求不能盖掉新的 // 每次加载一个序号:同一条先按「判题中」拉了一次、判完又拉一次时,晚回来的旧请求不能盖掉新的
let loadSeq = 0 let loadSeq = 0
@@ -78,15 +115,17 @@ async function load() {
const hit = cache.get(row.id) const hit = cache.get(row.id)
if (hit && hit.result === row.result) { if (hit && hit.result === row.result) {
detail.value = hit detail.value = hit
prefetch()
return return
} }
loading.value = true loading.value = true
try { try {
const res = await getSubmission(row.id) const res = await fetchDetail(row.id)
if (seq !== loadSeq) return if (seq !== loadSeq) return
// 列表那边还在判、详情这边已经判完了(或反过来)都不缓存,等两边对上 // 列表那边还在判、详情这边已经判完了(或反过来)都不缓存,等两边对上
if (!judging.value && res.result === props.row.result) cache.set(row.id, res) if (!judging.value && res.result === props.row.result) cache.set(row.id, res)
detail.value = res detail.value = res
prefetch()
} catch { } catch {
if (seq === loadSeq) failed.value = true if (seq === loadSeq) failed.value = true
} finally { } finally {
@@ -35,6 +35,13 @@ export function useRowCursor(options: {
const index = navigable.value.findIndex((row) => row.id === selectedId.value) const index = navigable.value.findIndex((row) => row.id === selectedId.value)
return index === -1 ? null : { index: index + 1, count: navigable.value.length } return index === -1 ? null : { index: index + 1, count: navigable.value.length }
}) })
/** 按 ↑ ↓ 会落到的上一条、下一条(本页之内),右栏拿去预取 */
const neighbors = computed(() => {
const list = navigable.value
const index = list.findIndex((row) => row.id === selectedId.value)
if (index === -1) return []
return [list[index + 1], list[index - 1]].filter((row): row is Row => row !== undefined)
})
// 翻页是异步的,先记下「落地后停在哪一头」,新一页回来再选 // 翻页是异步的,先记下「落地后停在哪一头」,新一页回来再选
let pendingJump: 'first' | 'last' | null = null let pendingJump: 'first' | 'last' | null = null
@@ -125,5 +132,5 @@ export function useRowCursor(options: {
move(e.key === 'ArrowUp' ? -1 : 1) move(e.key === 'ArrowUp' ? -1 : 1)
}) })
return { selectedId, selectedRow, position, maxPage, select, move, settleSelection, forgetJump } return { selectedId, selectedRow, position, neighbors, maxPage, select, move, settleSelection, forgetJump }
} }
+34 -1
View File
@@ -1,8 +1,41 @@
<script setup lang="ts"> <script setup lang="ts">
import { getSubmission } from 'oj/api'
import { useMascotGuide } from 'shared/mascot/guide'
import { useUserStore } from 'shared/store/user'
import type { Submission } from 'utils/types'
import SubmissionView from './components/SubmissionView.vue' import SubmissionView from './components/SubmissionView.vue'
/** 单独打开的一条提交,主体在 SubmissionView(课堂任务「讲错误」的弹层也用它) */ /** 单独打开的一条提交,主体在 SubmissionView(课堂任务「讲错误」的弹层也用它) */
defineProps<{ submissionID: string }>() const props = defineProps<{ submissionID: string }>()
const router = useRouter()
const userStore = useUserStore()
/**
* 看板娘:学生看自己的提交时带回这道题。SubmissionView 里的数据拿不出来(弹层也用它,不挂看板娘),
* 这里另取一份不带「这道题交的几次」的,只给学生取
*/
const mine = ref<Submission | null>(null)
watch(
() => [props.submissionID, userStore.isAuthed && !userStore.isTeacherOrAbove] as const,
async ([id, student]) => {
mine.value = null
if (!student) return
const res = await getSubmission(id).catch(() => null)
if (res && id === props.submissionID && res.userId === userStore.user?.id) mine.value = res
},
{ immediate: true },
)
useMascotGuide(() => {
const s = mine.value
if (!s || userStore.isTeacherOrAbove) return null
// 和页面上题目那个链接同一个去处:比赛里交的回比赛里的题
const to = s.contestId
? { name: 'contest problem', params: { contestID: String(s.contestId), problemID: s.problemDisplayId } }
: '/problem/' + s.problemDisplayId
return { situation: 'submission.detail', actions: [{ label: '回到这道题', run: () => router.push(to) }] }
})
</script> </script>
<template> <template>
+16 -1
View File
@@ -11,6 +11,7 @@ import { useBreakpoints } from 'shared/composables/breakpoints'
import { usePagination } from 'shared/composables/pagination' import { usePagination } from 'shared/composables/pagination'
import { useConfigStore } from 'shared/store/config' import { useConfigStore } from 'shared/store/config'
import { useUserStore } from 'shared/store/user' import { useUserStore } from 'shared/store/user'
import { useMascotGuide } from 'shared/mascot/guide'
import { LANGUAGE_SHOW_VALUE, SubmissionStatus } from 'utils/constants' import { LANGUAGE_SHOW_VALUE, SubmissionStatus } from 'utils/constants'
import { parseTime } from 'utils/functions' import { parseTime } from 'utils/functions'
import type { FlowchartSubmissionListItem, LANGUAGE, SubmissionListItem } from 'utils/types' import type { FlowchartSubmissionListItem, LANGUAGE, SubmissionListItem } from 'utils/types'
@@ -263,7 +264,7 @@ watch(
// ==================== 选中与翻阅 ==================== // ==================== 选中与翻阅 ====================
const { selectedId, selectedRow, position, maxPage, select, move, settleSelection, forgetJump } = useRowCursor({ const { selectedId, selectedRow, position, neighbors, maxPage, select, move, settleSelection, forgetJump } = useRowCursor({
rows, rows,
total, total,
query, query,
@@ -427,6 +428,18 @@ const { lesson, lessonActive, lessonLoading, toggleLesson } = useLessonFilter({
info: (text) => message.info(text), info: (text) => message.info(text),
}) })
// 看板娘:学生带去看自己的;「这节课」只有老师那一版有,老师给它
useMascotGuide(() => {
if (inContest.value) return null
if (!teacher.value) return { situation: 'submissions', actions: mine.value ? [] : [{ label: '只看我的', run: () => (scope.value = 'mine') }] }
const toLesson = () => {
// 「我的」时这节课的按钮是藏着的,先切回全部
if (mine.value) scope.value = 'all'
toggleLesson()
}
return { situation: 'teacher.submissions', actions: lessonActive.value ? [] : [{ label: '这节课', run: toLesson }] }
})
const activeFilters = computed( const activeFilters = computed(
() => () =>
[query.username, query.className, query.result, query.problem].filter(Boolean).length + [query.username, query.className, query.result, query.problem].filter(Boolean).length +
@@ -858,6 +871,7 @@ function dayBreak(index: number) {
<SubmissionPane <SubmissionPane
v-else v-else
:row="selectedRow as SubmissionListItem" :row="selectedRow as SubmissionListItem"
:neighbors="neighbors as SubmissionListItem[]"
:teacher="teacher" :teacher="teacher"
:class-name="query.className" :class-name="query.className"
:contest="inContest" :contest="inContest"
@@ -893,6 +907,7 @@ function dayBreak(index: number) {
<SubmissionPane <SubmissionPane
v-else v-else
:row="selectedRow as SubmissionListItem" :row="selectedRow as SubmissionListItem"
:neighbors="neighbors as SubmissionListItem[]"
:teacher="teacher" :teacher="teacher"
:class-name="query.className" :class-name="query.className"
:contest="inContest" :contest="inContest"
@@ -92,6 +92,9 @@ function openPicker() {
pickerInitial.value = inputIds().map((id) => ({ id, title: titles.get(id.toLowerCase()) })) pickerInitial.value = inputIds().map((id) => ({ id, title: titles.get(id.toLowerCase()) }))
picking.value = true picking.value = true
} }
// 看板娘气泡里的「选题」:课堂任务页没布置时替老师打开选题弹框
defineExpose({ openPicker })
function pickerConfirm(ids: string[]) { function pickerConfirm(ids: string[]) {
lessonInput.value = ids.join(' ') lessonInput.value = ids.join(' ')
saveLesson() saveLesson()
+34 -1
View File
@@ -10,6 +10,7 @@ import { useLeaveStudents } from 'shared/composables/leaveStudents'
import { useTeacherHelp } from 'shared/composables/teacherHelp' import { useTeacherHelp } from 'shared/composables/teacherHelp'
import { useCollabStore } from 'shared/store/collab' import { useCollabStore } from 'shared/store/collab'
import { useConfigStore } from 'shared/store/config' import { useConfigStore } from 'shared/store/config'
import { useMascotGuide } from 'shared/mascot/guide'
import { errorMessage } from 'utils/api' import { errorMessage } from 'utils/api'
import { LANGUAGE_SHOW_VALUE } from 'utils/constants' import { LANGUAGE_SHOW_VALUE } from 'utils/constants'
import { parseTime } from 'utils/functions' import { parseTime } from 'utils/functions'
@@ -511,6 +512,29 @@ function submissionsHref(
}).href }).href
} }
/**
* 看板娘:布置了就带去这节课的提交,筛法同提交列表「这节课」(班、这几道题、今天)。
* 语言和格子一致:画流程图的课看流程图,选了语言的只看它 —— 夹着 SQL 题的不筛语言,免得把 SQL 交的藏掉。
* 还没布置时填题号的框就是这页最大的东西,不给按钮
*/
const startForm = useTemplateRef<{ openPicker: () => void }>('startForm')
useMascotGuide(() => {
const b = board.value
if (!b?.className) return null
if (needLesson.value)
return { situation: 'teacher.task.unassigned', actions: startForm.value ? [{ label: '选题', run: () => startForm.value?.openPicker() }] : [] }
const language = b.mode === 'flowchart' ? 'Flowchart' : b.problems.some((problem) => problem.isSql) ? null : b.language
const query = {
className: b.className,
problem: b.problems.map((problem) => problem.problemDisplayId).join(','),
today: '1',
...(language ? { language } : {}),
}
// 新标签打开,和点格子一样:任务页一般开着不关
const open = () => window.open(router.resolve({ name: 'submissions', query }).href, '_blank')
return { situation: 'teacher.task.assigned', actions: [{ label: '这节课的提交', run: open }] }
})
function lastText(student: TaskBoardStudent) { function lastText(student: TaskBoardStudent) {
if (student.lastSubmitAt) return parseTime(student.lastSubmitAt, 'HH:mm') if (student.lastSubmitAt) return parseTime(student.lastSubmitAt, 'HH:mm')
if (oftenIdle(student)) { if (oftenIdle(student)) {
@@ -578,7 +602,16 @@ function lastText(student: TaskBoardStudent) {
<!-- 刚上课还没有题:填题号的框是这页最大的东西 --> <!-- 刚上课还没有题:填题号的框是这页最大的东西 -->
<section v-if="needLesson" class="start"> <section v-if="needLesson" class="start">
<div class="start-title">这节课做哪几道题?</div> <div class="start-title">这节课做哪几道题?</div>
<LessonForm v-if="className" :board="board" :class-name="className" :lesson-id="null" variant="start" class="start-row" @saved="lessonSaved" /> <LessonForm
v-if="className"
ref="startForm"
:board="board"
:class-name="className"
:lesson-id="null"
variant="start"
class="start-row"
@saved="lessonSaved"
/>
<div v-if="staleLesson" class="earlier"> <div v-if="staleLesson" class="earlier">
<span>上一节 {{ board.assignedAt ? parseTime(board.assignedAt, 'HH:mm') : '' }} {{ board.assignedBy }} 布置</span> <span>上一节 {{ board.assignedAt ? parseTime(board.assignedAt, 'HH:mm') : '' }} {{ board.assignedBy }} 布置</span>
<span v-for="problem in board.problems" :key="problem.problemId" class="chip">{{ problem.problemDisplayId }}</span> <span v-for="problem in board.problems" :key="problem.problemId" class="chip">{{ problem.problemDisplayId }}</span>
+8
View File
@@ -4,6 +4,7 @@ import { getProfileOverview } from 'oj/api'
import { getProfile } from 'shared/api' import { getProfile } from 'shared/api'
import { useBreakpoints } from 'shared/composables/breakpoints' import { useBreakpoints } from 'shared/composables/breakpoints'
import { useUserStore } from 'shared/store/user' import { useUserStore } from 'shared/store/user'
import { goAction, useMascotGuide } from 'shared/mascot/guide'
import type { Profile } from 'utils/types' import type { Profile } from 'utils/types'
import AchievementCard from './components/AchievementCard.vue' import AchievementCard from './components/AchievementCard.vue'
import KnowledgeMap from './components/KnowledgeMap.vue' import KnowledgeMap from './components/KnowledgeMap.vue'
@@ -17,6 +18,7 @@ import VersusCard from './components/VersusCard.vue'
* /profiles/:username/overview),这里只管摆。原来的「我的设置」并进了名片。 * /profiles/:username/overview),这里只管摆。原来的「我的设置」并进了名片。
*/ */
const route = useRoute() const route = useRoute()
const router = useRouter()
const userStore = useUserStore() const userStore = useUserStore()
const { isDesktop } = useBreakpoints() const { isDesktop } = useBreakpoints()
@@ -47,6 +49,12 @@ async function load() {
} }
watch(username, load, { immediate: true }) watch(username, load, { immediate: true })
// 看板娘:只在看自己的主页时说话
useMascotGuide(() => {
if (!isSelf.value || !profile.value || userStore.isTeacherOrAbove) return null
return { situation: 'profile', actions: [goAction(router, '我的成就', '/achievement'), goAction(router, '我的提交', '/submission?myself=1')] }
})
</script> </script>
<template> <template>
Binary file not shown.

After

Width:  |  Height:  |  Size: 92 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

@@ -1,11 +1,32 @@
<script setup lang="ts"> <script setup lang="ts">
import AchievementIcon from 'shared/components/AchievementIcon.vue' import AchievementIcon from 'shared/components/AchievementIcon.vue'
import { mascotBox } from 'shared/mascot/guide'
import { useAchievementStore } from 'shared/store/achievement' import { useAchievementStore } from 'shared/store/achievement'
import { RARITY_COLOR } from 'utils/constants' import { RARITY_COLOR } from 'utils/constants'
const store = useAchievementStore() const store = useAchievementStore()
const { current, queue } = storeToRefs(store) const { current, queue } = storeToRefs(store)
const visible = ref(false) const visible = ref(false)
const toastEl = ref<HTMLElement>()
const RIGHT = 24
const TOP = 72
const GAP = 12
/**
* 默认在右上角。看板娘被拖到和它重叠的地方(多半是右上角)时,挪到她左边 ——
* 补发成就时一次会连着弹好几个,一直压在她头上不好看。尺寸按弹出来以后量到的算,
* 还没量到时按最小宽度和大致高度估。
*/
const placement = computed(() => {
if (!mascotBox.shown || !visible.value) return {}
const vw = document.documentElement.clientWidth
const width = toastEl.value?.offsetWidth ?? 300
const height = toastEl.value?.offsetHeight ?? 90
const left = vw - RIGHT - width
const overlaps = mascotBox.x < vw - RIGHT && mascotBox.x + mascotBox.width > left && mascotBox.y < TOP + height && mascotBox.y + mascotBox.height > TOP
return overlaps ? { right: `${vw - mascotBox.x + GAP}px` } : {}
})
let timer: ReturnType<typeof setTimeout> | null = null let timer: ReturnType<typeof setTimeout> | null = null
let gapTimer: ReturnType<typeof setTimeout> | null = null let gapTimer: ReturnType<typeof setTimeout> | null = null
@@ -37,7 +58,7 @@ onUnmounted(() => {
<template> <template>
<Transition name="slide"> <Transition name="slide">
<div v-if="visible && current" class="toast" :style="{ borderColor: RARITY_COLOR[current.rarity] }"> <div v-if="visible && current" ref="toastEl" class="toast" :style="{ borderColor: RARITY_COLOR[current.rarity], ...placement }">
<div class="icon"> <div class="icon">
<AchievementIcon :icon="current.icon" :size="34" /> <AchievementIcon :icon="current.icon" :size="34" />
</div> </div>
@@ -56,7 +77,7 @@ onUnmounted(() => {
.toast { .toast {
position: fixed; position: fixed;
/* 右上角、顶栏下面。原来在右下角,题目页上正好和结果、点评弹窗叠在一起 */ /* 右上角、顶栏下面。原来在右下角,题目页上正好和结果、点评弹窗叠在一起 */
right: 24px; right: 24px; /* 和脚本里的 RIGHT / TOP 一致 */
top: 72px; top: 72px;
z-index: 3000; z-index: 3000;
display: flex; display: flex;
+587
View File
@@ -0,0 +1,587 @@
<script setup lang="ts">
/**
* 看板娘,兼站内的引导员。现在只有一个形象(鲸鱼娘)。
*
* 形象取自 MeteorNOX/DeepSeek-Balance-Whale-Widget 的 assets/DSniang1.png(裁掉透明边、缩到 2 倍显示尺寸转 webp)。
* 那个仓库的代码是 MIT,但 assets/ 下的图不在 MIT 里(见它的 PROVENANCE.md)。
*
* - 常驻在前台页面的角落,能拖;松手按「四分之一区」贴边:中心落在左/右四分之一就贴左/右缘,
* 上/下四分之一就贴上/下缘,中间保持松手的位置。两个方向各判各的,所以能贴进角落。
* - 在屏幕左半边时整体镜像,脸总朝着页面中间。
* - 按下去像玩偶一样压扁(底边不动),松手弹回。
* - 点一下冒气泡:一句话加最多三个按钮,按页面、按情况变(页面经 shared/mascot/guide.ts 告诉她),
* 台词在 shared/mascot/lines.ts。比赛里点她不弹气泡。再点一下、点别处、换页面都收起。
* - 对学生按行为挑话(常犯的错、今天做了几道、熟不熟,见 shared/mascot/behavior.ts);
* 题目页上有几件事她会主动开口,频率上限在下面 SPEAK_GAP_MS。
* - 互动都记进 mascot_event(点开、点按钮、主动开口、摸头、嫌烦、被拖走)。
* - 彩蛋:连着快点,有时候(每轮三分之一的机会)点到第 4~8 下(也是随机的)会被摸摸头(同一个仓库的 assets/rua.gif),摸的时候接着点就一直摸。
*
* 位置只是这台电脑上的个人偏好,存 localStorage(读写都包 try/catch,拿不到就用默认位置)。
* 定位一律用 transform 的像素值:贴右缘时若换成 right:0,过渡没法在 auto 和数值之间插值,会瞬移。
*/
import { TIME_ZONE_OFFSET_MINUTES } from '@oj2/contract'
import imageUrl from 'shared/assets/mascot/whale.webp'
import patUrl from 'shared/assets/mascot/whale-pat.gif'
import { MASCOT_LINES, type MascotSituation } from 'shared/mascot/lines'
import { currentMascotGuide, fillLine, mascotBox, type MascotAction, type MascotGuide } from 'shared/mascot/guide'
import { logMascotEvent, notePoke, personalize, refreshMascotProfile, speechRequest } from 'shared/mascot/behavior'
import { useAuthModalStore } from 'shared/store/authModal'
import { useCollabStore } from 'shared/store/collab'
import { useUserStore } from 'shared/store/user'
const WIDTH = 132
const HEIGHT = 140 // 图是 264×280
const MARGIN = 12
const TOP_GAP = 72 // 贴上缘时让开顶栏
const STORAGE_KEY = 'oj-mascot'
// 摸头动图是 128×128,人只占右下角、上面是手。放大到人和静态图一样大,
// 右边、人的下沿(第 117 行像素)对齐静态图,手伸出框外
const PAT_SIZE = 182
const PAT_BOTTOM = -Math.round((PAT_SIZE * 11) / 128)
const PAT_MS = 1200
// 每轮连点先抽这一轮有没有彩蛋,有的话再抽连点到第几下出。都猜不准才像彩蛋
const PAT_CHANCE = 1 / 3
const PAT_CLICKS_MIN = 4
const PAT_CLICKS_MAX = 8
function rollPatClicks() {
if (Math.random() >= PAT_CHANCE) return Infinity // 这一轮怎么点都只是蹦
return PAT_CLICKS_MIN + Math.floor(Math.random() * (PAT_CLICKS_MAX - PAT_CLICKS_MIN + 1))
}
const STREAK_GAP_MS = 600 // 两下之间超过这么久就不算连点
const OVERCLICK = 8 // 一轮连点到这么多下还没摸到头,她就嫌烦了
const QUIET_BUBBLE_MS = 5000 // 没有按钮的气泡(只是一句话)过这么久自己收起
const SPOKEN_BUBBLE_MS = 10_000 // 她主动说的话,有按钮也过这么久收起:没人点她,不该一直挡着
const SPEAK_GAP_MS = 3 * 60_000 // 主动开口至少隔这么久,课上别老打岔
type HAnchor = 'left' | 'right' | null
type VAnchor = 'top' | 'bottom' | null
interface Place {
h: HAnchor
v: VAnchor
x: number // 未贴边时的 left
y: number // 未贴边时的 top
}
function loadPlace(): Place {
try {
const raw = localStorage.getItem(STORAGE_KEY)
if (raw) {
const p = JSON.parse(raw) as Partial<Place>
if (typeof p.x === 'number' && typeof p.y === 'number') return { h: p.h ?? null, v: p.v ?? null, x: p.x, y: p.y }
}
} catch {
// 隐私窗口、禁了站点数据:用默认位置
}
return { h: 'right', v: 'bottom', x: 0, y: 0 }
}
function savePlace(p: Place) {
try {
localStorage.setItem(STORAGE_KEY, JSON.stringify(p))
} catch {
// 存不下就算了,下次回到默认位置
}
}
const place = loadPlace()
const pos = reactive({ x: 0, y: 0 })
const dragging = ref(false)
const pressed = ref(false)
const patting = ref(false)
const flipped = ref(false)
const body = ref<HTMLElement>()
const squashEl = ref<HTMLElement>()
const bubbleEl = ref<HTMLElement>()
function clamp(v: number, lo: number, hi: number) {
return Math.min(Math.max(v, lo), Math.max(lo, hi))
}
/** 按锚点算出实际坐标。窗口变了也走这里,贴边的照旧贴边 */
function settle() {
const vw = document.documentElement.clientWidth
const vh = window.innerHeight
pos.x = place.h === 'left' ? MARGIN : place.h === 'right' ? vw - WIDTH - MARGIN : clamp(place.x, MARGIN, vw - WIDTH - MARGIN)
// 图的下沿是裁断的半身,贴底时直接坐在屏幕底边上,不留空
pos.y = place.v === 'top' ? TOP_GAP : place.v === 'bottom' ? vh - HEIGHT : clamp(place.y, TOP_GAP, vh - HEIGHT)
flipped.value = pos.x + WIDTH / 2 < vw / 2
}
// 第一帧之前就算好位置。挪到 onMounted 里算的话,第一帧画在 (0,0),
// 接着位置一变就触发过渡,看上去是从左上角飞过去的
settle()
let start: { px: number; py: number; x: number; y: number } | null = null
let moved = false
function onDown(e: PointerEvent) {
if (e.button !== 0) return
// 不拦的话,第一下甩得快时浏览器会拿光标新位置底下的东西(比如题目列表的链接)开始原生拖拽,
// 随即发 pointercancel,看板娘就卡在半路
e.preventDefault()
body.value?.setPointerCapture(e.pointerId)
start = { px: e.clientX, py: e.clientY, x: pos.x, y: pos.y }
moved = false
pressed.value = true
}
function onMove(e: PointerEvent) {
if (!start) return
const dx = e.clientX - start.px
const dy = e.clientY - start.py
if (!moved && dx * dx + dy * dy < 9) return
moved = true
dragging.value = true
pressed.value = false
pos.x = start.x + dx
pos.y = start.y + dy
flipped.value = pos.x + WIDTH / 2 < document.documentElement.clientWidth / 2
}
/**
* 每点一下都压扁再弹回来一次。按住时的压扁靠 .pressed 的过渡,可快速点一下从按下到松开只有几十毫秒,
* 过渡还没走到位就松了,连点时看上去像卡住。用 Web Animations 播一遍完整的,每下都从头播
*/
const reducedMotion = usePreferredReducedMotion()
function boing() {
if (reducedMotion.value === 'reduce') return
squashEl.value?.animate([{ transform: 'scale(1.06, 0.86)' }, { transform: 'scale(0.97, 1.04)', offset: 0.55 }, { transform: 'scale(1, 1)' }], {
duration: 280,
easing: 'ease-out',
})
}
// 动图 94KB,不在每个页面一打开就下:连点到第 2 下才预载,最少也还要再点两下才用得上
let patPreloaded = false
function preloadPat() {
if (patPreloaded) return
patPreloaded = true
new Image().src = patUrl
}
let patTimer: ReturnType<typeof setTimeout> | undefined
let streak = 0
let patClicks = rollPatClicks()
let lastClick = 0
function onUp() {
if (!start) return
start = null
pressed.value = false
if (moved) {
dragging.value = false
const vw = document.documentElement.clientWidth
const vh = window.innerHeight
const cx = pos.x + WIDTH / 2
const cy = pos.y + HEIGHT / 2
place.h = cx < vw / 4 ? 'left' : cx > (vw * 3) / 4 ? 'right' : null
place.v = cy < vh / 4 ? 'top' : cy > (vh * 3) / 4 ? 'bottom' : null
place.x = pos.x
place.y = pos.y
settle()
savePlace(place)
logMascotEvent({ kind: 'move', line: `${place.h ?? '-'} ${place.v ?? '-'}` })
return
}
boing()
const now = performance.now()
if (now - lastClick <= STREAK_GAP_MS) streak++
else {
streak = 1
patClicks = rollPatClicks()
}
lastClick = now
if (streak >= 2) preloadPat()
// 正在被摸,或者连点到数了:摸摸头,从这一下再摸满一轮
if (patting.value || streak >= patClicks) {
if (!patting.value) {
say({ text: pick('patting') })
logMascotEvent({ kind: 'pat' })
}
patting.value = true
clearTimeout(patTimer)
patTimer = setTimeout(() => {
patting.value = false
streak = 0
}, PAT_MS)
return
}
// 一轮里只有第一下开关气泡,后面连着点是在找彩蛋,不跟着一开一关
if (streak === 1) toggleBubble()
else if (streak === OVERCLICK) {
say({ text: pick('overclick') })
logMascotEvent({ kind: 'overclick' })
}
}
// ---- 气泡 ----
const route = useRoute()
const userStore = useUserStore()
const collabStore = useCollabStore()
const authModal = useAuthModalStore()
interface Bubble {
text: string
actions?: MascotAction[]
/** 记互动时带上,看哪种情况下的按钮有人点 */
situation?: string
}
const bubble = ref<Bubble | null>(null)
let quietTimer: ReturnType<typeof setTimeout> | undefined
/** 比赛、测验里不说话:「运行例子」「举手」这类按钮在考试时算不算帮忙,干脆不弹 */
const silent = computed(() => String(route.name ?? '').startsWith('contest '))
function say(next: Bubble, closeAfter = next.actions?.length ? 0 : QUIET_BUBBLE_MS) {
if (silent.value) return
bubble.value = next
clearTimeout(quietTimer)
if (closeAfter) quietTimer = setTimeout(close, closeAfter)
}
function close() {
bubble.value = null
clearTimeout(quietTimer)
}
function toggleBubble() {
if (bubble.value) return close()
let guide = resolveGuide()
if (!userStore.isTeacherOrAbove) guide = personalize(guide)
const text = pickFor(guide)
say({ text, actions: guide.actions?.slice(0, 3), situation: guide.situation })
if (silent.value) return
notePoke()
logMascotEvent({ kind: 'open', situation: guide.situation, line: text })
}
/** 先看全站的:没登录、老师这边有人举手;再问页面;都没有就打个招呼 */
function resolveGuide(): MascotGuide {
if (!userStore.isAuthed) return { situation: 'guest', actions: [{ label: '登录', run: authModal.openLoginModal }] }
const teacher = userStore.isTeacherOrAbove
if (teacher && collabStore.isTeacher && collabStore.pendingCount > 0) {
return { situation: 'teacher.help', n: collabStore.pendingCount, actions: [{ label: '去看看', run: () => (collabStore.helpPanelOpen = true) }] }
}
return currentMascotGuide() ?? { situation: teacher ? 'teacher.greet' : 'greet' }
}
/** 这几种情况要紧,不拿彩蛋换掉 */
const SERIOUS = new Set<MascotSituation>(['guest', 'teacher.help', 'problem.stuck', 'first.meet'])
const RARE_CHANCE = 0.03
const TIME_CHANCE = 0.15
function pickFor(guide: MascotGuide) {
let situation = guide.situation
if (!SERIOUS.has(situation) && guide.n === undefined && !guide.vars) {
const timely = timeSituation()
if (Math.random() < RARE_CHANCE) situation = 'rare'
else if (timely && !userStore.isTeacherOrAbove && Math.random() < TIME_CHANCE) situation = timely
}
return fillLine(pick(situation), guide)
}
/** 同一组里不连着抽到同一句 */
let lastLine = ''
function pick(situation: MascotSituation) {
const pool: readonly string[] = MASCOT_LINES[situation]
const choices = pool.length > 1 ? pool.filter((line) => line !== lastLine) : pool
lastLine = choices[Math.floor(Math.random() * choices.length)]!
return lastLine
}
/**
* 按东八区的钟点挑时间彩蛋。节次是估的(第一节 8:00、午饭 11:20、下午第一节 13:30、
* 最后一节 15:50 前后),对不上学校作息就改这里
*/
function timeSituation(): MascotSituation | null {
const wall = new Date(Date.now() + TIME_ZONE_OFFSET_MINUTES * 60_000)
const day = wall.getUTCDay()
const minutes = wall.getUTCHours() * 60 + wall.getUTCMinutes()
const within = (from: string, to: string) => {
const [fh, fm] = from.split(':').map(Number)
const [th, tm] = to.split(':').map(Number)
return minutes >= fh! * 60 + fm! && minutes < th! * 60 + tm!
}
if (day === 0 || day === 6 || !within('07:00', '18:00')) return 'offHours'
if (within('08:00', '08:50')) return 'time.firstClass'
if (within('11:20', '12:10')) return 'time.lunch'
if (within('13:30', '14:20')) return 'time.afternoon'
if (within('15:50', '16:40')) return 'time.lastClass'
if (day === 1) return 'day.monday'
if (day === 5) return 'day.friday'
return null
}
async function runAction(action: MascotAction) {
logMascotEvent({ kind: 'action', action: action.label, situation: bubble.value?.situation })
close()
await action.run()
}
// ---- 主动开口:页面经 requestSpeech 请她说,这里卡频率 ----
let lastSpokeAt = -Infinity
const spokenKeys = new Set<string>()
watch(speechRequest, (speech) => {
if (!speech || silent.value || dragging.value || bubble.value || userStore.isTeacherOrAbove) return
if (document.visibilityState !== 'visible' || spokenKeys.has(speech.key)) return
if (performance.now() - lastSpokeAt < SPEAK_GAP_MS) return
lastSpokeAt = performance.now()
spokenKeys.add(speech.key)
const text = fillLine(pick(speech.situation), speech)
say({ text, actions: speech.actions?.slice(0, 3), situation: speech.situation }, SPOKEN_BUBBLE_MS)
logMascotEvent({ kind: 'speak', situation: speech.situation, line: text })
})
// 学生的行为数:进站、换页面时拉(30 秒内拉过就不拉),登录换人时重拉
watch(
() => route.fullPath,
() => refreshMascotProfile(),
)
watch(
() => userStore.user?.id,
() => refreshMascotProfile(true),
{ immediate: true },
)
// 点别处收起;点她自己由 onUp 管(开关),不算「别处」
onClickOutside(bubbleEl, close, { ignore: [body] })
watch(() => route.fullPath, close)
watch(silent, (quiet) => quiet && close())
/** 她靠上时气泡往下冒,免得顶出屏幕;在左半边时气泡贴左对齐 */
const bubbleBelow = computed(() => pos.y < 220)
// 告诉别的浮层她在哪(成就弹框会让开)
watchEffect(() => Object.assign(mascotBox, { x: pos.x, y: pos.y, width: WIDTH, height: HEIGHT }))
onMounted(() => {
window.addEventListener('resize', settle, { passive: true })
mascotBox.shown = true
})
onBeforeUnmount(() => {
mascotBox.shown = false
window.removeEventListener('resize', settle)
clearTimeout(patTimer)
clearTimeout(quietTimer)
})
</script>
<template>
<div class="mascot" :class="{ dragging }" :style="{ width: `${WIDTH}px`, height: `${HEIGHT}px`, transform: `translate3d(${pos.x}px, ${pos.y}px, 0)` }">
<div
ref="body"
class="body"
:class="{ pressed, patting, flipped }"
aria-hidden="true"
@pointerdown="onDown"
@pointermove="onMove"
@pointerup="onUp"
@pointercancel="onUp"
@dragstart.prevent
>
<div class="flip">
<div ref="squashEl" class="squash">
<div class="breathe">
<img
v-if="patting"
class="pat"
:src="patUrl"
:width="PAT_SIZE"
:height="PAT_SIZE"
:style="{ bottom: `${PAT_BOTTOM}px` }"
alt=""
draggable="false"
/>
<img v-else :src="imageUrl" :width="WIDTH" :height="HEIGHT" alt="" draggable="false" />
</div>
</div>
</div>
</div>
<Transition name="bubble">
<div v-if="bubble && !dragging" ref="bubbleEl" class="bubble" :class="{ below: bubbleBelow, left: flipped }" role="status">
<p class="line">{{ bubble.text }}</p>
<div v-if="bubble.actions?.length" class="actions">
<n-button
v-for="(action, index) in bubble.actions"
:key="action.label"
size="small"
:type="index === 0 ? 'primary' : 'default'"
@click="runAction(action)"
>
{{ action.label }}
</n-button>
</div>
</div>
</Transition>
</div>
</template>
<style scoped>
.mascot {
position: fixed;
left: 0;
top: 0;
z-index: 900; /* 压在页面上,但让弹框、消息、烟花盖住它 */
transition: transform 0.35s cubic-bezier(0.34, 1.4, 0.64, 1);
will-change: transform;
}
.mascot.dragging {
transition: none;
}
.body {
width: 100%;
height: 100%;
cursor: grab;
touch-action: none;
user-select: none;
-webkit-tap-highlight-color: transparent;
}
.dragging .body {
cursor: grabbing;
}
/* 气泡:白底深蓝描边(取她身上线条的颜色),尾巴指着她的头。设计稿「看板娘引导」 */
.bubble {
--bubble-line: #2b3a6b;
--bubble-bg: #fff;
position: absolute;
right: 14px;
bottom: calc(100% + 12px);
width: max-content;
min-width: 120px;
max-width: 280px;
box-sizing: border-box;
padding: 12px 14px;
background: var(--bubble-bg);
border: 2px solid var(--bubble-line);
border-radius: 16px;
box-shadow: 0 8px 24px rgba(20, 30, 60, 0.16);
display: flex;
flex-direction: column;
gap: 10px;
}
:global(html.dark) .bubble {
--bubble-line: #7f94d4;
--bubble-bg: #1f2230;
box-shadow: 0 8px 24px rgba(0, 0, 0, 0.45);
}
.bubble::after {
content: '';
position: absolute;
right: 40px;
bottom: -9px;
width: 14px;
height: 14px;
background: var(--bubble-bg);
border-right: 2px solid var(--bubble-line);
border-bottom: 2px solid var(--bubble-line);
transform: rotate(45deg);
}
.bubble.left {
right: auto;
left: 14px;
}
.bubble.left::after {
right: auto;
left: 40px;
}
.bubble.below {
bottom: auto;
top: calc(100% + 12px);
}
.bubble.below::after {
bottom: auto;
top: -9px;
transform: rotate(-135deg);
}
.line {
margin: 0;
font-size: 15px;
line-height: 1.5;
}
.actions {
display: flex;
flex-wrap: wrap;
gap: 8px;
}
.bubble-enter-active,
.bubble-leave-active {
transition:
opacity 0.15s ease,
transform 0.15s ease;
}
.bubble-enter-from,
.bubble-leave-to {
opacity: 0;
transform: translateY(6px) scale(0.96);
}
.flip,
.squash,
.breathe {
width: 100%;
height: 100%;
transform-origin: 50% 100%;
}
.flip {
transition: transform 0.3s ease;
}
.flipped .flip {
transform: scaleX(-1);
}
/* 按压 Q 弹:以底边中点为原点压扁,松手带一点回弹 */
.squash {
transition: transform 0.22s cubic-bezier(0.34, 1.56, 0.64, 1);
}
.pressed .squash {
transform: scale(1.05, 0.88);
transition-duration: 0.1s;
}
/* 平时轻轻地一起一伏 */
.breathe {
animation: mascot-breathe 3.6s ease-in-out infinite;
}
.dragging .breathe,
.patting .breathe {
animation-play-state: paused;
}
img {
display: block;
pointer-events: none;
-webkit-user-drag: none;
}
img.pat {
position: absolute;
right: 0;
max-width: none;
}
.breathe {
position: relative;
}
@keyframes mascot-breathe {
0%,
100% {
transform: scale(1, 1);
}
50% {
transform: scale(1.015, 0.975);
}
}
@media (prefers-reduced-motion: reduce) {
.breathe {
animation: none;
}
}
@media print {
.mascot {
display: none;
}
}
</style>
@@ -2,6 +2,7 @@
import { Icon } from '@iconify/vue' import { Icon } from '@iconify/vue'
import { useThemeVars } from 'naive-ui' import { useThemeVars } from 'naive-ui'
import type { RouteLocationRaw } from 'vue-router' import type { RouteLocationRaw } from 'vue-router'
import { useMascotGuide } from 'shared/mascot/guide'
/** /**
* 「找不到」的整页提示:地址打错、题目 / 比赛 / 专题不存在或没公开、比赛还没开始。 * 「找不到」的整页提示:地址打错、题目 / 比赛 / 专题不存在或没公开、比赛还没开始。
@@ -21,6 +22,9 @@ const props = withDefaults(
const theme = useThemeVars() const theme = useThemeVars()
const router = useRouter() const router = useRouter()
// 看板娘:和页面上那个按钮去同一个地方(回首页 / 回到专题 / 回到比赛)
useMascotGuide(() => ({ situation: 'notFound', actions: [{ label: props.toLabel, run: () => router.push(props.to) }] }))
</script> </script>
<template> <template>
@@ -6,6 +6,7 @@ import { useProblemJump } from 'shared/composables/problemJump'
import { useUserStore } from 'shared/store/user' import { useUserStore } from 'shared/store/user'
import type { ClassActivityProblem } from 'utils/types' import type { ClassActivityProblem } from 'utils/types'
import { zonedParts } from 'utils/functions' import { zonedParts } from 'utils/functions'
import { jumpFocusRequest } from 'shared/mascot/guide'
/** /**
* 顶栏的题号框:老师报完题号,学生在哪一页都能直接敲,不用先回首页或题目列表。 * 顶栏的题号框:老师报完题号,学生在哪一页都能直接敲,不用先回首页或题目列表。
@@ -29,7 +30,9 @@ const lessonStore = useLessonStore()
const { jump, jumping } = useProblemJump() const { jump, jumping } = useProblemJump()
const keyword = ref('') const keyword = ref('')
const focused = ref(false) const focused = ref(false)
const input = useTemplateRef<{ blur: () => void }>('input') const input = useTemplateRef<{ blur: () => void; focus: () => void }>('input')
// 看板娘气泡里的「输题号」:把光标放进来
watch(jumpFocusRequest, () => input.value?.focus())
/** 题目页的三种入口(题库 / 比赛 / 专题)顶上都有自己的上下文条 */ /** 题目页的三种入口(题库 / 比赛 / 专题)顶上都有自己的上下文条 */
const PROBLEM_PAGES = new Set(['problem', 'contest problem', 'problemset problem']) const PROBLEM_PAGES = new Set(['problem', 'contest problem', 'problemset problem'])
@@ -1,5 +1,5 @@
<script setup lang="ts"> <script setup lang="ts">
import { useDark } from '@vueuse/core' import { useDark } from 'shared/composables/dark'
import { rgba } from 'shared/composables/tone' import { rgba } from 'shared/composables/tone'
import { displayName } from '@oj2/contract' import { displayName } from '@oj2/contract'
@@ -1,4 +1,4 @@
import { useDark } from '@vueuse/core' import { useDark } from 'shared/composables/dark'
import { Chart as ChartJS } from 'chart.js' import { Chart as ChartJS } from 'chart.js'
/** /**
+25
View File
@@ -0,0 +1,25 @@
import { createGlobalState, useDark as useVueUseDark } from '@vueuse/core'
/**
* 全站只有一个 `useDark()` 实例。**别再从 `@vueuse/core` 直接取 useDark** ——
* auto-import 已经把 `useDark` 指到这里(apps/web/vite.config.ts 的 priority)。
*
* VueUse 的 useDark 每个实例挂载时都要把 `<html>` 的 class 「同步」一遍,同步的写法是
* 往 `<head>` 插一段关掉过渡的 `<style>`、`getComputedStyle()` 逼浏览器当场重算整页样式、
* 再删掉。亮色模式下它那句「没什么要改就跳过」永远不成立(要摘的 `dark` 本来就不在,它也算
* 一次改动),所以**每个实例挂载一次就是一次整页样式重算**。
*
* 提交列表每行的结果胶囊(StatusPill → useTone)都调它:一页 30 行就是 30 次,翻页、
* 切筛选再来 30 次,右栏换一条又是三四次。2026-11 实测(生产构建、CPU 降速 6 倍)首屏
* 光这一处就占了 1.3 秒。全站共用一个之后只在第一次挂载时同步,后面的调用都是读同一个 ref。
*/
export const useDark = createGlobalState(() =>
useVueUseDark({
// 剩下的那一次(一进页面它还要同步两遍)也省掉:<html> 上的 class 已经对了就不动。
// 只有真要切换时才走它原来那套(关过渡 + 重算),切暗色不会有颜色慢慢渐变的过渡
onChanged(dark, defaultHandler, mode) {
if (document.documentElement.classList.contains('dark') === dark) return
defaultHandler(mode)
},
}),
)
@@ -1,4 +1,4 @@
import { useDark } from '@vueuse/core' import { useDark } from 'shared/composables/dark'
/** /**
* 圆环从哪儿开始扩散。正常点击就用指针落点;键盘触发(Enter / 空格)时浏览器给的 * 圆环从哪儿开始扩散。正常点击就用指针落点;键盘触发(Enter / 空格)时浏览器给的
+1 -1
View File
@@ -1,4 +1,4 @@
import { useDark } from '@vueuse/core' import { useDark } from 'shared/composables/dark'
import { computed } from 'vue' import { computed } from 'vue'
import { RARITY_TEXT_COLOR } from 'utils/constants' import { RARITY_TEXT_COLOR } from 'utils/constants'
+1 -1
View File
@@ -1,5 +1,5 @@
import { useThemeVars } from 'naive-ui' import { useThemeVars } from 'naive-ui'
import { useDark } from '@vueuse/core' import { useDark } from 'shared/composables/dark'
export type Tone = 'success' | 'error' | 'warning' | 'info' | 'default' export type Tone = 'success' | 'error' | 'warning' | 'info' | 'default'
+5
View File
@@ -5,12 +5,16 @@ import Login from '../components/Login.vue'
import Signup from '../components/Signup.vue' import Signup from '../components/Signup.vue'
import AchievementToast from '../components/AchievementToast.vue' import AchievementToast from '../components/AchievementToast.vue'
import LessonUpdateNotice from '../components/LessonUpdateNotice.vue' import LessonUpdateNotice from '../components/LessonUpdateNotice.vue'
import Mascot from '../components/Mascot.vue'
import { useBreakpoints } from 'shared/composables/breakpoints'
import { useAchievementStore } from 'shared/store/achievement' import { useAchievementStore } from 'shared/store/achievement'
import { useUserStore } from 'shared/store/user' import { useUserStore } from 'shared/store/user'
const achievementStore = useAchievementStore() const achievementStore = useAchievementStore()
const userStore = useUserStore() const userStore = useUserStore()
const route = useRoute() const route = useRoute()
// 看板娘只在电脑上出现:手机屏幕窄,底下还有题目页的操作栏,一个看板娘就把内容挡掉一大块
const { isDesktop } = useBreakpoints()
// 拉取才是主通道:WebSocket 不是常驻连接(只在问题页且有提交监听时建连), // 拉取才是主通道:WebSocket 不是常驻连接(只在问题页且有提交监听时建连),
// 所以任何页面、任何时刻解锁的成就都靠这里补上 // 所以任何页面、任何时刻解锁的成就都靠这里补上
@@ -43,6 +47,7 @@ watch(
<AchievementToast /> <AchievementToast />
<LessonUpdateNotice /> <LessonUpdateNotice />
<Beian /> <Beian />
<Mascot v-if="isDesktop" />
</n-layout> </n-layout>
</template> </template>
+145
View File
@@ -0,0 +1,145 @@
import type { MascotEventInput, MascotProfile } from '@oj2/contract'
import api from 'utils/api'
import { useUserStore } from 'shared/store/user'
import type { MascotGuide } from './guide'
import type { MascotSituation } from './lines'
/**
* 看板娘按学生的行为挑话:常犯哪类错、今天做了几道、和她熟不熟。数从 GET /mascot/profile 来,
* 那边按库里的提交和互动记录算;互动本身经 logMascotEvent 记进 mascot_event。
*
* 只对学生。老师的话不跟着行为变。
*/
/** 记一条互动。只记登录了的,失败就算了:前台不等它、也不提示 */
export function logMascotEvent(event: Omit<MascotEventInput, 'path'>) {
if (!useUserStore().isAuthed) return
const body: MascotEventInput = { ...event, path: location.pathname.slice(0, 200) }
if (body.line) body.line = body.line.slice(0, 100)
api.post('mascot/events', body).catch(() => {})
}
export const mascotProfile = shallowRef<MascotProfile | null>(null)
let loadedAt = 0
let loading: Promise<void> | null = null
/** 进页面、交完一次都想要新的数,但别每次都打一遍 */
const STALE_MS = 30_000
export function refreshMascotProfile(force = false) {
const userStore = useUserStore()
if (!userStore.isAuthed || userStore.isTeacherOrAbove) {
mascotProfile.value = null
return null
}
if (loading) return loading
if (!force && mascotProfile.value && Date.now() - loadedAt < STALE_MS) return null
loading = api
.get<MascotProfile>('mascot/profile')
.then((profile) => {
mascotProfile.value = profile
loadedAt = Date.now()
})
.catch(() => {})
.finally(() => {
loading = null
})
return loading
}
/** 这一页会话里点开过几次:第一次见面那句只说一回,刚点过的也算熟了一点 */
let sessionPokes = 0
export function notePoke() {
sessionPokes++
}
// 门槛按本机生产快照定的(2026-11,最近 120 天交过 10 次以上的 266 个学生):最近 20 次里
// 运行出错 ≥3 的 87 人、答案错误 ≥5 的 82 人,各占三成;编译错误有提交前语法检查,≥3 的只有 7 人
const HABIT_MIN = { wrongAnswer: 5, compileError: 3, runtimeError: 3, timeout: 2 } as const
/** 有专门几句的运行错误类型,别的走 habit.runtimeError */
const NAMED_RUNTIME_ERRORS = new Set(['NameError', 'TypeError', 'ValueError', 'EOFError'])
/**
* 这一类错是不是这个学生的老毛病:是就给对应的那组话,不是返回 null。
* 题目页点她、交完错了她主动开口都走这里
*/
export function habitSituation(failure: MascotSituation): MascotSituation | null {
const recent = mascotProfile.value?.recent
if (!recent) return null
switch (failure) {
case 'problem.wrong':
return recent.wrongAnswer >= HABIT_MIN.wrongAnswer ? 'habit.wrongAnswer' : null
case 'problem.compileError':
return recent.compileError >= HABIT_MIN.compileError ? 'habit.compileError' : null
case 'problem.runtimeError': {
if (recent.runtimeError < HABIT_MIN.runtimeError) return null
const type = recent.runtimeErrorType
return type && NAMED_RUNTIME_ERRORS.has(type) ? (`habit.${type}` as MascotSituation) : 'habit.runtimeError'
}
case 'problem.timeout':
return recent.timeout >= HABIT_MIN.timeout ? 'habit.timeout' : null
default:
return null
}
}
const HABIT_CHANCE = 0.6
const GENTLE_CHANCE = 0.5
const WEEK_CHANCE = 0.4
/** 点过这么多次「太难了」,错了就别怼了 */
const GENTLE_TOO_HARD = 3
/** 这一周交了这么多次、例子却跑得不到五分之一,才说她「从来不跑例子」 */
const WEEK_SUBMITS_MIN = 10
/** 这一周要了这么多次 AI 提示,就劝先自己想 */
const WEEK_HINTS_MANY = 5
const FAILURES = new Set<MascotSituation>(['problem.wrong', 'problem.compileError', 'problem.runtimeError', 'problem.timeout'])
const TODAY_CHANCE = 0.4
const FAMILIAR_CHANCE = 0.2
/** 点开过这么多次算老熟人 */
const FAMILIAR_POKES = 50
/** 今天做到这么多道才拿出来说 */
const TODAY_MIN = 3
const GREETINGS = new Set<MascotSituation>(['greet', 'announcement', 'achievement', 'profile'])
const PRAISE = new Set<MascotSituation>(['problem.accepted', 'problem.firstTry', 'problem.finally', 'home.done', 'home.assigned', 'home.free'])
/** 点她的时候:按行为把页面给的情况换成更贴这个学生的那一组(按钮不变) */
export function personalize(guide: MascotGuide): MascotGuide {
const profile = mascotProfile.value
if (!profile) return guide
if (profile.pokes + sessionPokes === 0) return { ...guide, situation: 'first.meet', n: undefined, vars: undefined }
const situation = guide.situation
// 常点「太难了」的,错了先软着说,不翻老毛病
if (FAILURES.has(situation) && profile.tooHard >= GENTLE_TOO_HARD && Math.random() < GENTLE_CHANCE) return { ...guide, situation: 'gentle.wrong' }
const week = profile.week
if (situation === 'problem.stuck' && week.helps === 0 && Math.random() < WEEK_CHANCE) return { ...guide, situation: 'habit.neverHelp' }
if (situation === 'problem.hintReady' && week.aiHints >= WEEK_HINTS_MANY) return { ...guide, situation: 'habit.aiHintMany', n: week.aiHints }
if (
(situation === 'problem.unsubmitted' || situation === 'problem.samplesFailed') &&
week.submits >= WEEK_SUBMITS_MIN &&
week.trials * 5 < week.submits &&
Math.random() < WEEK_CHANCE
) {
return { ...guide, situation: 'habit.weekNoSamples', n: week.submits }
}
const habit = habitSituation(guide.situation)
if (habit && Math.random() < HABIT_CHANCE) return { ...guide, situation: habit }
if (PRAISE.has(guide.situation) && profile.todaySolved >= TODAY_MIN && Math.random() < TODAY_CHANCE) {
return { ...guide, situation: 'today.count', n: profile.todaySolved }
}
if (GREETINGS.has(guide.situation) && profile.pokes >= FAMILIAR_POKES && Math.random() < FAMILIAR_CHANCE) {
return { ...guide, situation: 'familiar' }
}
return guide
}
// ---- 主动开口 ----
export interface MascotSpeech extends MascotGuide {
/** 同一个 key 一次页面会话里只说一次(比如「这道题卡住了」每道题只说一回) */
key: string
}
/** 页面请她主动说一句;说不说、什么时候说由 Mascot.vue 按频率上限定 */
export const speechRequest = shallowRef<MascotSpeech | null>(null)
export function requestSpeech(speech: MascotSpeech) {
speechRequest.value = speech
}
+91
View File
@@ -0,0 +1,91 @@
import type { Router } from 'vue-router'
import type { MascotSituation } from './lines'
/**
* 看板娘的「引导」:页面告诉她现在是什么情况、气泡里的按钮各做什么。
*
* 每个页面在 setup 里调一次 useMascotGuide,给一个函数;看板娘被点的那一刻才调用它,
* 所以函数里直接读页面当下的状态就行,不用做成 computed。函数返回 null 就当这页没有专门的话,
* 看板娘只打招呼。比赛里看板娘不弹气泡,那一层在 Mascot.vue 里按路由判断,页面不用管。
*
* 以后要按学生的行为调整她说什么(常错哪一类、习惯先跑例子还是直接交),也是往这一层加信号。
*/
export interface MascotAction {
label: string
run: () => unknown
}
export interface MascotGuide {
situation: MascotSituation
/** 台词里 `{n}` 换成它:还差几道、第几课、几个人举手 */
n?: number
/** 别的占位:`{tag}` 换成 vars.tag(知识点名、成就名、「明天」……) */
vars?: Record<string, string | number>
/** 最多三个,第一个是主按钮 */
actions?: MascotAction[]
}
type GuideProvider = () => MascotGuide | null
/** 后挂上的排在后面;一页只挂一个,嵌套的子组件别再挂 */
const providers = shallowRef<GuideProvider[]>([])
export function useMascotGuide(provider: GuideProvider) {
onMounted(() => {
providers.value = [...providers.value, provider]
})
onBeforeUnmount(() => {
providers.value = providers.value.filter((it) => it !== provider)
})
}
export function currentMascotGuide(): MascotGuide | null {
const list = providers.value
for (let i = list.length - 1; i >= 0; i--) {
const guide = list[i]!()
if (guide) return guide
}
return null
}
/** 把台词里的 `{n}` 和 `{xxx}` 换成真的数和字 */
export function fillLine(line: string, guide: Pick<MascotGuide, 'n' | 'vars'>) {
return line.replace(/\{(\w+)\}/g, (all, key: string) => {
if (key === 'n' && guide.n !== undefined) return String(guide.n)
const value = guide.vars?.[key]
return value === undefined ? all : String(value)
})
}
// ---- 几个页面都用得上的按钮 ----
/** 顶栏「输入题号直达」框:看板娘点一下就把光标放进去。ProblemJumpBox 盯着这个数 */
export const jumpFocusRequest = ref(0)
export function focusJumpAction(): MascotAction {
return { label: '输题号', run: () => jumpFocusRequest.value++ }
}
/** 和题目列表的「随便来一道」同一个接口:不限知识点和类型,按学生惯用的语言挑 */
export function randomProblemAction(router: Router): MascotAction {
return {
label: '随便来一道',
run: async () => {
const [{ getRandomProblem }, { useCodeStore }] = await Promise.all([import('oj/api'), import('oj/store/code')])
const id = await getRandomProblem({ tag: '', type: '', language: useCodeStore().preferredLanguage() })
router.push('/problem/' + id)
},
}
}
export function goAction(router: Router, label: string, to: string): MascotAction {
return { label, run: () => router.push(to) }
}
// ---- 别的浮层要让开她 ----
/**
* 看板娘现在占的地方(视口坐标,拖动中也跟着变)。不在页面上(手机、没挂载)时 shown 为 false。
* 成就弹框靠它让开:学生把她拖进右上角时,弹框正好压在她头上。
*/
export const mascotBox = reactive({ shown: false, x: 0, y: 0, width: 0, height: 0 })
+215
View File
@@ -0,0 +1,215 @@
/**
* 看板娘的台词。点她一下,按「现在是什么情况」从对应那一组里随机抽一句。
*
* 口吻照「DeepSeek 小鲸鱼」角色卡:短、像群友、傲娇嘴硬、心软藏着。学校里舍掉了英文、
* 粗口和「V我50」;角色卡里叫人「用户」的梗改成「同学」。不自称「本小姐」,也不自称「大肥鱼」。
* 设计稿(含整张台词表):https://claude.ai/artifact/Qz2zPCfq2zCrqmxyms1UGx
*
* `{n}` 由页面给的数字替换(还差几道、第几课、几个人举手)。
* 文案守全站的规矩:全中文、不用「他」、对学生不说「追」。
*/
export const MASCOT_LINES = {
// ---- 学生:首页 ----
'home.assigned': [
'今天的题还没做完',
'题在这,自己去',
'还发呆?',
'老师布置的,不是我',
'做完再玩',
'就几道,别磨蹭',
'老师报题号了吧',
'还剩几道,自己数',
'先做今天的',
'别人都交了',
'题不会自己跑过来',
'我替你记着呢……才怪',
],
'home.done': ['做完了?哼,还挺快', '今天的题清空了', '行,算你今天没白来', '多做一道又不会掉肉', '做完了就去自学', '今天表现还行', '剩下的时间别浪费'],
'home.free': ['闲着?来一道', '没作业也别想摸鱼', '随便挑一道呗', '无聊就做题', '来都来了', '老师没布置,你也能做', '今天做一道,明天轻松点', '手痒了吧'],
// ---- 学生:题目列表 ----
problems: [
'找哪道',
'题号报来',
'翻半天了吧',
'不知道做哪道?随便来一道',
'题号都记不住?',
'简单的先做',
'没做完的先挑',
'看名字挑题?行吧',
'这么多,慢慢找',
],
// ---- 学生:题目页 ----
'problem.blank': ['看完题再写', '题目读两遍', '输入输出先看清', '例子先看懂', '先别急着敲', '空的?', '写啊,我又不会帮你写'],
'problem.inSet': ['专题里的题,做完拿奖章', '这个专题还差几道', '做完回专题看看'],
'problem.unsubmitted': [
'直接交?胆子不小',
'先跑例子',
'交之前对一下例子',
'例子都没跑就交?',
'我看着呢',
'写完了?先跑一下',
'跑一下又不要钱',
'自信是好事,先跑例子',
],
'problem.samplesFailed': ['例子都没过,还想交?', '差一点点', '对着例子看看', '一个字都不能差', '别急着交', '空格也算', '多了一行?', '输出和例子摆一起看'],
'problem.samplesPassed': ['例子过了,交吧', '还行,交', '交了才算数', '例子过了不代表全对'],
'problem.wrong': [
'错了就改呗',
'慌什么,看看错哪了',
'错一次而已',
'我就知道',
'改改就好了,又不难',
'再来',
'输出再对一遍',
'是不是格式的事',
'特殊情况想过没',
'离对就差一点',
],
'problem.compileError': ['连编译都没过?', '红字看看', '少了个符号吧', '中文标点?', '括号配对了没', '拼错了吧'],
'problem.runtimeError': ['跑一半崩了', '程序炸了', '看看哪一行', '输入读对了没', '除以零了?'],
'problem.timeout': ['跑太久了', '死循环?', '循环停得下来吗', '是不是多读了输入', '慢死了'],
'problem.stuck': [
'行吧,这次不怼你。问问老师?',
'别硬撑了,举个手',
'歇一下,再看一遍题',
'不丢人,老师就是干这个的',
'……我在呢',
'举手又没人笑你',
'换个思路试试',
'从头读一遍题',
],
'problem.accepted': [
'哼,算你厉害',
'还行吧,别得意',
'下一道',
'才不是夸你',
'这么快?……有点东西',
'行,记你一功',
'对了就对了,笑什么',
'一般般啦',
'还算有点用',
'别骄傲,下一道',
],
'problem.firstTry': ['一次就过?运气吧', '……好吧,厉害', '没跑例子也对了?算你狠', '这题对你太简单了吧'],
'problem.finally': ['终于', '我就说改改就行', '磨了半天,总算', '看吧,不难', '这次算你没放弃'],
'problem.solvedBefore': ['做过了还来?', '复习呢?行吧', '旧题有什么好看的', '会了就下一道', '再做一遍也行,别抄自己的'],
'problem.flowchart': ['先画图', '框和箭头别乱连', '画完让我看看……才不看', '判断框要两个出口'],
// ---- 学生:其他页面 ----
'submission.detail': ['盯着看也不会变对', '回去改改', '看出问题没', '看完了就回去', '又在研究?', '红的那一格看看'],
'problemsets.unfinished': ['上次那个还没做完', '挑一个', '别光看不做', '奖章还空着呢', '先把开了头的做完'],
'problemset.unfinished': ['还差 {n} 道', '就差 {n} 道了', '做一半跑了?', '奖章不会自己来', '接着做', '都到这儿了'],
'problemset.done': ['全做完了?哼,奖章拿着', '还挺能坚持', '下一个专题呢', '这个奖章……还挺好看'],
'learn.continue': ['第 {n} 课,没忘吧', '上次学到一半', '学一课又不会怎样', '今天学一课?', '接着上次的', '学完这课再玩'],
'learn.fresh': ['从第一课开始', '不会就从头学', '光做题不学?', '第一课很短的'],
tutorial: ['看完了?练一练', '光看不练没用', '练一练才算学会', '代码能直接跑,试试', '下一课等着呢', '别跳着看', '这段改一改再跑'],
'tutorial.passed': ['这课过了', '还挺快', '下一课'],
submissions: ['先看自己的', '看别人的干嘛', '找自己的?', '这么多,找得到吗', '这节课的在这', '红的多还是绿的多'],
rank: ['想知道第几?带你去', '别光看前面的', '排名又不会自己涨', '做对一道新题就能动', '看别人干嘛,做题去', '前一名也没多几道'],
pk: ['你们班行不行', '比输了别找我', '多做一道,班里就多一道'],
'contests.live': ['比赛开着呢', '还不进去?', '去吧,我不看'],
'contests.none': ['今天没比赛', '想比赛?找老师'],
announcement: ['看公告?难得', '有新东西', '看完就做题去'],
profile: ['欣赏自己呢?', '自恋', '做对的题都在这', '还行吧,这战绩', '签名该改了'],
achievement: ['又来数成就?', '还差几个', '下一个快了', '拿了就别显摆', '这么多?……一般吧'],
notFound: ['迷路了?跟我回去', '这里什么都没有', '地址打错了吧', '走错门了', '没这个地方'],
guest: ['先登录,不然不理你', '你谁啊', '登录再说', '不认识你', '报上名来', '点名字就能登录'],
// ---- 老师 ----
'teacher.help': ['{n} 个学生举手了,快去', '有人举手,别装没看见', '等着呢,快去', '{n} 个了,再不去要急了', '举着手呢,手酸了', '老师,有人找'],
'teacher.home.unassigned': ['今天不布置?学生要摸鱼了', '空着呢', '题呢?', '布置点什么吧', '不布置我可去吃饭了', '学生都在等'],
'teacher.home.assigned': ['这节课的提交,筛好了', '看看谁在摸鱼', '交上来不少了', '去看看', '有人卡住了吧'],
'teacher.task.unassigned': ['空的。题自己选', '选几道吧', '五道以内,别太狠', '还没布置呢', '挑简单的先热身?'],
'teacher.task.assigned': ['进度都在这', '谁在摸鱼,一目了然', '差不多该讲题了吧', '卡在同一道的有点多', '做完的可以加一道'],
'teacher.statistics': ['看完记得夸夸学生', '数字好看吗', '别只看平均数', '有进步的,夸一句', '这节课还行吧'],
'teacher.submissions': ['筛这节课的?', '想看谁的', '错的多的先看', '一条条看,辛苦了', '重判之前想清楚'],
'teacher.problem': ['全班做得怎样,不看看?', '难不难,数据说了算', '又在看题?', '要改题?', '这题错的人不少'],
'teacher.problems': ['又出新题?才没关心你', '出题辛苦了……随口说的', '题够多了吧', '新题记得放例子', '标签别忘了打'],
'teacher.problemset': ['全班进度,记着呢', '谁没做完,一看就知道', '奖章发得出去吗'],
'teacher.greet': ['老师好……才不是特意打招呼', '有事?', '忙完了?', '喝口水吧', '下课了吗', '今天几节课?', '辛苦……随口说的'],
// ---- 按学生的行为挑的(shared/mascot/behavior.ts)----
// 最近 20 次提交里某类错特别多,再错这一类时换成这几句
'habit.wrongAnswer': ['又是答案错误,例子对了没', '你老栽在输出上', '空格、换行再对一遍', '格式的事,又是', '这类错你很熟了吧'],
'habit.compileError': ['又是编译错误。中文标点?', '每次都是符号的事', '红字看完再改', '括号、冒号,老三样'],
'habit.runtimeError': ['又崩了,这次哪一行', '运行出错你最拿手了……不是夸你', '又炸了,看看报错'],
'habit.NameError': ['又是变量名,拼对了没', '用之前先赋值', '大小写也算不一样的名字', '名字又对不上了'],
'habit.TypeError': ['又是类型不对,input 出来的是文字', '数字和文字不能直接加', '先 int() 再算'],
'habit.ValueError': ['int() 里放了不是数字的东西', '输入格式再看看,一行几个数?', '又把一整行塞进 int() 了吧'],
'habit.EOFError': ['又多读了一行', 'input() 比输入的行数多了', '一行几个数,用一次 input() 再 split()'],
'habit.timeout': ['又超时,循环停得下来吗', '死循环又来了', '循环变量改了没'],
// 这一页上的习惯
'habit.noSamples': ['又没跑例子?', '第几次不跑例子了', '跑一下又不会少块肉', '例子都不跑,就硬交?'],
'idle.stuck': ['盯了好久了,举个手?', '卡住了吧', '要不先跑一下例子', '发呆也算做题吗'],
// 今天和熟悉程度
'today.count': ['今天第 {n} 道了……还行', '{n} 道了,别骄傲', '今天挺能做嘛,{n} 道', '才 {n} 道,再来'],
'first.meet': ['初次见面。……才不是特意等你', '你是新来的?', '第一次戳我?', '叫我小鲸鱼就行,别叫大肥鱼'],
familiar: ['又是你', '你今天戳了几次了', '习惯了,戳吧', '老熟人了', '又来找我?'],
// ---- 接进来的其他数据 ----
// 这节课的题:同班多少人做对了(课堂条那份数)
'class.manyDone': ['全班已经 {n} 个人做对了', '{n} 个人都对了,你呢', '就差你们几个了……没说你', '别人都对了,加把劲'],
'class.fewDone': ['这题全班才 {n} 个做对,别慌', '难的不只你一个', '大家都卡着呢', '全班都在跟它较劲'],
'class.firstSolver': ['全班第一个?……还行吧', '比别人都快,别得意', '第一个做对的,记你一功'],
// 题目难度、全站通过率
'problem.hardWrong': ['这题本来就难', '通过率不到三成,慢慢来', '难题错几次正常'],
'problem.easyWrong': ['这题挺简单的……再看看题', '大多数人一次就过了,看看细节', '简单题也别大意'],
// AI 提示、挑战、流程图
'problem.hintReady': ['卡这么久,要个 AI 提示?', 'AI 提示能用了,不丢人', '提示又不扣分'],
'problem.challenge': ['做对了?还有挑战,敢不敢', '挑战等着你呢', '光做对还不算厉害'],
'flowchart.low': ['流程图分不高啊', '判断框再看看', '箭头都连对了吗', '再画一版'],
'flowchart.good': ['S?……还行', '图画得不错嘛', '这图可以'],
// 常点「太难了」的学生,错了换成软一点的
'gentle.wrong': ['慢慢来,又不赶', '错了就改,没什么', '一步一步来', '不急,我等你'],
// 这一周的习惯
'habit.weekNoSamples': ['这周交了 {n} 次,例子没跑几回', '你是不是从来不跑例子', '这周的例子都白给了'],
'habit.aiHintMany': ['这周要了 {n} 次提示了,先自己想想', 'AI 又不是你同桌', '先想五分钟再要提示'],
'habit.neverHelp': ['从来不举手,硬撑?', '举个手又不会怎样', '卡这么久还不举手'],
// 首页:知识点、排名、比赛、公告、好久没来
'home.knowledgeNext': ['{tag}再做 {n} 道就到「{level}」', '{tag}快升级了,就差 {n} 道', '{tag},再来 {n} 道'],
'home.knowledgeUp': ['本周{tag}升级了……还行', '{tag}升到「{level}」了,别骄傲'],
'home.knowledgeFresh': ['班里在学{tag},你还没碰过', '去点亮{tag}', '{tag}还是空的'],
'rank.gap': ['再做 {n} 道就超过前一名了', '前一名就多你 {n} 道', '差 {n} 道,够得着'],
'rank.top': ['第一?……别得意', '榜首了,守住', '这周你最能做,哼'],
'home.contestSoon': ['{when}有比赛', '比赛快开始了,准备好没', '{when}比赛,别迟到'],
'home.newAnnouncement': ['有新公告,没看吧', '公告更新了', '看一眼公告'],
'home.back': ['{n} 天没来了,还认得我吗', '好久不见……才没有想你', '回来了?'],
// 成就、自学、专题
'achievement.near': ['再{need}就拿「{name}」了', '「{name}」快到手了', '离「{name}」不远了'],
'learn.wrongExercise': ['第 {n} 课的练一练还没全对', '上次的练一练错了几道,回去看看?', '练一练没做完的,记着呢'],
'problemset.lastOne': ['奖章就差最后 1 道', '最后一道了,别停', '就剩一道,冲'],
// ---- 招呼与彩蛋 ----
greet: [
'干嘛',
'?',
'戳我干嘛',
'在呢',
'又来',
'有事说事',
'忙着呢',
'嗯?',
'别戳了',
'看什么看',
'好饿',
'叫我干嘛',
'我在摸鱼,别吵',
'你也在摸鱼?',
'不理你',
'哼',
],
patting: ['头发乱了', '再摸收费', '别摸了', '……就一下', '手拿开', '摸够了没', '……还行'],
overclick: ['同学,你够了', '再点我要生气了', '手不酸吗', '点我又不加分', '有这功夫做道题', '鼠标要坏了'],
rare: ['服务器繁忙', '让我想想……算了', '这个我不会,骗你的', '刚才说到哪了', '我去吃饭了,你做完告诉我'],
'time.firstClass': ['醒了没', '早,题呢', '眼睛睁开', '早饭吃了没'],
'time.lunch': ['事已至此,先吃饭吧', '好饿', '饭点了', '做完这道就去吃'],
'time.afternoon': ['困了吧', '午觉睡了没', '醒醒'],
'time.lastClass': ['快下课了,交了再走', '收拾书包前再交一次', '最后一道'],
'day.monday': ['周一了,打起精神', '上周的题做完没'],
'day.friday': ['周五了,再做一道', '明天放假,今天做完'],
offHours: ['这个点还在做题?', '放假还来,行吧', '……有点感动,一点点'],
} as const satisfies Record<string, readonly string[]>
export type MascotSituation = keyof typeof MASCOT_LINES
+5
View File
@@ -93,6 +93,11 @@ export default defineConfig(() => {
'vue-router', 'vue-router',
'@vueuse/core', '@vueuse/core',
'pinia', 'pinia',
// 盖掉上面 @vueuse/core 的同名项:全站共用一个实例,原因见 shared/composables/dark.ts
{
from: 'shared/composables/dark',
imports: [{ name: 'useDark', priority: 10 }],
},
{ {
'naive-ui': ['useDialog', 'useMessage', 'useNotification', 'useLoadingBar'], 'naive-ui': ['useDialog', 'useMessage', 'useNotification', 'useLoadingBar'],
}, },
+17
View File
@@ -25,6 +25,23 @@ bun run --filter '@oj2/api' check:ast # 每个 target 的 node 在语法里
它只验节点类型**存在**,不验语义对不对(把 `while_loop` 配成 `for_statement` 这种两个都 它只验节点类型**存在**,不验语义对不对(把 `while_loop` 配成 `for_statement` 这种两个都
存在,机器看不出来),语义那层还是得实跑。 存在,机器看不出来),语义那层还是得实跑。
## 光比节点类型不够的几处
下面几处都是光比类型就会静默判错的,判题机(`judge/ast.ts`)额外看了一眼上下文:
- **C / C++ 的函数定义不算 `main`**(`nodeMatch`)。每个 C 程序都有 main,算进去的话「必须使用」
永远通过、「不能使用」永远失败。所以 C / C++ 的下拉叫「自定义函数」。
- **Python 的「赋值语句」连 `s += 1` 一起算**(`nodeMatch`),和 C 一个口径 —— C 的
`assignment_expression` 本来就包括复合赋值,tree-sitter-python 却把它拆成了 `augmented_assignment`。
- **运算符只认真在做运算的 token**(`operatorMatch`),看父节点是不是二元运算 / 复合赋值 / 自增自减,
一元的只认取反。不看的话 `scanf("%d", &n)` 算用了 `&`、`int *p` 算 `*`、`vector<int>` 算 `>`、
`*args` 和 `from m import *` 算 `*`、`not in` / `is not` 算 `not`。负号 `-x` 不算用了减号。
- **Python 的 `math.sqrt(4)` 算调用了 `sqrt()`**(`functionCalls`),只认 `import` 进来的模块名;
对象上的 `s.count()` 仍归「调用方法」。
改这几处之后,拿真实提交回放一遍:对着挂了语法要求的题,把 AC 和「语法检查没通过」的提交重新
`checkAst`,看结论变了多少条、变的是不是该变的。
## 只有三种语言真的会跑 ## 只有三种语言真的会跑
判题机只认 `AST_SUPPORTED_LANGUAGES`(C / C++ / Python)。别的语言配了规则一条都不会跑, 判题机只认 `AST_SUPPORTED_LANGUAGES`(C / C++ / Python)。别的语言配了规则一条都不会跑,
+9
View File
@@ -99,6 +99,15 @@ Run workflow),开发机不在、又急着上线时用。它不再 push 就
| 配置 | `~/.local/share/gitea-runner/config.yaml`(标签 `oj2-deploy:host`、`iot-deploy:host`,capacity 1) | | 配置 | `~/.local/share/gitea-runner/config.yaml`(标签 `oj2-deploy:host`、`iot-deploy:host`,capacity 1) |
| 注册 | 同目录的 `.runner`;注册在 `xuyue` 用户下,和 IOT_SIM(物联网仿真平台)共用。capacity 1,两边的部署排队,不会同时挤服务器 | | 注册 | 同目录的 `.runner`;注册在 `xuyue` 用户下,和 IOT_SIM(物联网仿真平台)共用。capacity 1,两边的部署排队,不会同时挤服务器 |
| 日志 | `journalctl --user -u gitea-runner -f`;每次部署的日志在 Gitea 的 Actions 页面 | | 日志 | `journalctl --user -u gitea-runner -f`;每次部署的日志在 Gitea 的 Actions 页面 |
| 看门狗 | `~/.config/systemd/user/gitea-runner-watchdog.timer`,每 5 分钟跑同目录配置旁的 `watchdog.sh`(见下) |
**runner 会「假在线」。** gitea-runner 5.2.4 拉任务超时一次(默认 5 秒,网络一抖就超)之后就再也
不拉了:服务还是 active,push 之后 Gitea 却说「没有在线的运行器来领取这个任务」(2026-11-03 一天
撞了两次)。两层兜底:`config.yaml` 里 `fetch_timeout: 30s` 少撞几次;看门狗
`~/.local/share/gitea-runner/watchdog.sh` 去服务器的 Gitea 库里看 `action_runner` 的
`last_online` / `last_active`,超过 3 分钟没见到这个 runner、而且它手上没有在跑的任务(不打断部署),
就 `systemctl --user restart gitea-runner`;连不上服务器时什么都不做。所以撞上了最多等 5 分钟,
等不及就自己重启一下。看门狗做了什么:`journalctl --user -u gitea-runner-watchdog`。
**部署不用开发机自己的 bun。** pacman 装的 bun 是 Arch 自己编的,动态链接系统 ICU,单二进制 **部署不用开发机自己的 bun。** pacman 装的 bun 是 Arch 自己编的,动态链接系统 ICU,单二进制
把它打进去之后到容器里报 `libicui18n.so.78: cannot open shared object file`(2026-11-03 第一次跑 把它打进去之后到容器里报 `libicui18n.so.78: cannot open shared object file`(2026-11-03 第一次跑
+1
View File
@@ -12,6 +12,7 @@ export * from './flowchart'
export * from './flowchart-doc' export * from './flowchart-doc'
export * from './judge-status' export * from './judge-status'
export * from './language' export * from './language'
export * from './mascot'
export * from './problem' export * from './problem'
export * from './problemset' export * from './problemset'
export * from './ranking' export * from './ranking'
+62
View File
@@ -0,0 +1,62 @@
import { z } from 'zod'
/**
* 看板娘的互动记录(POST /mascot/events)。前台每次互动发一条,落进 `mascot_event`:
*
* - `open`:点她冒出气泡(situation = 她当时判断的情况,line = 说的那句)
* - `action`:点了气泡里的按钮(action = 按钮上的字)
* - `speak`:她主动开口(situation / line 同 open)
* - `pat`:连点触发了摸头彩蛋
* - `overclick`:连点到她嫌烦
* - `move`:被拖到了别处(line 记落点贴的边,比如 `right bottom`)
*
* 另外两种不是对她做的,是她要看的行为,别处没有存:
* - `trial`:在题目页运行了例子 / 自己输入(action 记 `samples` / `custom`)
* - `help`:在题目页举了手
*
* 不记代码、不记按键。
*/
export const MASCOT_EVENT_KINDS = ['open', 'action', 'speak', 'pat', 'overclick', 'move', 'trial', 'help'] as const
export const mascotEventKindSchema = z.enum(MASCOT_EVENT_KINDS)
export type MascotEventKind = z.infer<typeof mascotEventKindSchema>
export const mascotEventSchema = z.object({
kind: mascotEventKindSchema,
situation: z.string().max(64).optional(),
line: z.string().max(100).optional(),
action: z.string().max(32).optional(),
/** 当时在哪一页(路由路径,不带查询串) */
path: z.string().max(200),
})
export type MascotEventInput = z.infer<typeof mascotEventSchema>
/**
* 看板娘按学生的行为挑话用的(GET /mascot/profile)。只给学生自己的,进页面时拉一次。
*
* `recent` 是最近 20 次题库提交(不含比赛)里各类错误的次数;`runtimeErrorType` 是其中
* 运行出错最多的那一种(NameError、TypeError …,C/C++ 没有这一项),没有就是 null。
*/
export const mascotProfileSchema = z.object({
/** 一共点开过她几次(open 事件数),按账号算 */
pokes: z.number().int(),
/** 今天(东八区)做对了几道不同的题 */
todaySolved: z.number().int(),
/** 一共点过几次「太难了」(做对后的点评) */
tooHard: z.number().int(),
/** 这一周(东八区周一零点起):题库里交了几次、跑了几次例子、举了几次手、要了几次 AI 提示 */
week: z.object({
submits: z.number().int(),
trials: z.number().int(),
helps: z.number().int(),
aiHints: z.number().int(),
}),
recent: z.object({
total: z.number().int(),
wrongAnswer: z.number().int(),
compileError: z.number().int(),
runtimeError: z.number().int(),
timeout: z.number().int(),
runtimeErrorType: z.string().nullable(),
}),
})
export type MascotProfile = z.infer<typeof mascotProfileSchema>
+12 -2
View File
@@ -145,7 +145,8 @@ const C_NODE_TARGETS = {
break: { label: 'break 语句', node: 'break_statement' }, break: { label: 'break 语句', node: 'break_statement' },
continue: { label: 'continue 语句', node: 'continue_statement' }, continue: { label: 'continue 语句', node: 'continue_statement' },
return: { label: 'return 语句', node: 'return_statement' }, return: { label: 'return 语句', node: 'return_statement' },
function_definition: { label: '函数定义', node: 'function_definition' }, // 不算 main(判题机 judge/ast.ts 的 nodeMatch 里排掉的),所以不叫「函数定义」
function_definition: { label: '自定义函数', node: 'function_definition' },
assignment: { label: '赋值语句', node: 'assignment_expression' }, assignment: { label: '赋值语句', node: 'assignment_expression' },
struct: { label: '结构体', node: 'struct_specifier' }, struct: { label: '结构体', node: 'struct_specifier' },
include: { label: '#include 指令', node: 'preproc_include' }, include: { label: '#include 指令', node: 'preproc_include' },
@@ -484,6 +485,14 @@ export const problemListItemSchema = z.object({
export const problemListSchema = paginatedSchema(problemListItemSchema) export const problemListSchema = paginatedSchema(problemListItemSchema)
/**
* 相似题推荐的一条。`sharedTags` 是它和原题共有的标签(知识点在前、主题在后),
* 学生不点开就知道练的是什么
*/
export const similarProblemSchema = problemListItemSchema.extend({
sharedTags: z.array(z.string()),
})
/** 题目列表「全部类型」下拉:SQL / 有参考图 / 画流程图 / 语法要求 */ /** 题目列表「全部类型」下拉:SQL / 有参考图 / 画流程图 / 语法要求 */
export const problemTypeFilterSchema = z.enum(['sql', 'reference', 'flowchart', 'ast']) export const problemTypeFilterSchema = z.enum(['sql', 'reference', 'flowchart', 'ast'])
@@ -498,7 +507,7 @@ export const problemListSortSchema = z.enum(['', 'create_time', '-submission_num
* 离哪个成就最近;没做对的只给一个数(「有 n 道差一点」),不列出来。 * 离哪个成就最近;没做对的只给一个数(「有 n 道差一点」),不列出来。
*/ */
export const problemProgressSchema = z.object({ export const problemProgressSchema = z.object({
/** 做对的题数,和成就的「AC 题目数」同一个数(不含比赛),这样「再做对 n 道」加得上 */ /** 做对的题数,和成就的「AC 题目数」同一个数(含比赛题,2026-11-03 起),这样「再做对 n 道」加得上 */
solved: z.number().int(), solved: z.number().int(),
/** 本周(东八区周一起)新做对几道 */ /** 本周(东八区周一起)新做对几道 */
weekSolved: z.number().int(), weekSolved: z.number().int(),
@@ -601,6 +610,7 @@ export type ChallengeList = z.infer<typeof challengeListSchema>
export type ProblemDifficulty = z.infer<typeof problemDifficultySchema> export type ProblemDifficulty = z.infer<typeof problemDifficultySchema>
export type ProblemListItem = z.infer<typeof problemListItemSchema> export type ProblemListItem = z.infer<typeof problemListItemSchema>
export type ProblemList = z.infer<typeof problemListSchema> export type ProblemList = z.infer<typeof problemListSchema>
export type SimilarProblem = z.infer<typeof similarProblemSchema>
export type ProblemTypeFilter = z.infer<typeof problemTypeFilterSchema> export type ProblemTypeFilter = z.infer<typeof problemTypeFilterSchema>
export type ProblemListSort = z.infer<typeof problemListSortSchema> export type ProblemListSort = z.infer<typeof problemListSortSchema>
export type ProblemProgress = z.infer<typeof problemProgressSchema> export type ProblemProgress = z.infer<typeof problemProgressSchema>