dsh-feiyu-life 0.10.2 → 0.10.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,11 @@
1
1
  # 更新记录
2
2
 
3
+ ## 0.10.3
4
+
5
+ - **角色动效对齐**:sprite 按内容段重新切分,每帧居中到 128×128,修掉切头和「下一行头顶」;角色站到地点卡片上方(不再盖住卡片),地图容器不再裁剪探头。
6
+ - **拍照冷却修复**:最短间隔按「上次主动拍照的开始时间」算,自检重拍不再把下一次拍照的冷却往后推。
7
+ - **相机地点同源**:`shoot` 的地点优先取 world 状态(含通勤路上),不再从 hint 文本反推;穿着、地点、时间和注入保持一致。
8
+
3
9
  ## 0.10.2
4
10
 
5
11
  - **咖啡店地点修复**:“去咖啡店/咖啡馆/咖啡厅”现在归入“校外 · 街上”,已有 v3 地图配置即使尚未保存新关键词也能正确识别,不再默认落回宿舍。
Binary file
package/client.js CHANGED
@@ -95,28 +95,28 @@ window.__ModuleLoader__.load({
95
95
  [data-fl-lg][data-fl-src='plan']::before{background:#8b93a1;}
96
96
  [data-fl-lg][data-fl-src='adjust']::before{background:#e08a1e;}
97
97
  [data-fl-lg][data-fl-src='travel']::before{background:#4b88d1;}
98
- [data-fl-map]{position:relative;isolation:isolate;width:100%;aspect-ratio:16/9;min-height:360px;overflow:hidden;border:1px solid var(--fl-line);border-radius:18px;background:radial-gradient(circle at 25% 25%,rgba(112,190,158,.19),transparent 24%),radial-gradient(circle at 74% 72%,rgba(79,137,209,.16),transparent 27%),linear-gradient(145deg,rgba(246,242,225,.92),rgba(226,241,237,.96));}
98
+ [data-fl-map]{position:relative;isolation:isolate;width:100%;aspect-ratio:16/9;min-height:360px;overflow:visible;border:1px solid var(--fl-line);border-radius:18px;background:radial-gradient(circle at 25% 25%,rgba(112,190,158,.19),transparent 24%),radial-gradient(circle at 74% 72%,rgba(79,137,209,.16),transparent 27%),linear-gradient(145deg,rgba(246,242,225,.92),rgba(226,241,237,.96));}
99
99
  @media(prefers-color-scheme:dark){[data-fl-map]{background:radial-gradient(circle at 25% 25%,rgba(64,145,115,.20),transparent 24%),radial-gradient(circle at 74% 72%,rgba(60,105,165,.20),transparent 27%),linear-gradient(145deg,#1d2725,#182129);}}
100
- [data-fl-map]::before{content:'';position:absolute;inset:0;z-index:-1;opacity:.28;background-image:linear-gradient(rgba(127,127,127,.12) 1px,transparent 1px),linear-gradient(90deg,rgba(127,127,127,.12) 1px,transparent 1px);background-size:32px 32px;}
100
+ [data-fl-map]::before{content:'';position:absolute;inset:0;z-index:-1;opacity:.28;background-image:linear-gradient(rgba(127,127,127,.12) 1px,transparent 1px),linear-gradient(90deg,rgba(127,127,127,.12) 1px,transparent 1px);background-size:32px 32px;border-radius:inherit;}
101
101
  [data-fl-map-lines]{position:absolute;inset:0;width:100%;height:100%;overflow:visible;}
102
102
  [data-fl-map-lines] line{stroke:rgba(64,107,112,.34);stroke-width:.65;stroke-linecap:round;stroke-dasharray:1.4 1.4;vector-effect:non-scaling-stroke;}
103
103
  [data-fl-place]{position:absolute;transform:translate(-50%,-50%);display:flex;flex-direction:column;align-items:center;gap:3px;min-width:72px;padding:7px 9px;border:1px solid rgba(75,112,115,.24);border-radius:13px;background:rgba(255,255,255,.76);box-shadow:0 5px 18px rgba(24,61,63,.08);backdrop-filter:blur(7px);font-size:11px;text-align:center;}
104
104
  @media(prefers-color-scheme:dark){[data-fl-place]{background:rgba(24,31,35,.78);}}
105
105
  [data-fl-place][data-fl-active]{border-color:var(--fl-accent);box-shadow:0 0 0 3px var(--fl-accent-soft);}
106
106
  [data-fl-place-icon]{font-size:20px;line-height:1;}
107
- [data-fl-avatar]{position:absolute;z-index:3;transform:translate(-50%,-78%);transition:left 1.2s linear,top 1.2s linear;filter:drop-shadow(0 7px 5px rgba(25,52,58,.23));}
108
- [data-fl-avatar-motion]{position:relative;width:92px;height:92px;transform-origin:50% 100%;}
109
- [data-fl-avatar-sprite]{--fl-sprite-y:0px;width:92px;height:92px;background-color:transparent;background-image:var(--fl-avatar-image);background-size:368px 644px;background-position-x:0;background-position-y:var(--fl-sprite-y);background-repeat:no-repeat;animation:fl-sprite-4 2.2s linear infinite;}
110
- [data-fl-avatar-motion][data-behavior='walk'] [data-fl-avatar-sprite]{--fl-sprite-y:-92px;animation-duration:.62s;}
111
- [data-fl-avatar-motion][data-behavior='sleep'] [data-fl-avatar-sprite]{--fl-sprite-y:-184px;animation-duration:2.8s;}
112
- [data-fl-avatar-motion][data-behavior='study'] [data-fl-avatar-sprite]{--fl-sprite-y:-276px;animation-duration:1.7s;}
113
- [data-fl-avatar-motion][data-behavior='eat'] [data-fl-avatar-sprite]{--fl-sprite-y:-368px;animation-duration:1.25s;}
114
- [data-fl-avatar-motion][data-behavior='phone'] [data-fl-avatar-sprite]{--fl-sprite-y:-460px;animation-duration:2s;}
115
- [data-fl-avatar-motion][data-behavior='photo'] [data-fl-avatar-sprite]{--fl-sprite-y:-552px;animation-duration:1.6s;}
116
- [data-fl-avatar-bubble]{position:absolute;right:-11px;top:-10px;display:grid;place-items:center;width:31px;height:31px;border-radius:50%;background:Canvas;border:1px solid var(--fl-line);font-size:16px;box-shadow:0 4px 12px rgba(0,0,0,.12);}
117
- [data-fl-avatar-label]{position:absolute;left:50%;bottom:-21px;transform:translateX(-50%);white-space:nowrap;padding:2px 7px;border-radius:999px;background:rgba(16,66,68,.82);color:#fff;font-size:10px;box-shadow:0 3px 8px rgba(0,0,0,.14);}
107
+ [data-fl-avatar]{position:absolute;z-index:3;transform:translate(-50%,calc(-100% - 30px));transition:left 1.2s linear,top 1.2s linear;filter:drop-shadow(0 7px 5px rgba(25,52,58,.23));}
108
+ [data-fl-avatar-motion]{position:relative;width:80px;height:80px;transform-origin:50% 100%;}
109
+ [data-fl-avatar-sprite]{--fl-sprite-y:0px;width:80px;height:80px;background-color:transparent;background-image:var(--fl-avatar-image);background-size:320px 560px;background-position-x:0;background-position-y:var(--fl-sprite-y);background-repeat:no-repeat;animation:fl-sprite-4 2.2s linear infinite;}
110
+ [data-fl-avatar-motion][data-behavior='walk'] [data-fl-avatar-sprite]{--fl-sprite-y:-80px;animation-duration:.62s;}
111
+ [data-fl-avatar-motion][data-behavior='sleep'] [data-fl-avatar-sprite]{--fl-sprite-y:-160px;animation-duration:2.8s;}
112
+ [data-fl-avatar-motion][data-behavior='study'] [data-fl-avatar-sprite]{--fl-sprite-y:-240px;animation-duration:1.7s;}
113
+ [data-fl-avatar-motion][data-behavior='eat'] [data-fl-avatar-sprite]{--fl-sprite-y:-320px;animation-duration:1.25s;}
114
+ [data-fl-avatar-motion][data-behavior='phone'] [data-fl-avatar-sprite]{--fl-sprite-y:-400px;animation-duration:2s;}
115
+ [data-fl-avatar-motion][data-behavior='photo'] [data-fl-avatar-sprite]{--fl-sprite-y:-480px;animation-duration:1.6s;}
116
+ [data-fl-avatar-bubble]{position:absolute;right:-9px;top:-6px;display:grid;place-items:center;width:28px;height:28px;border-radius:50%;background:Canvas;border:1px solid var(--fl-line);font-size:15px;box-shadow:0 4px 12px rgba(0,0,0,.12);}
117
+ [data-fl-avatar-label]{position:absolute;left:50%;top:calc(100% + 4px);transform:translateX(-50%);white-space:nowrap;padding:2px 7px;border-radius:999px;background:rgba(16,66,68,.82);color:#fff;font-size:10px;box-shadow:0 3px 8px rgba(0,0,0,.14);}
118
118
  [data-fl-world-cards]{display:grid;grid-template-columns:repeat(3,minmax(0,1fr));gap:8px;}
119
- @keyframes fl-sprite-4{0%,24.99%{background-position-x:0}25%,49.99%{background-position-x:-92px}50%,74.99%{background-position-x:-184px}75%,100%{background-position-x:-276px}}
119
+ @keyframes fl-sprite-4{0%,24.99%{background-position-x:0}25%,49.99%{background-position-x:-80px}50%,74.99%{background-position-x:-160px}75%,100%{background-position-x:-240px}}
120
120
  @media(prefers-reduced-motion:reduce){[data-fl-avatar]{transition:none!important;}[data-fl-avatar-sprite]{animation:none!important;background-position-x:0!important;}}
121
121
  @media(max-width:720px){[data-fl-stats]{grid-template-columns:repeat(2,minmax(0,1fr));}[data-fl-world-cards]{grid-template-columns:1fr;}[data-fl-map]{min-height:430px;}[data-fl-table]{display:block;overflow-x:auto;}[data-fl-tl-time]{flex-basis:78px;}[data-fl-track],[data-fl-ticks]{flex-basis:48%;}}
122
122
  `
package/image-prompt.js CHANGED
@@ -122,7 +122,7 @@ export function buildElements(cfg, args, state = liveState()) {
122
122
  const type = String(args.type || 'selfie')
123
123
  const hint = String(args.hint || args.prompt || '').trim()
124
124
  const outfit = String(args.outfit || (type === 'selfie' ? state.outfit : '') || '').trim()
125
- const location = String(args.location || '').trim() || locationHint(hint || state.what)
125
+ const location = String(args.location || '').trim() || state.location || locationHint(hint || state.what)
126
126
  const expression = String(args.expression || '').trim() || cfg.表情 || '自然的表情'
127
127
  return { type, hint, outfit, location, expression, state, clock: state.clock, light: state.light }
128
128
  }
@@ -133,7 +133,8 @@ export function templatePrompt(cfg, elements) {
133
133
  const r = rand(elements.hint + elements.location + elements.expression)
134
134
  const shotPool = shots[type] || shots.selfie
135
135
  const shot = shotPool[Math.floor(r() * shotPool.length) % shotPool.length]
136
- const pool = propsByPlace[location] || propsByPlace['宿舍书桌']
136
+ const pool = propsByPlace[location]
137
+ || (/路上|门口|地铁|公交|街上/.test(location) ? propsByPlace['路上'] : propsByPlace['宿舍书桌'])
137
138
  const props = []
138
139
  while (props.length < Math.min(3, pool.length)) {
139
140
  const x = pool[Math.floor(r() * pool.length) % pool.length]
package/image.js CHANGED
@@ -336,11 +336,16 @@ async function fetchModels() {
336
336
  }
337
337
 
338
338
  let shooting = false
339
+ // Cooldown belongs to deliberate shots, not internal retakes: retakes update image
340
+ // mtimes, so deriving the gap from files would push the next shot back every time a
341
+ // self-check fails. Track the start of the last deliberate shot instead.
342
+ let lastShotAt = 0
339
343
 
340
344
  function shotBlocked(cfg) {
341
345
  const usage = todayUsage(cfg)
342
346
  if (usage.n >= cfg.每日上限) return `今天已经拍了 ${usage.n} 张,达到上限`
343
- const waitMs = cfg.最短间隔秒 * 1000 - (Date.now() - usage.last)
347
+ const last = lastShotAt || usage.last
348
+ const waitMs = cfg.最短间隔秒 * 1000 - (Date.now() - last)
344
349
  if (waitMs > 0) return `刚拍过,再等 ${Math.ceil(waitMs / 1000)} 秒`
345
350
  return ''
346
351
  }
@@ -427,6 +432,7 @@ function registerRoutes(ctx) {
427
432
  if (blocked) return reply(res, 429, { ok: false, error: blocked })
428
433
  if (shooting) return reply(res, 409, { ok: false, error: '已有一张照片正在生成' })
429
434
  shooting = true
435
+ lastShotAt = Date.now()
430
436
  try {
431
437
  const expanded = await generatePrompt(ctx, findSession(ctx), cfg, {
432
438
  type: body.type || 'selfie',
@@ -517,6 +523,7 @@ export function registerImage(ctx) {
517
523
  if (blocked) return { ok: false, say: blocked }
518
524
  if (shooting) return { ok: false, say: '已经有一张照片正在生成,等它拍完' }
519
525
  shooting = true
526
+ lastShotAt = Date.now()
520
527
  try {
521
528
  const expanded = await generatePrompt(ctx, findSession(ctx), cfg, args)
522
529
  const useRef = String(args.type || 'selfie') !== 'scene' && cfg.用参考图
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "dsh-feiyu-life",
3
- "version": "0.10.2",
3
+ "version": "0.10.3",
4
4
  "description": "大肥鱼的生活(DSH 插件):每日剧本 + 时序状态机 + 二维生活地图;角色会在地点间移动并显示行为动效,对话与相机复用同一份世界状态。",
5
5
  "type": "module",
6
6
  "license": "MIT",