Ethscriptions commited on
Commit
44b6044
·
verified ·
1 Parent(s): 71ccfc6

fix: witch potion 2.4 per feedback (HUD align, ride bob, code-driven witch entrance, popups, bill layout) + prompts v5

Browse files
README.md CHANGED
@@ -17,6 +17,22 @@ pinned: false
17
  - 生成方法:`python3 htlb/pdf-src/build_pdf.py <原 PDF> <输出 PDF> <封面预览 jpg>`(原排版源文件不在本仓库,因此在原 PDF 上做增量修改:遮盖旧文字后用相同字号、颜色、行距写入新文字)
18
  - 小工具「领取 PDF」的笔记位置已预留(`app.js` 中 `PDF_NOTE`,发布笔记后填标题)
19
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
20
  # 本轮:「女巫的魔药」第 2.3 版——修复乱码 + 文件数精简到 200 以内
21
 
22
  - [x] **乱码原因**:对话框、按钮、选项牌用了「切片 + 平铺」的图片,中段素材并不能无缝平铺,拉伸 / 重复后出现错乱的花纹。现改为**纯 CSS 绘制**(羊皮纸渐变 + 金边 + 紫色宝石按钮 + 深紫金边选项牌),不再拉伸或平铺任何图片;只保留不需要拉伸的图片(分割线、托盘、头像框、图标、徽章)
 
17
  - 生成方法:`python3 htlb/pdf-src/build_pdf.py <原 PDF> <输出 PDF> <封面预览 jpg>`(原排版源文件不在本仓库,因此在原 PDF 上做增量修改:遮盖旧文字后用相同字号、颜色、行距写入新文字)
18
  - 小工具「领取 PDF」的笔记位置已预留(`app.js` 中 `PDF_NOTE`,发布笔记后填标题)
19
 
20
+ # 本轮:「女巫的魔药」第 2.4 版(逐条反馈修改)
21
+
22
+ - [x] 头像框与右侧进度面板垂直居中对齐(头像下移)
23
+ - [x] 骑车动画上下跳动:原素材每帧整体高低相差达 33 px,构建时把骑车帧的底边完全对齐(现相差 ≤ 1 px)
24
+ - [x] 女巫出场:原出场动画各帧不连贯、边界不齐,改为程序动画——书发光 → 紫金旋涡 → 女巫从书中升起淡入 → 待机
25
+ - [x] 选项里的魔药杯图标放大(30 → 44 px);杯子在手上的位置下移
26
+ - [x] 魔药托盘贴着问题框
27
+ - [x] 弹窗:关闭按钮固定在边框右上角;内容只能上下滚动、不能左右滑动;属性面板不滚动;「女巫有话说」弹窗同样只上下
28
+ - [x] 属性面板去掉「角色属性 · 综合 蓝」标题;战绩放进卡片,左右排列(「今天喝对 …… 2 杯」)
29
+ - [x] 成就面板只上下滚动;点徽章在屏幕中间提示 2 秒后消失
30
+ - [x] 设置:机制说明在上,「重看开场剧情」「遗忘之药水」(带图标)放在最下面;等级颜色字统一为同样的深色小标签
31
+ - [x] 去掉金色分割线图片;「看原文」改「原文」;喝错满 10 杯的弹窗去掉「明天再来」
32
+ - [x] 人生账单:去掉「综合等级 · 蓝」,头像(带头像框)放到画面卡片左上角,底部文字左右居中、自动换行
33
+ - [x] 女巫的魔药版 36 个文件 / 6.85 MB
34
+ - [ ] 待用户生成:`witch-src/PROMPTS.md` 第 5 版(方框四角角花、上边中饰、按钮宝石、遗忘之药水图标、重看开场图标,共 5 个文件)
35
+
36
  # 本轮:「女巫的魔药」第 2.3 版——修复乱码 + 文件数精简到 200 以内
37
 
38
  - [x] **乱码原因**:对话框、按钮、选项牌用了「切片 + 平铺」的图片,中段素材并不能无缝平铺,拉伸 / 重复后出现错乱的花纹。现改为**纯 CSS 绘制**(羊皮纸渐变 + 金边 + 紫色宝石按钮 + 深紫金边选项牌),不再拉伸或平铺任何图片;只保留不需要拉伸的图片(分割线、托盘、头像框、图标、徽章)
