- 题目页:这节课同班做对的人多就说「全班已经 N 个人做对了」、都卡着就安慰、第一个做对的夸一句; 通过率不到三成的题错了说「本来就难」、高于七成的说「再看看题」;AI 提示开了没用就提一句; 做对了还有挑战就问敢不敢;流程图分低、拿 S 各有话 - 常点「太难了」的学生错了换软话;这周交得多、例子跑得少的念一句;卡住却从不举手的劝举手; 这周要提示多的劝先自己想 - 首页(这节课没要做的时)每次戳随机说一件:知识点差几道升级、周榜差几道超过前一名、 今天明天的比赛、三天内的新公告;两周以上没来说「好久不见」,只说一回 - 排名页第一名、差前一名几道;成就页差一点的;自学没全对的练一练;专题差最后一道拿奖章 - 运行例子、自己输入、举手也记进 mascot_event(trial、help),GET /mascot/profile 多给「太难了」次数和这一周交、跑例子、举手、要提示的次数 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
81ef4dca6b
commit
aa7e0a6eb8
12 files changed
+296
-25
No files matched your search
@@ -61,8 +61,14 @@ async function load() {
|
||||
onMounted(load)
|
||||
watch(name, load)
|
||||
|
||||
// 看板娘:只在看自己的成就时说话
|
||||
useMascotGuide(() => (data.value && !other.value && !userStore.isTeacherOrAbove ? { situation: 'achievement' } : null))
|
||||
// 看板娘:只在看自己的成就时说话。「快拿到了」里最近的一个能说成「再做对 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>
|
||||
|
||||
<template>
|
||||
|
||||
@@ -5,13 +5,13 @@ import { Icon } from '@iconify/vue'
|
||||
import { getAnnouncementList, getKnowledgeMap, getContestList, getLastVisit, getLearnProgress, getSubmissions, getTutorials, getWeeklyRank } from 'oj/api'
|
||||
import { getClassActivity } from 'shared/api'
|
||||
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 { activityMode } from 'shared/store/lesson'
|
||||
import { focusJumpAction, goAction, randomProblemAction, useMascotGuide } from 'shared/mascot/guide'
|
||||
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 { 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 {
|
||||
type: TutorialType
|
||||
@@ -37,6 +37,8 @@ const classActivity = ref<ClassActivity | null>(null)
|
||||
const lastVisit = ref<LastVisit | null>(null)
|
||||
/** 知识点地图挑出来的那一句(本周升级 / 再做几道升档 / 去点亮一个),见 oj/user/knowledge.ts */
|
||||
const knowledgeHeadline = ref<Headline | null>(null)
|
||||
/** 地图原样留着给看板娘:她要知识点名、档位名、还差几道,不是拼好的那句话 */
|
||||
const knowledge = ref<KnowledgeMap | null>(null)
|
||||
const loaded = ref(false)
|
||||
|
||||
/** 头一回登录、还没交过:问候换成「欢迎」,告诉他题在哪找 */
|
||||
@@ -124,7 +126,8 @@ async function loadAnnouncements() {
|
||||
}
|
||||
|
||||
async function loadKnowledge() {
|
||||
knowledgeHeadline.value = pickHeadline(await getKnowledgeMap())
|
||||
knowledge.value = await getKnowledgeMap()
|
||||
knowledgeHeadline.value = pickHeadline(knowledge.value)
|
||||
}
|
||||
|
||||
async function loadClassActivity() {
|
||||
@@ -246,16 +249,85 @@ watch(
|
||||
)
|
||||
|
||||
// 看板娘:今天有课(和「这节课」那张卡同一个条件)就催今天的题,没课就随便做一道
|
||||
let greetedBack = false
|
||||
useMascotGuide(() => {
|
||||
if (!loaded.value) return null
|
||||
const random = randomProblemAction(router)
|
||||
const learn = goAction(router, '自学', '/learn')
|
||||
if (!classToday.value || !classActivity.value?.problems.length) return { situation: 'home.free', actions: [focusJumpAction(), random, learn] }
|
||||
const lesson = classToday.value && !!classActivity.value?.problems.length
|
||||
const next = nextProblem.value
|
||||
if (!next) return { situation: 'home.done', actions: [random, learn] }
|
||||
return { situation: 'home.assigned', actions: [goAction(router, '今天的题', `/problem/${next.problemDisplayId}`), focusJumpAction(), random] }
|
||||
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) {
|
||||
return tutorialPath(track.type, track.step)
|
||||
}
|
||||
|
||||
@@ -99,7 +99,16 @@ function doneIn(course: Course, ids: number[]) {
|
||||
useMascotGuide(() => {
|
||||
if (!loaded.value || userStore.isTeacherOrAbove) return null
|
||||
const it = resume.value
|
||||
if (it) return { situation: 'learn.continue', n: it.step, actions: [goAction(router, '接着学', tutorialPath(it.course.type, it.step))] }
|
||||
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))] }
|
||||
})
|
||||
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
import { useBreakpoints } from 'shared/composables/breakpoints'
|
||||
import { useMascotGuide, type MascotAction, type MascotGuide } from 'shared/mascot/guide'
|
||||
import { habitSituation, refreshMascotProfile, requestSpeech } from 'shared/mascot/behavior'
|
||||
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'
|
||||
@@ -33,6 +36,19 @@ const RESULT_SITUATION: Partial<Record<SubmissionStatus, MascotSituation>> = {
|
||||
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
|
||||
@@ -57,6 +73,8 @@ export function useProblemMascotGuide(showResult: (segment: ResultSegment) => vo
|
||||
const ctx = useProblemPageContext()
|
||||
const teacherCollab = useTeacherCollab()
|
||||
const { isDesktop } = useBreakpoints()
|
||||
const flowchartStore = useFlowchartStore()
|
||||
const challengeStore = useChallengeStore()
|
||||
|
||||
/** 学生在这道题上能用的几个按钮,点她和她主动开口共用 */
|
||||
function studentActions(problem: ProblemDetail) {
|
||||
@@ -100,7 +118,13 @@ export function useProblemMascotGuide(showResult: (segment: ResultSegment) => vo
|
||||
const entry = ctx.value
|
||||
const { runSamples, help, why, whySamples, submit } = studentActions(problem)
|
||||
|
||||
if (codeStore.code.language === 'Flowchart') return guide('problem.flowchart', help)
|
||||
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
|
||||
|
||||
@@ -115,18 +139,45 @@ export function useProblemMascotGuide(showResult: (segment: ResultSegment) => vo
|
||||
}
|
||||
|
||||
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) return stuck ? guide('problem.stuck', help, why) : guide(failed, why, failed === 'problem.wrong' ? runSamples : null, help)
|
||||
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}`) }
|
||||
@@ -159,6 +210,22 @@ export function useProblemMascotGuide(showResult: (segment: ResultSegment) => vo
|
||||
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(
|
||||
|
||||
@@ -131,7 +131,10 @@ useMascotGuide(() => {
|
||||
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')] }
|
||||
return { situation: 'problemset.unfinished', n: todo.length, actions: [{ label: '去做下一道', run: () => router.push(problemLink(next)) }] }
|
||||
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) */
|
||||
|
||||
@@ -280,7 +280,13 @@ useMascotGuide(() => {
|
||||
const el = document.querySelector('.track-card .entry.me, .track-card .prow.me, .track-card .tag.me')
|
||||
el?.scrollIntoView({ behavior: 'smooth', block: 'center' })
|
||||
}
|
||||
return { situation: 'rank', actions: listed ? [{ label: '我在哪', run: findMe }] : [] }
|
||||
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) {
|
||||
|
||||
Reference in new issue
Block a user