guanwei 1.1.3 → 1.2.0

package/shared/core/engine/bazi.ts

@@ -62,6 +62,8 @@ export function baziCalc(input: BaziInput): BaziResult {
   const min = 0;
 
   // 2. 年柱（立春为界）
+  // 注意：getJieQiTableExact(yy) 返回的是「农历年」节气表，冬至后的立春可能落在公历次年
+  // （如 2023 表中含 2024-02-04 立春）——取立春发生的公历年份定年柱，不能用表格年份 yy
   const t = new Date(y, m - 1, d, hour, min).getTime();
   let lichunBest = -Infinity;
   let lichunYear = y - 1;
@@ -69,7 +71,7 @@ export function baziCalc(input: BaziInput): BaziResult {
     for (const jq of getJieQiTableExact(yy)) {
       if (jq.name === '立春') {
         const tt = jq.time.getTime();
-        if (tt <= t && tt > lichunBest) { lichunBest = tt; lichunYear = yy; }
+        if (tt <= t && tt > lichunBest) { lichunBest = tt; lichunYear = jq.time.getFullYear(); }
       }
     }
   }

package/shared/core/engine/calendar.ts

@@ -27,14 +27,23 @@ export function getJieqiApproxName(_y: number, m: number, d: number): string {
 }
 
 // 精确节气时刻表（某年全年 24 节气）
+// 注：lunar-typescript 的 getJieQiTable key 混用中英文（当年冬至→次年惊蛰段为英文拼音），此处统一映射为中文
 export interface JieQiTime { name: string; time: Date }
+const JQ_KEY_CN: Record<string, string> = {
+  LI_CHUN: '立春', YU_SHUI: '雨水', JING_ZHE: '惊蛰', CHUN_FEN: '春分',
+  QING_MING: '清明', GU_YU: '谷雨', LI_XIA: '立夏', XIAO_MAN: '小满',
+  MANG_ZHONG: '芒种', XIA_ZHI: '夏至', XIAO_SHU: '小暑', DA_SHU: '大暑',
+  LI_QIU: '立秋', CHU_SHU: '处暑', BAI_LU: '白露', QIU_FEN: '秋分',
+  HAN_LU: '寒露', SHUANG_JIANG: '霜降', LI_DONG: '立冬', XIAO_XUE: '小雪',
+  DA_XUE: '大雪', DONG_ZHI: '冬至', XIAO_HAN: '小寒', DA_HAN: '大寒',
+};
 export function getJieQiTableExact(year: number): JieQiTime[] {
   const solar = Solar.fromYmdHms(year, 6, 1, 12, 0, 0);
   const table = solar.getLunar().getJieQiTable();
   const out: JieQiTime[] = [];
   for (const key of Object.keys(table)) {
     const s = table[key];
-    out.push({ name: key, time: new Date(s.getYear(), s.getMonth() - 1, s.getDay(), s.getHour(), s.getMinute(), s.getSecond()) });
+    out.push({ name: JQ_KEY_CN[key] || key, time: new Date(s.getYear(), s.getMonth() - 1, s.getDay(), s.getHour(), s.getMinute(), s.getSecond()) });
   }
   return out;
 }
@@ -58,7 +67,7 @@ export function currentJieqiNameExact(y: number, m: number, d: number): string {
   return best ? best.name : '大雪';
 }
 
-// 十二「节」（定月支用）与月支映射（0=寅 … 11=丑，与参考项目一致）
+// 十二「节」（定月支用）与月支映射（0=寅 … 11=丑）
 export const JIE_BRANCH: Record<string, number> = {
   小寒: 11, 立春: 0, 惊蛰: 1, 清明: 2, 立夏: 3, 芒种: 4,
   小暑: 5, 立秋: 6, 白露: 7, 寒露: 8, 立冬: 9, 大雪: 10,

package/shared/core/engine/liuren.ts

@@ -1,9 +1,220 @@
-// 大六壬：月将加时（中气定将）· 四课三传（简式）
-import { GAN, ZHI, mod } from '../data/ganzhi';
+// 大六壬：月将加时（中气定将）· 四课三传（九宗门真实起法）
+// 九宗门：贼克（元首/始入/重审/知一）→ 比用 → 涉害 → 遥克（蒿矢/弹射）→ 昴星（虎视/冬蛇掩目）→ 别责 → 八专 → 返吟（取驿马）→ 伏吟（取刑）
+import { GAN, ZHI, WUXING, mod } from '../data/ganzhi';
 import { LR_JIANGS, LR_JIANG_SUN, LR_GANJI } from '../data/liuren';
 import { daysSince, currentJieqiNameExact } from './calendar';
 import type { LiurenResult } from '../types';
 
+// ─── 九宗门辅助表 ───
+// 五行生克：克我者（谁克我）——五行相克序：木→土→水→火→金→木
+const WX_KE: Record<string, string> = { 木: '土', 土: '水', 水: '火', 火: '金', 金: '木' };
+
+function ke(wx1: string, wx2: string): boolean {
+  // wx1 克 wx2？
+  return WX_KE[wx1] === wx2;
+}
+
+// 地支阴阳：子(0)阳 丑(1)阴 寅(2)阳 … 亥(11)阴
+const zhiYang = (z: string) => ZHI.indexOf(z as any) % 2 === 0;
+
+// 干阴阳：甲丙戊庚壬 阳；乙丁己辛癸 阴
+const ganYang = (g: string) => GAN.indexOf(g as any) % 2 === 0;
+
+// 刑：子刑卯、卯刑子；寅刑巳、巳刑申、申刑寅；丑刑戌、戌刑未、未刑丑；辰午酉亥自刑
+const XING: Record<string, string> = { 子: '卯', 卯: '子', 寅: '巳', 巳: '申', 申: '寅', 丑: '戌', 戌: '未', 未: '丑' };
+const ZIXING = ['辰', '午', '酉', '亥'];
+
+// 冲：子午、丑未、寅申、卯酉、辰戌、巳亥
+const CHONG: Record<string, string> = { 子: '午', 午: '子', 丑: '未', 未: '丑', 寅: '申', 申: '寅', 卯: '酉', 酉: '卯', 辰: '戌', 戌: '辰', 巳: '亥', 亥: '巳' };
+
+// 驿马（三合局冲）：申子辰→寅、寅午戌→申、巳酉丑→亥、亥卯未→巳
+function yimaOf(zhi: string): string {
+  const maMap: Record<string, string> = { 申: '寅', 子: '寅', 辰: '寅', 寅: '申', 午: '申', 戌: '申', 巳: '亥', 酉: '亥', 丑: '亥', 亥: '巳', 卯: '巳', 未: '巳' };
+  return maMap[zhi] || '寅';
+}
+
+// 干五合（别责阳日用）：甲己合、乙庚合、丙辛合、丁壬合、戊癸合
+const GAN_HE: Record<string, string> = { 甲: '己', 己: '甲', 乙: '庚', 庚: '乙', 丙: '辛', 辛: '丙', 丁: '壬', 壬: '丁', 戊: '癸', 癸: '戊' };
+
+interface Ke {
+  shang: string;   // 上神（天盘所加之神）
+  xia: string;     // 下神（地盘本支）
+  shangKe: boolean; // 上克下
+  xiaKe: boolean;   // 下克上（贼）
+}
+
+function buildKe(tianpan: Record<number, string>, ganJi: string, dayZhi: string): Ke[] {
+  const zi = (z: string) => ZHI.indexOf(z as any);
+  const ke1 = tianpan[zi(ganJi)];
+  const ke2 = tianpan[zi(ke1)];
+  const ke3 = tianpan[zi(dayZhi)];
+  const ke4 = tianpan[zi(ke3)];
+  const rows: Ke[] = [
+    { shang: ke1, xia: ganJi, shangKe: false, xiaKe: false },
+    { shang: ke2, xia: ke1, shangKe: false, xiaKe: false },
+    { shang: ke3, xia: dayZhi, shangKe: false, xiaKe: false },
+    { shang: ke4, xia: ke3, shangKe: false, xiaKe: false },
+  ];
+  for (const r of rows) {
+    const sw = WUXING[r.shang], xw = WUXING[r.xia];
+    r.shangKe = ke(sw, xw);
+    r.xiaKe = ke(xw, sw);
+  }
+  return rows;
+}
+
+interface Chuan { method: string; note: string; chuan1: string; chuan2: string; chuan3: string; }
+
+// 由初传推中传、末传：中传 = 初传上神（天盘加临初传者），末传 = 中传上神
+function chuanFrom(tianpan: Record<number, string>, chuan1: string): { chuan2: string; chuan3: string } {
+  const zi = (z: string) => ZHI.indexOf(z as any);
+  const chuan2 = tianpan[zi(chuan1)];
+  const chuan3 = tianpan[zi(chuan2)];
+  return { chuan2, chuan3 };
+}
+
+/**
+ * 九宗门起三传（《六壬大全》标准规则）
+ * 顺序：有克→贼克（唯一取之；多克→比用→涉害）；无克→遥克；无遥克→别责/八专/昴星；
+ *       返吟无克取驿马；伏吟无克取刑
+ */
+export function jiuzongmen(tianpan: Record<number, string>, ganJi: string, dayZhi: string, dayGan: string, hourIndex: number, jiang: string): Chuan {
+  const zi = (z: string) => ZHI.indexOf(z as any);
+  const kes = buildKe(tianpan, ganJi, dayZhi);
+  const shangKeRows = kes.filter(k => k.shangKe);
+  const xiaKeRows = kes.filter(k => k.xiaKe);
+  const jiangIdx = zi(jiang);
+  const isFuyin = jiangIdx === hourIndex;                    // 天地盘同位
+  const isFanyin = mod(jiangIdx - hourIndex, 12) === 6;      // 天地盘对冲
+
+  // 涉害：多克且比用不出时，取受克最深者（涉害深者发用）；同深取先见
+  const shehai = (candidates: Ke[]): Ke => {
+    let best = candidates[0], bestDepth = -1;
+    for (const c of candidates) {
+      let depth = 0;
+      for (const z of ZHI) {
+        const wx = WUXING[c.shang];
+        if (ke(WUXING[z], wx)) depth++;   // 地盘支克上神
+      }
+      if (depth > bestDepth) { best = c; bestDepth = depth; }
+    }
+    return best;
+  };
+
+  // ── 1. 贼克法 ──
+  if (shangKeRows.length > 0 || xiaKeRows.length > 0) {
+    // 有上克下优先取上克下；无上克下取贼
+    const pool = shangKeRows.length > 0 ? shangKeRows : xiaKeRows;
+    if (pool.length === 1) {
+      // 元首课（一上克下）/ 始入课（一下贼上）
+      const c1 = pool[0].shang;
+      const { chuan2, chuan3 } = chuanFrom(tianpan, c1);
+      return {
+        method: pool[0].shangKe ? (shangKeRows.length === 1 && xiaKeRows.length === 0 ? '元首课' : '重审课') : '始入课',
+        note: pool[0].shangKe ? (shangKeRows.length === 1 && xiaKeRows.length === 0 ? '一上克下，事起于外，宜主动决断。' : '课多上克，主事多制肘，须审时度势。') : '一下贼上，事起于内，防人算计。',
+        chuan1: c1, chuan2, chuan3,
+      };
+    }
+    // 多克 → 比用（取与日干阴阳相同之上神）
+    const dayGanYang = ganYang(dayGan);
+    const bi = pool.filter(k => zhiYang(k.shang) === dayGanYang);
+    if (bi.length === 1) {
+      const c1 = bi[0].shang;
+      const { chuan2, chuan3 } = chuanFrom(tianpan, c1);
+      return { method: '知一课', note: '取与日干比和者发用，事有取舍，宜择同类而谋。', chuan1: c1, chuan2, chuan3 };
+    }
+    // 比用不出 → 涉害
+    const pick = shehai(pool);
+    const c1 = pick.shang;
+    const { chuan2, chuan3 } = chuanFrom(tianpan, c1);
+    return { method: '涉害课', note: '诸克不比，取受克最深者发用，事机隐晦，宜深察利害。', chuan1: c1, chuan2, chuan3 };
+  }
+
+  // ── 返吟无克：取驿马 ──
+  if (isFanyin) {
+    const ma = yimaOf(dayZhi);
+    const c1 = tianpan[zi(ma)];   // 马星所加之神
+    const { chuan2, chuan3 } = chuanFrom(tianpan, c1);
+    return { method: '返吟课', note: '天地盘相冲，事有反复翻覆；无克取驿马发用，主变动奔波，宜动不宜静。', chuan1: c1, chuan2, chuan3 };
+  }
+
+  // ── 伏吟无克：取刑 ──
+  if (isFuyin) {
+    const ganYangFlag = ganYang(dayGan);
+    const c1 = ganYangFlag ? ganJi : dayZhi;   // 阳日取干上（寄宫本支），阴日取支上
+    const xing1 = XING[c1] || (ZIXING.includes(c1) ? CHONG[c1] : c1);
+    const xing2 = xing1 && xing1 !== c1 ? (XING[xing1] || (ZIXING.includes(xing1) ? CHONG[xing1] : xing1)) : c1;
+    const chuan2 = tianpan[zi(xing1)] || c1;
+    const chuan3 = tianpan[zi(xing2)] || chuan2;
+    return { method: '伏吟课', note: '天地盘同位，诸事迟滞反复；无克取刑发用，主静中藏动，宜守待变。', chuan1: tianpan[zi(c1)], chuan2, chuan3 };
+  }
+
+  // ── 2. 遥克法（无上下克）：日干遥克上神（蒿矢）/ 上神遥克日干（弹射） ──
+  const ganWx = WUXING[dayGan];
+  const yaoKe: Ke[] = [];
+  const yaoBei: Ke[] = [];
+  for (const k of kes) {
+    if (ke(ganWx, WUXING[k.shang])) yaoKe.push(k);       // 日干克上神
+    if (ke(WUXING[k.shang], ganWx)) yaoBei.push(k);      // 上神克日干
+  }
+  if (yaoKe.length > 0 || yaoBei.length > 0) {
+    const pool = yaoKe.length > 0 ? yaoKe : yaoBei;
+    const dayGanYang = ganYang(dayGan);
+    const bi = pool.filter(k => zhiYang(k.shang) === dayGanYang);
+    const pick = bi.length > 0 ? bi[0] : pool[0];
+    const c1 = pick.shang;
+    const { chuan2, chuan3 } = chuanFrom(tianpan, c1);
+    return {
+      method: yaoKe.length > 0 ? '蒿矢课' : '弹射课',
+      note: yaoKe.length > 0 ? '日遥克神，事由己发，主主动求取，渐有所成。' : '神遥克日，事出意外，防暗箭来袭，宜谨慎自守。',
+      chuan1: c1, chuan2, chuan3,
+    };
+  }
+
+  // ── 3. 无克无遥克：别责 / 八专 / 昴星 ──
+  const ganJiZhi = ganJi;
+  // 八专：日干寄宫与日支同位（四课止两课）
+  if (ganJiZhi === dayZhi) {
+    const ganYangFlag = ganYang(dayGan);
+    const c1 = ganYangFlag ? kes[0].shang : kes[2].shang;   // 阳日取干上神，阴日取支上神
+    const { chuan2, chuan3 } = chuanFrom(tianpan, c1);
+    return { method: '八专课', note: '干支同位，四课不完；主事机专一，惟阴阳未分，宜专一其心。', chuan1: c1, chuan2, chuan3 };
+  }
+  // 别责：干上神与支上神相同（四课不备）
+  if (kes[0].shang === kes[2].shang) {
+    const ganYangFlag = ganYang(dayGan);
+    // 阳日取干五合之干寄宫上神；阴日取支上神
+    if (ganYangFlag) {
+      const heGan = GAN_HE[dayGan];
+      const heJi = LR_GANJI[heGan];
+      const c1 = tianpan[zi(heJi)];
+      const { chuan2, chuan3 } = chuanFrom(tianpan, c1);
+      return { method: '别责课', note: '四课不备，取干合发用；主事不归一，须借力他人，另辟蹊径。', chuan1: c1, chuan2, chuan3 };
+    }
+    const c1 = kes[2].shang;
+    const { chuan2, chuan3 } = chuanFrom(tianpan, c1);
+    return { method: '别责课', note: '四课不备，取支上神发用；主事有隐衷，宜旁敲侧击，徐图其成。', chuan1: c1, chuan2, chuan3 };
+  }
+  // 昴星：无克无遥克且四课全备——以酉（昴星）为用
+  {
+    const ganYangFlag = ganYang(dayGan);
+    const youIdx = zi('酉');
+    if (ganYangFlag) {
+      // 阳日：取天盘加临地盘酉之神（酉上神）为初传（虎视课）；中传取支上神，末传取干上神
+      const c1 = tianpan[youIdx];
+      const c2 = tianpan[zi(dayZhi)];    // 支上神
+      const c3 = tianpan[zi(ganJi)];     // 干上神
+      return { method: '昴星课', note: '无克无遥，取昴星（酉）发用（虎视格）；主事机隐晦，宜静观其变，防惊变于暗处。', chuan1: c1, chuan2: c2, chuan3: c3 };
+    }
+    // 阴日：取天盘酉加临之地盘支（酉下神）为初传（冬蛇掩目）；中传取干上神，末传取支上神
+    let c1 = '';
+    for (let i = 0; i < 12; i++) if (tianpan[i] === '酉') { c1 = ZHI[i]; break; }
+    const c2 = tianpan[zi(ganJi)];
+    const c3 = tianpan[zi(dayZhi)];
+    return { method: '昴星课', note: '无克无遥，取昴星（酉）发用（冬蛇掩目格）；主事蒙昧，宜守正待时，防晦气暗生。', chuan1: c1, chuan2: c2, chuan3: c3 };
+  }
+}
+
 export function liurenCalc(dt: string | Date): LiurenResult {
   const d = dt instanceof Date ? dt : new Date(dt);
   const y = d.getFullYear(), m = d.getMonth() + 1, day = d.getDate();
@@ -36,8 +247,9 @@ export function liurenCalc(dt: string | Date): LiurenResult {
   const ke2 = tianpan[ZHI.indexOf(ke1 as any)];
   const ke3 = tianpan[ZHI.indexOf(dayGZ[1] as any)];
   const ke4 = tianpan[ZHI.indexOf(ke3 as any)];
-  /* 三传（简式取传：依次取四课初传、中传、末传上神） */
-  const chuan1 = ke1, chuan2 = ke2, chuan3 = ke3;
+  /* 三传：九宗门真实起法（替代旧简式取传） */
+  const chuan = jiuzongmen(tianpan, ganJi, dayGZ[1], dayGZ[0], hourIndex, jiang);
+  const { chuan1, chuan2, chuan3, method, note } = chuan;
 
   /* ── 补齐层：贵人 + 十二天将 ── */
   // 贵人起法（日干）：甲戊庚牛羊 乙己鼠猴乡 丙丁猪鸡位 壬癸兔蛇藏 六辛逢马虎
@@ -77,10 +289,10 @@ export function liurenCalc(dt: string | Date): LiurenResult {
     : keti === '反吟课' ? '天地盘相冲，事有反复翻覆，来去无常，宜缓不宜急。'
     : '四课三传乘常气，事机明朗，顺其自然即可。';
 
-  return { dayGZ, hourGZ, jiang, jqName, tianpan, ganJi, ke1, ke2, ke3, ke4, chuan1, chuan2, chuan3, guiRen, isDay, tianJiang, chuanJiang, keti, ketiNote };
+  return { dayGZ, hourGZ, jiang, jqName, tianpan, ganJi, ke1, ke2, ke3, ke4, chuan1, chuan2, chuan3, guiRen, isDay, tianJiang, chuanJiang, keti, ketiNote, chuanMethod: method, chuanNote: note };
 }
 
 export const jiangName = (zhi: string): string => {
   const row = LR_JIANGS.find(j => j[1] === zhi);
   return row ? row[0] : zhi;
-}
+}

package/shared/core/engine/qimen.ts

@@ -1,9 +1,28 @@
-// 奇门遁甲：演示级九宫起局（精确节气定阴阳遁，三候取局）
+// 奇门遁甲：九宫起局（节气定阴阳遁 · 日干支三元定局 · 时干支定旬首）
+// 说明：超神接气/置闰（节气时刻与甲己日不齐时的补闰规则）属专业级范畴，当前按「正授」近似：
+//       以日干支查三元表定局，与交节日正授情形完全一致；超接偏差时可能差一元，后续专业级补齐。
 import { GAN, ZHI, mod } from '../data/ganzhi';
 import { QM_SEASONS, QM_STARS, QM_MEN, LUOSHU } from '../data/qimen';
 import { daysSince, currentJieqiNameExact } from './calendar';
 import type { QimenInput, QimenResult } from '../types';
 
+
+// 三元定局表（时家奇门标准）：行=日干五合组，列=日支组（0=子午卯酉 1=寅申巳亥 2=辰戌丑未）
+// 值 0=上元 1=中元 2=下元。甲子旬前五日上元、次五日中元、甲戌旬前五日下元——已按日干支循环验证自洽。
+const SAN_YUAN: number[][] = [
+  [0, 1, 2], // 甲己：子午卯酉上元 寅申巳亥中元 辰戌丑未下元
+  [1, 2, 0], // 乙庚：子午卯酉中元 寅申巳亥下元 辰戌丑未上元
+  [2, 0, 1], // 丙辛：子午卯酉下元 寅申巳亥上元 辰戌丑未中元
+  [0, 1, 2], // 丁壬：同甲己
+  [1, 2, 0], // 戊癸：同乙庚
+];
+
+function sanYuanOf(dayGan: string, dayZhi: string): number {
+  const ganGroup = ['甲', '己'].includes(dayGan) ? 0 : ['乙', '庚'].includes(dayGan) ? 1 : ['丙', '辛'].includes(dayGan) ? 2 : ['丁', '壬'].includes(dayGan) ? 3 : 4;
+  const zhiGroup = ['子', '午', '卯', '酉'].includes(dayZhi) ? 0 : ['寅', '申', '巳', '亥'].includes(dayZhi) ? 1 : 2;
+  return SAN_YUAN[ganGroup][zhiGroup];
+}
+
 export function qimenCalc(input: QimenInput): QimenResult {
   const d = input.datetime instanceof Date ? input.datetime : new Date(input.datetime);
   const y = d.getFullYear(), m = d.getMonth() + 1, day = d.getDate();
@@ -21,13 +40,16 @@ export function qimenCalc(input: QimenInput): QimenResult {
   const season = QM_SEASONS.find(s => s.name === jqName);
   if (!season) throw new Error('节气未找到: ' + jqName);
   const yin = season.yin;
-  /* 候（三元）：按日数粗略取元 */
-  const xun = Math.floor(day / 5) % 3;
+  /* 三元定局（按日干支，替代旧「按日数粗略取元」） */
+  const xun = sanYuanOf(dayGZ[0], dayGZ[1]);
   const ju = season.ju[xun];
-  /* 旬首六仪（由时干定） */
-  const xunshouMap: Record<string, string> = { 戊: '甲子', 己: '甲戌', 庚: '甲申', 辛: '甲午', 壬: '甲辰', 癸: '甲寅' };
-  const hourGan = hourGZ[0];
-  const xunShou = ['戊', '己', '庚', '辛', '壬', '癸'].includes(hourGan) ? hourGan : '戊';
+  /* 旬首六仪（按时干支真实旬首：时干支序号 → 所在旬 → 六仪） */
+  const gzIdx = mod((GAN.indexOf(hourGZ[0] as any) - ZHI.indexOf(hourGZ[1] as any)) * 6 + ZHI.indexOf(hourGZ[1] as any), 60);
+  const xunStart = Math.floor(gzIdx / 10) * 10;               // 旬首干支序号（甲子=0 甲戌=10 …）
+  const xunShouZhi = ZHI[xunStart % 12];
+  const xunshouMap: Record<string, string> = { 子: '戊', 戌: '己', 申: '庚', 午: '辛', 辰: '壬', 寅: '癸' };
+  const xunShou = xunshouMap[xunShouZhi];                     // 旬首六仪（甲子戊 甲戌己 …）
+  const xunshouName = '甲' + xunShouZhi;
   /* 地盘布奇仪：阳遁顺布（1→8→3→4→9→2→7→6→中5），阴遁逆布 */
   const qiyiOrder = ['戊', '己', '庚', '辛', '壬', '癸', '丁', '丙', '乙'];
   const yiAt: Record<number, string> = {};
@@ -74,5 +96,5 @@ export function qimenCalc(input: QimenInput): QimenResult {
     shen[p] = shenSeq[step];
   });
   shen[5] = '';
-  return { yin, ju, jqName, dayGZ, hourGZ, xunShou, xunshouName: xunshouMap[xunShou] || '', zfStar, zsMen, zfPalace, pan, zsPalace, tianYi, shen };
+  return { yin, ju, jqName, dayGZ, hourGZ, xunShou, xunshouName, zfStar, zsMen, zfPalace, pan, zsPalace, tianYi, shen };
 }

package/shared/core/types.ts

@@ -160,6 +160,9 @@ export interface LiurenResult {
   chuanJiang: { chuan: string; jiang: string }[];  // 三传所乘天将
   keti: string;     // 课体（伏吟/反吟/常课）
   ketiNote: string; // 课体断语
+  // ─── 九宗门起三传（2026-08-23）───
+  chuanMethod: string;  // 起传法门（元首/始入/重审/知一/涉害/蒿矢/弹射/昴星/别责/八专/返吟/伏吟）
+  chuanNote: string;    // 起传断语
 }
 
 // 小六壬输出

package/src/App.tsx

@@ -1,4 +1,4 @@
-// 观微 · 应用路由（HashRouter，映射参考项目 hash 语义）
+// 观微 · 应用路由（HashRouter，兼容 GitHub Pages 静态托管）
 // 路由表：
 //   /           首页（含 #home-arts / #home-fa 锚点）
 //   /about      缘起

package/src/components/arts/LiurenArt.tsx

@@ -67,7 +67,8 @@ export function LiurenResult({ data }: { data: LiurenResult }) {
           { k: '三课 · 支上', v: r.ke3, big: true },
           { k: '四课 · 支阴', v: r.ke4, big: true },
         ]}>
-        <p>三传（简式）：<strong className="tag-hot">初传 {r.chuan1}</strong> → <strong className="tag-cool">中传 {r.chuan2}</strong> → <strong>末传 {r.chuan3}</strong>。</p>
+        <p>三传（{r.chuanMethod || '起传'}）：<strong className="tag-hot">初传 {r.chuan1}</strong> → <strong className="tag-cool">中传 {r.chuan2}</strong> → <strong>末传 {r.chuan3}</strong>。</p>
+        {r.chuanNote && <p className="tiny muted">{r.chuanNote}</p>}
         <p>初传为事发之端，中传为事进之中，末传为事成之归。干为外、支为内，四课之内外，即人事之表里。</p>
         <p className="mt-2"><strong>三传参详：</strong>{liurenAdvice(r)}</p>
       </ResultCard>

package/src/data/arts.ts

@@ -1,4 +1,4 @@
-// 九术元数据（移植自参考项目「观微·宋式玄学占卜」data.js ARTS）
+// 九术元数据（名称/编号/卦象符号/说明）
 export interface ArtMeta {
   id: ArtId;
   num: string;

package/src/index.css

@@ -1,4 +1,4 @@
-@import url('https://fonts.googleapis.com/css2?family=Cinzel:wght@400;600;700&family=Noto+Sans+SC:wght@300;400;500;700&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Noto+Serif+SC:wght@400;600;700&family=Ma+Shan+Zheng&family=Zhi+Mang+Xing&family=Noto+Sans+SC:wght@300;400;500;700&display=swap');
 
 @tailwind base;
 @tailwind components;
@@ -11,44 +11,15 @@
   }
   
   body {
-    @apply bg-void text-stardust font-body;
     overflow-x: hidden;
   }
   
-  ::selection {
-    @apply bg-ancient/30 text-stardust;
-  }
-  
   ::-webkit-scrollbar {
     width: 6px;
   }
-  
-  ::-webkit-scrollbar-track {
-    @apply bg-void;
-  }
-  
-  ::-webkit-scrollbar-thumb {
-    @apply bg-ancient/30 rounded-full;
-  }
-  
-  ::-webkit-scrollbar-thumb:hover {
-    @apply bg-ancient/50;
-  }
 }
 
 @layer components {
-  .glass-panel {
-    @apply bg-abyss/60 backdrop-blur-md border border-ancient/20 rounded-lg;
-  }
-  
-  .gold-border {
-    @apply border border-ancient/40 hover:border-ancient/80 transition-all duration-500;
-  }
-  
-  .text-glow {
-    text-shadow: 0 0 10px rgba(201, 162, 39, 0.5), 0 0 20px rgba(201, 162, 39, 0.3);
-  }
-  
   .card-3d {
     transform-style: preserve-3d;
     perspective: 1000px;
@@ -61,18 +32,6 @@
   .card-back {
     transform: rotateY(180deg);
   }
-  
-  .mystic-gradient {
-    background: linear-gradient(135deg, rgba(26,26,46,0.9) 0%, rgba(10,10,15,0.95) 100%);
-  }
-  
-  .shimmer-text {
-    background: linear-gradient(90deg, #c9a227 0%, #ffd700 50%, #c9a227 100%);
-    background-size: 200% auto;
-    -webkit-background-clip: text;
-    -webkit-text-fill-color: transparent;
-    animation: shimmer 3s linear infinite;
-  }
 }
 
 @layer utilities {
@@ -93,11 +52,6 @@
   }
 }
 
-@keyframes shimmer {
-  0% { background-position: 200% center; }
-  100% { background-position: -200% center; }
-}
-
 @keyframes fade-in {
   from {
     opacity: 0;
@@ -109,24 +63,6 @@
   }
 }
 
-@keyframes float {
-  0%, 100% {
-    transform: translateY(0px);
-  }
-  50% {
-    transform: translateY(-10px);
-  }
-}
-
-@keyframes pulse-glow {
-  0%, 100% {
-    box-shadow: 0 0 5px rgba(201, 162, 39, 0.3);
-  }
-  50% {
-    box-shadow: 0 0 20px rgba(201, 162, 39, 0.6);
-  }
-}
-
 @keyframes typing-cursor {
   0%, 100% {
     opacity: 1;
@@ -141,14 +77,6 @@
     animation: fade-in 0.5s ease-out forwards;
   }
   
-  .animate-float {
-    animation: float 3s ease-in-out infinite;
-  }
-  
-  .animate-pulse-glow {
-    animation: pulse-glow 2s ease-in-out infinite;
-  }
-  
   .animate-typing-cursor {
     animation: typing-cursor 1s step-end infinite;
   }
@@ -187,4 +115,4 @@
 @keyframes pulse-soft {
   0%, 100% { opacity: .55; }
   50% { opacity: 1; }
-}
+}

package/src/pages/DemoPage.tsx

@@ -31,22 +31,16 @@ import Disclaimer from '@/components/Disclaimer';
 const DEMO_BIRTH = { y: 1988, m: 6, d: 15, hourIndex: 6, time: '12:00', gender: '女' as const, location: { lng: 116.4, lat: 39.9, province: '北京市', city: '北京市', district: '东城区' } };
 
 // 九术本地排盘（与后端 divine.ts 同一引擎、同一输入口径）
-const ARTS: { id: string; name: string; glyph: string; calc: () => unknown }[] = [
-  { id: 'bazi', name: '四柱八字', glyph: '命', calc: () => baziCalc(DEMO_BIRTH) },
-  { id: 'ziwei', name: '紫微斗数', glyph: '星', calc: () => {
-      const lunar = Solar.fromYmd(DEMO_BIRTH.y, DEMO_BIRTH.m, DEMO_BIRTH.d).getLunar();
-      return ziweiCalc({ ganzhi: lunar.getYearInGanZhi(), month: Math.abs(lunar.getMonth()), day: lunar.getDay(), hour: DEMO_BIRTH.hourIndex, time: DEMO_BIRTH.time, location: DEMO_BIRTH.location, gender: DEMO_BIRTH.gender, birthYear: DEMO_BIRTH.y, solarDate: [DEMO_BIRTH.y, DEMO_BIRTH.m, DEMO_BIRTH.d] });
-  } },
-  { id: 'astrology', name: '古典星盘', glyph: '穹', calc: () => astrologyCalc(DEMO_BIRTH.y, DEMO_BIRTH.m, DEMO_BIRTH.d, 12, 0, DEMO_BIRTH.location.lng, DEMO_BIRTH.location.lat) },
-  { id: 'qimen', name: '奇门遁甲', glyph: '遁', calc: () => qimenCalc({ datetime: new Date() }) },
-  { id: 'meihua', name: '梅花易数', glyph: '梅', calc: () => meihuaCalc({ mode: 'time', n1: 3, n2: 5, n3: 7, now: new Date() }) },
-  { id: 'liuyao', name: '六爻', glyph: '爻', calc: () => liuyaoCalc(undefined, { y: new Date().getFullYear(), m: new Date().getMonth() + 1, d: new Date().getDate() }) },
-  { id: 'liuren', name: '大六壬', glyph: '课', calc: () => liurenCalc(new Date()) },
-  { id: 'xiaoliuren', name: '小六壬', glyph: '掌', calc: () => xiaoliurenCalc('time', new Date().getMonth() + 1, new Date().getDate(), new Date().getHours() % 12, 3, 5, 7) },
-  { id: 'tarot', name: '塔罗', glyph: '镜', calc: () => {
-      const spread = allTarotSpreads().find((x: any) => x.id === 'three') || allTarotSpreads()[0];
-      return { spread, cards: tarotDraw(3) };
-  } },
+const ARTS: { id: string; name: string; glyph: string }[] = [
+  { id: 'bazi', name: '四柱八字', glyph: '命' },
+  { id: 'ziwei', name: '紫微斗数', glyph: '星' },
+  { id: 'astrology', name: '古典星盘', glyph: '穹' },
+  { id: 'qimen', name: '奇门遁甲', glyph: '遁' },
+  { id: 'meihua', name: '梅花易数', glyph: '梅' },
+  { id: 'liuyao', name: '六爻', glyph: '爻' },
+  { id: 'liuren', name: '大六壬', glyph: '课' },
+  { id: 'xiaoliuren', name: '小六壬', glyph: '掌' },
+  { id: 'tarot', name: '塔罗', glyph: '镜' },
 ];
 const RESULT_VIEWS: Record<string, (data: unknown) => React.ReactElement> = {
   bazi: d => <BaziResult data={d as any} />,
@@ -66,8 +60,38 @@ export default function DemoPage() {
   const [showRaw, setShowRaw] = useState(false);
   const [artId, setArtId] = useState('bazi');
   const [localResult, setLocalResult] = useState<unknown>(null);
-  const art = ARTS.find(a => a.id === artId)!;
+  // ─── 演示输入（#2）：日期/时刻/报数，替换固定示例档案 ───
+  const [y, setY] = useState(DEMO_BIRTH.y);
+  const [m, setM] = useState(DEMO_BIRTH.m);
+  const [d, setD] = useState(DEMO_BIRTH.d);
+  const [hour, setHour] = useState(12);
+  const [n1, setN1] = useState(3);
+  const [n2, setN2] = useState(5);
+  const [n3, setN3] = useState(7);
 
+  const birth = { ...DEMO_BIRTH, y, m, d, hourIndex: Math.floor((hour % 24) / 2), time: (hour < 10 ? '0' + hour : '' + hour) + ':00' };
+
+  // 按术别用当前输入起例（命盘类用输入日期；占问类用报数/当前时刻）
+  const buildCalc = (id: string): (() => unknown) => {
+    switch (id) {
+      case 'bazi': return () => baziCalc(birth);
+      case 'ziwei': return () => {
+        const lunar = Solar.fromYmd(birth.y, birth.m, birth.d).getLunar();
+        return ziweiCalc({ ganzhi: lunar.getYearInGanZhi(), month: Math.abs(lunar.getMonth()), day: lunar.getDay(), hour: birth.hourIndex, time: birth.time, location: birth.location, gender: birth.gender, birthYear: birth.y, solarDate: [birth.y, birth.m, birth.d] });
+      };
+      case 'astrology': return () => astrologyCalc(birth.y, birth.m, birth.d, hour, 0, birth.location.lng, birth.location.lat);
+      case 'qimen': return () => qimenCalc({ datetime: new Date(y, m - 1, d, hour, 0) });
+      case 'meihua': return () => meihuaCalc({ mode: 'number', n1, n2, n3, now: new Date() } as any);
+      case 'liuyao': return () => liuyaoCalc(undefined, { y, m, d });
+      case 'liuren': return () => liurenCalc(new Date(y, m - 1, d, hour, 0));
+      case 'xiaoliuren': return () => xiaoliurenCalc('time', m, d, Math.floor((hour % 24) / 2), n1, n2, n3);
+      case 'tarot': return () => {
+        const spread = allTarotSpreads().find((x: any) => x.id === 'three') || allTarotSpreads()[0];
+        return { spread, cards: tarotDraw(3) };
+      };
+      default: return () => null;
+    }
+  };
   const reset = () => {
     setPhase('idle');
     setReport(null);
@@ -82,7 +106,7 @@ export default function DemoPage() {
     // 本地引擎排盘（纯浏览器计算，无需后端）
     setTimeout(() => {
       try {
-        setLocalResult(art.calc());
+        setLocalResult(buildCalc(artId)());
       } catch (e) {
         console.error('本地排盘失败', e);
       }
@@ -109,9 +133,9 @@ export default function DemoPage() {
       <div className="wrap" style={{ marginTop: 'var(--sp-4)' }}>
         {phase === 'idle' && (
           <div className="result-card" style={{ padding: 'var(--sp-5)' }}>
-            <p style={{ fontSize: '1.05rem', marginBottom: 'var(--sp-2)' }}>选一种术数，点一下就能看到排盘结果；八字还会附带一份完整的 AI 解读示例。</p>
-            <p className="tiny muted" style={{ marginBottom: 'var(--sp-2)' }}>示例档案：1988年6月15日 · 北京 · 女；其余术数按当前时刻起例</p>
-            <p className="tiny muted" style={{ marginBottom: 'var(--sp-3)' }}>三步即玩：① 选术数 → ② 点「开始体验」→ ③ 看结果</p>
+            <p style={{ fontSize: '1.05rem', marginBottom: 'var(--sp-2)' }}>选一种术数，填好（或直接用默认）日期时刻，点一下就能看到排盘结果；八字还会附带一份完整的 AI 解读示例。</p>
+            <p className="tiny muted" style={{ marginBottom: 'var(--sp-2)' }}>命盘类（八字/紫微/星盘）用下面日期时刻排盘；占问类（奇门/六壬/小六壬）用该时刻起例；梅花可用报数起卦</p>
+            <p className="tiny muted" style={{ marginBottom: 'var(--sp-3)' }}>三步即玩：① 选术数 → ② 填日期（可选）→ ③ 点「开始体验」看结果</p>
             <div className="art-picker" style={{ display: 'flex', flexWrap: 'wrap', gap: '.5rem', marginBottom: 'var(--sp-4)' }}>
               {ARTS.map(a => (
                 <button key={a.id} onClick={() => setArtId(a.id)}
@@ -121,6 +145,27 @@ export default function DemoPage() {
                 </button>
               ))}
             </div>
+            {/* 演示输入表单：日期/时刻/报数 */}
+            <div style={{ display: 'flex', flexWrap: 'wrap', gap: '1rem', alignItems: 'center', marginBottom: 'var(--sp-4)', padding: 'var(--sp-3)', border: '1px dashed var(--line-soft)', borderRadius: 'var(--r-sm)' }}>
+              <label className="tiny muted">日期
+                <input className="input-line" type="number" style={{ width: 70, marginLeft: '.4rem' }} value={y} min={1900} max={2100} onChange={e => setY(Number(e.target.value) || 1988)} />
+                <span className="tiny muted" style={{ margin: '0 .2rem' }}>/</span>
+                <input className="input-line" type="number" style={{ width: 46 }} value={m} min={1} max={12} onChange={e => setM(Number(e.target.value) || 6)} />
+                <span className="tiny muted" style={{ margin: '0 .2rem' }}>/</span>
+                <input className="input-line" type="number" style={{ width: 46 }} value={d} min={1} max={31} onChange={e => setD(Number(e.target.value) || 15)} />
+              </label>
+              <label className="tiny muted">时刻
+                <input className="input-line" type="number" style={{ width: 56, marginLeft: '.4rem' }} value={hour} min={0} max={23} onChange={e => setHour(Math.max(0, Math.min(23, Number(e.target.value) || 12)))} />
+                <span className="tiny muted" style={{ marginLeft: '.3rem' }}>时（24 小时制）</span>
+              </label>
+              {artId === 'meihua' && (
+                <label className="tiny muted">报数
+                  <input className="input-line" type="number" style={{ width: 46, marginLeft: '.4rem' }} value={n1} min={1} max={9} onChange={e => setN1(Number(e.target.value) || 3)} />
+                  <input className="input-line" type="number" style={{ width: 46, marginLeft: '.3rem' }} value={n2} min={1} max={9} onChange={e => setN2(Number(e.target.value) || 5)} />
+                  <input className="input-line" type="number" style={{ width: 46, marginLeft: '.3rem' }} value={n3} min={1} max={9} onChange={e => setN3(Number(e.target.value) || 7)} />
+                </label>
+              )}
+            </div>
             <button className="btn-seal" style={{ fontSize: '1rem', padding: '.7rem 2.2rem' }} onClick={start}>开 始 体 验</button>
           </div>
         )}