mingpan 0.1.3 → 0.1.4

package/dist/services/qimen/calculators/JiuXingCalculator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"JiuXingCalculator.d.ts","sourceRoot":"","sources":["../../../../src/services/qimen/calculators/JiuXingCalculator.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAW,UAAU,EAAE,MAAM,UAAU,CAAC;AAW7E,MAAM,WAAW,aAAa;IAC5B,qBAAqB;IACrB,QAAQ,EAAE,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACnC,UAAU;IACV,SAAS,EAAE,OAAO,CAAC;IACnB,cAAc;IACd,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY;IACZ,YAAY,EAAE,OAAO,CAAC;CACvB;AAED;;;GAGG;AACH,qBAAa,iBAAiB;IAC5B;;;;;;;;;;;;OAYG;IACH,MAAM,CAAC,SAAS,CACd,WAAW,EAAE,OAAO,EACpB,OAAO,EAAE,KAAK,EACd,UAAU,EAAE,UAAU,GACrB,aAAa;IAyBhB;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,aAAa;IAe5B;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,OAAO;IAetB;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,gBAAgB;IAuC/B;;OAEG;IACH,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,IAAI,EAAE,OAAO,GAAG,OAAO;CAMlF"}
+{"version":3,"file":"JiuXingCalculator.d.ts","sourceRoot":"","sources":["../../../../src/services/qimen/calculators/JiuXingCalculator.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAM7D,MAAM,WAAW,aAAa;IAC5B,qBAAqB;IACrB,QAAQ,EAAE,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACnC,UAAU;IACV,SAAS,EAAE,OAAO,CAAC;IACnB,cAAc;IACd,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY;IACZ,YAAY,EAAE,OAAO,CAAC;CACvB;AAED;;;GAGG;AACH,qBAAa,iBAAiB;IAC5B;;;;;;;;;;;;OAYG;IACH,MAAM,CAAC,SAAS,CACd,WAAW,EAAE,OAAO,EACpB,aAAa,EAAE,OAAO,EACtB,UAAU,EAAE,UAAU,GACrB,aAAa;IA2BhB;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,aAAa;IAe5B;;OAEG;IACH,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,IAAI,EAAE,OAAO,GAAG,OAAO;CAGlF"}

package/dist/services/qimen/calculators/JiuXingCalculator.js

@@ -1,46 +1,49 @@
 "use strict";
 /**
- * 九星计算器
- * 计算九星在九宫中的分布
+ * 九星计算器（飞盘式）
+ * 计算九星在九宫中的飞布
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JiuXingCalculator = void 0;
 const constants_1 = require("../data/constants");
 /**
- * 九星计算器
+ * 九星计算器（飞盘式）
  * 负责计算九星的飞布
  */
 class JiuXingCalculator {
     /**
-     * 计算九星布局
-     * @param xunShouGong 旬首遁干在地盘的宫位
-     * @param hourZhi 时支
+     * 计算飞盘式九星布局
+     * @param xunShouGong 旬首遁干在地盘的宫位（值符星原始宫）
+     * @param shiGanLuoGong 参考干（时干等，甲用旬首仪）的地盘落宫
      * @param yinYangDun 阴阳遁
      * @returns 九星布局
      *
-     * 原理：
-     * 1. 确定值符星：旬首遁干落宫对应的星就是值符星
-     * 2. 值符星随时干飞布，从地盘旬首落宫起，按时辰数飞布
-     * 3. 阳遁顺飞，阴遁逆飞
-     * 4. 天禽星（中五宫）随天芮星，或寄坤二
+     * 原理（飞盘式）：
+     * 1. 值符星 = 旬首遁干原始宫对应的星（中五宫为天禽）
+     * 2. 值符星随时干：飞到参考干落宫
+     * 3. 其余诸星按九星原始序（蓬芮冲辅禽心柱任英，即原始宫数字序）
+     *    自值符星起，按宫位数字顺序飞布，阳遁顺飞、阴遁逆飞
      */
-    static calculate(xunShouGong, hourZhi, yinYangDun) {
+    static calculate(xunShouGong, shiGanLuoGong, yinYangDun) {
         const isYang = yinYangDun === '阳遁';
         // 1. 确定值符星（旬首落宫对应的星）
         const zhiFuXing = this.getXingByGong(xunShouGong);
         const zhiFuGong = constants_1.JIU_XING_GONG[zhiFuXing];
-        // 2. 计算时辰数（子时为1）
-        const hourNum = constants_1.DI_ZHI.indexOf(hourZhi) + 1;
-        // 3. 计算值符星落宫
-        // 值符星随时干，从旬首落宫起飞布
-        const zhiFuLuoGong = this.flyXing(xunShouGong, hourNum - 1, isYang);
-        // 4. 计算所有九星的落宫
-        const gongXing = this.calculateAllXing(zhiFuXing, zhiFuLuoGong, isYang);
+        // 2. 飞布序列：自值符星起，按九星原始序循环
+        const zhiFuIdx = constants_1.JIU_XING_ORDER.indexOf(zhiFuXing);
+        const flyOrder = constants_1.JIU_XING_ORDER.slice(zhiFuIdx).concat(constants_1.JIU_XING_ORDER.slice(0, zhiFuIdx));
+        // 3. 从参考干落宫起飞布（阳顺阴逆，宫位数字序）
+        const gongXing = {};
+        for (let i = 0; i < 9; i++) {
+            const offset = isYang ? i : -i;
+            const gong = (((shiGanLuoGong - 1 + offset) % 9) + 9) % 9 + 1;
+            gongXing[gong] = flyOrder[i];
+        }
         return {
             gongXing,
             zhiFuXing,
             zhiFuGong,
-            zhiFuLuoGong,
+            zhiFuLuoGong: shiGanLuoGong,
         };
     }
     /**
@@ -58,58 +61,10 @@ class JiuXingCalculator {
         }
         return '芮'; // 默认天芮
     }
-    /**
-     * 飞星：从某宫开始飞布指定步数
-     */
-    static flyXing(startGong, steps, isYang) {
-        let actualStart = startGong;
-        if (actualStart === 5) {
-            actualStart = constants_1.ZHONG_GONG_JI; // 中宫寄坤二
-        }
-        const startIdx = (0, constants_1.getLuoShuIndex)(actualStart);
-        const targetIdx = isYang
-            ? (startIdx + steps) % 8
-            : ((startIdx - steps) % 8 + 8) % 8;
-        return (0, constants_1.getLuoShuGong)(targetIdx);
-    }
-    /**
-     * 计算所有九星的落宫
-     * 从值符星落宫开始，按洛书顺序排列其他八星
-     * 天禽星随天芮星
-     */
-    static calculateAllXing(zhiFuXing, zhiFuLuoGong, isYang) {
-        const gongXing = {};
-        // 九星顺序（不含天禽，因为天禽随天芮）
-        const xingOrderWithoutQin = ['蓬', '芮', '冲', '辅', '心', '柱', '任', '英'];
-        // 找到值符星在顺序中的索引
-        let zhiFuIdx = xingOrderWithoutQin.indexOf(zhiFuXing);
-        if (zhiFuIdx === -1) {
-            // 如果值符星是天禽，则以天芮为准
-            zhiFuIdx = xingOrderWithoutQin.indexOf('芮');
-        }
-        // 获取值符星落宫在洛书中的索引
-        let startIdx = (0, constants_1.getLuoShuIndex)(zhiFuLuoGong === 5 ? constants_1.ZHONG_GONG_JI : zhiFuLuoGong);
-        // 依次排列八星（不含天禽）
-        for (let i = 0; i < 8; i++) {
-            const xingIdx = (zhiFuIdx + i) % 8;
-            const xing = xingOrderWithoutQin[xingIdx];
-            const gongIdx = isYang
-                ? (startIdx + i) % 8
-                : ((startIdx - i) % 8 + 8) % 8;
-            const gong = (0, constants_1.getLuoShuGong)(gongIdx);
-            gongXing[gong] = xing;
-        }
-        // 天禽星寄中宫，实际显示时随天芮
-        gongXing[5] = '禽';
-        return gongXing;
-    }
     /**
      * 根据宫位找星
      */
     static findXingByGong(gongXing, gong) {
-        if (gong === 5) {
-            return '禽';
-        }
         return gongXing[gong];
     }
 }

package/dist/services/qimen/calculators/JiuXingCalculator.js.map

@@ -1 +1 @@
-{"version":3,"file":"JiuXingCalculator.js","sourceRoot":"","sources":["../../../../src/services/qimen/calculators/JiuXingCalculator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"JiuXingCalculator.js","sourceRoot":"","sources":["../../../../src/services/qimen/calculators/JiuXingCalculator.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAGH,iDAG2B;AAa3B;;;GAGG;AACH,MAAa,iBAAiB;IAC5B;;;;;;;;;;;;OAYG;IACH,MAAM,CAAC,SAAS,CACd,WAAoB,EACpB,aAAsB,EACtB,UAAsB;QAEtB,MAAM,MAAM,GAAG,UAAU,KAAK,IAAI,CAAC;QAEnC,qBAAqB;QACrB,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;QAClD,MAAM,SAAS,GAAG,yBAAa,CAAC,SAAS,CAAC,CAAC;QAE3C,yBAAyB;QACzB,MAAM,QAAQ,GAAG,0BAAc,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACnD,MAAM,QAAQ,GAAG,0BAAc,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,0BAAc,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC;QAE1F,2BAA2B;QAC3B,MAAM,QAAQ,GAA6B,EAA8B,CAAC;QAC1E,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YAC3B,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC/B,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,aAAa,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC9D,QAAQ,CAAC,IAAe,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC1C,CAAC;QAED,OAAO;YACL,QAAQ;YACR,SAAS;YACT,SAAS;YACT,YAAY,EAAE,aAAa;SAC5B,CAAC;IACJ,CAAC;IAED;;OAEG;IACK,MAAM,CAAC,aAAa,CAAC,IAAa;QACxC,KAAK,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,yBAAa,CAAC,EAAE,CAAC;YAC7D,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;gBACtB,OAAO,IAAe,CAAC;YACzB,CAAC;QACH,CAAC;QAED,QAAQ;QACR,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;YACf,OAAO,GAAG,CAAC;QACb,CAAC;QAED,OAAO,GAAG,CAAC,CAAC,OAAO;IACrB,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,cAAc,CAAC,QAAkC,EAAE,IAAa;QACrE,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC;IACxB,CAAC;CACF;AArED,8CAqEC"}

package/dist/services/qimen/calculators/JuShuCalculator.d.ts

@@ -26,13 +26,16 @@ export declare class JuShuCalculator {
     static calculate(jieQi: string, dayGanZhi: string, method: ZhiRunMethod, jieQiDate?: Date, currentDate?: Date): JuShuResult;
     /**
      * 拆补法计算上中下元
-     * 根据日干支确定符头，从而确定上中下元
+     * 根据日干支的符头（五日一元，元首为甲日或己日）确定上中下元
      *
      * 原理：
-     * - 每个节气 15 天分为三元，每元 5 天
-     * - 上元：符头为甲子、甲午（甲子旬或甲午旬的开头）
-     * - 中元：符头为甲戌、甲辰
-     * - 下元：符头为甲申、甲寅
+     * - 六十甲子按五日一组，各组首日（甲/己日）为符头
+     * - 符头地支为四仲（子午卯酉）者为上元：甲子、甲午、己卯、己酉
+     * - 符头地支为四孟（寅申巳亥）者为中元：甲寅、甲申、己巳、己亥
+     * - 符头地支为四季（辰戌丑未）者为下元：甲辰、甲戌、己丑、己未
+     * - 节气内十五天被三元「拆开补齐」，故称拆补法
+     *
+     * 参照：kentang2017/kinqimen findyuen_dict（MIT）、《神奇之门》
      */
     private static calculateYuanChaibu;
     /**

package/dist/services/qimen/calculators/JuShuCalculator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"JuShuCalculator.d.ts","sourceRoot":"","sources":["../../../../src/services/qimen/calculators/JuShuCalculator.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAkB,KAAK,EAAW,UAAU,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAQnG,MAAM,WAAW,WAAW;IAC1B,UAAU;IACV,UAAU,EAAE,UAAU,CAAC;IACvB,eAAe;IACf,KAAK,EAAE,KAAK,CAAC;IACb,WAAW;IACX,IAAI,EAAE,QAAQ,CAAC;CAChB;AAED;;GAEG;AACH,qBAAa,eAAe;IAC1B;;;;;;;OAOG;IACH,MAAM,CAAC,SAAS,CACd,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,YAAY,EACpB,SAAS,CAAC,EAAE,IAAI,EAChB,WAAW,CAAC,EAAE,IAAI,GACjB,WAAW;IA6Bd;;;;;;;;;OASG;IACH,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAmBlC;;;;;;;;OAQG;IACH,OAAO,CAAC,MAAM,CAAC,oBAAoB;IAmBnC;;OAEG;IACH,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAI7C;;OAEG;IACH,MAAM,CAAC,SAAS,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO;CAGlD"}
+{"version":3,"file":"JuShuCalculator.d.ts","sourceRoot":"","sources":["../../../../src/services/qimen/calculators/JuShuCalculator.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAkB,KAAK,EAAW,UAAU,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAQnG,MAAM,WAAW,WAAW;IAC1B,UAAU;IACV,UAAU,EAAE,UAAU,CAAC;IACvB,eAAe;IACf,KAAK,EAAE,KAAK,CAAC;IACb,WAAW;IACX,IAAI,EAAE,QAAQ,CAAC;CAChB;AAED;;GAEG;AACH,qBAAa,eAAe;IAC1B;;;;;;;OAOG;IACH,MAAM,CAAC,SAAS,CACd,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,YAAY,EACpB,SAAS,CAAC,EAAE,IAAI,EAChB,WAAW,CAAC,EAAE,IAAI,GACjB,WAAW;IA6Bd;;;;;;;;;;;;OAYG;IACH,OAAO,CAAC,MAAM,CAAC,mBAAmB;IASlC;;;;;;;;OAQG;IACH,OAAO,CAAC,MAAM,CAAC,oBAAoB;IAmBnC;;OAEG;IACH,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAI7C;;OAEG;IACH,MAAM,CAAC,SAAS,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO;CAGlD"}

package/dist/services/qimen/calculators/JuShuCalculator.js

@@ -6,6 +6,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JuShuCalculator = void 0;
 const constants_1 = require("../data/constants");
+const PanTypeCalculator_1 = require("./PanTypeCalculator");
 /**
  * 局数计算器
  */
@@ -45,30 +46,24 @@ class JuShuCalculator {
     }
     /**
      * 拆补法计算上中下元
-     * 根据日干支确定符头，从而确定上中下元
+     * 根据日干支的符头（五日一元，元首为甲日或己日）确定上中下元
      *
      * 原理：
-     * - 每个节气 15 天分为三元，每元 5 天
-     * - 上元：符头为甲子、甲午（甲子旬或甲午旬的开头）
-     * - 中元：符头为甲戌、甲辰
-     * - 下元：符头为甲申、甲寅
+     * - 六十甲子按五日一组，各组首日（甲/己日）为符头
+     * - 符头地支为四仲（子午卯酉）者为上元：甲子、甲午、己卯、己酉
+     * - 符头地支为四孟（寅申巳亥）者为中元：甲寅、甲申、己巳、己亥
+     * - 符头地支为四季（辰戌丑未）者为下元：甲辰、甲戌、己丑、己未
+     * - 节气内十五天被三元「拆开补齐」，故称拆补法
+     *
+     * 参照：kentang2017/kinqimen findyuen_dict（MIT）、《神奇之门》
      */
     static calculateYuanChaibu(dayGanZhi) {
-        const xunShou = (0, constants_1.getXunShou)(dayGanZhi);
-        // 根据旬首判断上中下元
-        switch (xunShou) {
-            case '甲子':
-            case '甲午':
-                return '上元';
-            case '甲戌':
-            case '甲辰':
-                return '中元';
-            case '甲申':
-            case '甲寅':
-                return '下元';
-            default:
-                return '上元';
+        const idx = constants_1.JIA_ZI_60.indexOf(dayGanZhi);
+        if (idx === -1) {
+            throw new Error(`无效的日干支: ${dayGanZhi}`);
         }
+        const fuTou = constants_1.JIA_ZI_60[idx - (idx % 5)];
+        return PanTypeCalculator_1.DI_ZHI_YUAN_MAP[fuTou.charAt(1)];
     }
     /**
      * 茅山法计算上中下元

package/dist/services/qimen/calculators/JuShuCalculator.js.map

@@ -1 +1 @@
-{"version":3,"file":"JuShuCalculator.js","sourceRoot":"","sources":["../../../../src/services/qimen/calculators/JuShuCalculator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"JuShuCalculator.js","sourceRoot":"","sources":["../../../../src/services/qimen/calculators/JuShuCalculator.ts"],"names":[],"mappings":"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"}

package/dist/services/qimen/calculators/SanQiLiuYiCalculator.d.ts

@@ -1,6 +1,6 @@
 /**
  * 三奇六仪计算器
- * 计算天盘布局（时干/日干带动的天盘飞布）
+ * 计算飞盘式天盘布局
  */
 import type { GongWei, TianGan, YinYangDun } from '../types';
 export interface TianPanResult {
@@ -11,37 +11,28 @@ export interface TianPanResult {
 }
 /**
  * 三奇六仪计算器
- * 负责计算天盘布局
+ * 负责计算飞盘式天盘布局
  */
 export declare class SanQiLiuYiCalculator {
     /**
-     * 计算天盘布局
+     * 计算飞盘式天盘布局
      * @param diPanGanGong 地盘干->宫位映射
-     * @param hourGanZhi 时干支（时盘）或日干支（日盘）
+     * @param refGanZhi 参考干支（时盘为时干支，余类推）
      * @param yinYangDun 阴阳遁
      * @returns 天盘各宫的干
      *
-     * 原理：
-     * 1. 找到时干（或日干）在地盘的落宫
-     * 2. 以该宫为起点，将三奇六仪按洛书顺序飞布
-     * 3. 阳遁顺飞，阴遁逆飞
-     *
-     * 例如：
-     * - 阳遁一局，时干为庚
-     * - 庚在地盘震三宫
-     * - 则天盘从震三宫开始顺布：戊-震3, 己-巽4, 庚-离9...
+     * 原理（飞盘式）：
+     * 1. 值符随时干：旬首六仪飞到参考干（甲用旬首仪）所在的地盘宫
+     * 2. 其余八干按 戊己庚辛壬癸丁丙乙 的循环顺序（自旬首仪起），
+     *    按宫位数字顺序（1→2→…→9→1）飞布，阳遁顺飞、阴遁逆飞
+     * 3. 落入中五宫之干寄坤二宫（查询时换算，显示时仍在中宫）
      */
-    static calculate(diPanGanGong: Record<TianGan, GongWei>, hourGanZhi: string, yinYangDun: YinYangDun): TianPanResult;
+    static calculate(diPanGanGong: Record<TianGan, GongWei>, refGanZhi: string, yinYangDun: YinYangDun): TianPanResult;
     /**
      * 获取遁甲干
-     * 甲遁于六仪之下，需要根据时干支确定
+     * 甲遁于六仪之下，需要根据干支确定
      */
     private static getDunGan;
-    /**
-     * 根据起始宫位和步数计算目标宫位（9宫飞布）
-     * 洛书9宫顺序：1(坎) -> 8(艮) -> 3(震) -> 4(巽) -> 5(中) -> 9(离) -> 2(坤) -> 7(兑) -> 6(乾)
-     */
-    private static getGongByStep;
     /**
      * 根据天干找天盘落宫
      */

package/dist/services/qimen/calculators/SanQiLiuYiCalculator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SanQiLiuYiCalculator.d.ts","sourceRoot":"","sources":["../../../../src/services/qimen/calculators/SanQiLiuYiCalculator.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAU7D,MAAM,WAAW,aAAa;IAC5B,sBAAsB;IACtB,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAClC,uBAAuB;IACvB,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;CACnC;AAED;;;GAGG;AACH,qBAAa,oBAAoB;IAC/B;;;;;;;;;;;;;;;;OAgBG;IACH,MAAM,CAAC,SAAS,CACd,YAAY,EAAE,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,EACtC,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,UAAU,GACrB,aAAa;IA4BhB;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,SAAS;IAWxB;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,aAAa;IAU5B;;OAEG;IACH,MAAM,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE,OAAO,GAAG,OAAO;CAI/E"}
+{"version":3,"file":"SanQiLiuYiCalculator.d.ts","sourceRoot":"","sources":["../../../../src/services/qimen/calculators/SanQiLiuYiCalculator.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAQ7D,MAAM,WAAW,aAAa;IAC5B,sBAAsB;IACtB,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAClC,uBAAuB;IACvB,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;CACnC;AAED;;;GAGG;AACH,qBAAa,oBAAoB;IAC/B;;;;;;;;;;;;OAYG;IACH,MAAM,CAAC,SAAS,CACd,YAAY,EAAE,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,EACtC,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,UAAU,GACrB,aAAa;IAiChB;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,SAAS;IASxB;;OAEG;IACH,MAAM,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE,OAAO,GAAG,OAAO;CAI/E"}

package/dist/services/qimen/calculators/SanQiLiuYiCalculator.js

@@ -1,50 +1,50 @@
 "use strict";
 /**
  * 三奇六仪计算器
- * 计算天盘布局（时干/日干带动的天盘飞布）
+ * 计算飞盘式天盘布局
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SanQiLiuYiCalculator = void 0;
 const constants_1 = require("../data/constants");
 /**
  * 三奇六仪计算器
- * 负责计算天盘布局
+ * 负责计算飞盘式天盘布局
  */
 class SanQiLiuYiCalculator {
     /**
-     * 计算天盘布局
+     * 计算飞盘式天盘布局
      * @param diPanGanGong 地盘干->宫位映射
-     * @param hourGanZhi 时干支（时盘）或日干支（日盘）
+     * @param refGanZhi 参考干支（时盘为时干支，余类推）
      * @param yinYangDun 阴阳遁
      * @returns 天盘各宫的干
      *
-     * 原理：
-     * 1. 找到时干（或日干）在地盘的落宫
-     * 2. 以该宫为起点，将三奇六仪按洛书顺序飞布
-     * 3. 阳遁顺飞，阴遁逆飞
-     *
-     * 例如：
-     * - 阳遁一局，时干为庚
-     * - 庚在地盘震三宫
-     * - 则天盘从震三宫开始顺布：戊-震3, 己-巽4, 庚-离9...
+     * 原理（飞盘式）：
+     * 1. 值符随时干：旬首六仪飞到参考干（甲用旬首仪）所在的地盘宫
+     * 2. 其余八干按 戊己庚辛壬癸丁丙乙 的循环顺序（自旬首仪起），
+     *    按宫位数字顺序（1→2→…→9→1）飞布，阳遁顺飞、阴遁逆飞
+     * 3. 落入中五宫之干寄坤二宫（查询时换算，显示时仍在中宫）
      */
-    static calculate(diPanGanGong, hourGanZhi, yinYangDun) {
+    static calculate(diPanGanGong, refGanZhi, yinYangDun) {
         const isYang = yinYangDun === '阳遁';
-        const hourGan = hourGanZhi.charAt(0);
-        // 时干对应的遁甲干
-        // 如果时干是甲，需要找到该甲的旬首，然后找到对应的六仪
-        const dunGan = this.getDunGan(hourGan, hourGanZhi);
-        // 找到遁甲干在地盘的落宫
-        let startGong = diPanGanGong[dunGan];
+        const refGan = refGanZhi.charAt(0);
+        // 参考干对应的遁甲干（甲遁于旬首六仪之下）
+        const refDunGan = this.getDunGan(refGan, refGanZhi);
+        // 起点宫 = 参考干（遁干）在地盘的落宫（中五寄坤二）
+        let startGong = diPanGanGong[refDunGan];
         if (startGong === 5) {
-            startGong = constants_1.ZHONG_GONG_JI; // 中宫寄坤二
+            startGong = constants_1.ZHONG_GONG_JI;
         }
+        // 飞布序列：自旬首仪起，按戊己庚辛壬癸丁丙乙循环
+        const xunShou = (0, constants_1.getXunShou)(refGanZhi);
+        const fuGan = (0, constants_1.getLiuYiGan)(xunShou);
+        const fuIdx = constants_1.SAN_QI_LIU_YI.indexOf(fuGan);
+        const flyOrder = constants_1.SAN_QI_LIU_YI.slice(fuIdx).concat(constants_1.SAN_QI_LIU_YI.slice(0, fuIdx));
         const gongGan = {};
         const ganGong = {};
-        // 从起始宫开始，依次布入三奇六仪（9干飞布9宫）
         for (let i = 0; i < 9; i++) {
-            const gan = constants_1.SAN_QI_LIU_YI[i];
-            const gong = this.getGongByStep(startGong, i, isYang);
+            const gan = flyOrder[i];
+            const offset = isYang ? i : -i;
+            const gong = (((startGong - 1 + offset) % 9) + 9) % 9 + 1;
             gongGan[gong] = gan;
             ganGong[gan] = gong;
         }
@@ -52,28 +52,15 @@ class SanQiLiuYiCalculator {
     }
     /**
      * 获取遁甲干
-     * 甲遁于六仪之下，需要根据时干支确定
+     * 甲遁于六仪之下，需要根据干支确定
      */
-    static getDunGan(hourGan, hourGanZhi) {
-        if (hourGan !== '甲') {
-            // 非甲时，直接返回时干
-            return hourGan;
+    static getDunGan(refGan, refGanZhi) {
+        if (refGan !== '甲') {
+            return refGan;
         }
-        // 甲时，需要找到旬首对应的六仪
-        const xunShou = (0, constants_1.getXunShou)(hourGanZhi);
+        const xunShou = (0, constants_1.getXunShou)(refGanZhi);
         return (0, constants_1.getLiuYiGan)(xunShou);
     }
-    /**
-     * 根据起始宫位和步数计算目标宫位（9宫飞布）
-     * 洛书9宫顺序：1(坎) -> 8(艮) -> 3(震) -> 4(巽) -> 5(中) -> 9(离) -> 2(坤) -> 7(兑) -> 6(乾)
-     */
-    static getGongByStep(startGong, steps, isYang) {
-        const startIdx = (0, constants_1.getLuoShuIndex9)(startGong);
-        const targetIdx = isYang
-            ? (startIdx + steps) % 9
-            : ((startIdx - steps) % 9 + 9) % 9;
-        return (0, constants_1.getLuoShuGong9)(targetIdx);
-    }
     /**
      * 根据天干找天盘落宫
      */

package/dist/services/qimen/calculators/SanQiLiuYiCalculator.js.map

@@ -1 +1 @@
-{"version":3,"file":"SanQiLiuYiCalculator.js","sourceRoot":"","sources":["../../../../src/services/qimen/calculators/SanQiLiuYiCalculator.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAGH,iDAO2B;AAS3B;;;GAGG;AACH,MAAa,oBAAoB;IAC/B;;;;;;;;;;;;;;;;OAgBG;IACH,MAAM,CAAC,SAAS,CACd,YAAsC,EACtC,UAAkB,EAClB,UAAsB;QAEtB,MAAM,MAAM,GAAG,UAAU,KAAK,IAAI,CAAC;QACnC,MAAM,OAAO,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAY,CAAC;QAEhD,WAAW;QACX,6BAA6B;QAC7B,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAEnD,cAAc;QACd,IAAI,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;QACrC,IAAI,SAAS,KAAK,CAAC,EAAE,CAAC;YACpB,SAAS,GAAG,yBAAa,CAAC,CAAC,QAAQ;QACrC,CAAC;QAED,MAAM,OAAO,GAA6B,EAA8B,CAAC;QACzE,MAAM,OAAO,GAA6B,EAA8B,CAAC;QAEzE,0BAA0B;QAC1B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YAC3B,MAAM,GAAG,GAAG,yBAAa,CAAC,CAAC,CAAC,CAAC;YAC7B,MAAM,IAAI,GAAG,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;YACtD,OAAO,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC;YACpB,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;QACtB,CAAC;QAED,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;IAC9B,CAAC;IAED;;;OAGG;IACK,MAAM,CAAC,SAAS,CAAC,OAAgB,EAAE,UAAkB;QAC3D,IAAI,OAAO,KAAK,GAAG,EAAE,CAAC;YACpB,aAAa;YACb,OAAO,OAAO,CAAC;QACjB,CAAC;QAED,iBAAiB;QACjB,MAAM,OAAO,GAAG,IAAA,sBAAU,EAAC,UAAU,CAAC,CAAC;QACvC,OAAO,IAAA,uBAAW,EAAC,OAAO,CAAC,CAAC;IAC9B,CAAC;IAED;;;OAGG;IACK,MAAM,CAAC,aAAa,CAAC,SAAkB,EAAE,KAAa,EAAE,MAAe;QAC7E,MAAM,QAAQ,GAAG,IAAA,2BAAe,EAAC,SAAS,CAAC,CAAC;QAE5C,MAAM,SAAS,GAAG,MAAM;YACtB,CAAC,CAAC,CAAC,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC;YACxB,CAAC,CAAC,CAAC,CAAC,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;QAErC,OAAO,IAAA,0BAAc,EAAC,SAAS,CAAC,CAAC;IACnC,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,aAAa,CAAC,OAAiC,EAAE,GAAY;QAClE,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;QAC1B,OAAO,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,yBAAa,CAAC,CAAC,CAAC,IAAI,CAAC;IAC3C,CAAC;CACF;AAtFD,oDAsFC"}
+{"version":3,"file":"SanQiLiuYiCalculator.js","sourceRoot":"","sources":["../../../../src/services/qimen/calculators/SanQiLiuYiCalculator.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAGH,iDAK2B;AAS3B;;;GAGG;AACH,MAAa,oBAAoB;IAC/B;;;;;;;;;;;;OAYG;IACH,MAAM,CAAC,SAAS,CACd,YAAsC,EACtC,SAAiB,EACjB,UAAsB;QAEtB,MAAM,MAAM,GAAG,UAAU,KAAK,IAAI,CAAC;QACnC,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAY,CAAC;QAE9C,uBAAuB;QACvB,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QAEpD,6BAA6B;QAC7B,IAAI,SAAS,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC;QACxC,IAAI,SAAS,KAAK,CAAC,EAAE,CAAC;YACpB,SAAS,GAAG,yBAAa,CAAC;QAC5B,CAAC;QAED,0BAA0B;QAC1B,MAAM,OAAO,GAAG,IAAA,sBAAU,EAAC,SAAS,CAAC,CAAC;QACtC,MAAM,KAAK,GAAG,IAAA,uBAAW,EAAC,OAAO,CAAC,CAAC;QACnC,MAAM,KAAK,GAAG,yBAAa,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC3C,MAAM,QAAQ,GAAG,yBAAa,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,yBAAa,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;QAElF,MAAM,OAAO,GAA6B,EAA8B,CAAC;QACzE,MAAM,OAAO,GAA6B,EAA8B,CAAC;QAEzE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YAC3B,MAAM,GAAG,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;YACxB,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC/B,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,SAAS,GAAG,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC1D,OAAO,CAAC,IAAe,CAAC,GAAG,GAAG,CAAC;YAC/B,OAAO,CAAC,GAAG,CAAC,GAAG,IAAe,CAAC;QACjC,CAAC;QAED,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;IAC9B,CAAC;IAED;;;OAGG;IACK,MAAM,CAAC,SAAS,CAAC,MAAe,EAAE,SAAiB;QACzD,IAAI,MAAM,KAAK,GAAG,EAAE,CAAC;YACnB,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,MAAM,OAAO,GAAG,IAAA,sBAAU,EAAC,SAAS,CAAC,CAAC;QACtC,OAAO,IAAA,uBAAW,EAAC,OAAO,CAAC,CAAC;IAC9B,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,aAAa,CAAC,OAAiC,EAAE,GAAY;QAClE,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;QAC1B,OAAO,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,yBAAa,CAAC,CAAC,CAAC,IAAI,CAAC;IAC3C,CAAC;CACF;AAvED,oDAuEC"}

package/dist/services/qimen/calculators/ZhuanPanCalculator.d.ts

@@ -3,14 +3,18 @@
  * Rotating style Qimen calculator (following《神奇之门》)
  *
  * 转盘式核心规则：
- * 1. 三奇六仪按物理方向旋转（非洛书飞布）
- * 2. 阳遁顺转（物理顺时针）：1→8→3→4→9→2→7→6
- * 3. 阴遁逆转（物理逆时针）：1→6→7→2→9→4→3→8
- * 4. 八门、九星同样按物理方向转动
- * 5. 中宫寄坤二
- * 6. 天禽星随天芮星（寄坤二宫）
+ * 1. 天盘、九星、八门是三个「物理转盘」，盘内元素相对顺序恒定不变
+ * 2. 转盘环序（物理顺时针，从坎一宫起）：坎→艮→震→巽→离→坤→兑→乾
+ *    - 九星环序：蓬任冲辅英芮柱心（禽寄芮，随坤二宫）
+ *    - 八门环序：休生伤杜景死惊开
+ * 3. 天盘干与九星同转：值符星携旬首六仪转到时干（遁干）所在的地盘宫
+ * 4. 值使门随时辰飞宫：从值符原始宫起，按旬内时辰序数，
+ *    阳遁顺数宫位数字（1→2→…→9→1）、阴遁逆数
+ * 5. 中五宫寄坤二宫；天禽随天芮
+ *
+ * 参照：《神奇之门》（张志春）、kentang2017/kinqimen pan_sky/pan_star/pan_door（MIT）
  */
-import type { GongWei, TianGan, DiZhi, BaMen, JiuXing, YinYangDun } from '../types';
+import type { GongWei, TianGan, BaMen, JiuXing, YinYangDun } from '../types';
 export interface ZhuanPanTianPanResult {
     gongGan: Record<GongWei, TianGan>;
     ganGong: Record<TianGan, GongWei>;
@@ -32,6 +36,11 @@ export interface ZhuanPanJiuXingResult {
  * 实现《神奇之门》中的转盘式排盘法
  */
 export declare class ZhuanPanCalculator {
+    /**
+     * 获取参考干（时干/日干/月干/年干）遁干后的地盘落宫
+     * 甲遁于旬首六仪之下；落中五宫者寄坤二
+     */
+    static getShiGanLuoGong(diPanGanGong: Record<TianGan, GongWei>, ganZhi: string): GongWei;
     /**
      * 计算转盘式天盘布局
      * @param diPanGanGong 地盘干->宫位映射
@@ -39,51 +48,45 @@ export declare class ZhuanPanCalculator {
      * @param yinYangDun 阴阳遁
      * @returns 天盘各宫的干
      *
-     * 原理（转盘式）：
-     * 1. 找到时干（或日干/月干/年干）在地盘的落宫
-     * 2. 计算该宫到值符星原始宫的旋转步数
-     * 3. 将整个地盘旋转相应步数
-     * 4. 阳遁顺时针旋转，阴遁逆时针旋转
+     * 原理（转盘式刚体旋转）：
+     * 1. 旬首六仪（值符所携之干）在地盘的原始宫
+     * 2. 参考干（时干等，甲用旬首仪）在地盘的落宫
+     * 3. 将整个地盘沿转盘环旋转，使旬首仪从原始宫转到参考干落宫
+     * 4. 中五宫之干寄坤二宫随盘转动；天盘中宫显示坤二宫之干
      */
     static calculateTianPan(diPanGanGong: Record<TianGan, GongWei>, ganZhi: string, yinYangDun: YinYangDun): ZhuanPanTianPanResult;
     /**
      * 计算转盘式八门布局
-     * @param zhiFuGong 值符星落宫（旬首遁干在地盘的宫位）
-     * @param hourZhi 时支
+     * @param zhiFuGong 值符星原始宫位（旬首遁干在地盘的宫位，值使门原始宫与其相同）
+     * @param refGanZhi 参考干支（时盘为时干支，余类推）
      * @param yinYangDun 阴阳遁
      * @returns 八门布局
      *
      * 原理（转盘式）：
-     * 1. 确定值使门（值符星原始宫位对应的门）
-     * 2. 值使门从值符星落宫起，按时辰数旋转
-     * 3. 阳遁顺时针，阴遁逆时针
-     * 4. 其他七门依次排列（按物理方向旋转）
+     * 1. 值使门 = 值符星原始宫位对应的门（中五宫寄坤二取死门）
+     * 2. 值使门落宫：从值符原始宫起，按参考干支的旬内序数（甲为0），
+     *    阳遁顺数宫位数字、阴遁逆数；落中五宫寄坤二
+     * 3. 其余七门按八门环序（休生伤杜景死惊开）随盘刚体旋转
      */
-    static calculateBaMen(zhiFuGong: GongWei, hourZhi: DiZhi, yinYangDun: YinYangDun): ZhuanPanBaMenResult;
+    static calculateBaMen(zhiFuGong: GongWei, refGanZhi: string, yinYangDun: YinYangDun): ZhuanPanBaMenResult;
     /**
      * 计算转盘式九星布局
-     * @param xunShouGong 旬首遁干在地盘的宫位
-     * @param hourZhi 时支
+     * @param xunShouGong 旬首遁干在地盘的宫位（值符星原始宫）
+     * @param shiGanLuoGong 参考干（时干等，甲用旬首仪）的地盘落宫
      * @param yinYangDun 阴阳遁
      * @returns 九星布局
      *
      * 原理（转盘式）：
-     * 1. 确定值符星（旬首落宫对应的星）
-     * 2. 值符星从地盘旬首落宫起，按时辰数旋转
-     * 3. 阳遁顺时针，阴遁逆时针
-     * 4. 天禽星（中五宫）随天芮星，或寄坤二
+     * 1. 值符星 = 旬首遁干原始宫对应的星（中五宫为天禽，寄坤二随天芮）
+     * 2. 值符星随时干：转盘旋转使值符星从原始宫转到参考干落宫
+     * 3. 其余诸星按九星环序（蓬任冲辅英芮柱心）随盘刚体旋转
      */
-    static calculateJiuXing(xunShouGong: GongWei, hourZhi: DiZhi, yinYangDun: YinYangDun): ZhuanPanJiuXingResult;
+    static calculateJiuXing(xunShouGong: GongWei, shiGanLuoGong: GongWei, yinYangDun: YinYangDun): ZhuanPanJiuXingResult;
     /**
      * 获取遁甲干
      * 甲遁于六仪之下，需要根据干支确定
      */
     private static getDunGan;
-    /**
-     * 根据起始宫位和步数计算目标宫位（转盘式9宫旋转）
-     * 包含中宫处理
-     */
-    private static getGongByRotation;
     /**
      * 根据宫位获取原始门
      */
@@ -92,16 +95,6 @@ export declare class ZhuanPanCalculator {
      * 根据宫位获取原始星
      */
     private static getXingByGong;
-    /**
-     * 计算所有八门的落宫（转盘式）
-     * 整体按物理方向旋转
-     */
-    private static calculateAllMenZhuanPan;
-    /**
-     * 计算所有九星的落宫（转盘式）
-     * 整体按物理方向旋转，天禽星随天芮星
-     */
-    private static calculateAllXingZhuanPan;
     /**
      * 根据宫位找门
      */

package/dist/services/qimen/calculators/ZhuanPanCalculator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ZhuanPanCalculator.d.ts","sourceRoot":"","sources":["../../../../src/services/qimen/calculators/ZhuanPanCalculator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAoBpF,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAClC,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;CACnC;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAChC,SAAS,EAAE,KAAK,CAAC;IACjB,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa,EAAE,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,EAAE,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACnC,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,EAAE,OAAO,CAAC;CACvB;AAID;;;GAGG;AACH,qBAAa,kBAAkB;IAC7B;;;;;;;;;;;;OAYG;IACH,MAAM,CAAC,gBAAgB,CACrB,YAAY,EAAE,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,EACtC,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU,GACrB,qBAAqB;IA6BxB;;;;;;;;;;;;OAYG;IACH,MAAM,CAAC,cAAc,CACnB,SAAS,EAAE,OAAO,EAClB,OAAO,EAAE,KAAK,EACd,UAAU,EAAE,UAAU,GACrB,mBAAmB;IAwBtB;;;;;;;;;;;;OAYG;IACH,MAAM,CAAC,gBAAgB,CACrB,WAAW,EAAE,OAAO,EACpB,OAAO,EAAE,KAAK,EACd,UAAU,EAAE,UAAU,GACrB,qBAAqB;IA0BxB;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,SAAS;IAUxB;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,iBAAiB;IAwBhC;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,YAAY;IAY3B;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,aAAa;IAe5B;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,uBAAuB;IA6BtC;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,wBAAwB;IAoCvC;;OAEG;IACH,MAAM,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,IAAI,EAAE,OAAO,GAAG,KAAK;IAI3E;;OAEG;IACH,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,IAAI,EAAE,OAAO,GAAG,OAAO;IAOjF;;OAEG;IACH,MAAM,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE,OAAO,GAAG,OAAO;CAI/E"}
+{"version":3,"file":"ZhuanPanCalculator.d.ts","sourceRoot":"","sources":["../../../../src/services/qimen/calculators/ZhuanPanCalculator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAS,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAiBpF,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAClC,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;CACnC;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAChC,SAAS,EAAE,KAAK,CAAC;IACjB,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa,EAAE,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,EAAE,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACnC,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,EAAE,OAAO,CAAC;CACvB;AAUD;;;GAGG;AACH,qBAAa,kBAAkB;IAC7B;;;OAGG;IACH,MAAM,CAAC,gBAAgB,CACrB,YAAY,EAAE,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,EACtC,MAAM,EAAE,MAAM,GACb,OAAO;IAOV;;;;;;;;;;;;OAYG;IACH,MAAM,CAAC,gBAAgB,CACrB,YAAY,EAAE,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,EACtC,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU,GACrB,qBAAqB;IA0CxB;;;;;;;;;;;;OAYG;IACH,MAAM,CAAC,cAAc,CACnB,SAAS,EAAE,OAAO,EAClB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,UAAU,GACrB,mBAAmB;IAyCtB;;;;;;;;;;;OAWG;IACH,MAAM,CAAC,gBAAgB,CACrB,WAAW,EAAE,OAAO,EACpB,aAAa,EAAE,OAAO,EACtB,UAAU,EAAE,UAAU,GACrB,qBAAqB;IA+BxB;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,SAAS;IAUxB;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,YAAY;IAY3B;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,aAAa;IAe5B;;OAEG;IACH,MAAM,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,IAAI,EAAE,OAAO,GAAG,KAAK;IAI3E;;OAEG;IACH,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,IAAI,EAAE,OAAO,GAAG,OAAO;IAOjF;;OAEG;IACH,MAAM,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE,OAAO,GAAG,OAAO;CAI/E"}