htlb/miniapp/dist-potato/style.css CHANGED
@@ -687,3 +687,32 @@ html.game-on img{-webkit-user-drag:none;pointer-events:none}
687
  .w2-pop-box{position:relative;width:100%;max-width:360px;max-height:80%;overflow-y:auto;color:#2b1d12}
688
  .w2-btn{display:flex;align-items:center;justify-content:center;width:100%;font-size:16px;font-weight:900;transition:transform .12s}
689
  .w2-opt{display:flex;align-items:center;justify-content:center;text-align:center;font-size:14px;font-weight:900;line-height:1.35;transition:transform .12s}
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
687
  .w2-pop-box{position:relative;width:100%;max-width:360px;max-height:80%;overflow-y:auto;color:#2b1d12}
688
  .w2-btn{display:flex;align-items:center;justify-content:center;width:100%;font-size:16px;font-weight:900;transition:transform .12s}
689
  .w2-opt{display:flex;align-items:center;justify-content:center;text-align:center;font-size:14px;font-weight:900;line-height:1.35;transition:transform .12s}
690
+ /* ===== 女巫的魔药 第 2.4 版 ===== */
691
+ .w2-hud{align-items:center}
692
+ .w2-hud .w2-me{margin-top:6px}
693
+ .w2-scene .wt-actor.witch.pre-in{opacity:0;-webkit-transform:translateY(40px) scale(.4);transform:translateY(40px) scale(.4);transition:none}
694
+ .w2-scene .wt-actor.witch.rise-in{opacity:1;-webkit-transform:none;transform:none;transition:opacity .7s ease-out,transform .9s cubic-bezier(.3,1.4,.5,1)}
695
+ .w2-book.glow{-webkit-filter:brightness(1.8) drop-shadow(0 0 22px #ffe58a);filter:brightness(1.8) drop-shadow(0 0 22px #ffe58a)}
696
+ .w2-scene .wt-fx.wfx{left:77%}
697
+ .w2-opt i{width:44px!important;height:44px!important;margin-right:4px}
698
+ .w2-pop{overflow:hidden;touch-action:none}
699
+ .w2-pop-box{overflow:visible!important;max-height:none!important;touch-action:pan-y}
700
+ .w2-pop-body{max-height:calc(78vh - 70px);overflow-y:auto;overflow-x:hidden;-webkit-overflow-scrolling:touch;overscroll-behavior:contain;touch-action:pan-y}
701
+ .w2-pop.panel .w2-pop-body{max-height:none;overflow:hidden;touch-action:none}
702
+ .w2-pop-x{position:absolute!important;top:-16px!important;right:-16px!important;z-index:5}
703
+ .w2-name,.w2-title{background:none!important;padding-bottom:4px!important}
704
+ .w2-pop.panel .w2-pscene{height:150px}
705
+ .w2-pop.panel .w2-attrs p{padding:3px 0;font-size:13px}
706
+ .w2-card{margin-top:8px;background:rgba(91,42,134,.07);border:1.5px solid rgba(201,164,92,.7);border-radius:12px;padding:4px 8px 6px}
707
+ .w2-card .w2-subcap{margin:2px 0 2px}
708
+ .w2-stats.row div{width:50%;display:flex;align-items:baseline;justify-content:space-between;padding:3px 6px}
709
+ .w2-stats.row dt{font-size:12px;opacity:.75}
710
+ .w2-stats.row dd{font-size:14px;font-weight:900}
711
+ .w2-tip{position:absolute;left:50%;top:46%;z-index:40;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);max-width:78%;background:rgba(20,14,26,.94);color:#fff;border:2px solid #c9a45c;border-radius:14px;padding:14px 18px;text-align:center;font-size:14px;line-height:1.6;box-shadow:0 10px 24px rgba(0,0,0,.5);transition:opacity .3s;pointer-events:none}
712
+ .w2-tip b{color:#FFE58A;font-size:16px}
713
+ .w2-tip small{opacity:.7}
714
+ .w2-tip.out{opacity:0}
715
+ .w2-gc{display:inline-block;background:#2a1d3d;border-radius:5px;padding:0 6px;font-weight:900;line-height:1.5}
716
+ .w2-setbtns{margin-top:14px;padding-top:6px;border-top:1px dashed rgba(91,42,134,.3)}
717
+ .w2-setbtns .w2-btn .w2-ic{width:26px;height:26px;margin-right:6px}
718
+ .w2-hud .w2-me{margin-top:30px}
htlb/miniapp/dist-witch/style.css CHANGED
@@ -687,3 +687,32 @@ html.game-on img{-webkit-user-drag:none;pointer-events:none}
687
  .w2-pop-box{position:relative;width:100%;max-width:360px;max-height:80%;overflow-y:auto;color:#2b1d12}
688
  .w2-btn{display:flex;align-items:center;justify-content:center;width:100%;font-size:16px;font-weight:900;transition:transform .12s}
689
  .w2-opt{display:flex;align-items:center;justify-content:center;text-align:center;font-size:14px;font-weight:900;line-height:1.35;transition:transform .12s}
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
687
  .w2-pop-box{position:relative;width:100%;max-width:360px;max-height:80%;overflow-y:auto;color:#2b1d12}
688
  .w2-btn{display:flex;align-items:center;justify-content:center;width:100%;font-size:16px;font-weight:900;transition:transform .12s}
689
  .w2-opt{display:flex;align-items:center;justify-content:center;text-align:center;font-size:14px;font-weight:900;line-height:1.35;transition:transform .12s}
690
+ /* ===== 女巫的魔药 第 2.4 版 ===== */
691
+ .w2-hud{align-items:center}
692
+ .w2-hud .w2-me{margin-top:6px}
693
+ .w2-scene .wt-actor.witch.pre-in{opacity:0;-webkit-transform:translateY(40px) scale(.4);transform:translateY(40px) scale(.4);transition:none}
694
+ .w2-scene .wt-actor.witch.rise-in{opacity:1;-webkit-transform:none;transform:none;transition:opacity .7s ease-out,transform .9s cubic-bezier(.3,1.4,.5,1)}
695
+ .w2-book.glow{-webkit-filter:brightness(1.8) drop-shadow(0 0 22px #ffe58a);filter:brightness(1.8) drop-shadow(0 0 22px #ffe58a)}
696
+ .w2-scene .wt-fx.wfx{left:77%}
697
+ .w2-opt i{width:44px!important;height:44px!important;margin-right:4px}
698
+ .w2-pop{overflow:hidden;touch-action:none}
699
+ .w2-pop-box{overflow:visible!important;max-height:none!important;touch-action:pan-y}
700
+ .w2-pop-body{max-height:calc(78vh - 70px);overflow-y:auto;overflow-x:hidden;-webkit-overflow-scrolling:touch;overscroll-behavior:contain;touch-action:pan-y}
701
+ .w2-pop.panel .w2-pop-body{max-height:none;overflow:hidden;touch-action:none}
702
+ .w2-pop-x{position:absolute!important;top:-16px!important;right:-16px!important;z-index:5}
703
+ .w2-name,.w2-title{background:none!important;padding-bottom:4px!important}
704
+ .w2-pop.panel .w2-pscene{height:150px}
705
+ .w2-pop.panel .w2-attrs p{padding:3px 0;font-size:13px}
706
+ .w2-card{margin-top:8px;background:rgba(91,42,134,.07);border:1.5px solid rgba(201,164,92,.7);border-radius:12px;padding:4px 8px 6px}
707
+ .w2-card .w2-subcap{margin:2px 0 2px}
708
+ .w2-stats.row div{width:50%;display:flex;align-items:baseline;justify-content:space-between;padding:3px 6px}
709
+ .w2-stats.row dt{font-size:12px;opacity:.75}
710
+ .w2-stats.row dd{font-size:14px;font-weight:900}
711
+ .w2-tip{position:absolute;left:50%;top:46%;z-index:40;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);max-width:78%;background:rgba(20,14,26,.94);color:#fff;border:2px solid #c9a45c;border-radius:14px;padding:14px 18px;text-align:center;font-size:14px;line-height:1.6;box-shadow:0 10px 24px rgba(0,0,0,.5);transition:opacity .3s;pointer-events:none}
712
+ .w2-tip b{color:#FFE58A;font-size:16px}
713
+ .w2-tip small{opacity:.7}
714
+ .w2-tip.out{opacity:0}
715
+ .w2-gc{display:inline-block;background:#2a1d3d;border-radius:5px;padding:0 6px;font-weight:900;line-height:1.5}
716
+ .w2-setbtns{margin-top:14px;padding-top:6px;border-top:1px dashed rgba(91,42,134,.3)}
717
+ .w2-setbtns .w2-btn .w2-ic{width:26px;height:26px;margin-right:6px}
718
+ .w2-hud .w2-me{margin-top:30px}
htlb/miniapp/dist-witch/witch-sprites.js CHANGED
@@ -1 +1 @@
1
- window.__WITCH_SPR__={"A":{"man-a1i":[6,9],"man-a1x":[8,15],"man-a2i":[6,9],"man-a2x":[8,16],"man-a3i":[6,9],"man-a3x":[8,15],"man-a4i":[6,9],"man-a4x":[8,15],"witch":[8,8],"cups":[6,6],"fx":[6,3],"cars":[4,2],"faces":[6,2],"frames":[7,1],"icons":[12,1],"badges":[6,4],"ui-tray":[1,1],"ui-divider":[1,1]},"S":{"man-a1p1l1-idle":{"a":"man-a1i","x":0,"y":0,"n":6,"h":212,"b":241},"man-a1p1l2-idle":{"a":"man-a1i","x":0,"y":1,"n":6,"h":194,"b":244},"man-a1p1l3-idle":{"a":"man-a1i","x":0,"y":2,"n":6,"h":195,"b":243},"man-a1p2l1-idle":{"a":"man-a1i","x":0,"y":3,"n":6,"h":180,"b":227},"man-a1p2l2-idle":{"a":"man-a1i","x":0,"y":4,"n":6,"h":183,"b":234},"man-a1p2l3-idle":{"a":"man-a1i","x":0,"y":5,"n":6,"h":195,"b":239},"man-a1p3l1-idle":{"a":"man-a1i","x":0,"y":6,"n":6,"h":202,"b":244},"man-a1p3l2-idle":{"a":"man-a1i","x":0,"y":7,"n":6,"h":198,"b":242},"man-a1p3l3-idle":{"a":"man-a1i","x":0,"y":8,"n":6,"h":184,"b":244},"man-a1p1-idle2":{"a":"man-a1x","x":0,"y":0,"n":6,"h":180,"b":231},"man-a1p1-idle3":{"a":"man-a1x","x":0,"y":1,"n":6,"h":191,"b":242},"man-a1p1-drink":{"a":"man-a1x","x":0,"y":2,"n":8,"h":166,"b":235},"man-a1p1-good":{"a":"man-a1x","x":0,"y":3,"n":6,"h":184,"b":240},"man-a1p1-bad":{"a":"man-a1x","x":0,"y":4,"n":6,"h":180,"b":231},"man-a1p2-idle2":{"a":"man-a1x","x":0,"y":5,"n":6,"h":215,"b":243},"man-a1p2-idle3":{"a":"man-a1x","x":0,"y":6,"n":6,"h":193,"b":234},"man-a1p2-drink":{"a":"man-a1x","x":0,"y":7,"n":8,"h":172,"b":236},"man-a1p2-good":{"a":"man-a1x","x":0,"y":8,"n":6,"h":170,"b":226},"man-a1p2-bad":{"a":"man-a1x","x":0,"y":9,"n":6,"h":189,"b":234},"man-a1p3-idle2":{"a":"man-a1x","x":0,"y":10,"n":6,"h":195,"b":242},"man-a1p3-idle3":{"a":"man-a1x","x":0,"y":11,"n":6,"h":206,"b":243},"man-a1p3-drink":{"a":"man-a1x","x":0,"y":12,"n":8,"h":168,"b":243},"man-a1p3-good":{"a":"man-a1x","x":0,"y":13,"n":6,"h":192,"b":236},"man-a1p3-bad":{"a":"man-a1x","x":0,"y":14,"n":6,"h":188,"b":240},"man-a2p1l1-idle":{"a":"man-a2i","x":0,"y":0,"n":6,"h":186,"b":243},"man-a2p1l2-idle":{"a":"man-a2i","x":0,"y":1,"n":6,"h":205,"b":242},"man-a2p1l3-idle":{"a":"man-a2i","x":0,"y":2,"n":6,"h":187,"b":237},"man-a2p2l1-idle":{"a":"man-a2i","x":0,"y":3,"n":6,"h":189,"b":244},"man-a2p2l2-idle":{"a":"man-a2i","x":0,"y":4,"n":6,"h":178,"b":231},"man-a2p2l3-idle":{"a":"man-a2i","x":0,"y":5,"n":6,"h":182,"b":226},"man-a2p3l1-idle":{"a":"man-a2i","x":0,"y":6,"n":6,"h":202,"b":244},"man-a2p3l2-idle":{"a":"man-a2i","x":0,"y":7,"n":6,"h":181,"b":235},"man-a2p3l3-idle":{"a":"man-a2i","x":0,"y":8,"n":6,"h":200,"b":241},"man-a2p1-idle2":{"a":"man-a2x","x":0,"y":0,"n":6,"h":197,"b":242},"man-a2p1-idle3":{"a":"man-a2x","x":0,"y":1,"n":6,"h":188,"b":242},"man-a2p1-drink":{"a":"man-a2x","x":0,"y":2,"n":8,"h":173,"b":236},"man-a2p1-good":{"a":"man-a2x","x":0,"y":3,"n":6,"h":204,"b":233},"man-a2p1-bad":{"a":"man-a2x","x":0,"y":4,"n":6,"h":180,"b":236},"man-a2p2-idle2":{"a":"man-a2x","x":0,"y":5,"n":6,"h":203,"b":244},"man-a2p2-idle3":{"a":"man-a2x","x":0,"y":6,"n":6,"h":180,"b":234},"man-a2p2-drink":{"a":"man-a2x","x":0,"y":7,"n":8,"h":193,"b":242},"man-a2p2-good":{"a":"man-a2x","x":0,"y":8,"n":6,"h":193,"b":234},"man-a2p2-bad":{"a":"man-a2x","x":0,"y":9,"n":6,"h":208,"b":244},"man-a2p3-idle2":{"a":"man-a2x","x":0,"y":10,"n":6,"h":196,"b":243},"man-a2p3-idle3":{"a":"man-a2x","x":0,"y":11,"n":6,"h":194,"b":234},"man-a2p3-drink":{"a":"man-a2x","x":0,"y":12,"n":8,"h":168,"b":229},"man-a2p3-good":{"a":"man-a2x","x":0,"y":13,"n":6,"h":213,"b":242},"man-a2p3-bad":{"a":"man-a2x","x":0,"y":14,"n":6,"h":188,"b":244},"man-ride":{"a":"man-a2x","x":0,"y":15,"n":6,"h":168,"b":214},"man-a3p1l1-idle":{"a":"man-a3i","x":0,"y":0,"n":6,"h":194,"b":244},"man-a3p1l2-idle":{"a":"man-a3i","x":0,"y":1,"n":6,"h":198,"b":243},"man-a3p1l3-idle":{"a":"man-a3i","x":0,"y":2,"n":6,"h":190,"b":233},"man-a3p2l1-idle":{"a":"man-a3i","x":0,"y":3,"n":6,"h":187,"b":240},"man-a3p2l2-idle":{"a":"man-a3i","x":0,"y":4,"n":6,"h":204,"b":242},"man-a3p2l3-idle":{"a":"man-a3i","x":0,"y":5,"n":6,"h":180,"b":235},"man-a3p3l1-idle":{"a":"man-a3i","x":0,"y":6,"n":6,"h":199,"b":241},"man-a3p3l2-idle":{"a":"man-a3i","x":0,"y":7,"n":6,"h":216,"b":244},"man-a3p3l3-idle":{"a":"man-a3i","x":0,"y":8,"n":6,"h":201,"b":243},"man-a3p1-idle2":{"a":"man-a3x","x":0,"y":0,"n":6,"h":189,"b":242},"man-a3p1-idle3":{"a":"man-a3x","x":0,"y":1,"n":6,"h":197,"b":233},"man-a3p1-drink":{"a":"man-a3x","x":0,"y":2,"n":8,"h":176,"b":242},"man-a3p1-good":{"a":"man-a3x","x":0,"y":3,"n":6,"h":194,"b":243},"man-a3p1-bad":{"a":"man-a3x","x":0,"y":4,"n":6,"h":174,"b":223},"man-a3p2-idle2":{"a":"man-a3x","x":0,"y":5,"n":6,"h":193,"b":244},"man-a3p2-idle3":{"a":"man-a3x","x":0,"y":6,"n":6,"h":195,"b":242},"man-a3p2-drink":{"a":"man-a3x","x":0,"y":7,"n":8,"h":178,"b":242},"man-a3p2-good":{"a":"man-a3x","x":0,"y":8,"n":6,"h":201,"b":241},"man-a3p2-bad":{"a":"man-a3x","x":0,"y":9,"n":6,"h":184,"b":242},"man-a3p3-idle2":{"a":"man-a3x","x":0,"y":10,"n":6,"h":200,"b":241},"man-a3p3-idle3":{"a":"man-a3x","x":0,"y":11,"n":6,"h":186,"b":238},"man-a3p3-drink":{"a":"man-a3x","x":0,"y":12,"n":8,"h":175,"b":238},"man-a3p3-good":{"a":"man-a3x","x":0,"y":13,"n":6,"h":187,"b":243},"man-a3p3-bad":{"a":"man-a3x","x":0,"y":14,"n":6,"h":180,"b":226},"man-a4p1l1-idle":{"a":"man-a4i","x":0,"y":0,"n":6,"h":186,"b":244},"man-a4p1l2-idle":{"a":"man-a4i","x":0,"y":1,"n":6,"h":186,"b":227},"man-a4p1l3-idle":{"a":"man-a4i","x":0,"y":2,"n":6,"h":197,"b":242},"man-a4p2l1-idle":{"a":"man-a4i","x":0,"y":3,"n":6,"h":193,"b":242},"man-a4p2l2-idle":{"a":"man-a4i","x":0,"y":4,"n":6,"h":197,"b":234},"man-a4p2l3-idle":{"a":"man-a4i","x":0,"y":5,"n":6,"h":184,"b":228},"man-a4p3l1-idle":{"a":"man-a4i","x":0,"y":6,"n":6,"h":192,"b":234},"man-a4p3l2-idle":{"a":"man-a4i","x":0,"y":7,"n":6,"h":190,"b":232},"man-a4p3l3-idle":{"a":"man-a4i","x":0,"y":8,"n":6,"h":204,"b":243},"man-a4p1-idle2":{"a":"man-a4x","x":0,"y":0,"n":6,"h":198,"b":231},"man-a4p1-idle3":{"a":"man-a4x","x":0,"y":1,"n":6,"h":172,"b":223},"man-a4p1-drink":{"a":"man-a4x","x":0,"y":2,"n":8,"h":156,"b":214},"man-a4p1-good":{"a":"man-a4x","x":0,"y":3,"n":6,"h":201,"b":234},"man-a4p1-bad":{"a":"man-a4x","x":0,"y":4,"n":6,"h":177,"b":215},"man-a4p2-idle2":{"a":"man-a4x","x":0,"y":5,"n":6,"h":186,"b":237},"man-a4p2-idle3":{"a":"man-a4x","x":0,"y":6,"n":6,"h":180,"b":221},"man-a4p2-drink":{"a":"man-a4x","x":0,"y":7,"n":8,"h":188,"b":232},"man-a4p2-good":{"a":"man-a4x","x":0,"y":8,"n":6,"h":177,"b":227},"man-a4p2-bad":{"a":"man-a4x","x":0,"y":9,"n":6,"h":186,"b":225},"man-a4p3-idle2":{"a":"man-a4x","x":0,"y":10,"n":6,"h":190,"b":227},"man-a4p3-idle3":{"a":"man-a4x","x":0,"y":11,"n":6,"h":185,"b":228},"man-a4p3-drink":{"a":"man-a4x","x":0,"y":12,"n":8,"h":173,"b":238},"man-a4p3-good":{"a":"man-a4x","x":0,"y":13,"n":6,"h":192,"b":231},"man-a4p3-bad":{"a":"man-a4x","x":0,"y":14,"n":6,"h":192,"b":231},"witch-idle":{"a":"witch","x":0,"y":0,"n":8,"h":152,"b":222},"witch-idle2":{"a":"witch","x":0,"y":1,"n":8,"h":160,"b":219},"witch-idle3":{"a":"witch","x":0,"y":2,"n":8,"h":171,"b":242},"witch-appear":{"a":"witch","x":0,"y":3,"n":8,"h":160,"b":219},"witch-nod":{"a":"witch","x":0,"y":4,"n":6,"h":216,"b":243},"witch-laugh":{"a":"witch","x":0,"y":5,"n":6,"h":205,"b":241},"witch-wand":{"a":"witch","x":0,"y":6,"n":8,"h":139,"b":232},"witch-stop":{"a":"witch","x":0,"y":7,"n":6,"h":205,"b":236},"cup-1":{"a":"cups","x":0,"y":0,"n":6,"f":1},"cup-2":{"a":"cups","x":0,"y":1,"n":6,"f":1},"cup-3":{"a":"cups","x":0,"y":2,"n":6,"f":1},"cup-4":{"a":"cups","x":0,"y":3,"n":6,"f":1},"cup-5":{"a":"cups","x":0,"y":4,"n":6,"f":1},"cup-6":{"a":"cups","x":0,"y":5,"n":6,"f":1},"fx-good":{"a":"fx","x":0,"y":0,"n":6,"f":1},"fx-bad":{"a":"fx","x":0,"y":1,"n":6,"f":1},"fx-change":{"a":"fx","x":0,"y":2,"n":6,"f":1},"car-0":{"a":"cars","x":0,"y":0,"n":1,"box":[127,14,641,488],"w":768,"h":512},"car-1":{"a":"cars","x":1,"y":0,"n":1,"box":[148,17,644,490],"w":768,"h":512},"car-2":{"a":"cars","x":2,"y":0,"n":1,"box":[20,72,754,458],"w":768,"h":512},"car-3":{"a":"cars","x":3,"y":0,"n":1,"box":[24,79,753,458],"w":768,"h":512},"car-4":{"a":"cars","x":0,"y":1,"n":1,"box":[24,56,748,445],"w":768,"h":512},"car-5":{"a":"cars","x":1,"y":1,"n":1,"box":[25,65,752,421],"w":768,"h":512},"car-6":{"a":"cars","x":2,"y":1,"n":1,"box":[18,201,750,432],"w":768,"h":512},"car-7":{"a":"cars","x":3,"y":1,"n":1,"box":[22,13,744,477],"w":768,"h":512},"face-a1l1":{"a":"faces","x":0,"y":0,"n":1},"face-a1l2":{"a":"faces","x":1,"y":0,"n":1},"face-a1l3":{"a":"faces","x":2,"y":0,"n":1},"face-a2l1":{"a":"faces","x":3,"y":0,"n":1},"face-a2l2":{"a":"faces","x":4,"y":0,"n":1},"face-a2l3":{"a":"faces","x":5,"y":0,"n":1},"face-a3l1":{"a":"faces","x":0,"y":1,"n":1},"face-a3l2":{"a":"faces","x":1,"y":1,"n":1},"face-a3l3":{"a":"faces","x":2,"y":1,"n":1},"face-a4l1":{"a":"faces","x":3,"y":1,"n":1},"face-a4l2":{"a":"faces","x":4,"y":1,"n":1},"face-a4l3":{"a":"faces","x":5,"y":1,"n":1},"ui-frame-1":{"a":"frames","x":0,"y":0,"n":1},"ui-frame-2":{"a":"frames","x":1,"y":0,"n":1},"ui-frame-3":{"a":"frames","x":2,"y":0,"n":1},"ui-frame-4":{"a":"frames","x":3,"y":0,"n":1},"ui-frame-5":{"a":"frames","x":4,"y":0,"n":1},"ui-frame-6":{"a":"frames","x":5,"y":0,"n":1},"ui-frame-7":{"a":"frames","x":6,"y":0,"n":1},"icon-age":{"a":"icons","x":0,"y":0,"n":1},"icon-body":{"a":"icons","x":1,"y":0,"n":1},"icon-look":{"a":"icons","x":2,"y":0,"n":1},"icon-wealth":{"a":"icons","x":3,"y":0,"n":1},"icon-house":{"a":"icons","x":4,"y":0,"n":1},"icon-car":{"a":"icons","x":5,"y":0,"n":1},"icon-ach":{"a":"icons","x":6,"y":0,"n":1},"icon-share":{"a":"icons","x":7,"y":0,"n":1},"icon-set":{"a":"icons","x":8,"y":0,"n":1},"icon-exit":{"a":"icons","x":9,"y":0,"n":1},"icon-book":{"a":"icons","x":10,"y":0,"n":1},"ui-close":{"a":"icons","x":11,"y":0,"n":1},"badge-first":{"a":"badges","x":0,"y":0,"n":1},"badge-r10":{"a":"badges","x":1,"y":0,"n":1},"badge-r100":{"a":"badges","x":2,"y":0,"n":1},"badge-r500":{"a":"badges","x":3,"y":0,"n":1},"badge-c5":{"a":"badges","x":4,"y":0,"n":1},"badge-c10":{"a":"badges","x":5,"y":0,"n":1},"badge-c20":{"a":"badges","x":0,"y":1,"n":1},"badge-young":{"a":"badges","x":1,"y":1,"n":1},"badge-ageR":{"a":"badges","x":2,"y":1,"n":1},"badge-fit":{"a":"badges","x":3,"y":1,"n":1},"badge-phyR":{"a":"badges","x":4,"y":1,"n":1},"badge-hand":{"a":"badges","x":5,"y":1,"n":1},"badge-lookR":{"a":"badges","x":0,"y":2,"n":1},"badge-m1":{"a":"badges","x":1,"y":2,"n":1},"badge-m2":{"a":"badges","x":2,"y":2,"n":1},"badge-m4":{"a":"badges","x":3,"y":2,"n":1},"badge-m5":{"a":"badges","x":4,"y":2,"n":1},"badge-m7":{"a":"badges","x":5,"y":2,"n":1},"badge-win":{"a":"badges","x":0,"y":3,"n":1},"badge-old":{"a":"badges","x":1,"y":3,"n":1},"badge-dead":{"a":"badges","x":2,"y":3,"n":1},"badge-revive":{"a":"badges","x":3,"y":3,"n":1},"badge-bill":{"a":"badges","x":4,"y":3,"n":1},"badge-unlock":{"a":"badges","x":5,"y":3,"n":1},"ui-tray":{"a":"ui-tray","x":0,"y":0,"n":1,"w":426,"h":219},"ui-divider":{"a":"ui-divider","x":0,"y":0,"n":1,"w":768,"h":40}}};
 
1
+ window.__WITCH_SPR__={"A":{"man-a1i":[6,9],"man-a1x":[8,15],"man-a2i":[6,9],"man-a2x":[8,16],"man-a3i":[6,9],"man-a3x":[8,15],"man-a4i":[6,9],"man-a4x":[8,15],"witch":[8,8],"cups":[6,6],"fx":[6,3],"cars":[4,2],"faces":[6,2],"frames":[7,1],"icons":[13,1],"badges":[6,4],"ui-tray":[1,1]},"S":{"man-a1p1l1-idle":{"a":"man-a1i","x":0,"y":0,"n":6,"h":212,"b":241},"man-a1p1l2-idle":{"a":"man-a1i","x":0,"y":1,"n":6,"h":194,"b":244},"man-a1p1l3-idle":{"a":"man-a1i","x":0,"y":2,"n":6,"h":195,"b":243},"man-a1p2l1-idle":{"a":"man-a1i","x":0,"y":3,"n":6,"h":180,"b":227},"man-a1p2l2-idle":{"a":"man-a1i","x":0,"y":4,"n":6,"h":183,"b":234},"man-a1p2l3-idle":{"a":"man-a1i","x":0,"y":5,"n":6,"h":195,"b":239},"man-a1p3l1-idle":{"a":"man-a1i","x":0,"y":6,"n":6,"h":202,"b":244},"man-a1p3l2-idle":{"a":"man-a1i","x":0,"y":7,"n":6,"h":198,"b":242},"man-a1p3l3-idle":{"a":"man-a1i","x":0,"y":8,"n":6,"h":184,"b":244},"man-a1p1-idle2":{"a":"man-a1x","x":0,"y":0,"n":6,"h":180,"b":231},"man-a1p1-idle3":{"a":"man-a1x","x":0,"y":1,"n":6,"h":191,"b":242},"man-a1p1-drink":{"a":"man-a1x","x":0,"y":2,"n":8,"h":166,"b":235},"man-a1p1-good":{"a":"man-a1x","x":0,"y":3,"n":6,"h":184,"b":240},"man-a1p1-bad":{"a":"man-a1x","x":0,"y":4,"n":6,"h":180,"b":231},"man-a1p2-idle2":{"a":"man-a1x","x":0,"y":5,"n":6,"h":215,"b":243},"man-a1p2-idle3":{"a":"man-a1x","x":0,"y":6,"n":6,"h":193,"b":234},"man-a1p2-drink":{"a":"man-a1x","x":0,"y":7,"n":8,"h":172,"b":236},"man-a1p2-good":{"a":"man-a1x","x":0,"y":8,"n":6,"h":170,"b":226},"man-a1p2-bad":{"a":"man-a1x","x":0,"y":9,"n":6,"h":189,"b":234},"man-a1p3-idle2":{"a":"man-a1x","x":0,"y":10,"n":6,"h":195,"b":242},"man-a1p3-idle3":{"a":"man-a1x","x":0,"y":11,"n":6,"h":206,"b":243},"man-a1p3-drink":{"a":"man-a1x","x":0,"y":12,"n":8,"h":168,"b":243},"man-a1p3-good":{"a":"man-a1x","x":0,"y":13,"n":6,"h":192,"b":236},"man-a1p3-bad":{"a":"man-a1x","x":0,"y":14,"n":6,"h":188,"b":240},"man-a2p1l1-idle":{"a":"man-a2i","x":0,"y":0,"n":6,"h":186,"b":243},"man-a2p1l2-idle":{"a":"man-a2i","x":0,"y":1,"n":6,"h":205,"b":242},"man-a2p1l3-idle":{"a":"man-a2i","x":0,"y":2,"n":6,"h":187,"b":237},"man-a2p2l1-idle":{"a":"man-a2i","x":0,"y":3,"n":6,"h":189,"b":244},"man-a2p2l2-idle":{"a":"man-a2i","x":0,"y":4,"n":6,"h":178,"b":231},"man-a2p2l3-idle":{"a":"man-a2i","x":0,"y":5,"n":6,"h":182,"b":226},"man-a2p3l1-idle":{"a":"man-a2i","x":0,"y":6,"n":6,"h":202,"b":244},"man-a2p3l2-idle":{"a":"man-a2i","x":0,"y":7,"n":6,"h":181,"b":235},"man-a2p3l3-idle":{"a":"man-a2i","x":0,"y":8,"n":6,"h":200,"b":241},"man-a2p1-idle2":{"a":"man-a2x","x":0,"y":0,"n":6,"h":197,"b":242},"man-a2p1-idle3":{"a":"man-a2x","x":0,"y":1,"n":6,"h":188,"b":242},"man-a2p1-drink":{"a":"man-a2x","x":0,"y":2,"n":8,"h":173,"b":236},"man-a2p1-good":{"a":"man-a2x","x":0,"y":3,"n":6,"h":204,"b":233},"man-a2p1-bad":{"a":"man-a2x","x":0,"y":4,"n":6,"h":180,"b":236},"man-a2p2-idle2":{"a":"man-a2x","x":0,"y":5,"n":6,"h":203,"b":244},"man-a2p2-idle3":{"a":"man-a2x","x":0,"y":6,"n":6,"h":180,"b":234},"man-a2p2-drink":{"a":"man-a2x","x":0,"y":7,"n":8,"h":193,"b":242},"man-a2p2-good":{"a":"man-a2x","x":0,"y":8,"n":6,"h":193,"b":234},"man-a2p2-bad":{"a":"man-a2x","x":0,"y":9,"n":6,"h":208,"b":244},"man-a2p3-idle2":{"a":"man-a2x","x":0,"y":10,"n":6,"h":196,"b":243},"man-a2p3-idle3":{"a":"man-a2x","x":0,"y":11,"n":6,"h":194,"b":234},"man-a2p3-drink":{"a":"man-a2x","x":0,"y":12,"n":8,"h":168,"b":229},"man-a2p3-good":{"a":"man-a2x","x":0,"y":13,"n":6,"h":213,"b":242},"man-a2p3-bad":{"a":"man-a2x","x":0,"y":14,"n":6,"h":188,"b":244},"man-ride":{"a":"man-a2x","x":0,"y":15,"n":6,"h":168,"b":214},"man-a3p1l1-idle":{"a":"man-a3i","x":0,"y":0,"n":6,"h":194,"b":244},"man-a3p1l2-idle":{"a":"man-a3i","x":0,"y":1,"n":6,"h":198,"b":243},"man-a3p1l3-idle":{"a":"man-a3i","x":0,"y":2,"n":6,"h":190,"b":233},"man-a3p2l1-idle":{"a":"man-a3i","x":0,"y":3,"n":6,"h":187,"b":240},"man-a3p2l2-idle":{"a":"man-a3i","x":0,"y":4,"n":6,"h":204,"b":242},"man-a3p2l3-idle":{"a":"man-a3i","x":0,"y":5,"n":6,"h":180,"b":235},"man-a3p3l1-idle":{"a":"man-a3i","x":0,"y":6,"n":6,"h":199,"b":241},"man-a3p3l2-idle":{"a":"man-a3i","x":0,"y":7,"n":6,"h":216,"b":244},"man-a3p3l3-idle":{"a":"man-a3i","x":0,"y":8,"n":6,"h":201,"b":243},"man-a3p1-idle2":{"a":"man-a3x","x":0,"y":0,"n":6,"h":189,"b":242},"man-a3p1-idle3":{"a":"man-a3x","x":0,"y":1,"n":6,"h":197,"b":233},"man-a3p1-drink":{"a":"man-a3x","x":0,"y":2,"n":8,"h":176,"b":242},"man-a3p1-good":{"a":"man-a3x","x":0,"y":3,"n":6,"h":194,"b":243},"man-a3p1-bad":{"a":"man-a3x","x":0,"y":4,"n":6,"h":174,"b":223},"man-a3p2-idle2":{"a":"man-a3x","x":0,"y":5,"n":6,"h":193,"b":244},"man-a3p2-idle3":{"a":"man-a3x","x":0,"y":6,"n":6,"h":195,"b":242},"man-a3p2-drink":{"a":"man-a3x","x":0,"y":7,"n":8,"h":178,"b":242},"man-a3p2-good":{"a":"man-a3x","x":0,"y":8,"n":6,"h":201,"b":241},"man-a3p2-bad":{"a":"man-a3x","x":0,"y":9,"n":6,"h":184,"b":242},"man-a3p3-idle2":{"a":"man-a3x","x":0,"y":10,"n":6,"h":200,"b":241},"man-a3p3-idle3":{"a":"man-a3x","x":0,"y":11,"n":6,"h":186,"b":238},"man-a3p3-drink":{"a":"man-a3x","x":0,"y":12,"n":8,"h":175,"b":238},"man-a3p3-good":{"a":"man-a3x","x":0,"y":13,"n":6,"h":187,"b":243},"man-a3p3-bad":{"a":"man-a3x","x":0,"y":14,"n":6,"h":180,"b":226},"man-a4p1l1-idle":{"a":"man-a4i","x":0,"y":0,"n":6,"h":186,"b":244},"man-a4p1l2-idle":{"a":"man-a4i","x":0,"y":1,"n":6,"h":186,"b":227},"man-a4p1l3-idle":{"a":"man-a4i","x":0,"y":2,"n":6,"h":197,"b":242},"man-a4p2l1-idle":{"a":"man-a4i","x":0,"y":3,"n":6,"h":193,"b":242},"man-a4p2l2-idle":{"a":"man-a4i","x":0,"y":4,"n":6,"h":197,"b":234},"man-a4p2l3-idle":{"a":"man-a4i","x":0,"y":5,"n":6,"h":184,"b":228},"man-a4p3l1-idle":{"a":"man-a4i","x":0,"y":6,"n":6,"h":192,"b":234},"man-a4p3l2-idle":{"a":"man-a4i","x":0,"y":7,"n":6,"h":190,"b":232},"man-a4p3l3-idle":{"a":"man-a4i","x":0,"y":8,"n":6,"h":204,"b":243},"man-a4p1-idle2":{"a":"man-a4x","x":0,"y":0,"n":6,"h":198,"b":231},"man-a4p1-idle3":{"a":"man-a4x","x":0,"y":1,"n":6,"h":172,"b":223},"man-a4p1-drink":{"a":"man-a4x","x":0,"y":2,"n":8,"h":156,"b":214},"man-a4p1-good":{"a":"man-a4x","x":0,"y":3,"n":6,"h":201,"b":234},"man-a4p1-bad":{"a":"man-a4x","x":0,"y":4,"n":6,"h":177,"b":215},"man-a4p2-idle2":{"a":"man-a4x","x":0,"y":5,"n":6,"h":186,"b":237},"man-a4p2-idle3":{"a":"man-a4x","x":0,"y":6,"n":6,"h":180,"b":221},"man-a4p2-drink":{"a":"man-a4x","x":0,"y":7,"n":8,"h":188,"b":232},"man-a4p2-good":{"a":"man-a4x","x":0,"y":8,"n":6,"h":177,"b":227},"man-a4p2-bad":{"a":"man-a4x","x":0,"y":9,"n":6,"h":186,"b":225},"man-a4p3-idle2":{"a":"man-a4x","x":0,"y":10,"n":6,"h":190,"b":227},"man-a4p3-idle3":{"a":"man-a4x","x":0,"y":11,"n":6,"h":185,"b":228},"man-a4p3-drink":{"a":"man-a4x","x":0,"y":12,"n":8,"h":173,"b":238},"man-a4p3-good":{"a":"man-a4x","x":0,"y":13,"n":6,"h":192,"b":231},"man-a4p3-bad":{"a":"man-a4x","x":0,"y":14,"n":6,"h":192,"b":231},"witch-idle":{"a":"witch","x":0,"y":0,"n":8,"h":152,"b":222},"witch-idle2":{"a":"witch","x":0,"y":1,"n":8,"h":160,"b":219},"witch-idle3":{"a":"witch","x":0,"y":2,"n":8,"h":171,"b":242},"witch-appear":{"a":"witch","x":0,"y":3,"n":8,"h":160,"b":219},"witch-nod":{"a":"witch","x":0,"y":4,"n":6,"h":216,"b":243},"witch-laugh":{"a":"witch","x":0,"y":5,"n":6,"h":205,"b":241},"witch-wand":{"a":"witch","x":0,"y":6,"n":8,"h":139,"b":232},"witch-stop":{"a":"witch","x":0,"y":7,"n":6,"h":205,"b":236},"cup-1":{"a":"cups","x":0,"y":0,"n":6,"f":1},"cup-2":{"a":"cups","x":0,"y":1,"n":6,"f":1},"cup-3":{"a":"cups","x":0,"y":2,"n":6,"f":1},"cup-4":{"a":"cups","x":0,"y":3,"n":6,"f":1},"cup-5":{"a":"cups","x":0,"y":4,"n":6,"f":1},"cup-6":{"a":"cups","x":0,"y":5,"n":6,"f":1},"fx-good":{"a":"fx","x":0,"y":0,"n":6,"f":1},"fx-bad":{"a":"fx","x":0,"y":1,"n":6,"f":1},"fx-change":{"a":"fx","x":0,"y":2,"n":6,"f":1},"car-0":{"a":"cars","x":0,"y":0,"n":1,"box":[127,14,641,488],"w":768,"h":512},"car-1":{"a":"cars","x":1,"y":0,"n":1,"box":[148,17,644,490],"w":768,"h":512},"car-2":{"a":"cars","x":2,"y":0,"n":1,"box":[20,72,754,458],"w":768,"h":512},"car-3":{"a":"cars","x":3,"y":0,"n":1,"box":[24,79,753,458],"w":768,"h":512},"car-4":{"a":"cars","x":0,"y":1,"n":1,"box":[24,56,748,445],"w":768,"h":512},"car-5":{"a":"cars","x":1,"y":1,"n":1,"box":[25,65,752,421],"w":768,"h":512},"car-6":{"a":"cars","x":2,"y":1,"n":1,"box":[18,201,750,432],"w":768,"h":512},"car-7":{"a":"cars","x":3,"y":1,"n":1,"box":[22,13,744,477],"w":768,"h":512},"face-a1l1":{"a":"faces","x":0,"y":0,"n":1},"face-a1l2":{"a":"faces","x":1,"y":0,"n":1},"face-a1l3":{"a":"faces","x":2,"y":0,"n":1},"face-a2l1":{"a":"faces","x":3,"y":0,"n":1},"face-a2l2":{"a":"faces","x":4,"y":0,"n":1},"face-a2l3":{"a":"faces","x":5,"y":0,"n":1},"face-a3l1":{"a":"faces","x":0,"y":1,"n":1},"face-a3l2":{"a":"faces","x":1,"y":1,"n":1},"face-a3l3":{"a":"faces","x":2,"y":1,"n":1},"face-a4l1":{"a":"faces","x":3,"y":1,"n":1},"face-a4l2":{"a":"faces","x":4,"y":1,"n":1},"face-a4l3":{"a":"faces","x":5,"y":1,"n":1},"ui-frame-1":{"a":"frames","x":0,"y":0,"n":1},"ui-frame-2":{"a":"frames","x":1,"y":0,"n":1},"ui-frame-3":{"a":"frames","x":2,"y":0,"n":1},"ui-frame-4":{"a":"frames","x":3,"y":0,"n":1},"ui-frame-5":{"a":"frames","x":4,"y":0,"n":1},"ui-frame-6":{"a":"frames","x":5,"y":0,"n":1},"ui-frame-7":{"a":"frames","x":6,"y":0,"n":1},"icon-age":{"a":"icons","x":0,"y":0,"n":1},"icon-body":{"a":"icons","x":1,"y":0,"n":1},"icon-look":{"a":"icons","x":2,"y":0,"n":1},"icon-wealth":{"a":"icons","x":3,"y":0,"n":1},"icon-house":{"a":"icons","x":4,"y":0,"n":1},"icon-car":{"a":"icons","x":5,"y":0,"n":1},"icon-ach":{"a":"icons","x":6,"y":0,"n":1},"icon-share":{"a":"icons","x":7,"y":0,"n":1},"icon-set":{"a":"icons","x":8,"y":0,"n":1},"icon-exit":{"a":"icons","x":9,"y":0,"n":1},"icon-book":{"a":"icons","x":10,"y":0,"n":1},"ui-close":{"a":"icons","x":11,"y":0,"n":1},"icon-forget":{"a":"icons","x":12,"y":0,"n":1},"badge-first":{"a":"badges","x":0,"y":0,"n":1},"badge-r10":{"a":"badges","x":1,"y":0,"n":1},"badge-r100":{"a":"badges","x":2,"y":0,"n":1},"badge-r500":{"a":"badges","x":3,"y":0,"n":1},"badge-c5":{"a":"badges","x":4,"y":0,"n":1},"badge-c10":{"a":"badges","x":5,"y":0,"n":1},"badge-c20":{"a":"badges","x":0,"y":1,"n":1},"badge-young":{"a":"badges","x":1,"y":1,"n":1},"badge-ageR":{"a":"badges","x":2,"y":1,"n":1},"badge-fit":{"a":"badges","x":3,"y":1,"n":1},"badge-phyR":{"a":"badges","x":4,"y":1,"n":1},"badge-hand":{"a":"badges","x":5,"y":1,"n":1},"badge-lookR":{"a":"badges","x":0,"y":2,"n":1},"badge-m1":{"a":"badges","x":1,"y":2,"n":1},"badge-m2":{"a":"badges","x":2,"y":2,"n":1},"badge-m4":{"a":"badges","x":3,"y":2,"n":1},"badge-m5":{"a":"badges","x":4,"y":2,"n":1},"badge-m7":{"a":"badges","x":5,"y":2,"n":1},"badge-win":{"a":"badges","x":0,"y":3,"n":1},"badge-old":{"a":"badges","x":1,"y":3,"n":1},"badge-dead":{"a":"badges","x":2,"y":3,"n":1},"badge-revive":{"a":"badges","x":3,"y":3,"n":1},"badge-bill":{"a":"badges","x":4,"y":3,"n":1},"badge-unlock":{"a":"badges","x":5,"y":3,"n":1},"ui-tray":{"a":"ui-tray","x":0,"y":0,"n":1,"w":426,"h":219}}};
htlb/miniapp/dist-witch/witch.js CHANGED
@@ -175,7 +175,7 @@
175
  return 'background-image:url(' + DIR + m.a + '.webp);background-size:' + (at[0] * 100) + '% ' + (at[1] * 100) + '%;background-position:0% ' + y + '%;background-position-y:' + y + '%' + (still ? '' : ';-webkit-animation-duration:' + d + 's;animation-duration:' + d + 's');
176
  }
177
  function sprBg(name, k) { return bg(name, k); }
178
- var ICON_FILE = ['icon-ach', 'icon-ach', 'icon-share', 'icon-book', 'icon-set', 'icon-exit', 'icon-set', 'icon-age'];
179
  function uiIcon(k) { var f = ICON_FILE[k]; return SPR[f] ? '<i class="w2-ic one" style="' + bg(f) + '"></i>' : '<i class="w2-ic"></i>'; }
180
 
181
  /* ---------------- 冒险页(落地页) ---------------- */
@@ -207,7 +207,7 @@
207
  lay.el.innerHTML = '<div class="w2-bg" id="w2-bg"></div><div class="w2-bg next" id="w2-bg2"></div>' +
208
  '<div class="w2-scene" id="w2-scene"><div class="wt-plat" id="w2-plat"></div><div class="wt-car" id="w2-car"></div>' +
209
  '<div class="wt-actor hero" id="w2-hero"></div><div class="wt-actor witch" id="w2-witch"></div><div class="w2-book" id="w2-book" data-act="wt-book"></div>' +
210
- '<div class="w2-tray" id="w2-tray"></div><div class="wt-fx" id="w2-fx"></div></div>' +
211
  '<div class="w2-hud" id="w2-hud"></div><div class="w2-flash" id="w2-flash"></div>' +
212
  '<div class="w2-dialog" id="w2-dialog"><div class="w2-name" id="w2-name"></div><div class="w2-text" id="w2-text"></div><div class="w2-extra" id="w2-extra"></div></div>' +
213
  '<div class="w2-tools" id="w2-tools">' + tool('ach', '成就') + tool('share', '账单') + tool('set', '设置') + tool('exit', '退出') + '</div>' +
@@ -332,10 +332,10 @@
332
  ['house', '房子', M.house, gMoney()],
333
  ['car', '车子', M.car, gMoney()]
334
  ];
335
- popup('角色属性 · 综合 <em style="color:' + GRADE[gAll()][1] + '">' + GRADE[gAll()][0] + '</em>', '<div class="w2-pscene" id="w2-pscene" style="background-image:url(' + DIR + 'house-' + ms + '.webp)"><div class="w2-pcar" style="' + bg('car-' + ms) + '"></div><div class="wt-actor" id="w2-phero"></div></div>' +
336
  '<div class="w2-attrs">' + rows.map(function (r) { return '<p>' + statIcon(r[0]) + '<b>' + r[1] + '</b><span style="color:' + GRADE[r[3]][1] + '">' + esc(r[2]) + '</span></p>'; }).join('') + '</div>' +
337
- '<div class="w2-subcap">战绩</div><dl class="w2-stats"><div><dt>今天喝对</dt><dd>' + S.today.right + ' 杯</dd></div><div><dt>今天喝错</dt><dd>' + S.today.wrong + ' 杯</dd></div><div><dt>累计喝对</dt><dd>' + S.total.right + ' 杯</dd></div><div><dt>累计喝错</dt><dd>' + S.total.wrong + ' 杯</dd></div>' +
338
- '<div><dt>连续喝对</dt><dd>' + S.combo + ' 杯</dd></div><div><dt>最年轻</dt><dd>' + (S.peak.age < 20 ? S.peak.age.toFixed(1) : Math.round(S.peak.age)) + ' 岁</dd></div><div><dt>最高金钱</dt><dd>' + Math.round(S.peak.m) + '</dd></div><div><dt>寿终 / 复活</dt><dd>' + S.total.deaths + ' / ' + S.total.revives + '</dd></div></dl>', 'panel');
339
  var ph = $('#w2-phero', L.el);
340
  if (ph) { var sc = $('#w2-pscene', L.el), a = new Actor(ph, '', (sc.offsetHeight || 200) * 0.62); G.panelA = a; a.play(heroKey() + '-idle', { fps: 4, loop: true, pingpong: true }); }
341
  }
@@ -398,14 +398,27 @@
398
  tray([{ k: 0, label: '准备好了', v: 'go' }, { k: 1, label: '还没准备好', v: 'no' }]);
399
  }
400
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
401
  async function bookTapped() {
402
  if (!G || G.mode !== 'story' || !STORY[G.storyK].book) return;
403
  B.buzz('medium');
404
- $('#w2-book', L.el).className = 'w2-book';
405
- showWitch(true);
406
  say('', '……');
407
- await G.witch.play('witch-appear', { fps: 5 });
408
- witchIdle();
409
  G.busy = false;
410
  story(G.storyK + 1);
411
  }
@@ -429,8 +442,7 @@
429
  setTimeout(function () {
430
  if (!alive()) return;
431
  var d = $('#w2-dialog', L.el), rr = L.el.getBoundingClientRect(), dTop = d.getBoundingClientRect().top - rr.top;
432
- var bottomY = Math.min(G.ground - G.ground * 0.04, dTop - 8);
433
- t.style.bottom = Math.max(0, G.ground - bottomY) + 'px';
434
  }, 60);
435
  t.innerHTML = '<i class="w2-tray-img" style="background-image:url(' + DIR + 'ui-tray.webp)"></i>' + items.map(function (it, i) {
436
  return '<button class="w2-cup" type="button" data-act="wt-cup" data-i="' + i + '" style="left:' + (10 + (i + 0.5) / items.length * 80) + '%;width:' + cw + 'px;height:' + cw + 'px;margin-left:' + (-cw / 2) + 'px;bottom:' + (h * 0.4) + 'px"><i class="smoke" style="' + cupBg(it.k) + '"></i></button>';
@@ -483,8 +495,8 @@
483
  setCar(false);
484
  $('#w2-hero', L.el).className = 'wt-actor hero';
485
  if (!G.appeared) {
486
- G.appeared = true; showWitch(true); tray([]); say('', '书页一闪,女巫飘了出来……');
487
- await G.witch.play('witch-appear', { fps: 6 });
488
  }
489
  showWitch(true); witchIdle();
490
  ask();
@@ -551,7 +563,7 @@
551
  f = document.createElement('i'); f.className = 'wt-fly smoke'; f.setAttribute('style', cupBtn.firstChild.getAttribute('style'));
552
  f.style.left = (from.left - rr.left) + 'px'; f.style.top = (from.top - rr.top) + 'px'; f.style.width = from.width + 'px'; f.style.height = from.height + 'px';
553
  L.el.appendChild(f); cupBtn.style.visibility = 'hidden'; void f.offsetWidth;
554
- var tx = hp.x - (from.left - rr.left + from.width / 2), ty = hp.y - sz * 0.25 - (from.top - rr.top + from.height / 2), sc = sz / from.width;
555
  base = 'translate(' + tx + 'px,' + ty + 'px) scale(' + sc + ')';
556
  f.style.webkitTransform = f.style.transform = base;
557
  B.buzz('light');
@@ -623,7 +635,7 @@
623
  if (!S.dead) heroIdle();
624
  var over = !S.dead && S.wrong >= cap();
625
  say('女巫', (ok ? '「喝对了!」' : timeout ? '「时间到,硬灌一杯!」' : '「哈哈,喝错了!」') + what + '。正确答案是「' + q.o[q.a] + '」。' + q.w,
626
- (change ? '<p class="w2-change">' + change + '</p>' : '') + '<div class="w2-acts"><button class="w2-btn ghost orig" type="button" data-act="wt-orig" data-id="' + q.id + '">' + (SPR['icon-book'] ? '<i class="w2-ic one" style="' + bg('icon-book') + '"></i>' : '') + '看原文</button>' +
627
  (S.dead ? '<button class="w2-btn" type="button" data-act="wt-death">寿终了……</button>' : over ? '<button class="w2-btn" type="button" data-act="wt-cap">女巫有话说</button>' : '<button class="w2-btn" type="button" data-act="wt-next">继续挑战</button>') + '</div>');
628
  $('#w2-name', L.el).innerHTML = '女巫';
629
  tray([]);
@@ -670,8 +682,7 @@
670
  G.witch.play('witch-stop', { fps: 5 }).then(function () { if (alive()) witchIdle(); });
671
  B.buzz('heavy');
672
  var mini = B.mini(), canComment = !!(mini && typeof mini.interactionOpenApi === 'function');
673
- popup('女巫:「今天喝错太多,你的身体受不了了!」', '<p>晒一下你的人生账单,我再给你 10 杯。或者,明天再来。</p>' + shareRows('unlock', canComment) +
674
- '<button class="w2-btn ghost wide" type="button" data-act="wt-popclose" data-then="lobby">明天再来</button>');
675
  }
676
  function shareRows(why, canComment) {
677
  return '<div class="w2-share"><button type="button" data-act="wt-share" data-k="note" data-why="' + why + '">' + uiIcon(ICON.share) + '<span><b>发图文晒人生账单</b><small>打开发笔记页就' + (why === 'revive' ? '复活' : '解锁') + '</small></span></button>' +
@@ -708,9 +719,16 @@
708
  closePopup();
709
  var p = document.createElement('div'); p.className = 'w2-pop' + (cls ? ' ' + cls : ''); p.id = 'w2-pop';
710
  var x = SPR['ui-close'] ? '<i style="' + bg('ui-close') + '"></i>' : '✕';
711
- p.innerHTML = '<div class="w2-pop-box rise"><div class="w2-title">' + title + '</div><div class="w2-pop-body">' + body + '</div><button class="w2-pop-x" type="button" data-act="wt-popclose" aria-label="关闭">' + x + '</button></div>';
 
712
  L.el.appendChild(p);
713
  }
 
 
 
 
 
 
714
  function closePopup() { var p = L && $('#w2-pop', L.el); if (p) p.parentNode.removeChild(p); if (G && G.panelA) { G.panelA.stop(); G.panelA = null; } }
715
  function badge(a, got) {
716
  var art = SPR['badge-' + a[0]] ? '<i style="' + bg('badge-' + a[0]) + '"></i>' : '<i class="t">' + a[1].slice(0, 1) + '</i>';
@@ -720,7 +738,7 @@
720
  '<h4>怎么玩</h4><p>女巫每次出一道题,选项有几个,托盘上就有几杯魔药。15 秒内选一杯喝下:喝对加分,喝错扣分,超时算喝错。题目全部来自《高性价比人生指南》的 765 条建议。</p>' +
721
  '<h4>四项属性</h4><p><b>年龄、身材、颜值</b>属于身体:身体类的题,喝对喝错会随机影响其中一项。<b>财富</b>对应金钱类的题,决定你住什么房子、开什么车。</p>' +
722
  '<h4>加减分</h4><p>喝对 + 题目难度分(1–8);喝错 − 2 × 难度分。题目难度由决策模型离线评定,属性越高,女巫出的题越难。</p>' +
723
- '<h4>等级颜色</h4><p>每项属性分 7 级:<span style="color:#a3a7ad">灰</span> → <span style="color:#f4f1ea;background:#555;padding:0 3px;border-radius:3px">白</span> → <span style="color:#5aa9ff">蓝</span> → <span style="color:#c07bff">紫</span> → <span style="color:#45d483">绿</span> → <span style="color:#ffc83d">金</span> → <span style="color:#ff5a5a">红</span>。右上角进度条显示每项离下一级还差多少分;头像框随综合等级越来越华丽。</p>' +
724
  '<h4>年龄</h4><p>开局 22 岁,最年轻 18 岁。往老的方向每 10 分老 1 岁,<b>到 90 岁寿终</b>。老了以后多喝对,也能变回年轻。</p>' +
725
  '<h4>财富</h4><p>8 个阶段:生存 → 稳定 → 小康 → 中产 → 富裕 → 豪门 → 顶级富豪 → 传说,满分 2000,每阶约 286 分。</p>' +
726
  '<h4>每天的限制</h4><p>每天最多喝错 10 杯。超过后,晒一下人生账单(发图文、做成图集或发评论)可以再喝 10 杯,不限次数;也可以第二天再来。</p>' +
@@ -731,11 +749,11 @@
731
  if (k === 'share') { share('note', ''); return; }
732
  if (k === 'ach') {
733
  var n = 0; ACH.forEach(function (a) { if (S.ach[a[0]]) n++; });
734
- popup('成就徽章 ' + n + ' / ' + ACH.length, '<div class="w2-badges">' + ACH.map(function (a) { return badge(a, S.ach[a[0]]); }).join('') + '</div><p class="w2-small" id="w2-badge-tip">点徽章查看获得条件</p>');
735
  return;
736
  }
737
  if (k === 'set') {
738
- popup('游戏设置', '<div class="w2-setbtns"><button class="w2-btn" type="button" data-act="wt-replay">重看开场剧情</button><button class="w2-btn danger" type="button" data-act="wt-forget">喝下「遗忘之药水」(全部清零)</button></div>' + RULES);
739
  return;
740
  }
741
  }
@@ -772,26 +790,26 @@
772
  drawSpr(g, heroKey() + '-idle', 330, 725, 430);
773
  g.restore();
774
  g.strokeStyle = GRADE[gAll()][1]; g.lineWidth = 6; B.rr(g, 64, 150, 952, 600, 34); g.stroke();
775
- // 头像 + 综合等级
776
- g.save(); g.beginPath(); g.arc(150, 830, 70, 0, 6.3); g.fillStyle = '#f3d7c0'; g.fill(); g.clip(); drawCell(g, faceKey(), 0, 80, 760, 140, 140); g.restore();
777
- g.strokeStyle = GRADE[gAll()][1]; g.lineWidth = 8; g.beginPath(); g.arc(150, 830, 72, 0, 6.3); g.stroke();
778
- g.fillStyle = '#fff'; g.font = f(900, 48); g.fillText('我', 250, 820);
779
- g.font = f(800, 30); g.fillStyle = GRADE[gAll()][1]; g.fillText('综合等级 · ' + GRADE[gAll()][0], 250, 868);
780
  // 属性:带等级颜色
781
  var rows = [['年龄', ageTxt() + ' 岁 · ' + AGE7[gAge()], gAge(), prog(S.y, TH_Y, Y_MIN, SUB).p], ['身材', PHY7[gPhy()], gPhy(), prog(S.phy, TH_S, S_MIN, SUB).p], ['颜值', LOOK7[gLook()], gLook(), prog(S.look, TH_S, S_MIN, SUB).p],
782
  ['财富', M.name + ' · ' + M.more, gMoney(), ms >= 7 ? 1 : (S.money - ms * UP) / UP], ['房子', M.house, gMoney(), -1], ['车子', M.car, gMoney(), -1]];
783
  rows.forEach(function (r, k) {
784
- var y = 950 + k * 62, c = GRADE[r[2]][1];
785
  g.fillStyle = 'rgba(255,255,255,.08)'; B.rr(g, 64, y - 42, 952, 54, 14); g.fill();
786
  g.fillStyle = c; g.beginPath(); g.arc(100, y - 15, 9, 0, 6.3); g.fill();
787
  g.font = f(900, 28); g.fillStyle = 'rgba(255,255,255,.75)'; g.fillText(r[0], 124, y - 4);
788
  g.font = f(800, 28); g.fillStyle = c; g.fillText(B.clip(g, B.wrap(g, r[1], r[3] >= 0 ? 560 : 820), 1, r[3] >= 0 ? 560 : 820)[0], 210, y - 4);
789
  if (r[3] >= 0) { g.fillStyle = 'rgba(255,255,255,.15)'; B.rr(g, 800, y - 24, 190, 14, 7); g.fill(); g.fillStyle = c; B.rr(g, 800, y - 24, Math.max(8, 190 * r[3]), 14, 7); g.fill(); }
790
  });
791
- g.font = f(700, 28); g.fillStyle = 'rgba(255,255,255,.82)';
792
- g.fillText('今天喝对 ' + S.today.right + ' 杯 · 喝错 ' + S.today.wrong + ' 杯 · 累计喝对 ' + S.total.right + ' 杯', 64, 1340);
793
- g.fillStyle = 'rgba(255,255,255,.55)'; g.font = f(700, 22);
794
- g.fillText('高性价比人生 · 魔药题目出自《高性价比人生指南》CC BY 4.0 · github.com/eternity4719/HowToLiveBetter', 64, 1400);
 
 
795
  return cv;
796
  }
797
  function cardCanvas(q) {
@@ -827,7 +845,7 @@
827
  postBusy = true;
828
  var mini = B.mini();
829
  try {
830
- await loadAll(['house-' + moneyStage(), 'car-' + moneyStage(), heroKey() + '-idle', faceKey(), 'witch-idle']);
831
  var imgs = [toURL(billCanvas)];
832
  if (kind === 'slides') recentQs(3).forEach(function (q) { imgs.push(toURL(function () { return cardCanvas(q); })); });
833
  if (!mini) {
@@ -871,8 +889,8 @@
871
  case 'wt-panel': panel(); break;
872
  case 'wt-replay': closePopup(); G.appeared = false; story(0); break;
873
  case 'wt-badge':
874
- var aa = ACH.filter(function (x) { return x[0] === el.getAttribute('data-id'); })[0], tip = $('#w2-badge-tip', L.el);
875
- if (aa && tip) { var gt = S.ach[aa[0]]; tip.innerHTML = '<b>' + aa[1] + '</b>:' + aa[2] + (gt ? '(' + new Date(gt).toLocaleDateString() + ' 获得)' : '(未获得)'); B.buzz('light'); }
876
  break;
877
  case 'wt-money': moneyPop(); break;
878
  case 'wt-orig': B.openDetail(el.getAttribute('data-id')); break;
 
175
  return 'background-image:url(' + DIR + m.a + '.webp);background-size:' + (at[0] * 100) + '% ' + (at[1] * 100) + '%;background-position:0% ' + y + '%;background-position-y:' + y + '%' + (still ? '' : ';-webkit-animation-duration:' + d + 's;animation-duration:' + d + 's');
176
  }
177
  function sprBg(name, k) { return bg(name, k); }
178
+ var ICON_FILE = ['icon-ach', 'icon-ach', 'icon-share', 'icon-book', 'icon-set', 'icon-exit', 'icon-forget', 'icon-age'];
179
  function uiIcon(k) { var f = ICON_FILE[k]; return SPR[f] ? '<i class="w2-ic one" style="' + bg(f) + '"></i>' : '<i class="w2-ic"></i>'; }
180
 
181
  /* ---------------- 冒险页(落地页) ---------------- */
 
207
  lay.el.innerHTML = '<div class="w2-bg" id="w2-bg"></div><div class="w2-bg next" id="w2-bg2"></div>' +
208
  '<div class="w2-scene" id="w2-scene"><div class="wt-plat" id="w2-plat"></div><div class="wt-car" id="w2-car"></div>' +
209
  '<div class="wt-actor hero" id="w2-hero"></div><div class="wt-actor witch" id="w2-witch"></div><div class="w2-book" id="w2-book" data-act="wt-book"></div>' +
210
+ '<div class="w2-tray" id="w2-tray"></div><div class="wt-fx" id="w2-fx"></div><div class="wt-fx wfx" id="w2-wfx"></div></div>' +
211
  '<div class="w2-hud" id="w2-hud"></div><div class="w2-flash" id="w2-flash"></div>' +
212
  '<div class="w2-dialog" id="w2-dialog"><div class="w2-name" id="w2-name"></div><div class="w2-text" id="w2-text"></div><div class="w2-extra" id="w2-extra"></div></div>' +
213
  '<div class="w2-tools" id="w2-tools">' + tool('ach', '成就') + tool('share', '账单') + tool('set', '设置') + tool('exit', '退出') + '</div>' +
 
332
  ['house', '房子', M.house, gMoney()],
333
  ['car', '车子', M.car, gMoney()]
334
  ];
335
+ popup('', '<div class="w2-pscene" id="w2-pscene" style="background-image:url(' + DIR + 'house-' + ms + '.webp)"><div class="w2-pcar" style="' + bg('car-' + ms) + '"></div><div class="wt-actor" id="w2-phero"></div></div>' +
336
  '<div class="w2-attrs">' + rows.map(function (r) { return '<p>' + statIcon(r[0]) + '<b>' + r[1] + '</b><span style="color:' + GRADE[r[3]][1] + '">' + esc(r[2]) + '</span></p>'; }).join('') + '</div>' +
337
+ '<div class="w2-card"><div class="w2-subcap">战绩</div><dl class="w2-stats row"><div><dt>今天喝对</dt><dd>' + S.today.right + ' 杯</dd></div><div><dt>今天喝错</dt><dd>' + S.today.wrong + ' 杯</dd></div><div><dt>累计喝对</dt><dd>' + S.total.right + ' 杯</dd></div><div><dt>累计喝错</dt><dd>' + S.total.wrong + ' 杯</dd></div>' +
338
+ '<div><dt>连续喝对</dt><dd>' + S.combo + ' 杯</dd></div><div><dt>最年轻</dt><dd>' + (S.peak.age < 20 ? S.peak.age.toFixed(1) : Math.round(S.peak.age)) + ' 岁</dd></div><div><dt>最高金钱</dt><dd>' + Math.round(S.peak.m) + '</dd></div><div><dt>寿终 / 复活</dt><dd>' + S.total.deaths + ' / ' + S.total.revives + '</dd></div></dl></div>', 'panel');
339
  var ph = $('#w2-phero', L.el);
340
  if (ph) { var sc = $('#w2-pscene', L.el), a = new Actor(ph, '', (sc.offsetHeight || 200) * 0.62); G.panelA = a; a.play(heroKey() + '-idle', { fps: 4, loop: true, pingpong: true }); }
341
  }
 
398
  tray([{ k: 0, label: '准备好了', v: 'go' }, { k: 1, label: '还没准备好', v: 'no' }]);
399
  }
400
  }
401
+ async function witchAppear() {
402
+ var we = $('#w2-witch', L.el), bk = $('#w2-book', L.el), box = $('#w2-wfx', L.el);
403
+ clearTimeout(G.wIdleT);
404
+ bk.className = 'w2-book on glow'; bk.setAttribute('style', sprBg('witch-appear', 0));
405
+ we.classList.add('gone'); we.classList.remove('gone', 'rise-in'); we.classList.add('pre-in');
406
+ G.witch.T = heroT() * 0.95; G.witch.play('witch-idle', { fps: 4, loop: true, pingpong: true });
407
+ box.innerHTML = '';
408
+ var a = new Actor(box, '', heroT() * 1.2);
409
+ var done = a.play('fx-change', { fps: 7, onFrame: function (k) {
410
+ if (k === 3) { B.buzz('medium'); we.classList.remove('pre-in'); we.classList.add('rise-in'); }
411
+ if (k === 4) bk.className = 'w2-book';
412
+ } });
413
+ await done; box.innerHTML = '';
414
+ we.classList.remove('rise-in');
415
+ witchIdle();
416
+ }
417
  async function bookTapped() {
418
  if (!G || G.mode !== 'story' || !STORY[G.storyK].book) return;
419
  B.buzz('medium');
 
 
420
  say('', '……');
421
+ await witchAppear();
 
422
  G.busy = false;
423
  story(G.storyK + 1);
424
  }
 
442
  setTimeout(function () {
443
  if (!alive()) return;
444
  var d = $('#w2-dialog', L.el), rr = L.el.getBoundingClientRect(), dTop = d.getBoundingClientRect().top - rr.top;
445
+ t.style.bottom = (G.ground - (dTop - 2)) + 'px';
 
446
  }, 60);
447
  t.innerHTML = '<i class="w2-tray-img" style="background-image:url(' + DIR + 'ui-tray.webp)"></i>' + items.map(function (it, i) {
448
  return '<button class="w2-cup" type="button" data-act="wt-cup" data-i="' + i + '" style="left:' + (10 + (i + 0.5) / items.length * 80) + '%;width:' + cw + 'px;height:' + cw + 'px;margin-left:' + (-cw / 2) + 'px;bottom:' + (h * 0.4) + 'px"><i class="smoke" style="' + cupBg(it.k) + '"></i></button>';
 
495
  setCar(false);
496
  $('#w2-hero', L.el).className = 'wt-actor hero';
497
  if (!G.appeared) {
498
+ G.appeared = true; tray([]); say('', '书页一闪,女巫飘了出来……');
499
+ await witchAppear();
500
  }
501
  showWitch(true); witchIdle();
502
  ask();
 
563
  f = document.createElement('i'); f.className = 'wt-fly smoke'; f.setAttribute('style', cupBtn.firstChild.getAttribute('style'));
564
  f.style.left = (from.left - rr.left) + 'px'; f.style.top = (from.top - rr.top) + 'px'; f.style.width = from.width + 'px'; f.style.height = from.height + 'px';
565
  L.el.appendChild(f); cupBtn.style.visibility = 'hidden'; void f.offsetWidth;
566
+ var tx = hp.x - (from.left - rr.left + from.width / 2), ty = hp.y + sz * 0.22 - (from.top - rr.top + from.height / 2), sc = sz / from.width;
567
  base = 'translate(' + tx + 'px,' + ty + 'px) scale(' + sc + ')';
568
  f.style.webkitTransform = f.style.transform = base;
569
  B.buzz('light');
 
635
  if (!S.dead) heroIdle();
636
  var over = !S.dead && S.wrong >= cap();
637
  say('女巫', (ok ? '「喝对了!」' : timeout ? '「时间到,硬灌一杯!」' : '「哈哈,喝错了!」') + what + '。正确答案是「' + q.o[q.a] + '」。' + q.w,
638
+ (change ? '<p class="w2-change">' + change + '</p>' : '') + '<div class="w2-acts"><button class="w2-btn ghost orig" type="button" data-act="wt-orig" data-id="' + q.id + '">' + (SPR['icon-book'] ? '<i class="w2-ic one" style="' + bg('icon-book') + '"></i>' : '') + '原文</button>' +
639
  (S.dead ? '<button class="w2-btn" type="button" data-act="wt-death">寿终了……</button>' : over ? '<button class="w2-btn" type="button" data-act="wt-cap">女巫有话说</button>' : '<button class="w2-btn" type="button" data-act="wt-next">继续挑战</button>') + '</div>');
640
  $('#w2-name', L.el).innerHTML = '女巫';
641
  tray([]);
 
682
  G.witch.play('witch-stop', { fps: 5 }).then(function () { if (alive()) witchIdle(); });
683
  B.buzz('heavy');
684
  var mini = B.mini(), canComment = !!(mini && typeof mini.interactionOpenApi === 'function');
685
+ popup('女巫:「今天喝错太多,你的身体受不了了!」', '<p>晒一下你的人生账单,我再给你 10 杯。</p>' + shareRows('unlock', canComment), 'cap');
 
686
  }
687
  function shareRows(why, canComment) {
688
  return '<div class="w2-share"><button type="button" data-act="wt-share" data-k="note" data-why="' + why + '">' + uiIcon(ICON.share) + '<span><b>发图文晒人生账单</b><small>打开发笔记页就' + (why === 'revive' ? '复活' : '解锁') + '</small></span></button>' +
 
719
  closePopup();
720
  var p = document.createElement('div'); p.className = 'w2-pop' + (cls ? ' ' + cls : ''); p.id = 'w2-pop';
721
  var x = SPR['ui-close'] ? '<i style="' + bg('ui-close') + '"></i>' : '✕';
722
+ p.innerHTML = '<div class="w2-pop-box rise">' + (title ? '<div class="w2-title">' + title + '</div>' : '') + '<div class="w2-pop-body">' + body + '</div><button class="w2-pop-x" type="button" data-act="wt-popclose" aria-label="关闭">' + x + '</button></div>';
723
+ B.buzz('light');
724
  L.el.appendChild(p);
725
  }
726
+ function centerTip(html) {
727
+ var old = $('#w2-tip', L.el); if (old) old.parentNode.removeChild(old);
728
+ var t = document.createElement('div'); t.className = 'w2-tip'; t.id = 'w2-tip'; t.innerHTML = html;
729
+ L.el.appendChild(t); clearTimeout(G.tipT);
730
+ G.tipT = setTimeout(function () { t.classList.add('out'); setTimeout(function () { t.parentNode && t.parentNode.removeChild(t); }, 300); }, 2000);
731
+ }
732
  function closePopup() { var p = L && $('#w2-pop', L.el); if (p) p.parentNode.removeChild(p); if (G && G.panelA) { G.panelA.stop(); G.panelA = null; } }
733
  function badge(a, got) {
734
  var art = SPR['badge-' + a[0]] ? '<i style="' + bg('badge-' + a[0]) + '"></i>' : '<i class="t">' + a[1].slice(0, 1) + '</i>';
 
738
  '<h4>怎么玩</h4><p>女巫每次出一道题,选项有几个,托盘上就有几杯魔药。15 秒内选一杯喝下:喝对加分,喝错扣分,超时算喝错。题目全部来自《高性价比人生指南》的 765 条建议。</p>' +
739
  '<h4>四项属性</h4><p><b>年龄、身材、颜值</b>属于身体:身体类的题,喝对喝错会随机影响其中一项。<b>财富</b>对应金钱类的题,决定你住什么房子、开什么车。</p>' +
740
  '<h4>加减分</h4><p>喝对 + 题目难度分(1–8);喝错 − 2 × 难度分。题目难度由决策模型离线评定,属性越高,女巫出的题越难。</p>' +
741
+ '<h4>等级颜色</h4><p>每项属性分 7 级:' + GRADE.map(function (g) { return '<span class="w2-gc" style="color:' + g[1] + '">' + g[0] + '</span>'; }).join(' → ') + '。右上角进度条显示每项离下一级还差多少分;头像框随综合等级越来越华丽。</p>' +
742
  '<h4>年龄</h4><p>开局 22 岁,最年轻 18 岁。往老的方向每 10 分老 1 岁,<b>到 90 岁寿终</b>。老了以后多喝对,也能变回年轻。</p>' +
743
  '<h4>财富</h4><p>8 个阶段:生存 → 稳定 → 小康 → 中产 → 富裕 → 豪门 → 顶级富豪 → 传说,满分 2000,每阶约 286 分。</p>' +
744
  '<h4>每天的限制</h4><p>每天最多喝错 10 杯。超过后,晒一下人生账单(发图文、做成图集或发评论)可以再喝 10 杯,不限次数;也可以第二天再来。</p>' +
 
749
  if (k === 'share') { share('note', ''); return; }
750
  if (k === 'ach') {
751
  var n = 0; ACH.forEach(function (a) { if (S.ach[a[0]]) n++; });
752
+ popup('成就徽章 ' + n + ' / ' + ACH.length, '<div class="w2-badges">' + ACH.map(function (a) { return badge(a, S.ach[a[0]]); }).join('') + '</div>', 'ach');
753
  return;
754
  }
755
  if (k === 'set') {
756
+ popup('游戏设置', RULES + '<div class="w2-setbtns"><button class="w2-btn" type="button" data-act="wt-replay">' + uiIcon(ICON.intro) + '重看开场剧情</button><button class="w2-btn danger" type="button" data-act="wt-forget">' + uiIcon(ICON.forget) + '遗忘之药水</button></div>');
757
  return;
758
  }
759
  }
 
790
  drawSpr(g, heroKey() + '-idle', 330, 725, 430);
791
  g.restore();
792
  g.strokeStyle = GRADE[gAll()][1]; g.lineWidth = 6; B.rr(g, 64, 150, 952, 600, 34); g.stroke();
793
+ // 头像(带头像框)放在画面卡片左上角
794
+ g.save(); g.beginPath(); g.arc(170, 256, 74, 0, 6.3); g.fillStyle = '#f3d7c0'; g.fill(); g.clip(); drawCell(g, faceKey(), 0, 96, 182, 148, 148); g.restore();
795
+ drawCell(g, 'ui-frame-' + (gAll() + 1), 0, 72, 158, 196, 196);
 
 
796
  // 属性:带等级颜色
797
  var rows = [['年龄', ageTxt() + ' 岁 · ' + AGE7[gAge()], gAge(), prog(S.y, TH_Y, Y_MIN, SUB).p], ['身材', PHY7[gPhy()], gPhy(), prog(S.phy, TH_S, S_MIN, SUB).p], ['颜值', LOOK7[gLook()], gLook(), prog(S.look, TH_S, S_MIN, SUB).p],
798
  ['财富', M.name + ' · ' + M.more, gMoney(), ms >= 7 ? 1 : (S.money - ms * UP) / UP], ['房子', M.house, gMoney(), -1], ['车子', M.car, gMoney(), -1]];
799
  rows.forEach(function (r, k) {
800
+ var y = 832 + k * 70, c = GRADE[r[2]][1];
801
  g.fillStyle = 'rgba(255,255,255,.08)'; B.rr(g, 64, y - 42, 952, 54, 14); g.fill();
802
  g.fillStyle = c; g.beginPath(); g.arc(100, y - 15, 9, 0, 6.3); g.fill();
803
  g.font = f(900, 28); g.fillStyle = 'rgba(255,255,255,.75)'; g.fillText(r[0], 124, y - 4);
804
  g.font = f(800, 28); g.fillStyle = c; g.fillText(B.clip(g, B.wrap(g, r[1], r[3] >= 0 ? 560 : 820), 1, r[3] >= 0 ? 560 : 820)[0], 210, y - 4);
805
  if (r[3] >= 0) { g.fillStyle = 'rgba(255,255,255,.15)'; B.rr(g, 800, y - 24, 190, 14, 7); g.fill(); g.fillStyle = c; B.rr(g, 800, y - 24, Math.max(8, 190 * r[3]), 14, 7); g.fill(); }
806
  });
807
+ g.textAlign = 'center';
808
+ g.font = f(800, 30); g.fillStyle = 'rgba(255,255,255,.88)';
809
+ g.fillText('今天喝对 ' + S.today.right + ' 杯 · 喝错 ' + S.today.wrong + ' 杯 · 累计喝对 ' + S.total.right + ' 杯', 540, 1282);
810
+ g.fillStyle = 'rgba(255,255,255,.58)'; g.font = f(700, 24);
811
+ B.wrap(g, '高性价比人生 · 魔药题目出自《高性价比人生指南》CC BY 4.0 · github.com/eternity4719/HowToLiveBetter', 900).slice(0, 2).forEach(function (ln, i) { g.fillText(ln, 540, 1350 + i * 36); });
812
+ g.textAlign = 'left';
813
  return cv;
814
  }
815
  function cardCanvas(q) {
 
845
  postBusy = true;
846
  var mini = B.mini();
847
  try {
848
+ await loadAll(['house-' + moneyStage(), 'car-' + moneyStage(), heroKey() + '-idle', faceKey(), 'witch-idle', 'ui-frame-' + (gAll() + 1)]);
849
  var imgs = [toURL(billCanvas)];
850
  if (kind === 'slides') recentQs(3).forEach(function (q) { imgs.push(toURL(function () { return cardCanvas(q); })); });
851
  if (!mini) {
 
889
  case 'wt-panel': panel(); break;
890
  case 'wt-replay': closePopup(); G.appeared = false; story(0); break;
891
  case 'wt-badge':
892
+ var aa = ACH.filter(function (x) { return x[0] === el.getAttribute('data-id'); })[0];
893
+ if (aa) { var gt = S.ach[aa[0]]; centerTip('<b>' + aa[1] + '</b><br>' + aa[2] + '<br><small>' + (gt ? new Date(gt).toLocaleDateString() + ' 获得' : '未获得') + '</small>'); B.buzz('light'); }
894
  break;
895
  case 'wt-money': moneyPop(); break;
896
  case 'wt-orig': B.openDetail(el.getAttribute('data-id')); break;
htlb/miniapp/dist-witch/witch/icons.webp CHANGED

Git LFS Details

  • SHA256: f93938f4d8ba91a2746dbe36febc76681a74a6d9bdc51edd0f3d603d8208ffac
  • Pointer size: 130 Bytes
  • Size of remote file: 57.4 kB

Git LFS Details

  • SHA256: 7d42c3c140b6e98e88bfc89b7b237672be6a874c1eb328ebe419e91ff799ec93
  • Pointer size: 130 Bytes
  • Size of remote file: 59.3 kB
htlb/miniapp/dist-witch/witch/man-a2x.webp CHANGED

Git LFS Details

  • SHA256: 946805f730e7f428b163e90e12de684600a04b087051af84ef5c15369395efd9
  • Pointer size: 131 Bytes
  • Size of remote file: 513 kB

Git LFS Details

  • SHA256: 67e5c2b45055fbc60c1c41a50d9a82d562a2212b666608f754f492a86364934f
  • Pointer size: 131 Bytes
  • Size of remote file: 513 kB
htlb/miniapp/dist-witch/witch/ui-divider.webp DELETED

Git LFS Details

  • SHA256: 0777b444a5287f25847536e9dda0ec296d28f971d78c993193cedd575da70e7d
  • Pointer size: 129 Bytes
  • Size of remote file: 2.11 kB
htlb/miniapp/tool/style.css CHANGED
@@ -687,3 +687,32 @@ html.game-on img{-webkit-user-drag:none;pointer-events:none}
687
  .w2-pop-box{position:relative;width:100%;max-width:360px;max-height:80%;overflow-y:auto;color:#2b1d12}
688
  .w2-btn{display:flex;align-items:center;justify-content:center;width:100%;font-size:16px;font-weight:900;transition:transform .12s}
689
  .w2-opt{display:flex;align-items:center;justify-content:center;text-align:center;font-size:14px;font-weight:900;line-height:1.35;transition:transform .12s}
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
687
  .w2-pop-box{position:relative;width:100%;max-width:360px;max-height:80%;overflow-y:auto;color:#2b1d12}
688
  .w2-btn{display:flex;align-items:center;justify-content:center;width:100%;font-size:16px;font-weight:900;transition:transform .12s}
689
  .w2-opt{display:flex;align-items:center;justify-content:center;text-align:center;font-size:14px;font-weight:900;line-height:1.35;transition:transform .12s}
690
+ /* ===== 女巫的魔药 第 2.4 版 ===== */
691
+ .w2-hud{align-items:center}
692
+ .w2-hud .w2-me{margin-top:6px}
693
+ .w2-scene .wt-actor.witch.pre-in{opacity:0;-webkit-transform:translateY(40px) scale(.4);transform:translateY(40px) scale(.4);transition:none}
694
+ .w2-scene .wt-actor.witch.rise-in{opacity:1;-webkit-transform:none;transform:none;transition:opacity .7s ease-out,transform .9s cubic-bezier(.3,1.4,.5,1)}
695
+ .w2-book.glow{-webkit-filter:brightness(1.8) drop-shadow(0 0 22px #ffe58a);filter:brightness(1.8) drop-shadow(0 0 22px #ffe58a)}
696
+ .w2-scene .wt-fx.wfx{left:77%}
697
+ .w2-opt i{width:44px!important;height:44px!important;margin-right:4px}
698
+ .w2-pop{overflow:hidden;touch-action:none}
699
+ .w2-pop-box{overflow:visible!important;max-height:none!important;touch-action:pan-y}
700
+ .w2-pop-body{max-height:calc(78vh - 70px);overflow-y:auto;overflow-x:hidden;-webkit-overflow-scrolling:touch;overscroll-behavior:contain;touch-action:pan-y}
701
+ .w2-pop.panel .w2-pop-body{max-height:none;overflow:hidden;touch-action:none}
702
+ .w2-pop-x{position:absolute!important;top:-16px!important;right:-16px!important;z-index:5}
703
+ .w2-name,.w2-title{background:none!important;padding-bottom:4px!important}
704
+ .w2-pop.panel .w2-pscene{height:150px}
705
+ .w2-pop.panel .w2-attrs p{padding:3px 0;font-size:13px}
706
+ .w2-card{margin-top:8px;background:rgba(91,42,134,.07);border:1.5px solid rgba(201,164,92,.7);border-radius:12px;padding:4px 8px 6px}
707
+ .w2-card .w2-subcap{margin:2px 0 2px}
708
+ .w2-stats.row div{width:50%;display:flex;align-items:baseline;justify-content:space-between;padding:3px 6px}
709
+ .w2-stats.row dt{font-size:12px;opacity:.75}
710
+ .w2-stats.row dd{font-size:14px;font-weight:900}
711
+ .w2-tip{position:absolute;left:50%;top:46%;z-index:40;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);max-width:78%;background:rgba(20,14,26,.94);color:#fff;border:2px solid #c9a45c;border-radius:14px;padding:14px 18px;text-align:center;font-size:14px;line-height:1.6;box-shadow:0 10px 24px rgba(0,0,0,.5);transition:opacity .3s;pointer-events:none}
712
+ .w2-tip b{color:#FFE58A;font-size:16px}
713
+ .w2-tip small{opacity:.7}
714
+ .w2-tip.out{opacity:0}
715
+ .w2-gc{display:inline-block;background:#2a1d3d;border-radius:5px;padding:0 6px;font-weight:900;line-height:1.5}
716
+ .w2-setbtns{margin-top:14px;padding-top:6px;border-top:1px dashed rgba(91,42,134,.3)}
717
+ .w2-setbtns .w2-btn .w2-ic{width:26px;height:26px;margin-right:6px}
718
+ .w2-hud .w2-me{margin-top:30px}
htlb/miniapp/tool/witch-sprites.js CHANGED
@@ -1 +1 @@
1
- window.__WITCH_SPR__={"A":{"man-a1i":[6,9],"man-a1x":[8,15],"man-a2i":[6,9],"man-a2x":[8,16],"man-a3i":[6,9],"man-a3x":[8,15],"man-a4i":[6,9],"man-a4x":[8,15],"witch":[8,8],"cups":[6,6],"fx":[6,3],"cars":[4,2],"faces":[6,2],"frames":[7,1],"icons":[12,1],"badges":[6,4],"ui-tray":[1,1],"ui-divider":[1,1]},"S":{"man-a1p1l1-idle":{"a":"man-a1i","x":0,"y":0,"n":6,"h":212,"b":241},"man-a1p1l2-idle":{"a":"man-a1i","x":0,"y":1,"n":6,"h":194,"b":244},"man-a1p1l3-idle":{"a":"man-a1i","x":0,"y":2,"n":6,"h":195,"b":243},"man-a1p2l1-idle":{"a":"man-a1i","x":0,"y":3,"n":6,"h":180,"b":227},"man-a1p2l2-idle":{"a":"man-a1i","x":0,"y":4,"n":6,"h":183,"b":234},"man-a1p2l3-idle":{"a":"man-a1i","x":0,"y":5,"n":6,"h":195,"b":239},"man-a1p3l1-idle":{"a":"man-a1i","x":0,"y":6,"n":6,"h":202,"b":244},"man-a1p3l2-idle":{"a":"man-a1i","x":0,"y":7,"n":6,"h":198,"b":242},"man-a1p3l3-idle":{"a":"man-a1i","x":0,"y":8,"n":6,"h":184,"b":244},"man-a1p1-idle2":{"a":"man-a1x","x":0,"y":0,"n":6,"h":180,"b":231},"man-a1p1-idle3":{"a":"man-a1x","x":0,"y":1,"n":6,"h":191,"b":242},"man-a1p1-drink":{"a":"man-a1x","x":0,"y":2,"n":8,"h":166,"b":235},"man-a1p1-good":{"a":"man-a1x","x":0,"y":3,"n":6,"h":184,"b":240},"man-a1p1-bad":{"a":"man-a1x","x":0,"y":4,"n":6,"h":180,"b":231},"man-a1p2-idle2":{"a":"man-a1x","x":0,"y":5,"n":6,"h":215,"b":243},"man-a1p2-idle3":{"a":"man-a1x","x":0,"y":6,"n":6,"h":193,"b":234},"man-a1p2-drink":{"a":"man-a1x","x":0,"y":7,"n":8,"h":172,"b":236},"man-a1p2-good":{"a":"man-a1x","x":0,"y":8,"n":6,"h":170,"b":226},"man-a1p2-bad":{"a":"man-a1x","x":0,"y":9,"n":6,"h":189,"b":234},"man-a1p3-idle2":{"a":"man-a1x","x":0,"y":10,"n":6,"h":195,"b":242},"man-a1p3-idle3":{"a":"man-a1x","x":0,"y":11,"n":6,"h":206,"b":243},"man-a1p3-drink":{"a":"man-a1x","x":0,"y":12,"n":8,"h":168,"b":243},"man-a1p3-good":{"a":"man-a1x","x":0,"y":13,"n":6,"h":192,"b":236},"man-a1p3-bad":{"a":"man-a1x","x":0,"y":14,"n":6,"h":188,"b":240},"man-a2p1l1-idle":{"a":"man-a2i","x":0,"y":0,"n":6,"h":186,"b":243},"man-a2p1l2-idle":{"a":"man-a2i","x":0,"y":1,"n":6,"h":205,"b":242},"man-a2p1l3-idle":{"a":"man-a2i","x":0,"y":2,"n":6,"h":187,"b":237},"man-a2p2l1-idle":{"a":"man-a2i","x":0,"y":3,"n":6,"h":189,"b":244},"man-a2p2l2-idle":{"a":"man-a2i","x":0,"y":4,"n":6,"h":178,"b":231},"man-a2p2l3-idle":{"a":"man-a2i","x":0,"y":5,"n":6,"h":182,"b":226},"man-a2p3l1-idle":{"a":"man-a2i","x":0,"y":6,"n":6,"h":202,"b":244},"man-a2p3l2-idle":{"a":"man-a2i","x":0,"y":7,"n":6,"h":181,"b":235},"man-a2p3l3-idle":{"a":"man-a2i","x":0,"y":8,"n":6,"h":200,"b":241},"man-a2p1-idle2":{"a":"man-a2x","x":0,"y":0,"n":6,"h":197,"b":242},"man-a2p1-idle3":{"a":"man-a2x","x":0,"y":1,"n":6,"h":188,"b":242},"man-a2p1-drink":{"a":"man-a2x","x":0,"y":2,"n":8,"h":173,"b":236},"man-a2p1-good":{"a":"man-a2x","x":0,"y":3,"n":6,"h":204,"b":233},"man-a2p1-bad":{"a":"man-a2x","x":0,"y":4,"n":6,"h":180,"b":236},"man-a2p2-idle2":{"a":"man-a2x","x":0,"y":5,"n":6,"h":203,"b":244},"man-a2p2-idle3":{"a":"man-a2x","x":0,"y":6,"n":6,"h":180,"b":234},"man-a2p2-drink":{"a":"man-a2x","x":0,"y":7,"n":8,"h":193,"b":242},"man-a2p2-good":{"a":"man-a2x","x":0,"y":8,"n":6,"h":193,"b":234},"man-a2p2-bad":{"a":"man-a2x","x":0,"y":9,"n":6,"h":208,"b":244},"man-a2p3-idle2":{"a":"man-a2x","x":0,"y":10,"n":6,"h":196,"b":243},"man-a2p3-idle3":{"a":"man-a2x","x":0,"y":11,"n":6,"h":194,"b":234},"man-a2p3-drink":{"a":"man-a2x","x":0,"y":12,"n":8,"h":168,"b":229},"man-a2p3-good":{"a":"man-a2x","x":0,"y":13,"n":6,"h":213,"b":242},"man-a2p3-bad":{"a":"man-a2x","x":0,"y":14,"n":6,"h":188,"b":244},"man-ride":{"a":"man-a2x","x":0,"y":15,"n":6,"h":168,"b":214},"man-a3p1l1-idle":{"a":"man-a3i","x":0,"y":0,"n":6,"h":194,"b":244},"man-a3p1l2-idle":{"a":"man-a3i","x":0,"y":1,"n":6,"h":198,"b":243},"man-a3p1l3-idle":{"a":"man-a3i","x":0,"y":2,"n":6,"h":190,"b":233},"man-a3p2l1-idle":{"a":"man-a3i","x":0,"y":3,"n":6,"h":187,"b":240},"man-a3p2l2-idle":{"a":"man-a3i","x":0,"y":4,"n":6,"h":204,"b":242},"man-a3p2l3-idle":{"a":"man-a3i","x":0,"y":5,"n":6,"h":180,"b":235},"man-a3p3l1-idle":{"a":"man-a3i","x":0,"y":6,"n":6,"h":199,"b":241},"man-a3p3l2-idle":{"a":"man-a3i","x":0,"y":7,"n":6,"h":216,"b":244},"man-a3p3l3-idle":{"a":"man-a3i","x":0,"y":8,"n":6,"h":201,"b":243},"man-a3p1-idle2":{"a":"man-a3x","x":0,"y":0,"n":6,"h":189,"b":242},"man-a3p1-idle3":{"a":"man-a3x","x":0,"y":1,"n":6,"h":197,"b":233},"man-a3p1-drink":{"a":"man-a3x","x":0,"y":2,"n":8,"h":176,"b":242},"man-a3p1-good":{"a":"man-a3x","x":0,"y":3,"n":6,"h":194,"b":243},"man-a3p1-bad":{"a":"man-a3x","x":0,"y":4,"n":6,"h":174,"b":223},"man-a3p2-idle2":{"a":"man-a3x","x":0,"y":5,"n":6,"h":193,"b":244},"man-a3p2-idle3":{"a":"man-a3x","x":0,"y":6,"n":6,"h":195,"b":242},"man-a3p2-drink":{"a":"man-a3x","x":0,"y":7,"n":8,"h":178,"b":242},"man-a3p2-good":{"a":"man-a3x","x":0,"y":8,"n":6,"h":201,"b":241},"man-a3p2-bad":{"a":"man-a3x","x":0,"y":9,"n":6,"h":184,"b":242},"man-a3p3-idle2":{"a":"man-a3x","x":0,"y":10,"n":6,"h":200,"b":241},"man-a3p3-idle3":{"a":"man-a3x","x":0,"y":11,"n":6,"h":186,"b":238},"man-a3p3-drink":{"a":"man-a3x","x":0,"y":12,"n":8,"h":175,"b":238},"man-a3p3-good":{"a":"man-a3x","x":0,"y":13,"n":6,"h":187,"b":243},"man-a3p3-bad":{"a":"man-a3x","x":0,"y":14,"n":6,"h":180,"b":226},"man-a4p1l1-idle":{"a":"man-a4i","x":0,"y":0,"n":6,"h":186,"b":244},"man-a4p1l2-idle":{"a":"man-a4i","x":0,"y":1,"n":6,"h":186,"b":227},"man-a4p1l3-idle":{"a":"man-a4i","x":0,"y":2,"n":6,"h":197,"b":242},"man-a4p2l1-idle":{"a":"man-a4i","x":0,"y":3,"n":6,"h":193,"b":242},"man-a4p2l2-idle":{"a":"man-a4i","x":0,"y":4,"n":6,"h":197,"b":234},"man-a4p2l3-idle":{"a":"man-a4i","x":0,"y":5,"n":6,"h":184,"b":228},"man-a4p3l1-idle":{"a":"man-a4i","x":0,"y":6,"n":6,"h":192,"b":234},"man-a4p3l2-idle":{"a":"man-a4i","x":0,"y":7,"n":6,"h":190,"b":232},"man-a4p3l3-idle":{"a":"man-a4i","x":0,"y":8,"n":6,"h":204,"b":243},"man-a4p1-idle2":{"a":"man-a4x","x":0,"y":0,"n":6,"h":198,"b":231},"man-a4p1-idle3":{"a":"man-a4x","x":0,"y":1,"n":6,"h":172,"b":223},"man-a4p1-drink":{"a":"man-a4x","x":0,"y":2,"n":8,"h":156,"b":214},"man-a4p1-good":{"a":"man-a4x","x":0,"y":3,"n":6,"h":201,"b":234},"man-a4p1-bad":{"a":"man-a4x","x":0,"y":4,"n":6,"h":177,"b":215},"man-a4p2-idle2":{"a":"man-a4x","x":0,"y":5,"n":6,"h":186,"b":237},"man-a4p2-idle3":{"a":"man-a4x","x":0,"y":6,"n":6,"h":180,"b":221},"man-a4p2-drink":{"a":"man-a4x","x":0,"y":7,"n":8,"h":188,"b":232},"man-a4p2-good":{"a":"man-a4x","x":0,"y":8,"n":6,"h":177,"b":227},"man-a4p2-bad":{"a":"man-a4x","x":0,"y":9,"n":6,"h":186,"b":225},"man-a4p3-idle2":{"a":"man-a4x","x":0,"y":10,"n":6,"h":190,"b":227},"man-a4p3-idle3":{"a":"man-a4x","x":0,"y":11,"n":6,"h":185,"b":228},"man-a4p3-drink":{"a":"man-a4x","x":0,"y":12,"n":8,"h":173,"b":238},"man-a4p3-good":{"a":"man-a4x","x":0,"y":13,"n":6,"h":192,"b":231},"man-a4p3-bad":{"a":"man-a4x","x":0,"y":14,"n":6,"h":192,"b":231},"witch-idle":{"a":"witch","x":0,"y":0,"n":8,"h":152,"b":222},"witch-idle2":{"a":"witch","x":0,"y":1,"n":8,"h":160,"b":219},"witch-idle3":{"a":"witch","x":0,"y":2,"n":8,"h":171,"b":242},"witch-appear":{"a":"witch","x":0,"y":3,"n":8,"h":160,"b":219},"witch-nod":{"a":"witch","x":0,"y":4,"n":6,"h":216,"b":243},"witch-laugh":{"a":"witch","x":0,"y":5,"n":6,"h":205,"b":241},"witch-wand":{"a":"witch","x":0,"y":6,"n":8,"h":139,"b":232},"witch-stop":{"a":"witch","x":0,"y":7,"n":6,"h":205,"b":236},"cup-1":{"a":"cups","x":0,"y":0,"n":6,"f":1},"cup-2":{"a":"cups","x":0,"y":1,"n":6,"f":1},"cup-3":{"a":"cups","x":0,"y":2,"n":6,"f":1},"cup-4":{"a":"cups","x":0,"y":3,"n":6,"f":1},"cup-5":{"a":"cups","x":0,"y":4,"n":6,"f":1},"cup-6":{"a":"cups","x":0,"y":5,"n":6,"f":1},"fx-good":{"a":"fx","x":0,"y":0,"n":6,"f":1},"fx-bad":{"a":"fx","x":0,"y":1,"n":6,"f":1},"fx-change":{"a":"fx","x":0,"y":2,"n":6,"f":1},"car-0":{"a":"cars","x":0,"y":0,"n":1,"box":[127,14,641,488],"w":768,"h":512},"car-1":{"a":"cars","x":1,"y":0,"n":1,"box":[148,17,644,490],"w":768,"h":512},"car-2":{"a":"cars","x":2,"y":0,"n":1,"box":[20,72,754,458],"w":768,"h":512},"car-3":{"a":"cars","x":3,"y":0,"n":1,"box":[24,79,753,458],"w":768,"h":512},"car-4":{"a":"cars","x":0,"y":1,"n":1,"box":[24,56,748,445],"w":768,"h":512},"car-5":{"a":"cars","x":1,"y":1,"n":1,"box":[25,65,752,421],"w":768,"h":512},"car-6":{"a":"cars","x":2,"y":1,"n":1,"box":[18,201,750,432],"w":768,"h":512},"car-7":{"a":"cars","x":3,"y":1,"n":1,"box":[22,13,744,477],"w":768,"h":512},"face-a1l1":{"a":"faces","x":0,"y":0,"n":1},"face-a1l2":{"a":"faces","x":1,"y":0,"n":1},"face-a1l3":{"a":"faces","x":2,"y":0,"n":1},"face-a2l1":{"a":"faces","x":3,"y":0,"n":1},"face-a2l2":{"a":"faces","x":4,"y":0,"n":1},"face-a2l3":{"a":"faces","x":5,"y":0,"n":1},"face-a3l1":{"a":"faces","x":0,"y":1,"n":1},"face-a3l2":{"a":"faces","x":1,"y":1,"n":1},"face-a3l3":{"a":"faces","x":2,"y":1,"n":1},"face-a4l1":{"a":"faces","x":3,"y":1,"n":1},"face-a4l2":{"a":"faces","x":4,"y":1,"n":1},"face-a4l3":{"a":"faces","x":5,"y":1,"n":1},"ui-frame-1":{"a":"frames","x":0,"y":0,"n":1},"ui-frame-2":{"a":"frames","x":1,"y":0,"n":1},"ui-frame-3":{"a":"frames","x":2,"y":0,"n":1},"ui-frame-4":{"a":"frames","x":3,"y":0,"n":1},"ui-frame-5":{"a":"frames","x":4,"y":0,"n":1},"ui-frame-6":{"a":"frames","x":5,"y":0,"n":1},"ui-frame-7":{"a":"frames","x":6,"y":0,"n":1},"icon-age":{"a":"icons","x":0,"y":0,"n":1},"icon-body":{"a":"icons","x":1,"y":0,"n":1},"icon-look":{"a":"icons","x":2,"y":0,"n":1},"icon-wealth":{"a":"icons","x":3,"y":0,"n":1},"icon-house":{"a":"icons","x":4,"y":0,"n":1},"icon-car":{"a":"icons","x":5,"y":0,"n":1},"icon-ach":{"a":"icons","x":6,"y":0,"n":1},"icon-share":{"a":"icons","x":7,"y":0,"n":1},"icon-set":{"a":"icons","x":8,"y":0,"n":1},"icon-exit":{"a":"icons","x":9,"y":0,"n":1},"icon-book":{"a":"icons","x":10,"y":0,"n":1},"ui-close":{"a":"icons","x":11,"y":0,"n":1},"badge-first":{"a":"badges","x":0,"y":0,"n":1},"badge-r10":{"a":"badges","x":1,"y":0,"n":1},"badge-r100":{"a":"badges","x":2,"y":0,"n":1},"badge-r500":{"a":"badges","x":3,"y":0,"n":1},"badge-c5":{"a":"badges","x":4,"y":0,"n":1},"badge-c10":{"a":"badges","x":5,"y":0,"n":1},"badge-c20":{"a":"badges","x":0,"y":1,"n":1},"badge-young":{"a":"badges","x":1,"y":1,"n":1},"badge-ageR":{"a":"badges","x":2,"y":1,"n":1},"badge-fit":{"a":"badges","x":3,"y":1,"n":1},"badge-phyR":{"a":"badges","x":4,"y":1,"n":1},"badge-hand":{"a":"badges","x":5,"y":1,"n":1},"badge-lookR":{"a":"badges","x":0,"y":2,"n":1},"badge-m1":{"a":"badges","x":1,"y":2,"n":1},"badge-m2":{"a":"badges","x":2,"y":2,"n":1},"badge-m4":{"a":"badges","x":3,"y":2,"n":1},"badge-m5":{"a":"badges","x":4,"y":2,"n":1},"badge-m7":{"a":"badges","x":5,"y":2,"n":1},"badge-win":{"a":"badges","x":0,"y":3,"n":1},"badge-old":{"a":"badges","x":1,"y":3,"n":1},"badge-dead":{"a":"badges","x":2,"y":3,"n":1},"badge-revive":{"a":"badges","x":3,"y":3,"n":1},"badge-bill":{"a":"badges","x":4,"y":3,"n":1},"badge-unlock":{"a":"badges","x":5,"y":3,"n":1},"ui-tray":{"a":"ui-tray","x":0,"y":0,"n":1,"w":426,"h":219},"ui-divider":{"a":"ui-divider","x":0,"y":0,"n":1,"w":768,"h":40}}};
 
1
+ window.__WITCH_SPR__={"A":{"man-a1i":[6,9],"man-a1x":[8,15],"man-a2i":[6,9],"man-a2x":[8,16],"man-a3i":[6,9],"man-a3x":[8,15],"man-a4i":[6,9],"man-a4x":[8,15],"witch":[8,8],"cups":[6,6],"fx":[6,3],"cars":[4,2],"faces":[6,2],"frames":[7,1],"icons":[13,1],"badges":[6,4],"ui-tray":[1,1]},"S":{"man-a1p1l1-idle":{"a":"man-a1i","x":0,"y":0,"n":6,"h":212,"b":241},"man-a1p1l2-idle":{"a":"man-a1i","x":0,"y":1,"n":6,"h":194,"b":244},"man-a1p1l3-idle":{"a":"man-a1i","x":0,"y":2,"n":6,"h":195,"b":243},"man-a1p2l1-idle":{"a":"man-a1i","x":0,"y":3,"n":6,"h":180,"b":227},"man-a1p2l2-idle":{"a":"man-a1i","x":0,"y":4,"n":6,"h":183,"b":234},"man-a1p2l3-idle":{"a":"man-a1i","x":0,"y":5,"n":6,"h":195,"b":239},"man-a1p3l1-idle":{"a":"man-a1i","x":0,"y":6,"n":6,"h":202,"b":244},"man-a1p3l2-idle":{"a":"man-a1i","x":0,"y":7,"n":6,"h":198,"b":242},"man-a1p3l3-idle":{"a":"man-a1i","x":0,"y":8,"n":6,"h":184,"b":244},"man-a1p1-idle2":{"a":"man-a1x","x":0,"y":0,"n":6,"h":180,"b":231},"man-a1p1-idle3":{"a":"man-a1x","x":0,"y":1,"n":6,"h":191,"b":242},"man-a1p1-drink":{"a":"man-a1x","x":0,"y":2,"n":8,"h":166,"b":235},"man-a1p1-good":{"a":"man-a1x","x":0,"y":3,"n":6,"h":184,"b":240},"man-a1p1-bad":{"a":"man-a1x","x":0,"y":4,"n":6,"h":180,"b":231},"man-a1p2-idle2":{"a":"man-a1x","x":0,"y":5,"n":6,"h":215,"b":243},"man-a1p2-idle3":{"a":"man-a1x","x":0,"y":6,"n":6,"h":193,"b":234},"man-a1p2-drink":{"a":"man-a1x","x":0,"y":7,"n":8,"h":172,"b":236},"man-a1p2-good":{"a":"man-a1x","x":0,"y":8,"n":6,"h":170,"b":226},"man-a1p2-bad":{"a":"man-a1x","x":0,"y":9,"n":6,"h":189,"b":234},"man-a1p3-idle2":{"a":"man-a1x","x":0,"y":10,"n":6,"h":195,"b":242},"man-a1p3-idle3":{"a":"man-a1x","x":0,"y":11,"n":6,"h":206,"b":243},"man-a1p3-drink":{"a":"man-a1x","x":0,"y":12,"n":8,"h":168,"b":243},"man-a1p3-good":{"a":"man-a1x","x":0,"y":13,"n":6,"h":192,"b":236},"man-a1p3-bad":{"a":"man-a1x","x":0,"y":14,"n":6,"h":188,"b":240},"man-a2p1l1-idle":{"a":"man-a2i","x":0,"y":0,"n":6,"h":186,"b":243},"man-a2p1l2-idle":{"a":"man-a2i","x":0,"y":1,"n":6,"h":205,"b":242},"man-a2p1l3-idle":{"a":"man-a2i","x":0,"y":2,"n":6,"h":187,"b":237},"man-a2p2l1-idle":{"a":"man-a2i","x":0,"y":3,"n":6,"h":189,"b":244},"man-a2p2l2-idle":{"a":"man-a2i","x":0,"y":4,"n":6,"h":178,"b":231},"man-a2p2l3-idle":{"a":"man-a2i","x":0,"y":5,"n":6,"h":182,"b":226},"man-a2p3l1-idle":{"a":"man-a2i","x":0,"y":6,"n":6,"h":202,"b":244},"man-a2p3l2-idle":{"a":"man-a2i","x":0,"y":7,"n":6,"h":181,"b":235},"man-a2p3l3-idle":{"a":"man-a2i","x":0,"y":8,"n":6,"h":200,"b":241},"man-a2p1-idle2":{"a":"man-a2x","x":0,"y":0,"n":6,"h":197,"b":242},"man-a2p1-idle3":{"a":"man-a2x","x":0,"y":1,"n":6,"h":188,"b":242},"man-a2p1-drink":{"a":"man-a2x","x":0,"y":2,"n":8,"h":173,"b":236},"man-a2p1-good":{"a":"man-a2x","x":0,"y":3,"n":6,"h":204,"b":233},"man-a2p1-bad":{"a":"man-a2x","x":0,"y":4,"n":6,"h":180,"b":236},"man-a2p2-idle2":{"a":"man-a2x","x":0,"y":5,"n":6,"h":203,"b":244},"man-a2p2-idle3":{"a":"man-a2x","x":0,"y":6,"n":6,"h":180,"b":234},"man-a2p2-drink":{"a":"man-a2x","x":0,"y":7,"n":8,"h":193,"b":242},"man-a2p2-good":{"a":"man-a2x","x":0,"y":8,"n":6,"h":193,"b":234},"man-a2p2-bad":{"a":"man-a2x","x":0,"y":9,"n":6,"h":208,"b":244},"man-a2p3-idle2":{"a":"man-a2x","x":0,"y":10,"n":6,"h":196,"b":243},"man-a2p3-idle3":{"a":"man-a2x","x":0,"y":11,"n":6,"h":194,"b":234},"man-a2p3-drink":{"a":"man-a2x","x":0,"y":12,"n":8,"h":168,"b":229},"man-a2p3-good":{"a":"man-a2x","x":0,"y":13,"n":6,"h":213,"b":242},"man-a2p3-bad":{"a":"man-a2x","x":0,"y":14,"n":6,"h":188,"b":244},"man-ride":{"a":"man-a2x","x":0,"y":15,"n":6,"h":168,"b":214},"man-a3p1l1-idle":{"a":"man-a3i","x":0,"y":0,"n":6,"h":194,"b":244},"man-a3p1l2-idle":{"a":"man-a3i","x":0,"y":1,"n":6,"h":198,"b":243},"man-a3p1l3-idle":{"a":"man-a3i","x":0,"y":2,"n":6,"h":190,"b":233},"man-a3p2l1-idle":{"a":"man-a3i","x":0,"y":3,"n":6,"h":187,"b":240},"man-a3p2l2-idle":{"a":"man-a3i","x":0,"y":4,"n":6,"h":204,"b":242},"man-a3p2l3-idle":{"a":"man-a3i","x":0,"y":5,"n":6,"h":180,"b":235},"man-a3p3l1-idle":{"a":"man-a3i","x":0,"y":6,"n":6,"h":199,"b":241},"man-a3p3l2-idle":{"a":"man-a3i","x":0,"y":7,"n":6,"h":216,"b":244},"man-a3p3l3-idle":{"a":"man-a3i","x":0,"y":8,"n":6,"h":201,"b":243},"man-a3p1-idle2":{"a":"man-a3x","x":0,"y":0,"n":6,"h":189,"b":242},"man-a3p1-idle3":{"a":"man-a3x","x":0,"y":1,"n":6,"h":197,"b":233},"man-a3p1-drink":{"a":"man-a3x","x":0,"y":2,"n":8,"h":176,"b":242},"man-a3p1-good":{"a":"man-a3x","x":0,"y":3,"n":6,"h":194,"b":243},"man-a3p1-bad":{"a":"man-a3x","x":0,"y":4,"n":6,"h":174,"b":223},"man-a3p2-idle2":{"a":"man-a3x","x":0,"y":5,"n":6,"h":193,"b":244},"man-a3p2-idle3":{"a":"man-a3x","x":0,"y":6,"n":6,"h":195,"b":242},"man-a3p2-drink":{"a":"man-a3x","x":0,"y":7,"n":8,"h":178,"b":242},"man-a3p2-good":{"a":"man-a3x","x":0,"y":8,"n":6,"h":201,"b":241},"man-a3p2-bad":{"a":"man-a3x","x":0,"y":9,"n":6,"h":184,"b":242},"man-a3p3-idle2":{"a":"man-a3x","x":0,"y":10,"n":6,"h":200,"b":241},"man-a3p3-idle3":{"a":"man-a3x","x":0,"y":11,"n":6,"h":186,"b":238},"man-a3p3-drink":{"a":"man-a3x","x":0,"y":12,"n":8,"h":175,"b":238},"man-a3p3-good":{"a":"man-a3x","x":0,"y":13,"n":6,"h":187,"b":243},"man-a3p3-bad":{"a":"man-a3x","x":0,"y":14,"n":6,"h":180,"b":226},"man-a4p1l1-idle":{"a":"man-a4i","x":0,"y":0,"n":6,"h":186,"b":244},"man-a4p1l2-idle":{"a":"man-a4i","x":0,"y":1,"n":6,"h":186,"b":227},"man-a4p1l3-idle":{"a":"man-a4i","x":0,"y":2,"n":6,"h":197,"b":242},"man-a4p2l1-idle":{"a":"man-a4i","x":0,"y":3,"n":6,"h":193,"b":242},"man-a4p2l2-idle":{"a":"man-a4i","x":0,"y":4,"n":6,"h":197,"b":234},"man-a4p2l3-idle":{"a":"man-a4i","x":0,"y":5,"n":6,"h":184,"b":228},"man-a4p3l1-idle":{"a":"man-a4i","x":0,"y":6,"n":6,"h":192,"b":234},"man-a4p3l2-idle":{"a":"man-a4i","x":0,"y":7,"n":6,"h":190,"b":232},"man-a4p3l3-idle":{"a":"man-a4i","x":0,"y":8,"n":6,"h":204,"b":243},"man-a4p1-idle2":{"a":"man-a4x","x":0,"y":0,"n":6,"h":198,"b":231},"man-a4p1-idle3":{"a":"man-a4x","x":0,"y":1,"n":6,"h":172,"b":223},"man-a4p1-drink":{"a":"man-a4x","x":0,"y":2,"n":8,"h":156,"b":214},"man-a4p1-good":{"a":"man-a4x","x":0,"y":3,"n":6,"h":201,"b":234},"man-a4p1-bad":{"a":"man-a4x","x":0,"y":4,"n":6,"h":177,"b":215},"man-a4p2-idle2":{"a":"man-a4x","x":0,"y":5,"n":6,"h":186,"b":237},"man-a4p2-idle3":{"a":"man-a4x","x":0,"y":6,"n":6,"h":180,"b":221},"man-a4p2-drink":{"a":"man-a4x","x":0,"y":7,"n":8,"h":188,"b":232},"man-a4p2-good":{"a":"man-a4x","x":0,"y":8,"n":6,"h":177,"b":227},"man-a4p2-bad":{"a":"man-a4x","x":0,"y":9,"n":6,"h":186,"b":225},"man-a4p3-idle2":{"a":"man-a4x","x":0,"y":10,"n":6,"h":190,"b":227},"man-a4p3-idle3":{"a":"man-a4x","x":0,"y":11,"n":6,"h":185,"b":228},"man-a4p3-drink":{"a":"man-a4x","x":0,"y":12,"n":8,"h":173,"b":238},"man-a4p3-good":{"a":"man-a4x","x":0,"y":13,"n":6,"h":192,"b":231},"man-a4p3-bad":{"a":"man-a4x","x":0,"y":14,"n":6,"h":192,"b":231},"witch-idle":{"a":"witch","x":0,"y":0,"n":8,"h":152,"b":222},"witch-idle2":{"a":"witch","x":0,"y":1,"n":8,"h":160,"b":219},"witch-idle3":{"a":"witch","x":0,"y":2,"n":8,"h":171,"b":242},"witch-appear":{"a":"witch","x":0,"y":3,"n":8,"h":160,"b":219},"witch-nod":{"a":"witch","x":0,"y":4,"n":6,"h":216,"b":243},"witch-laugh":{"a":"witch","x":0,"y":5,"n":6,"h":205,"b":241},"witch-wand":{"a":"witch","x":0,"y":6,"n":8,"h":139,"b":232},"witch-stop":{"a":"witch","x":0,"y":7,"n":6,"h":205,"b":236},"cup-1":{"a":"cups","x":0,"y":0,"n":6,"f":1},"cup-2":{"a":"cups","x":0,"y":1,"n":6,"f":1},"cup-3":{"a":"cups","x":0,"y":2,"n":6,"f":1},"cup-4":{"a":"cups","x":0,"y":3,"n":6,"f":1},"cup-5":{"a":"cups","x":0,"y":4,"n":6,"f":1},"cup-6":{"a":"cups","x":0,"y":5,"n":6,"f":1},"fx-good":{"a":"fx","x":0,"y":0,"n":6,"f":1},"fx-bad":{"a":"fx","x":0,"y":1,"n":6,"f":1},"fx-change":{"a":"fx","x":0,"y":2,"n":6,"f":1},"car-0":{"a":"cars","x":0,"y":0,"n":1,"box":[127,14,641,488],"w":768,"h":512},"car-1":{"a":"cars","x":1,"y":0,"n":1,"box":[148,17,644,490],"w":768,"h":512},"car-2":{"a":"cars","x":2,"y":0,"n":1,"box":[20,72,754,458],"w":768,"h":512},"car-3":{"a":"cars","x":3,"y":0,"n":1,"box":[24,79,753,458],"w":768,"h":512},"car-4":{"a":"cars","x":0,"y":1,"n":1,"box":[24,56,748,445],"w":768,"h":512},"car-5":{"a":"cars","x":1,"y":1,"n":1,"box":[25,65,752,421],"w":768,"h":512},"car-6":{"a":"cars","x":2,"y":1,"n":1,"box":[18,201,750,432],"w":768,"h":512},"car-7":{"a":"cars","x":3,"y":1,"n":1,"box":[22,13,744,477],"w":768,"h":512},"face-a1l1":{"a":"faces","x":0,"y":0,"n":1},"face-a1l2":{"a":"faces","x":1,"y":0,"n":1},"face-a1l3":{"a":"faces","x":2,"y":0,"n":1},"face-a2l1":{"a":"faces","x":3,"y":0,"n":1},"face-a2l2":{"a":"faces","x":4,"y":0,"n":1},"face-a2l3":{"a":"faces","x":5,"y":0,"n":1},"face-a3l1":{"a":"faces","x":0,"y":1,"n":1},"face-a3l2":{"a":"faces","x":1,"y":1,"n":1},"face-a3l3":{"a":"faces","x":2,"y":1,"n":1},"face-a4l1":{"a":"faces","x":3,"y":1,"n":1},"face-a4l2":{"a":"faces","x":4,"y":1,"n":1},"face-a4l3":{"a":"faces","x":5,"y":1,"n":1},"ui-frame-1":{"a":"frames","x":0,"y":0,"n":1},"ui-frame-2":{"a":"frames","x":1,"y":0,"n":1},"ui-frame-3":{"a":"frames","x":2,"y":0,"n":1},"ui-frame-4":{"a":"frames","x":3,"y":0,"n":1},"ui-frame-5":{"a":"frames","x":4,"y":0,"n":1},"ui-frame-6":{"a":"frames","x":5,"y":0,"n":1},"ui-frame-7":{"a":"frames","x":6,"y":0,"n":1},"icon-age":{"a":"icons","x":0,"y":0,"n":1},"icon-body":{"a":"icons","x":1,"y":0,"n":1},"icon-look":{"a":"icons","x":2,"y":0,"n":1},"icon-wealth":{"a":"icons","x":3,"y":0,"n":1},"icon-house":{"a":"icons","x":4,"y":0,"n":1},"icon-car":{"a":"icons","x":5,"y":0,"n":1},"icon-ach":{"a":"icons","x":6,"y":0,"n":1},"icon-share":{"a":"icons","x":7,"y":0,"n":1},"icon-set":{"a":"icons","x":8,"y":0,"n":1},"icon-exit":{"a":"icons","x":9,"y":0,"n":1},"icon-book":{"a":"icons","x":10,"y":0,"n":1},"ui-close":{"a":"icons","x":11,"y":0,"n":1},"icon-forget":{"a":"icons","x":12,"y":0,"n":1},"badge-first":{"a":"badges","x":0,"y":0,"n":1},"badge-r10":{"a":"badges","x":1,"y":0,"n":1},"badge-r100":{"a":"badges","x":2,"y":0,"n":1},"badge-r500":{"a":"badges","x":3,"y":0,"n":1},"badge-c5":{"a":"badges","x":4,"y":0,"n":1},"badge-c10":{"a":"badges","x":5,"y":0,"n":1},"badge-c20":{"a":"badges","x":0,"y":1,"n":1},"badge-young":{"a":"badges","x":1,"y":1,"n":1},"badge-ageR":{"a":"badges","x":2,"y":1,"n":1},"badge-fit":{"a":"badges","x":3,"y":1,"n":1},"badge-phyR":{"a":"badges","x":4,"y":1,"n":1},"badge-hand":{"a":"badges","x":5,"y":1,"n":1},"badge-lookR":{"a":"badges","x":0,"y":2,"n":1},"badge-m1":{"a":"badges","x":1,"y":2,"n":1},"badge-m2":{"a":"badges","x":2,"y":2,"n":1},"badge-m4":{"a":"badges","x":3,"y":2,"n":1},"badge-m5":{"a":"badges","x":4,"y":2,"n":1},"badge-m7":{"a":"badges","x":5,"y":2,"n":1},"badge-win":{"a":"badges","x":0,"y":3,"n":1},"badge-old":{"a":"badges","x":1,"y":3,"n":1},"badge-dead":{"a":"badges","x":2,"y":3,"n":1},"badge-revive":{"a":"badges","x":3,"y":3,"n":1},"badge-bill":{"a":"badges","x":4,"y":3,"n":1},"badge-unlock":{"a":"badges","x":5,"y":3,"n":1},"ui-tray":{"a":"ui-tray","x":0,"y":0,"n":1,"w":426,"h":219}}};
htlb/miniapp/tool/witch.js CHANGED
@@ -175,7 +175,7 @@
175
  return 'background-image:url(' + DIR + m.a + '.webp);background-size:' + (at[0] * 100) + '% ' + (at[1] * 100) + '%;background-position:0% ' + y + '%;background-position-y:' + y + '%' + (still ? '' : ';-webkit-animation-duration:' + d + 's;animation-duration:' + d + 's');
176
  }
177
  function sprBg(name, k) { return bg(name, k); }
178
- var ICON_FILE = ['icon-ach', 'icon-ach', 'icon-share', 'icon-book', 'icon-set', 'icon-exit', 'icon-set', 'icon-age'];
179
  function uiIcon(k) { var f = ICON_FILE[k]; return SPR[f] ? '<i class="w2-ic one" style="' + bg(f) + '"></i>' : '<i class="w2-ic"></i>'; }
180
 
181
  /* ---------------- 冒险页(落地页) ---------------- */
@@ -207,7 +207,7 @@
207
  lay.el.innerHTML = '<div class="w2-bg" id="w2-bg"></div><div class="w2-bg next" id="w2-bg2"></div>' +
208
  '<div class="w2-scene" id="w2-scene"><div class="wt-plat" id="w2-plat"></div><div class="wt-car" id="w2-car"></div>' +
209
  '<div class="wt-actor hero" id="w2-hero"></div><div class="wt-actor witch" id="w2-witch"></div><div class="w2-book" id="w2-book" data-act="wt-book"></div>' +
210
- '<div class="w2-tray" id="w2-tray"></div><div class="wt-fx" id="w2-fx"></div></div>' +
211
  '<div class="w2-hud" id="w2-hud"></div><div class="w2-flash" id="w2-flash"></div>' +
212
  '<div class="w2-dialog" id="w2-dialog"><div class="w2-name" id="w2-name"></div><div class="w2-text" id="w2-text"></div><div class="w2-extra" id="w2-extra"></div></div>' +
213
  '<div class="w2-tools" id="w2-tools">' + tool('ach', '成就') + tool('share', '账单') + tool('set', '设置') + tool('exit', '退出') + '</div>' +
@@ -332,10 +332,10 @@
332
  ['house', '房子', M.house, gMoney()],
333
  ['car', '车子', M.car, gMoney()]
334
  ];
335
- popup('角色属性 · 综合 <em style="color:' + GRADE[gAll()][1] + '">' + GRADE[gAll()][0] + '</em>', '<div class="w2-pscene" id="w2-pscene" style="background-image:url(' + DIR + 'house-' + ms + '.webp)"><div class="w2-pcar" style="' + bg('car-' + ms) + '"></div><div class="wt-actor" id="w2-phero"></div></div>' +
336
  '<div class="w2-attrs">' + rows.map(function (r) { return '<p>' + statIcon(r[0]) + '<b>' + r[1] + '</b><span style="color:' + GRADE[r[3]][1] + '">' + esc(r[2]) + '</span></p>'; }).join('') + '</div>' +
337
- '<div class="w2-subcap">战绩</div><dl class="w2-stats"><div><dt>今天喝对</dt><dd>' + S.today.right + ' 杯</dd></div><div><dt>今天喝错</dt><dd>' + S.today.wrong + ' 杯</dd></div><div><dt>累计喝对</dt><dd>' + S.total.right + ' 杯</dd></div><div><dt>累计喝错</dt><dd>' + S.total.wrong + ' 杯</dd></div>' +
338
- '<div><dt>连续喝对</dt><dd>' + S.combo + ' 杯</dd></div><div><dt>最年轻</dt><dd>' + (S.peak.age < 20 ? S.peak.age.toFixed(1) : Math.round(S.peak.age)) + ' 岁</dd></div><div><dt>最高金钱</dt><dd>' + Math.round(S.peak.m) + '</dd></div><div><dt>寿终 / 复活</dt><dd>' + S.total.deaths + ' / ' + S.total.revives + '</dd></div></dl>', 'panel');
339
  var ph = $('#w2-phero', L.el);
340
  if (ph) { var sc = $('#w2-pscene', L.el), a = new Actor(ph, '', (sc.offsetHeight || 200) * 0.62); G.panelA = a; a.play(heroKey() + '-idle', { fps: 4, loop: true, pingpong: true }); }
341
  }
@@ -398,14 +398,27 @@
398
  tray([{ k: 0, label: '准备好了', v: 'go' }, { k: 1, label: '还没准备好', v: 'no' }]);
399
  }
400
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
401
  async function bookTapped() {
402
  if (!G || G.mode !== 'story' || !STORY[G.storyK].book) return;
403
  B.buzz('medium');
404
- $('#w2-book', L.el).className = 'w2-book';
405
- showWitch(true);
406
  say('', '……');
407
- await G.witch.play('witch-appear', { fps: 5 });
408
- witchIdle();
409
  G.busy = false;
410
  story(G.storyK + 1);
411
  }
@@ -429,8 +442,7 @@
429
  setTimeout(function () {
430
  if (!alive()) return;
431
  var d = $('#w2-dialog', L.el), rr = L.el.getBoundingClientRect(), dTop = d.getBoundingClientRect().top - rr.top;
432
- var bottomY = Math.min(G.ground - G.ground * 0.04, dTop - 8);
433
- t.style.bottom = Math.max(0, G.ground - bottomY) + 'px';
434
  }, 60);
435
  t.innerHTML = '<i class="w2-tray-img" style="background-image:url(' + DIR + 'ui-tray.webp)"></i>' + items.map(function (it, i) {
436
  return '<button class="w2-cup" type="button" data-act="wt-cup" data-i="' + i + '" style="left:' + (10 + (i + 0.5) / items.length * 80) + '%;width:' + cw + 'px;height:' + cw + 'px;margin-left:' + (-cw / 2) + 'px;bottom:' + (h * 0.4) + 'px"><i class="smoke" style="' + cupBg(it.k) + '"></i></button>';
@@ -483,8 +495,8 @@
483
  setCar(false);
484
  $('#w2-hero', L.el).className = 'wt-actor hero';
485
  if (!G.appeared) {
486
- G.appeared = true; showWitch(true); tray([]); say('', '书页一闪,女巫飘了出来……');
487
- await G.witch.play('witch-appear', { fps: 6 });
488
  }
489
  showWitch(true); witchIdle();
490
  ask();
@@ -551,7 +563,7 @@
551
  f = document.createElement('i'); f.className = 'wt-fly smoke'; f.setAttribute('style', cupBtn.firstChild.getAttribute('style'));
552
  f.style.left = (from.left - rr.left) + 'px'; f.style.top = (from.top - rr.top) + 'px'; f.style.width = from.width + 'px'; f.style.height = from.height + 'px';
553
  L.el.appendChild(f); cupBtn.style.visibility = 'hidden'; void f.offsetWidth;
554
- var tx = hp.x - (from.left - rr.left + from.width / 2), ty = hp.y - sz * 0.25 - (from.top - rr.top + from.height / 2), sc = sz / from.width;
555
  base = 'translate(' + tx + 'px,' + ty + 'px) scale(' + sc + ')';
556
  f.style.webkitTransform = f.style.transform = base;
557
  B.buzz('light');
@@ -623,7 +635,7 @@
623
  if (!S.dead) heroIdle();
624
  var over = !S.dead && S.wrong >= cap();
625
  say('女巫', (ok ? '「喝对了!」' : timeout ? '「时间到,硬灌一杯!」' : '「哈哈,喝错了!」') + what + '。正确答案是「' + q.o[q.a] + '」。' + q.w,
626
- (change ? '<p class="w2-change">' + change + '</p>' : '') + '<div class="w2-acts"><button class="w2-btn ghost orig" type="button" data-act="wt-orig" data-id="' + q.id + '">' + (SPR['icon-book'] ? '<i class="w2-ic one" style="' + bg('icon-book') + '"></i>' : '') + '看原文</button>' +
627
  (S.dead ? '<button class="w2-btn" type="button" data-act="wt-death">寿终了……</button>' : over ? '<button class="w2-btn" type="button" data-act="wt-cap">女巫有话说</button>' : '<button class="w2-btn" type="button" data-act="wt-next">继续挑战</button>') + '</div>');
628
  $('#w2-name', L.el).innerHTML = '女巫';
629
  tray([]);
@@ -670,8 +682,7 @@
670
  G.witch.play('witch-stop', { fps: 5 }).then(function () { if (alive()) witchIdle(); });
671
  B.buzz('heavy');
672
  var mini = B.mini(), canComment = !!(mini && typeof mini.interactionOpenApi === 'function');
673
- popup('女巫:「今天喝错太多,你的身体受不了了!」', '<p>晒一下你的人生账单,我再给你 10 杯。或者,明天再来。</p>' + shareRows('unlock', canComment) +
674
- '<button class="w2-btn ghost wide" type="button" data-act="wt-popclose" data-then="lobby">明天再来</button>');
675
  }
676
  function shareRows(why, canComment) {
677
  return '<div class="w2-share"><button type="button" data-act="wt-share" data-k="note" data-why="' + why + '">' + uiIcon(ICON.share) + '<span><b>发图文晒人生账单</b><small>打开发笔记页就' + (why === 'revive' ? '复活' : '解锁') + '</small></span></button>' +
@@ -708,9 +719,16 @@
708
  closePopup();
709
  var p = document.createElement('div'); p.className = 'w2-pop' + (cls ? ' ' + cls : ''); p.id = 'w2-pop';
710
  var x = SPR['ui-close'] ? '<i style="' + bg('ui-close') + '"></i>' : '✕';
711
- p.innerHTML = '<div class="w2-pop-box rise"><div class="w2-title">' + title + '</div><div class="w2-pop-body">' + body + '</div><button class="w2-pop-x" type="button" data-act="wt-popclose" aria-label="关闭">' + x + '</button></div>';
 
712
  L.el.appendChild(p);
713
  }
 
 
 
 
 
 
714
  function closePopup() { var p = L && $('#w2-pop', L.el); if (p) p.parentNode.removeChild(p); if (G && G.panelA) { G.panelA.stop(); G.panelA = null; } }
715
  function badge(a, got) {
716
  var art = SPR['badge-' + a[0]] ? '<i style="' + bg('badge-' + a[0]) + '"></i>' : '<i class="t">' + a[1].slice(0, 1) + '</i>';
@@ -720,7 +738,7 @@
720
  '<h4>怎么玩</h4><p>女巫每次出一道题,选项有几个,托盘上就有几杯魔药。15 秒内选一杯喝下:喝对加分,喝错扣分,超时算喝错。题目全部来自《高性价比人生指南》的 765 条建议。</p>' +
721
  '<h4>四项属性</h4><p><b>年龄、身材、颜值</b>属于身体:身体类的题,喝对喝错会随机影响其中一项。<b>财富</b>对应金钱类的题,决定你住什么房子、开什么车。</p>' +
722
  '<h4>加减分</h4><p>喝对 + 题目难度分(1–8);喝错 − 2 × 难度分。题目难度由决策模型离线评定,属性越高,女巫出的题越难。</p>' +
723
- '<h4>等级颜色</h4><p>每项属性分 7 级:<span style="color:#a3a7ad">灰</span> → <span style="color:#f4f1ea;background:#555;padding:0 3px;border-radius:3px">白</span> → <span style="color:#5aa9ff">蓝</span> → <span style="color:#c07bff">紫</span> → <span style="color:#45d483">绿</span> → <span style="color:#ffc83d">金</span> → <span style="color:#ff5a5a">红</span>。右上角进度条显示每项离下一级还差多少分;头像框随综合等级越来越华丽。</p>' +
724
  '<h4>年龄</h4><p>开局 22 岁,最年轻 18 岁。往老的方向每 10 分老 1 岁,<b>到 90 岁寿终</b>。老了以后多喝对,也能变回年轻。</p>' +
725
  '<h4>财富</h4><p>8 个阶段:生存 → 稳定 → 小康 → 中产 → 富裕 → 豪门 → 顶级富豪 → 传说,满分 2000,每阶约 286 分。</p>' +
726
  '<h4>每天的限制</h4><p>每天最多喝错 10 杯。超过后,晒一下人生账单(发图文、做成图集或发评论)可以再喝 10 杯,不限次数;也可以第二天再来。</p>' +
@@ -731,11 +749,11 @@
731
  if (k === 'share') { share('note', ''); return; }
732
  if (k === 'ach') {
733
  var n = 0; ACH.forEach(function (a) { if (S.ach[a[0]]) n++; });
734
- popup('成就徽章 ' + n + ' / ' + ACH.length, '<div class="w2-badges">' + ACH.map(function (a) { return badge(a, S.ach[a[0]]); }).join('') + '</div><p class="w2-small" id="w2-badge-tip">点徽章查看获得条件</p>');
735
  return;
736
  }
737
  if (k === 'set') {
738
- popup('游戏设置', '<div class="w2-setbtns"><button class="w2-btn" type="button" data-act="wt-replay">重看开场剧情</button><button class="w2-btn danger" type="button" data-act="wt-forget">喝下「遗忘之药水」(全部清零)</button></div>' + RULES);
739
  return;
740
  }
741
  }
@@ -772,26 +790,26 @@
772
  drawSpr(g, heroKey() + '-idle', 330, 725, 430);
773
  g.restore();
774
  g.strokeStyle = GRADE[gAll()][1]; g.lineWidth = 6; B.rr(g, 64, 150, 952, 600, 34); g.stroke();
775
- // 头像 + 综合等级
776
- g.save(); g.beginPath(); g.arc(150, 830, 70, 0, 6.3); g.fillStyle = '#f3d7c0'; g.fill(); g.clip(); drawCell(g, faceKey(), 0, 80, 760, 140, 140); g.restore();
777
- g.strokeStyle = GRADE[gAll()][1]; g.lineWidth = 8; g.beginPath(); g.arc(150, 830, 72, 0, 6.3); g.stroke();
778
- g.fillStyle = '#fff'; g.font = f(900, 48); g.fillText('我', 250, 820);
779
- g.font = f(800, 30); g.fillStyle = GRADE[gAll()][1]; g.fillText('综合等级 · ' + GRADE[gAll()][0], 250, 868);
780
  // 属性:带等级颜色
781
  var rows = [['年龄', ageTxt() + ' 岁 · ' + AGE7[gAge()], gAge(), prog(S.y, TH_Y, Y_MIN, SUB).p], ['身材', PHY7[gPhy()], gPhy(), prog(S.phy, TH_S, S_MIN, SUB).p], ['颜值', LOOK7[gLook()], gLook(), prog(S.look, TH_S, S_MIN, SUB).p],
782
  ['财富', M.name + ' · ' + M.more, gMoney(), ms >= 7 ? 1 : (S.money - ms * UP) / UP], ['房子', M.house, gMoney(), -1], ['车子', M.car, gMoney(), -1]];
783
  rows.forEach(function (r, k) {
784
- var y = 950 + k * 62, c = GRADE[r[2]][1];
785
  g.fillStyle = 'rgba(255,255,255,.08)'; B.rr(g, 64, y - 42, 952, 54, 14); g.fill();
786
  g.fillStyle = c; g.beginPath(); g.arc(100, y - 15, 9, 0, 6.3); g.fill();
787
  g.font = f(900, 28); g.fillStyle = 'rgba(255,255,255,.75)'; g.fillText(r[0], 124, y - 4);
788
  g.font = f(800, 28); g.fillStyle = c; g.fillText(B.clip(g, B.wrap(g, r[1], r[3] >= 0 ? 560 : 820), 1, r[3] >= 0 ? 560 : 820)[0], 210, y - 4);
789
  if (r[3] >= 0) { g.fillStyle = 'rgba(255,255,255,.15)'; B.rr(g, 800, y - 24, 190, 14, 7); g.fill(); g.fillStyle = c; B.rr(g, 800, y - 24, Math.max(8, 190 * r[3]), 14, 7); g.fill(); }
790
  });
791
- g.font = f(700, 28); g.fillStyle = 'rgba(255,255,255,.82)';
792
- g.fillText('今天喝对 ' + S.today.right + ' 杯 · 喝错 ' + S.today.wrong + ' 杯 · 累计喝对 ' + S.total.right + ' 杯', 64, 1340);
793
- g.fillStyle = 'rgba(255,255,255,.55)'; g.font = f(700, 22);
794
- g.fillText('高性价比人生 · 魔药题目出自《高性价比人生指南》CC BY 4.0 · github.com/eternity4719/HowToLiveBetter', 64, 1400);
 
 
795
  return cv;
796
  }
797
  function cardCanvas(q) {
@@ -827,7 +845,7 @@
827
  postBusy = true;
828
  var mini = B.mini();
829
  try {
830
- await loadAll(['house-' + moneyStage(), 'car-' + moneyStage(), heroKey() + '-idle', faceKey(), 'witch-idle']);
831
  var imgs = [toURL(billCanvas)];
832
  if (kind === 'slides') recentQs(3).forEach(function (q) { imgs.push(toURL(function () { return cardCanvas(q); })); });
833
  if (!mini) {
@@ -871,8 +889,8 @@
871
  case 'wt-panel': panel(); break;
872
  case 'wt-replay': closePopup(); G.appeared = false; story(0); break;
873
  case 'wt-badge':
874
- var aa = ACH.filter(function (x) { return x[0] === el.getAttribute('data-id'); })[0], tip = $('#w2-badge-tip', L.el);
875
- if (aa && tip) { var gt = S.ach[aa[0]]; tip.innerHTML = '<b>' + aa[1] + '</b>:' + aa[2] + (gt ? '(' + new Date(gt).toLocaleDateString() + ' 获得)' : '(未获得)'); B.buzz('light'); }
876
  break;
877
  case 'wt-money': moneyPop(); break;
878
  case 'wt-orig': B.openDetail(el.getAttribute('data-id')); break;
 
175
  return 'background-image:url(' + DIR + m.a + '.webp);background-size:' + (at[0] * 100) + '% ' + (at[1] * 100) + '%;background-position:0% ' + y + '%;background-position-y:' + y + '%' + (still ? '' : ';-webkit-animation-duration:' + d + 's;animation-duration:' + d + 's');
176
  }
177
  function sprBg(name, k) { return bg(name, k); }
178
+ var ICON_FILE = ['icon-ach', 'icon-ach', 'icon-share', 'icon-book', 'icon-set', 'icon-exit', 'icon-forget', 'icon-age'];
179
  function uiIcon(k) { var f = ICON_FILE[k]; return SPR[f] ? '<i class="w2-ic one" style="' + bg(f) + '"></i>' : '<i class="w2-ic"></i>'; }
180
 
181
  /* ---------------- 冒险页(落地页) ---------------- */
 
207
  lay.el.innerHTML = '<div class="w2-bg" id="w2-bg"></div><div class="w2-bg next" id="w2-bg2"></div>' +
208
  '<div class="w2-scene" id="w2-scene"><div class="wt-plat" id="w2-plat"></div><div class="wt-car" id="w2-car"></div>' +
209
  '<div class="wt-actor hero" id="w2-hero"></div><div class="wt-actor witch" id="w2-witch"></div><div class="w2-book" id="w2-book" data-act="wt-book"></div>' +
210
+ '<div class="w2-tray" id="w2-tray"></div><div class="wt-fx" id="w2-fx"></div><div class="wt-fx wfx" id="w2-wfx"></div></div>' +
211
  '<div class="w2-hud" id="w2-hud"></div><div class="w2-flash" id="w2-flash"></div>' +
212
  '<div class="w2-dialog" id="w2-dialog"><div class="w2-name" id="w2-name"></div><div class="w2-text" id="w2-text"></div><div class="w2-extra" id="w2-extra"></div></div>' +
213
  '<div class="w2-tools" id="w2-tools">' + tool('ach', '成就') + tool('share', '账单') + tool('set', '设置') + tool('exit', '退出') + '</div>' +
 
332
  ['house', '房子', M.house, gMoney()],
333
  ['car', '车子', M.car, gMoney()]
334
  ];
335
+ popup('', '<div class="w2-pscene" id="w2-pscene" style="background-image:url(' + DIR + 'house-' + ms + '.webp)"><div class="w2-pcar" style="' + bg('car-' + ms) + '"></div><div class="wt-actor" id="w2-phero"></div></div>' +
336
  '<div class="w2-attrs">' + rows.map(function (r) { return '<p>' + statIcon(r[0]) + '<b>' + r[1] + '</b><span style="color:' + GRADE[r[3]][1] + '">' + esc(r[2]) + '</span></p>'; }).join('') + '</div>' +
337
+ '<div class="w2-card"><div class="w2-subcap">战绩</div><dl class="w2-stats row"><div><dt>今天喝对</dt><dd>' + S.today.right + ' 杯</dd></div><div><dt>今天喝错</dt><dd>' + S.today.wrong + ' 杯</dd></div><div><dt>累计喝对</dt><dd>' + S.total.right + ' 杯</dd></div><div><dt>累计喝错</dt><dd>' + S.total.wrong + ' 杯</dd></div>' +
338
+ '<div><dt>连续喝对</dt><dd>' + S.combo + ' 杯</dd></div><div><dt>最年轻</dt><dd>' + (S.peak.age < 20 ? S.peak.age.toFixed(1) : Math.round(S.peak.age)) + ' 岁</dd></div><div><dt>最高金钱</dt><dd>' + Math.round(S.peak.m) + '</dd></div><div><dt>寿终 / 复活</dt><dd>' + S.total.deaths + ' / ' + S.total.revives + '</dd></div></dl></div>', 'panel');
339
  var ph = $('#w2-phero', L.el);
340
  if (ph) { var sc = $('#w2-pscene', L.el), a = new Actor(ph, '', (sc.offsetHeight || 200) * 0.62); G.panelA = a; a.play(heroKey() + '-idle', { fps: 4, loop: true, pingpong: true }); }
341
  }
 
398
  tray([{ k: 0, label: '准备好了', v: 'go' }, { k: 1, label: '还没准备好', v: 'no' }]);
399
  }
400
  }
401
+ async function witchAppear() {
402
+ var we = $('#w2-witch', L.el), bk = $('#w2-book', L.el), box = $('#w2-wfx', L.el);
403
+ clearTimeout(G.wIdleT);
404
+ bk.className = 'w2-book on glow'; bk.setAttribute('style', sprBg('witch-appear', 0));
405
+ we.classList.add('gone'); we.classList.remove('gone', 'rise-in'); we.classList.add('pre-in');
406
+ G.witch.T = heroT() * 0.95; G.witch.play('witch-idle', { fps: 4, loop: true, pingpong: true });
407
+ box.innerHTML = '';
408
+ var a = new Actor(box, '', heroT() * 1.2);
409
+ var done = a.play('fx-change', { fps: 7, onFrame: function (k) {
410
+ if (k === 3) { B.buzz('medium'); we.classList.remove('pre-in'); we.classList.add('rise-in'); }
411
+ if (k === 4) bk.className = 'w2-book';
412
+ } });
413
+ await done; box.innerHTML = '';
414
+ we.classList.remove('rise-in');
415
+ witchIdle();
416
+ }
417
  async function bookTapped() {
418
  if (!G || G.mode !== 'story' || !STORY[G.storyK].book) return;
419
  B.buzz('medium');
 
 
420
  say('', '……');
421
+ await witchAppear();
 
422
  G.busy = false;
423
  story(G.storyK + 1);
424
  }
 
442
  setTimeout(function () {
443
  if (!alive()) return;
444
  var d = $('#w2-dialog', L.el), rr = L.el.getBoundingClientRect(), dTop = d.getBoundingClientRect().top - rr.top;
445
+ t.style.bottom = (G.ground - (dTop - 2)) + 'px';
 
446
  }, 60);
447
  t.innerHTML = '<i class="w2-tray-img" style="background-image:url(' + DIR + 'ui-tray.webp)"></i>' + items.map(function (it, i) {
448
  return '<button class="w2-cup" type="button" data-act="wt-cup" data-i="' + i + '" style="left:' + (10 + (i + 0.5) / items.length * 80) + '%;width:' + cw + 'px;height:' + cw + 'px;margin-left:' + (-cw / 2) + 'px;bottom:' + (h * 0.4) + 'px"><i class="smoke" style="' + cupBg(it.k) + '"></i></button>';
 
495
  setCar(false);
496
  $('#w2-hero', L.el).className = 'wt-actor hero';
497
  if (!G.appeared) {
498
+ G.appeared = true; tray([]); say('', '书页一闪,女巫飘了出来……');
499
+ await witchAppear();
500
  }
501
  showWitch(true); witchIdle();
502
  ask();
 
563
  f = document.createElement('i'); f.className = 'wt-fly smoke'; f.setAttribute('style', cupBtn.firstChild.getAttribute('style'));
564
  f.style.left = (from.left - rr.left) + 'px'; f.style.top = (from.top - rr.top) + 'px'; f.style.width = from.width + 'px'; f.style.height = from.height + 'px';
565
  L.el.appendChild(f); cupBtn.style.visibility = 'hidden'; void f.offsetWidth;
566
+ var tx = hp.x - (from.left - rr.left + from.width / 2), ty = hp.y + sz * 0.22 - (from.top - rr.top + from.height / 2), sc = sz / from.width;
567
  base = 'translate(' + tx + 'px,' + ty + 'px) scale(' + sc + ')';
568
  f.style.webkitTransform = f.style.transform = base;
569
  B.buzz('light');
 
635
  if (!S.dead) heroIdle();
636
  var over = !S.dead && S.wrong >= cap();
637
  say('女巫', (ok ? '「喝对了!」' : timeout ? '「时间到,硬灌一杯!」' : '「哈哈,喝错了!」') + what + '。正确答案是「' + q.o[q.a] + '」。' + q.w,
638
+ (change ? '<p class="w2-change">' + change + '</p>' : '') + '<div class="w2-acts"><button class="w2-btn ghost orig" type="button" data-act="wt-orig" data-id="' + q.id + '">' + (SPR['icon-book'] ? '<i class="w2-ic one" style="' + bg('icon-book') + '"></i>' : '') + '原文</button>' +
639
  (S.dead ? '<button class="w2-btn" type="button" data-act="wt-death">寿终了……</button>' : over ? '<button class="w2-btn" type="button" data-act="wt-cap">女巫有话说</button>' : '<button class="w2-btn" type="button" data-act="wt-next">继续挑战</button>') + '</div>');
640
  $('#w2-name', L.el).innerHTML = '女巫';
641
  tray([]);
 
682
  G.witch.play('witch-stop', { fps: 5 }).then(function () { if (alive()) witchIdle(); });
683
  B.buzz('heavy');
684
  var mini = B.mini(), canComment = !!(mini && typeof mini.interactionOpenApi === 'function');
685
+ popup('女巫:「今天喝错太多,你的身体受不了了!」', '<p>晒一下你的人生账单,我再给你 10 杯。</p>' + shareRows('unlock', canComment), 'cap');
 
686
  }
687
  function shareRows(why, canComment) {
688
  return '<div class="w2-share"><button type="button" data-act="wt-share" data-k="note" data-why="' + why + '">' + uiIcon(ICON.share) + '<span><b>发图文晒人生账单</b><small>打开发笔记页就' + (why === 'revive' ? '复活' : '解锁') + '</small></span></button>' +
 
719
  closePopup();
720
  var p = document.createElement('div'); p.className = 'w2-pop' + (cls ? ' ' + cls : ''); p.id = 'w2-pop';
721
  var x = SPR['ui-close'] ? '<i style="' + bg('ui-close') + '"></i>' : '✕';
722
+ p.innerHTML = '<div class="w2-pop-box rise">' + (title ? '<div class="w2-title">' + title + '</div>' : '') + '<div class="w2-pop-body">' + body + '</div><button class="w2-pop-x" type="button" data-act="wt-popclose" aria-label="关闭">' + x + '</button></div>';
723
+ B.buzz('light');
724
  L.el.appendChild(p);
725
  }
726
+ function centerTip(html) {
727
+ var old = $('#w2-tip', L.el); if (old) old.parentNode.removeChild(old);
728
+ var t = document.createElement('div'); t.className = 'w2-tip'; t.id = 'w2-tip'; t.innerHTML = html;
729
+ L.el.appendChild(t); clearTimeout(G.tipT);
730
+ G.tipT = setTimeout(function () { t.classList.add('out'); setTimeout(function () { t.parentNode && t.parentNode.removeChild(t); }, 300); }, 2000);
731
+ }
732
  function closePopup() { var p = L && $('#w2-pop', L.el); if (p) p.parentNode.removeChild(p); if (G && G.panelA) { G.panelA.stop(); G.panelA = null; } }
733
  function badge(a, got) {
734
  var art = SPR['badge-' + a[0]] ? '<i style="' + bg('badge-' + a[0]) + '"></i>' : '<i class="t">' + a[1].slice(0, 1) + '</i>';
 
738
  '<h4>怎么玩</h4><p>女巫每次出一道题,选项有几个,托盘上就有几杯魔药。15 秒内选一杯喝下:喝对加分,喝错扣分,超时算喝错。题目全部来自《高性价比人生指南》的 765 条建议。</p>' +
739
  '<h4>四项属性</h4><p><b>年龄、身材、颜值</b>属于身体:身体类的题,喝对喝错会随机影响其中一项。<b>财富</b>对应金钱类的题,决定你住什么房子、开什么车。</p>' +
740
  '<h4>加减分</h4><p>喝对 + 题目难度分(1–8);喝错 − 2 × 难度分。题目难度由决策模型离线评定,属性越高,女巫出的题越难。</p>' +
741
+ '<h4>等级颜色</h4><p>每项属性分 7 级:' + GRADE.map(function (g) { return '<span class="w2-gc" style="color:' + g[1] + '">' + g[0] + '</span>'; }).join(' → ') + '。右上角进度条显示每项离下一级还差多少分;头像框随综合等级越来越华丽。</p>' +
742
  '<h4>年龄</h4><p>开局 22 岁,最年轻 18 岁。往老的方向每 10 分老 1 岁,<b>到 90 岁寿终</b>。老了以后多喝对,也能变回年轻。</p>' +
743
  '<h4>财富</h4><p>8 个阶段:生存 → 稳定 → 小康 → 中产 → 富裕 → 豪门 → 顶级富豪 → 传说,满分 2000,每阶约 286 分。</p>' +
744
  '<h4>每天的限制</h4><p>每天最多喝错 10 杯。超过后,晒一下人生账单(发图文、做成图集或发评论)可以再喝 10 杯,不限次数;也可以第二天再来。</p>' +
 
749
  if (k === 'share') { share('note', ''); return; }
750
  if (k === 'ach') {
751
  var n = 0; ACH.forEach(function (a) { if (S.ach[a[0]]) n++; });
752
+ popup('成就徽章 ' + n + ' / ' + ACH.length, '<div class="w2-badges">' + ACH.map(function (a) { return badge(a, S.ach[a[0]]); }).join('') + '</div>', 'ach');
753
  return;
754
  }
755
  if (k === 'set') {
756
+ popup('游戏设置', RULES + '<div class="w2-setbtns"><button class="w2-btn" type="button" data-act="wt-replay">' + uiIcon(ICON.intro) + '重看开场剧情</button><button class="w2-btn danger" type="button" data-act="wt-forget">' + uiIcon(ICON.forget) + '遗忘之药水</button></div>');
757
  return;
758
  }
759
  }
 
790
  drawSpr(g, heroKey() + '-idle', 330, 725, 430);
791
  g.restore();
792
  g.strokeStyle = GRADE[gAll()][1]; g.lineWidth = 6; B.rr(g, 64, 150, 952, 600, 34); g.stroke();
793
+ // 头像(带头像框)放在画面卡片左上角
794
+ g.save(); g.beginPath(); g.arc(170, 256, 74, 0, 6.3); g.fillStyle = '#f3d7c0'; g.fill(); g.clip(); drawCell(g, faceKey(), 0, 96, 182, 148, 148); g.restore();
795
+ drawCell(g, 'ui-frame-' + (gAll() + 1), 0, 72, 158, 196, 196);
 
 
796
  // 属性:带等级颜色
797
  var rows = [['年龄', ageTxt() + ' 岁 · ' + AGE7[gAge()], gAge(), prog(S.y, TH_Y, Y_MIN, SUB).p], ['身材', PHY7[gPhy()], gPhy(), prog(S.phy, TH_S, S_MIN, SUB).p], ['颜值', LOOK7[gLook()], gLook(), prog(S.look, TH_S, S_MIN, SUB).p],
798
  ['财富', M.name + ' · ' + M.more, gMoney(), ms >= 7 ? 1 : (S.money - ms * UP) / UP], ['房子', M.house, gMoney(), -1], ['车子', M.car, gMoney(), -1]];
799
  rows.forEach(function (r, k) {
800
+ var y = 832 + k * 70, c = GRADE[r[2]][1];
801
  g.fillStyle = 'rgba(255,255,255,.08)'; B.rr(g, 64, y - 42, 952, 54, 14); g.fill();
802
  g.fillStyle = c; g.beginPath(); g.arc(100, y - 15, 9, 0, 6.3); g.fill();
803
  g.font = f(900, 28); g.fillStyle = 'rgba(255,255,255,.75)'; g.fillText(r[0], 124, y - 4);
804
  g.font = f(800, 28); g.fillStyle = c; g.fillText(B.clip(g, B.wrap(g, r[1], r[3] >= 0 ? 560 : 820), 1, r[3] >= 0 ? 560 : 820)[0], 210, y - 4);
805
  if (r[3] >= 0) { g.fillStyle = 'rgba(255,255,255,.15)'; B.rr(g, 800, y - 24, 190, 14, 7); g.fill(); g.fillStyle = c; B.rr(g, 800, y - 24, Math.max(8, 190 * r[3]), 14, 7); g.fill(); }
806
  });
807
+ g.textAlign = 'center';
808
+ g.font = f(800, 30); g.fillStyle = 'rgba(255,255,255,.88)';
809
+ g.fillText('今天喝对 ' + S.today.right + ' 杯 · 喝错 ' + S.today.wrong + ' 杯 · 累计喝对 ' + S.total.right + ' 杯', 540, 1282);
810
+ g.fillStyle = 'rgba(255,255,255,.58)'; g.font = f(700, 24);
811
+ B.wrap(g, '高性价比人生 · 魔药题目出自《高性价比人生指南》CC BY 4.0 · github.com/eternity4719/HowToLiveBetter', 900).slice(0, 2).forEach(function (ln, i) { g.fillText(ln, 540, 1350 + i * 36); });
812
+ g.textAlign = 'left';
813
  return cv;
814
  }
815
  function cardCanvas(q) {
 
845
  postBusy = true;
846
  var mini = B.mini();
847
  try {
848
+ await loadAll(['house-' + moneyStage(), 'car-' + moneyStage(), heroKey() + '-idle', faceKey(), 'witch-idle', 'ui-frame-' + (gAll() + 1)]);
849
  var imgs = [toURL(billCanvas)];
850
  if (kind === 'slides') recentQs(3).forEach(function (q) { imgs.push(toURL(function () { return cardCanvas(q); })); });
851
  if (!mini) {
 
889
  case 'wt-panel': panel(); break;
890
  case 'wt-replay': closePopup(); G.appeared = false; story(0); break;
891
  case 'wt-badge':
892
+ var aa = ACH.filter(function (x) { return x[0] === el.getAttribute('data-id'); })[0];
893
+ if (aa) { var gt = S.ach[aa[0]]; centerTip('<b>' + aa[1] + '</b><br>' + aa[2] + '<br><small>' + (gt ? new Date(gt).toLocaleDateString() + ' 获得' : '未获得') + '</small>'); B.buzz('light'); }
894
  break;
895
  case 'wt-money': moneyPop(); break;
896
  case 'wt-orig': B.openDetail(el.getAttribute('data-id')); break;
htlb/miniapp/tool/witch/icons.webp CHANGED

Git LFS Details

  • SHA256: f93938f4d8ba91a2746dbe36febc76681a74a6d9bdc51edd0f3d603d8208ffac
  • Pointer size: 130 Bytes
  • Size of remote file: 57.4 kB

Git LFS Details

  • SHA256: 7d42c3c140b6e98e88bfc89b7b237672be6a874c1eb328ebe419e91ff799ec93
  • Pointer size: 130 Bytes
  • Size of remote file: 59.3 kB
htlb/miniapp/tool/witch/man-a2x.webp CHANGED

Git LFS Details

  • SHA256: 946805f730e7f428b163e90e12de684600a04b087051af84ef5c15369395efd9
  • Pointer size: 131 Bytes
  • Size of remote file: 513 kB

Git LFS Details

  • SHA256: 67e5c2b45055fbc60c1c41a50d9a82d562a2212b666608f754f492a86364934f
  • Pointer size: 131 Bytes
  • Size of remote file: 513 kB
htlb/miniapp/tool/witch/ui-divider.webp DELETED

Git LFS Details

  • SHA256: 0777b444a5287f25847536e9dda0ec296d28f971d78c993193cedd575da70e7d
  • Pointer size: 129 Bytes
  • Size of remote file: 2.11 kB
htlb/miniapp/witch-src/PROMPTS.md CHANGED
@@ -1,202 +1,26 @@
1
- # 「女巫的魔药」素材提示词(第 4 版)
2
 
3
- > 生成后打包成 **`女巫的魔药-素材6.zip`**,放在 Space 根目录。文件名照下表。
4
- > 共 **163 个文件**(另有 1 个可选)。
5
- > **强烈建议**:生成时把 `素材5/man-a2p2l2-idle.png`(男主角)和 `素材4/witch-idle.png`(女巫)作为**参考图**一起上传,保证同一个人、同一种画风。
6
 
7
- | 类别 | 数量 |
8
- | --- | --- |
9
- | 男主角动画 | 96 |
10
- | 女巫动画 | 8 |
11
- | 魔药杯(烟雾) | 6 |
12
- | 头像框 | 7 |
13
- | 属性图标 | 6 |
14
- | 工具图标与关闭按钮 | 5 + 1 |
15
- | 成就徽章 | 24 |
16
- | 对话框、按钮、选项牌(三段式) | 9 |
17
- | 金色分割线 | 1 |
18
- | 面板背景 | 1(可选) |
19
 
20
- ## 一、通用规格
21
-
22
- 1. **动画条**:
23
- - PNG,真正的透明背景;一行横排,每帧 256 × 256,帧数 = 宽 ÷ 256;
24
- - 同一角色在每一帧里**位置、大小完全一致**:脚底在同一条线上(每格底部上方约 10 px),身体中线在格子正中;
25
- - **只让局部动,整体不要跳**。
26
- 2. **动画要慢、要顺**:
27
- - 相邻两帧的变化要小(例如只动 2–3 px 的呼吸起伏、眨眼、衣角摆动);
28
- - 最后一帧要能自然接回第一帧;
29
- - 不要每帧换姿势、不要每帧重画脸。
30
- - 上一版「抽搐」的原因就是每帧角色的位置和姿势变化太大。
31
- 3. 画面里不要文字、数字、水印。
32
- 4. 男主角面朝右,女巫面朝左。
33
- 5. 画风与素材 5 完全一致:Q 版二头身、厚涂、暖色、圆润深棕描边。
34
-
35
- ### 通用风格提示词(动画条)
36
-
37
- ```
38
- cute chibi game sprite, 2-head-tall proportions, thick painterly cel shading, warm soft palette, rounded dark-brown outline, gentle rim light, transparent background, no text, sprite sheet, single horizontal row, each frame 256x256, the character stays at exactly the same position and size in every frame, feet on the same baseline about 10px above the bottom, body centered, smooth subtle looping animation with very small changes between consecutive frames, the last frame flows back into the first
39
- ```
40
-
41
- 男主角身份锚点、年龄 / 身材 / 颜值描述词,**沿用第 3 版**(见 `素材5` 的提示词)。
42
-
43
- ---
44
-
45
- ## 二、男主角动画(96 个,替换素材 5 的动画)
46
-
47
- | 文件名 | 数量 | 帧数 / 尺寸 | 内容 |
48
- | --- | --- | --- | --- |
49
- | `man-a{年龄}p{身材}l{颜值}-idle.png` | 36 | **6 帧** · 1536×256 | 待机 1:缓慢呼吸(胸口起伏 2 px)、眨一次眼、呆毛轻轻晃。**站姿完全不变** |
50
- | `man-a{年龄}p{身材}-idle2.png` | 12 | 6 帧 · 1536×256 | 待机 2:慢慢左右张望一次,再回正(颜值用「普通」) |
51
- | `man-a{年龄}p{身材}-idle3.png` | 12 | 6 帧 · 1536×256 | 待机 3:按年龄段不同:<br>• 少年 / 青年:伸懒腰;<br>• 中年:扶腰捶背;<br>• 老年:拄拐轻咳 |
52
- | `man-a{年龄}p{身材}-drink.png` | 12 | **8 帧** · 2048×256 | 喝药,**手里不要画杯子**,程序会把玩家选中的那杯魔药放进手里:<br>① 站立 → ② 右手伸出接杯 → ③ 右手举到嘴前 → ④⑤⑥ 仰头喝,**右手停在嘴前同一个位置不动**(约在格子 x=150、y=95 处)→ ⑦ 手放下 → ⑧ 咂嘴复位 |
53
- | `man-a{年龄}p{身材}-good.png` | 12 | 6 帧 · 1536×256 | 喝对:慢慢眼睛发亮 → 微笑 → 握拳 → 小跳 → 落地 → 复位 |
54
- | `man-a{年龄}p{身材}-bad.png` | 12 | 6 帧 · 1536×256 | 喝错:慢慢脸色发绿 → 捂嘴 → 摇晃 → 头上冒小星星 → 甩甩头 → 复位 |
55
-
56
- `{年龄}` = 1–4,`{身材}` = 1–3,`{颜值}` = 1–3,含义同第 3 版。
57
-
58
- 喝药动画提示词示例:
59
-
60
- ```
61
- [通用风格提示词], [identity], [年龄描述词], [身材描述词], ordinary face, 8-frame drinking animation WITHOUT any cup or glass drawn: standing, reaching out the right hand, raising the empty right hand to the front of his mouth as if holding a cup, tilting his head back to drink for three frames while the right hand stays still at exactly the same spot in front of his mouth, lowering the hand, smacking lips back to idle
62
  ```
63
-
64
- ## 三、女巫动画(8 个,替换素材 4 的女巫)
65
-
66
- 身份(同素材 4,**银白卷发、紫色长袍、尖帽别书页书签,面朝左**),**这次手里不拿托盘**(托盘由程序画在画面中间):
67
-
68
- | 文件 | 帧数 / 尺寸 | 内容 |
69
- | --- | --- | --- |
70
- | `witch-idle.png` | 8 · 2048×256 | 缓慢上下漂浮(只浮动 3–4 px)��袍角飘、眨眼 |
71
- | `witch-idle2.png` | 8 · 2048×256 | 低头翻一页魔法书,再抬头坏笑 |
72
- | `witch-idle3.png` | 8 · 2048×256 | 转动魔杖,杖尖冒出几颗小星星 |
73
- | `witch-appear.png` | 8 · 2048×256 | 地上一本发光的书 → 光柱 → 书页旋转 → 帽尖冒出 → 半身 → 全身 → 站定 → 坏笑 |
74
- | `witch-nod.png` | 6 · 1536×256 | 挑眉 → 点头 → 轻轻鼓掌 → 复位(喝对) |
75
- | `witch-laugh.png` | 6 · 1536×256 | 捂嘴 → 仰头大笑 → 拍腿 → 擦眼泪 → 复位(喝错) |
76
- | `witch-wand.png` | 8 · 2048×256 | 举杖 → 画圈 → 杖尖聚光 → 紫金光向左射出 → 余光 → 复位(变身) |
77
- | `witch-stop.png` | 6 · 1536×256 | 皱眉 → 摆手 → 双手交叉 ✗ → 叹气 → 复位(喝错满 10 杯) |
78
-
79
- ## 四、魔药杯(6 个,**杯子不动,只有烟雾缭绕**)
80
-
81
- | 文件 | 帧数 / 尺寸 | 内容 |
82
- | --- | --- | --- |
83
- | `cup-1.png` … `cup-6.png` | 6 · 1536×256 | 每个文件一只杯子:<br>① 红色高脚杯<br>② 蓝色圆肚烧瓶<br>③ 绿色方口药瓶<br>④ 紫色螺旋杯<br>⑤ 金色酒杯<br>⑥ 粉色心形瓶<br>**杯身每帧位置完全不变**,只有杯口的同色魔法烟雾缓慢升起、打旋、散开,液面偶尔冒一个小泡;6 帧循环 |
84
-
85
- ```
86
- [通用风格提示词,把 character 换成 potion cup], a single magic potion cup that stays perfectly still in every frame, only the colored magical vapor above it slowly rises, swirls and fades, occasional tiny bubble on the liquid surface, 6-frame seamless loop
87
  ```
88
 
89
- ## 五、头像框(7 个,从简朴到尊贵华丽)
90
-
91
- **规格**:每个 **256 × 256**,透明背景;**中间是直径约 190 px 的透明圆**(放头像),圆心在格子正中;框的装饰只在圆外面。
92
 
93
- | 文件 | 等级色 | 样式 |
94
  | --- | --- | --- |
95
- | `ui-frame-1.png` | 灰 | 朴素的旧木圈,有裂纹 |
96
- | `ui-frame-2.png` | 白 | 干净的白色石圈 |
97
- | `ui-frame-3.png` | 蓝 | 蓝色金属圈,两侧小宝石 |
98
- | `ui-frame-4.png` | 紫 | 紫色魔法圈,底部有小翅膀 |
99
- | `ui-frame-5.png` | 绿 | 翡翠藤蔓圈,带叶子和小花 |
100
- | `ui-frame-6.png` | 金 | 华丽金框,顶部小皇冠、两侧翅膀 |
101
- | `ui-frame-7.png` | 红 | 至尊红宝石金框,大皇冠、火焰光环、星光 |
102
-
103
- ```
104
- cute fantasy mobile game avatar frame, round, 256x256, transparent background, perfectly transparent circular hole in the center about 190px in diameter, ornaments only outside the circle, thick painterly cel shading, soft glow, no text, [样式描述]
105
- ```
106
-
107
- ## 六、属性图标(6 个)
108
-
109
- **规格**:每个 **128 × 128**,透明背景,图标居中、占 80%,同一风格(金边小徽章感)。
110
-
111
- | 文件 | 内容 |
112
- | --- | --- |
113
- | `icon-age.png` | 年龄:沙漏 |
114
- | `icon-body.png` | 身材:哑铃和肌肉手臂 |
115
- | `icon-look.png` | 颜值:带星光的手镜 |
116
- | `icon-wealth.png` | 财富:一袋金币 |
117
- | `icon-house.png` | 房子:小房子 |
118
- | `icon-car.png` | 车子:小跑车 |
119
-
120
- ## 七、工具图标与关闭按钮(**每个单独一个文件**,不再拼在一张图里)
121
-
122
- **规格**:每个 **128 × 128**,透明背景,图标居中、占 80%。
123
-
124
- | 文件 | 内容 |
125
- | --- | --- |
126
- | `icon-ach.png` | 成就:带丝带的奖杯徽章 |
127
- | `icon-share.png` | 账单:卷轴和羽毛笔 |
128
- | `icon-set.png` | 设置:魔法齿轮 |
129
- | `icon-exit.png` | 退出:拱形木门 |
130
- | `icon-book.png` | 看原文:打开的发光魔法书 |
131
- | `ui-close.png` | 关闭按钮:圆形紫色宝石,金边,中间一个白色 ✗(✗ 用图形画出来,不是文字) |
132
-
133
- ## 八、成就徽章(24 个)
134
-
135
- **规格**:每个 **192 × 192**,透明背景,圆形勋章,金属边 + 中间图案,同一套风格。未获得时程序会自动变灰,**不用另外画灰色版**。
136
-
137
- | 文件 | 成就 | 徽章图案 |
138
- | --- | --- | --- |
139
- | `badge-first.png` | 初出茅庐 | 第一杯冒泡的魔药 |
140
- | `badge-r10.png` | 小有心得 | 10 颗星围成一圈 |
141
- | `badge-r100.png` | 魔药常客 | 一排魔药瓶 |
142
- | `badge-r500.png` | 魔药大师 | 戴学士帽的魔药瓶 |
143
- | `badge-c5.png` | 五连胜 | 五颗连在一起的火焰 |
144
- | `badge-c10.png` | 十连胜 | 燃烧的「10」形火焰(用火焰图形,不写数字) |
145
- | `badge-c20.png` | 二十连胜 | 凤凰 |
146
- | `badge-young.png` | 返老还童 | 倒转的沙漏和嫩芽 |
147
- | `badge-ageR.png` | 青春永驻 | 永远盛开的玫瑰和沙漏 |
148
- | `badge-fit.png` | 练出肌肉 | 哑铃 |
149
- | `badge-phyR.png` | 神级体魄 | 金色肌肉手臂和闪电 |
150
- | `badge-hand.png` | 颜值逆袭 | 镜子里的星星眼 |
151
- | `badge-lookR.png` | 颜值封神 | 王冠和闪光的镜子 |
152
- | `badge-m1.png` | 第一笔应急金 | 小存��罐 |
153
- | `badge-m2.png` | 有房一族 | 带钥匙的小房子 |
154
- | `badge-m4.png` | 江景大平层 | 江边高楼和月亮 |
155
- | `badge-m5.png` | 跑车车主 | 红色跑车 |
156
- | `badge-m7.png` | 传说 | 小岛和城堡 |
157
- | `badge-win.png` | 人生赢家 | 金色奖杯加皇冠 |
158
- | `badge-old.png` | 被魔药催老 | 冒绿烟的魔药和白胡子 |
159
- | `badge-dead.png` | 寿终正寝 | 墓碑上开着一朵花(可爱风,不吓人) |
160
- | `badge-revive.png` | 起死回生 | 从书里飞出的光和心形 |
161
- | `badge-bill.png` | 晒出账单 | 卷轴账单 |
162
- | `badge-unlock.png` | 再来十杯 | 一排十个小魔药杯 |
163
-
164
- ```
165
- cute fantasy game achievement medal, round badge, metal rim with small ribbons, thick painterly cel shading, soft glow, transparent background, 192x192, centered, no text, no numbers, [徽章图案]
166
- ```
167
-
168
- ## 九、对话框、按钮、选项牌(三段式,**怎么拉伸都不会变形**)
169
-
170
- 程序会把**左右两段(或上下两段)原样贴在两端,中间那段反复平铺**,所以中间那段必须是**可以无缝重复**的简单图案。
171
-
172
- | 文件 | 尺寸 | 内容 |
173
- | --- | --- | --- |
174
- | `ui-dialog-top.png` | 1024 × 96 | 对话框**上端**:羊皮纸 + 紫金花边顶部,两个上角有魔法装饰 |
175
- | `ui-dialog-mid.png` | 1024 × 64 | 对话框**中段**:左右两条竖向花边 + 中间干净羊皮纸,**上下边缘能无缝相接**(竖向平铺) |
176
- | `ui-dialog-bottom.png` | 1024 × 96 | 对话框**下端**:两个下角装饰 + 底部花边 |
177
- | `ui-btn-left.png` | 64 × 128 | 主按钮**左端**:紫色宝石质感圆角左头 + 金边 |
178
- | `ui-btn-mid.png` | 64 × 128 | 主按钮**中段**:同材质的平直部分,**左右边缘能无缝相接**(横向平铺) |
179
- | `ui-btn-right.png` | 64 × 128 | 主按钮**右端** |
180
- | `ui-opt-left.png` | 48 × 112 | 魔药选项牌**左端**:和魔药杯搭配的标签(深紫丝绒 + 金色细边 + 小小的瓶塞 / 蜡封装饰) |
181
- | `ui-opt-mid.png` | 48 × 112 | 选项牌**中段**:可横向无缝平铺 |
182
- | `ui-opt-right.png` | 48 × 112 | 选项牌**右端** |
183
-
184
- ```
185
- cute fantasy mobile game UI, magic spellbook theme, parchment and purple-gold, thick painterly cel shading, clean edges, transparent background outside the shape, no text, [这一段的内容], the middle piece must tile seamlessly
186
- ```
187
-
188
- ## 十、名字分割线(1 个,可选)
189
-
190
- | 文件 | 尺寸 | 内容 |
191
- | --- | --- | --- |
192
- | `ui-divider.png` | 768 × 40 | 细长的金色花纹分割线,中间有一颗小宝石,两端渐隐,透明背景。(现在已改用代码画的金线,有这张图会更好看) |
193
-
194
- ## 十一、面板背景(1 个,可选)
195
-
196
- - 属性面板上方目前用的是房子背景图,已经够用,**这一项可以不做**。
197
- - 如果想让面板更像游戏角色面板,可以生成 `panel-bg.png`(1080 × 720,魔法书房 / 星空舞台)。
198
 
199
- ## 交付时请告诉我
200
 
201
- - 实际帧数和上表不同的文件。
202
- - 喝药动画里「手停在嘴前」的大致位置(如果和 x=150、y=95 差别很大)。
 
1
+ # 「女巫的魔药」素材提示词(第 5 版:方框角花 + 图标)
2
 
3
+ > 生成后打包成 **`女巫的魔药-素材7.zip`**,放在 Space 根目录。共 **5 个文件**。
4
+ >
5
+ > **为什么不会再变形**:对话框、弹窗、按钮的方框本体由代码绘制(纯色、渐变、金边),图片只用来**贴在四个角上**,四个角用同一张图翻转得到,**图片本身从不拉伸、从不平铺**,所以不会再出现接缝乱码。
6
 
7
+ ## 一、通用要求
 
 
 
 
 
 
 
 
 
 
 
8
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
9
  ```
10
+ cute fantasy mobile game UI ornament, magic spellbook theme, gold filigree with small purple gems, thick painterly cel shading, soft glow, transparent background, clean edges, no text, no letters
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
11
  ```
12
 
13
+ ## 二、文件清单
 
 
14
 
15
+ | 文件 | 尺寸 | 内容与要求 |
16
  | --- | --- | --- |
17
+ | `ui-corner.png` | 128 × 128 | **左上角**角花:金色花纹 + 一颗紫宝石,花纹从左上角向右、向下两个方向延伸约 100 px,形成一个「直角」。<br>图案**贴着画布的左边和上边**,右下大部分区域透明。<br>程序会把它翻转后放到另外三个角。 |
18
+ | `ui-edge-top.png` | 256 × 48 | (可选)**上边中间**的装饰:一颗居中的紫宝石,两侧各一小段对称金色卷草。宽 256,左右透明渐隐,底边贴近画布下沿。<br>程序把它放在方框上边正中间;下边正中间用翻转后的同一张图。 |
19
+ | `ui-btn-gem.png` | 96 × 96 | (可选)按钮左右两端的小宝石装饰:一颗圆形紫宝石 + 金托,居中。<br>程序在按钮左右两端各放一颗,不拉伸。 |
20
+ | `icon-forget.png` | 128 × 128 | 遗忘之药水图标:黑紫色骷髅药瓶,瓶口冒灰紫色烟雾。图标居中、占 80%,风格和其他图标一致(金边小徽章感)。<br>**现在暂时用的是素材 5 里裁出来的小图,有点糊。** |
21
+ | `icon-replay.png` | 128 × 128 | 重看开场图标:一本打开的书,书页上一个循环箭头般的光圈(不要文字)。 |
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
22
 
23
+ ## 三、生成提示
24
 
25
+ - `ui-corner.png` 最重要:只画一个角,**图案要贴着左边和上边**,这样四个角对齐方框的边。
26
+ - 可以把 `素材6/icon-set.png` 作为风格参考图上传,保证金边、宝石的质感和现有图标一致。
htlb/miniapp/witch-src/REPORT.md CHANGED
@@ -1,7 +1,7 @@
1
  # 「女巫的魔药」素材检查报告(合图版)
2
 
3
- - 来源(后者覆盖前者):素材4 → 素材5 → 素材6
4
- - 合成 **26 张图**(179 个素材),WebP 合计 **5159 KB**;同类素材合在一张图里,程序按行 / 列切出来用
5
 
6
  | 图 | 尺寸 | 大小 |
7
  | --- | --- | --- |
@@ -19,7 +19,7 @@
19
  | cars | 1920×640 | 276 KB |
20
  | faces | 960×320 | 107 KB |
21
  | frames | 1344×192 | 81 KB |
22
- | icons | 1152×96 | 56 KB |
23
  | badges | 768×512 | 186 KB |
24
  | house-0 | 720×1280 | 104 KB |
25
  | house-1 | 720×1280 | 69 KB |
@@ -30,4 +30,3 @@
30
  | house-6 | 720×1280 | 89 KB |
31
  | house-7 | 720×1280 | 84 KB |
32
  | ui-tray | 426×219 | 27 KB |
33
- | ui-divider | 768×40 | 2 KB |
 
1
  # 「女巫的魔药」素材检查报告(合图版)
2
 
3
+ - 来源(后者覆盖前者):素材4 → 素材5 → 素材6 → extra
4
+ - 合成 **25 张图**(179 个素材),WebP 合计 **5159 KB**;同类素材合在一张图里,程序按行 / 列切出来用
5
 
6
  | 图 | 尺寸 | 大小 |
7
  | --- | --- | --- |
 
19
  | cars | 1920×640 | 276 KB |
20
  | faces | 960×320 | 107 KB |
21
  | frames | 1344×192 | 81 KB |
22
+ | icons | 1248×96 | 57 KB |
23
  | badges | 768×512 | 186 KB |
24
  | house-0 | 720×1280 | 104 KB |
25
  | house-1 | 720×1280 | 69 KB |
 
30
  | house-6 | 720×1280 | 89 KB |
31
  | house-7 | 720×1280 | 84 KB |
32
  | ui-tray | 426×219 | 27 KB |
 
htlb/miniapp/witch-src/build_atlas.py CHANGED
@@ -33,7 +33,7 @@ def body_box(alpha):
33
  if not len(ry) or not len(cx): return None
34
  return [int(cx.min()), int(ry.min()), int(cx.max()), int(ry.max())]
35
 
36
- def stabilize(a, n):
37
  anchors = []
38
  for k in range(n):
39
  cell = a[:, k * CELL:(k + 1) * CELL]
@@ -47,7 +47,7 @@ def stabilize(a, n):
47
  mx, my = int(np.median([x[0] for x in ok])), int(np.median([x[1] for x in ok]))
48
  for k, an in enumerate(anchors):
49
  if not an: continue
50
- dx, dy = max(-12, min(12, mx - an[0])), max(-12, min(12, my - an[1]))
51
  if dx or dy:
52
  cell = a[:, k * CELL:(k + 1) * CELL].copy(); out = np.zeros_like(cell)
53
  ys0, ys1 = max(0, dy), CELL + min(0, dy); xs0, xs1 = max(0, dx), CELL + min(0, dx)
@@ -56,7 +56,7 @@ def stabilize(a, n):
56
 
57
  def strip_frames(name, stab):
58
  a = np.array(Image.open(files[name]).convert('RGBA')); n = a.shape[1] // CELL
59
- if stab and n > 1: stabilize(a, n)
60
  frames = [Image.fromarray(a[:, k * CELL:(k + 1) * CELL]) for k in range(n)]
61
  boxes = [body_box(a[:, k * CELL:(k + 1) * CELL, 3]) for k in range(n)]
62
  valid = [b for b in boxes if b]
@@ -116,13 +116,13 @@ anim_atlas('fx', ['fx-good', 'fx-bad', 'fx-change'], 224, 6, stab=False, fixed=T
116
  grid_atlas('cars', [f'car-{i}' for i in range(8)], 480, 320, 4, 80, meta=lambda n, im: {'box': body_box(np.array(im)[..., 3]), 'w': 768, 'h': 512})
117
  grid_atlas('faces', [f'face-a{a}l{l}' for a in (1, 2, 3, 4) for l in (1, 2, 3)], 160, 160, 6)
118
  grid_atlas('frames', [f'ui-frame-{i}' for i in range(1, 8)], 192, 192, 7)
119
- grid_atlas('icons', ['icon-age', 'icon-body', 'icon-look', 'icon-wealth', 'icon-house', 'icon-car', 'icon-ach', 'icon-share', 'icon-set', 'icon-exit', 'icon-book', 'ui-close'], 96, 96, 12)
120
  BADGES = ['first', 'r10', 'r100', 'r500', 'c5', 'c10', 'c20', 'young', 'ageR', 'fit', 'phyR', 'hand', 'lookR', 'm1', 'm2', 'm4', 'm5', 'm7', 'win', 'old', 'dead', 'revive', 'bill', 'unlock']
121
  grid_atlas('badges', ['badge-' + b for b in BADGES], 128, 128, 6)
122
  for i in range(8):
123
  if f'house-{i}' in files:
124
  save(Image.open(files[f'house-{i}']).convert('RGB').resize((720, 1280), Image.LANCZOS), f'house-{i}', 70, alpha=False)
125
- for name in ('ui-tray', 'ui-divider'):
126
  if name in files:
127
  im = Image.open(files[name]).convert('RGBA')
128
  if name == 'ui-tray':
 
33
  if not len(ry) or not len(cx): return None
34
  return [int(cx.min()), int(ry.min()), int(cx.max()), int(ry.max())]
35
 
36
+ def stabilize(a, n, cap=12):
37
  anchors = []
38
  for k in range(n):
39
  cell = a[:, k * CELL:(k + 1) * CELL]
 
47
  mx, my = int(np.median([x[0] for x in ok])), int(np.median([x[1] for x in ok]))
48
  for k, an in enumerate(anchors):
49
  if not an: continue
50
+ dx, dy = max(-cap, min(cap, mx - an[0])), max(-cap, min(cap, my - an[1]))
51
  if dx or dy:
52
  cell = a[:, k * CELL:(k + 1) * CELL].copy(); out = np.zeros_like(cell)
53
  ys0, ys1 = max(0, dy), CELL + min(0, dy); xs0, xs1 = max(0, dx), CELL + min(0, dx)
 
56
 
57
  def strip_frames(name, stab):
58
  a = np.array(Image.open(files[name]).convert('RGBA')); n = a.shape[1] // CELL
59
+ if stab and n > 1: stabilize(a, n, 40 if name == 'man-ride' else 12) # 骑车整体上下跳动较大,完全对齐底边
60
  frames = [Image.fromarray(a[:, k * CELL:(k + 1) * CELL]) for k in range(n)]
61
  boxes = [body_box(a[:, k * CELL:(k + 1) * CELL, 3]) for k in range(n)]
62
  valid = [b for b in boxes if b]
 
116
  grid_atlas('cars', [f'car-{i}' for i in range(8)], 480, 320, 4, 80, meta=lambda n, im: {'box': body_box(np.array(im)[..., 3]), 'w': 768, 'h': 512})
117
  grid_atlas('faces', [f'face-a{a}l{l}' for a in (1, 2, 3, 4) for l in (1, 2, 3)], 160, 160, 6)
118
  grid_atlas('frames', [f'ui-frame-{i}' for i in range(1, 8)], 192, 192, 7)
119
+ grid_atlas('icons', ['icon-age', 'icon-body', 'icon-look', 'icon-wealth', 'icon-house', 'icon-car', 'icon-ach', 'icon-share', 'icon-set', 'icon-exit', 'icon-book', 'ui-close', 'icon-forget'], 96, 96, 13)
120
  BADGES = ['first', 'r10', 'r100', 'r500', 'c5', 'c10', 'c20', 'young', 'ageR', 'fit', 'phyR', 'hand', 'lookR', 'm1', 'm2', 'm4', 'm5', 'm7', 'win', 'old', 'dead', 'revive', 'bill', 'unlock']
121
  grid_atlas('badges', ['badge-' + b for b in BADGES], 128, 128, 6)
122
  for i in range(8):
123
  if f'house-{i}' in files:
124
  save(Image.open(files[f'house-{i}']).convert('RGB').resize((720, 1280), Image.LANCZOS), f'house-{i}', 70, alpha=False)
125
+ for name in ('ui-tray',):
126
  if name in files:
127
  im = Image.open(files[name]).convert('RGBA')
128
  if name == 'ui-tray':
htlb/miniapp/高性价比人生-女巫的魔药版.zip CHANGED
@@ -1,3 +1,3 @@
1
  version https://git-lfs.github.com/spec/v1
2
- oid sha256:1ccd8042be400eb62bb8d58d515096f40e4444b0390fdf11324759a5669326f0
3
- size 6845546
 
1
  version https://git-lfs.github.com/spec/v1
2
+ oid sha256:06b265f54941c93e556d252b26f8f7a34b49ea82b4290b811ea80e546e931066
3
+ size 6845603
htlb/miniapp/高性价比人生-红薯冒险版.zip CHANGED
@@ -1,3 +1,3 @@
1
  version https://git-lfs.github.com/spec/v1
2
- oid sha256:c02ce2d74160f033b06011ad8e4cd6a57fe4e3ba7d5ef34df7041e4c989d4973
3
- size 3849429
 
1
  version https://git-lfs.github.com/spec/v1
2
+ oid sha256:ac24172491db5223e47c436dcbdcb09edf2d8c3ee5e0cc08fd78e4eb0adea50e
3
+ size 3849895