From 5b0ed3065742d92dbd7569d796b9b55f026ea689 Mon Sep 17 00:00:00 2001 From: 6tail <6tail@6tail.cn> Date: Wed, 3 May 2023 21:10:05 +0800 Subject: [PATCH] =?UTF-8?q?v1.6.2=20=E4=BC=98=E5=8C=96=E5=A4=9A=E8=AF=AD?= =?UTF-8?q?=E8=A8=80=E6=94=AF=E6=8C=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- __tests__/EightChar.test.js | 8 + lunar.js | 421 +++++++++++++++++++++++++++--------- package.json | 2 +- 3 files changed, 324 insertions(+), 107 deletions(-) diff --git a/__tests__/EightChar.test.js b/__tests__/EightChar.test.js index f05f03b..f8d151f 100644 --- a/__tests__/EightChar.test.js +++ b/__tests__/EightChar.test.js @@ -181,3 +181,11 @@ test('test11', () => { test('test12', () => { expect(Solar.fromYmdHms('1999', '06', '07', '09', '11', '00').getLunar().getEightChar().toString()).toBe('己卯 庚午 庚寅 辛巳'); }); + +test('流月', () => { + const solar = Solar.fromYmdHms(2023, 5, 3, 9, 0, 0); + const lunar = solar.getLunar(); + const eightChar = lunar.getEightChar(); + const yun = eightChar.getYun(1); + expect(yun.getDaYun()[0].getLiuNian()[0].getLiuYue()[0].getGanZhi()).toBe('甲寅'); +}); diff --git a/lunar.js b/lunar.js index 03279d8..2a1f1d9 100644 --- a/lunar.js +++ b/lunar.js @@ -4826,117 +4826,117 @@ '{sn.wangWang}', '{sn.tianXing}', '{sn.tianDe}', - '官日', - '吉期', - '玉宇', - '大时', - '大败', - '咸池', + '{sn.guanRi}', + '{sn.jiQi}', + '{sn.yuYu}', + '{sn.daShi}', + '{sn.daBai}', + '{sn.xianChi}', '{sn.zhuQue}', - '守日', - '天巫', - '福德', - '六仪', - '金堂', + '{sn.shouRi}', + '{sn.tianWu}', + '{sn.fuDe}', + '{sn.liuYi}', + '{sn.jinTang}', '{sn.jinKui}', - '厌对', - '招摇', - '九空', - '九坎', - '九焦', - '相日', - '宝光', - '天罡', - '死神', - '月刑', - '月害', - '游祸', - '重日', - '时德', - '民日', - '三合', - '临日', - '天马', - '时阴', - '鸣吠', - '死气', - '地囊', + '{sn.yanDui}', + '{sn.zhaoYao}', + '{sn.jiuKong}', + '{sn.jiuKan}', + '{sn.jiuJiao}', + '{sn.xiangRi}', + '{sn.baoGuang}', + '{sn.tianGang}', + '{sn.siShen}', + '{sn.yueXing}', + '{sn.yueHai}', + '{sn.youHuo}', + '{sn.chongRi}', + '{sn.shiDe}', + '{sn.minRi}', + '{sn.sanHe}', + '{sn.linRi}', + '{sn.tianMa}', + '{sn.shiYin}', + '{sn.mingFei}', + '{sn.siQi}', + '{sn.diNang}', '{sn.baiHu}', - '月德合', - '敬安', + '{sn.yueDeHe}', + '{sn.jingAn}', '{sn.yuTang}', - '普护', - '解神', - '小耗', - '天德合', - '月空', - '驿马', - '天后', - '除神', - '月破', - '大耗', - '五离', + '{sn.puHu}', + '{sn.jieShen}', + '{sn.xiaoHao}', + '{sn.tianDeHe}', + '{sn.yueKong}', + '{sn.yiMa}', + '{sn.tianHou}', + '{sn.chuShen}', + '{sn.yuePo}', + '{sn.daHao}', + '{sn.wuLi}', '{sn.tianLao}', - '阴德', - '福生', - '天吏', - '致死', - '元武', - '阳德', - '天喜', - '天医', + '{sn.yinDe}', + '{sn.fuSheng}', + '{sn.tianLi}', + '{sn.zhiSi}', + '{sn.yuanWu}', + '{sn.yangDe}', + '{sn.tianXi}', + '{sn.tianYi}', '{sn.siMing}', - '月厌', - '地火', - '四击', - '大煞', - '大会', - '天愿', - '六合', - '五富', - '圣心', - '河魁', - '劫煞', - '四穷', + '{sn.yueYan}', + '{sn.diHuo}', + '{sn.fourHit}', + '{sn.daSha}', + '{sn.daHui}', + '{sn.tianYuan}', + '{sn.liuHe}', + '{sn.wuFu}', + '{sn.shengXin}', + '{sn.heKui}', + '{sn.jieSha}', + '{sn.siQiong}', '{sn.gouChen}', - '触水龙', - '八风', - '天赦', - '五墓', - '八专', - '阴错', - '四耗', - '阳错', - '四废', - '三阴', - '小会', - '阴道冲阳', - '单阴', - '孤辰', - '阴位', - '行狠', - '了戾', - '绝阴', - '纯阳', - '七鸟', - '岁薄', - '阴阳交破', - '阴阳俱错', - '阴阳击冲', - '逐阵', - '阳错阴冲', - '七符', - '天狗', - '九虎', - '成日', - '天符', - '孤阳', - '绝阳', - '纯阴', - '六蛇', - '阴神', - '解除', - '阳破阴冲' + '{sn.chuShuiLong}', + '{sn.baFeng}', + '{sn.tianShe}', + '{sn.wuMu}', + '{sn.baZhuan}', + '{sn.yinCuo}', + '{sn.siHao}', + '{sn.yangCuo}', + '{sn.siFei}', + '{sn.sanYin}', + '{sn.xiaoHui}', + '{sn.yinDaoChongYang}', + '{sn.danYin}', + '{sn.guChen}', + '{sn.yinWei}', + '{sn.xingHen}', + '{sn.liaoLi}', + '{sn.jueYin}', + '{sn.chunYang}', + '{sn.qiNiao}', + '{sn.suiBo}', + '{sn.yinYangJiaoPo}', + '{sn.yinYangJuCuo}', + '{sn.yinYangJiChong}', + '{sn.zhuZhen}', + '{sn.yangCuoYinChong}', + '{sn.qiFu}', + '{sn.tianGou}', + '{sn.jiuHu}', + '{sn.chengRi}', + '{sn.tianFu}', + '{sn.guYang}', + '{sn.jueYang}', + '{sn.chunYin}', + '{sn.liuShe}', + '{sn.yinShen}', + '{sn.jieChu}', + '{sn.yangPoYinChong}' ], DAY_SHEN_SHA:'100=010203040506,0708090A0B101=010C0D,0E0F101112131415102=16011718191A1B1C1D1E,1F20212223103=24011825261B271D1E,28292A2B104=012C2D2E2F3031,3233343536105=3738,393A3B3C3D123E106=3F404142434445,464748107=494A4B4C4D,4E108=4F5051524C4D5345,54555657109=58595345,5A5B12565C10A=5D415E5F60,616263640B6510B=0266676869,6A6B6C0A3E6D10C=1602171803041B05061E,07086E10D=24181B0C0D,0E0F1011126F13141510E=70191A1C1D,1F2021222310F=0125261B271D,28292A2B110=012C2D2E2F3031,3233343536111=49013738,393A3B3C3D123E112=4F50013F404142434445,4648113=014A4B,4E6E114=51524C4D5345,54550B5657115=0158595345,5A5B12565C116=1601185D415E5F60,61626364117=24021867681B69,6A6B3E6D118=0203040506,0708119=1B0C0D,0E0F10111213141511A=191A1B1C1D1E,1F2021222311B=4925261B271D1E,28292A11C=4F502C2D2E2F3031,323334353611D=3738,393A3B3C3D123E11E=3F404142434445,460B4811F=4A4B,4E71120=16171851524C4D5345,545556121=241858595345,5A5B12565C122=5D415E5F60,61626364123=0267681B69,6A6B3E6D124=0203041B05061E,070847125=491B0C0D,0E0F101112131415126=4F50191A1C1D1E,1F20212223127=2526271D1E,28292A2B128=2C2D2E2F3031,32333435360B129=3738,393A3B3C3D123E12A=1617183F404142434445,464812B=24184A4B,4E7212C=51524C4D53,5455565712D=0158595345,5A5B12565C12E=015D415E5F60,616263647312F=49010267681B69,6A6B3E6D130=4F500102030405061E,070874131=010C0D,0E0F101112131415726E132=191A1C1D1E,1F2021220B722375133=2526271D1E,28292A2B134=1617182C2D2E2F3031,3233343536135=24183738,393A3B3C3D126F3E136=3F4041424344,4648137=4A4B,4E72138=51524C4D5345,545576567257139=4958595345,5A5B7612565C7713A=4F505D415E5F60,6162636413B=02676869,6A6B3E6D200=1601025D60,393B28292A11090A201=0103041A1B4A,123435360B6D202=011819681B4C1D061E,3D1014203=011718252F591D0D1E,1F20213233204=012C26,3C23205=493751522D2E69,121364223E2B206=503F4005311E,6A3A5A5B207=5841440C38,4615208=431C4D45,6B4E5648209=27534B45,545507086162125620A=16666730,0E0F635720B=0241425E5F1B,6C0A0B3E5C20C=02185D1B601E,393B28292A116E20D=171803041B4A,126F3435366D20E=7019684C1D06,3D101420F=4901252F591D0D,1F2021323378210=50012C26,3C23211=013751522D2E69,121364223E2B212=013F40053145,6A3A5A5B213=015841440C38,46156E214=16431C4D5345,6B4E5648215=27534B45,545507086162120B5648216=18671B30,0E0F6357217=02171841425E5F1B,3E5C218=025D60,393B28292A11219=4903041A1B4A,123435366D21A=5019681B4C1D061E,3D101421B=252F591D0D45,1F2021323321C=2C26,3C2321D=3751522D2E69,121364223E2B21E=163F40053145,6A3A5A5B21F=5841440C38,467147150B220=18431C4D5345,6B4E5648221=171827534B45,5455070861621256222=6730,0E0F6357223=490241425E5F1B,3E5C224=50025D1B601E,393B28292A11225=03041A4A,123435366D226=19684C1D061E,3D1014227=252F591D0D1E,1F20213233228=162C26,3C23229=3751522D2E69,121364220B3E2B22A=183F40053145,6A3A5A5B22B=17185841440C38,46157222C=431C4D53,6B4E564822D=490127534B45,54550708616212567922E=5001671B30,0E0F635722F=010241425E5F,3E5C230=01025D601E,393B28292A1174231=0103041A4A,1234353647726E6D232=1619684C1D061E,3D1014233=252F591D0D1E,1F202132330B75234=182C26,3C23235=17183751522D2E69,126F1364223E2B236=3F400531,6A3A5A5B237=495841440C38,461572238=50431C4D5345,6B4E76567248239=27534B45,5455070861627612567323A=6730,0E0F635723B=0241425E5F,3E5C300=0102415E5F1A1B69,090A471457301=011B05,6A125C302=5001185D19515203042F0C1D601E,323315303=4F490118251C1D1E,3C5A5B106D304=012C2706,1F20213B710B787A305=58372668300D,6B123E306=173F402D2E45,07086423307=00,393A0E2B308=24164142444A533145,61624622567B309=674C533845,28292A4E12135630A=431B594D,5455633435364830B=021B27,3D116C0A3E30C=500218415E5F1A1B691E,146E5730D=4F49181B05,6A126F5C30E=705D19515203042F0C1D60,3233150B30F=01251C1D,3C5A5B106D310=01172C2706,1F20213B7C311=0158372668300D,6B123E312=2416013F402D2E45,0708476423313=01,393A0E0F6E2B314=4142444A533145,61624622567D315=66671B4C533845,28292A4E121356316=5018431B594D,54556334353648317=4F4902181B4B,3D113E318=02415E5F1A69,140B57319=1B05,6A125C31A=175D19515203042F0C1D601E,32331531B=251C1D1E,3C5A5B106D31C=24162C2706,1F20213B31D=58372668300D,6B123E31E=3F402D2E45,0708642331F=00,393A0E0F2B320=50184142444A533145,61624622567E321=4F4918671B4C533845,28292A4E121356322=43594D,5455633435360B48323=021B4B,3D113E324=0217415E5F1A691E,1457325=05,6A125C326=58165D19515203042F0C1D601E,323315327=251C1D1E,3C5A5B106D328=2C2706,1F20213B75329=58372668300D,6B123E32A=50183F402D2E45,0708642332B=4F4918,393A0E0F722B32C=4142444A5331,616246220B567B32D=01671B4C533845,28292A4E12135632E=011743594D,5455633435364832F=01024B,3D113E330=24160102415E5F1A691E,741457331=0105,6A12726E5C332=5D19515203042F0C1D601E,32331572333=251C1D1E,3C5A5B106D334=50182C2706,1F20213B335=4F491858372668300D,6B126F3E336=3F402D2E,0708640B23337=00,393A0E0F722B338=174142444A533145,616246762256727B73339=674C533845,28292A4E7612135633A=241643594D,5455633435364833B=024B,3D113E400=5001431B,5A5B1248401=490141425E5F2F4B,32336314402=4F01024A1D1E,396B3C130B57403=01025803044C1D1E,07085C404=01183F5D5960,0E0F10127F405=171819,1F20213E6D788075406=162526690645,28292A407=242C2D2E050D,6162343536647B408=3767680C5345,6A3A3B3D12155623409=4041441C5345,46562B40A=501B274D31,4E1140B=4951521A1B3038,5455223E40C=4F431B1E,5A5B0981120B6E4840D=41425E5F2F4B,3233631440E=02184A1D,396B3C135740F=010217185803044C1D,0708475C410=16013F585960,0E0F1012411=240119,1F20213E6D412=012526690645,28292A413=012C2D2E050D,6162343536646E7B414=503767681B0C5345,6A3A3B3D126F155623415=494041441B1C5345,46562B416=4F1B274D31,4E11710B417=51521A1B3038,54556C81223E418=18431B,5A5B1248419=171841425E5F2F4B,3233631441A=16024A1D1E,396B3C135741B=24025844044C1D1E,07085C41C=3F5D5960,0E0F101241D=19,1F20213E6D41E=50702526690645,28292A41F=492C2D2E050D,6162343536647D420=4F663767681B0C5345,6A3A3B3D12150B5623421=4041441B1C5345,46562B422=181B274D31,4E11423=171851521A3038,5455223E424=16431E,5A5B1248425=2441425E5F2F4B,32336314426=024A1D1E,396B3C1357427=025803044C1D1E,07085C428=503F5D5960,0E0F10126F429=4919,1F20213E6D42A=4F2526690645,28292A0B8242B=2C2D2E050D,616234353664727E7342C=183767681B0C53,6A3A3B3D1215562342D=0117184041441C5345,4647562B42E=1601274D31,4E1142F=240151521A3038,5455223E430=01431E,5A5B761248431=0141425E5F2F4B,32336314726E432=50024A1D1E,396B3C137257433=49025844044C1D1E,0708745C434=4F3F5D5960,0E0F10120B435=19,1F20213E6D75436=1825266906,28292A82437=17182C2D2E050D,616234353664727B73438=163767680C5345,6A3A3B3D1215567223439=244041441C5345,46562B43A=274D31,4E1143B=51521A3038,545576223E83500=012F4D31,54550708323312501=01586938,0E0F3C63502=16010241435E5F051D1E,641448503=01020C1D4B1E,6A28292A353615220B504=0117183F03041C,123457505=181927,3D103E5C506=5D25306045,1F20213B616213507=492C2667,6D508=503751522D2E530645,1256509=401B4A530D45,393A5A5B115650A=4142441A1B4C,462350B=681B59,6B4E3E2B50C=162F4D311E,5455070832330981126E50D=586938,0E0F3C0B50E=02171841435E5F051D,64144850F=0102180C1D4B,6A28292A35361522510=013F03041C,123457511=49011927,3D103E5C512=50015D25306045,1F20213B616213513=012C26671B,6E6D514=3751522D2E1B530645,126F56515=401B4A530D45,393A5A5B1156516=164142441A1B4C,467123517=6859,6B4E6C810B3E2B518=17182F4D31,54550708323312519=18586938,0E0F3C6351A=0241435E5F051D1E,64144851B=49020C1D4B1E,6A28292A3536152251C=503F03041C,12345751D=1927,3D103E5C51E=705D25306045,1F20213B61621351F=2C26671B,6D520=163751522D2E1B530645,1256521=404A530D45,393A5A5B110B56522=17184142441A1B,4623523=186859,6B4E3E2B524=2F4D311E,54550708323312525=49586938,0E0F3C63526=500241435E5F051D1E,641448527=020C1D4B1E,6A28292A35361522528=3F03041C,126F344757529=1927,3D103E5C52A=165D25306045,1F20213B616213658452B=662C2667,0B726D52C=17183751522D2E1B5306,125652D=0118404A530D45,393A5A5B115652E=014142441A4C,462352F=49016859,6B4E3E2B530=50012F4D311E,545507083233761285531=01586938,0E0F3C63726E532=0241435E5F051D1E,64147248533=020C1D4B1E,6A28292A7435361522534=163F03041C,123457535=1927,3D100B3E5C536=16185D253060,1F20213B61621378537=182C2667,726D538=3751522D2E530645,125672539=49404A530D45,393A5A5B115653A=504142441A4C,46472353B=681B59,6B4E763E2B600=241601304D,3C28292A4E1235361423601=01,54553B63342B602=0102681D311E,3D603=010241425E5F4A1D381E,64604=01183F434C,39127148605=4F49181951520304594B,61620B3E73606=50256745,5A5B102257607=172C69,1F20215C608=5D37261B05536045,6B111256609=402D2E1A1B0C5345,6B11125660A=24161B1C06,6A3A0E0F1360B=5841442F270D,3233463E60C=304D1E,3C28292A4E0981123536146E2360D=00,54553B63342B60E=0218681D31,3D60F=4F4901021841425E5F4A1D38,640B610=50013F434C,391248611=01171951520304594B,61623E612=0125671B45,5A5B102257613=012C1B69,1F20216E5C614=24165D37261B05536045,6B11126F56615=402D2E1A1B0C5345,070815566D616=1C06,6A3A0E0F1347617=5841442F270D,3233466C813E618=18304D,3C28292A4E1235361423619=4F4918,54553B63340B2B61A=5002681D311E,3D61B=021741425E5F4A1D381E,6461C=3F434C,39124861D=1951520304594B,61623E61E=24167025671B45,5A5B10225761F=2C1B69,1F20215C620=5D372605536045,6B111256621=402D2E1A0C5345,070815566D622=181B1C06,6A3A0E0F13623=4F49185841442F270D,3233460B3E624=50304D1E,3C28292A4E1235361423625=17,54553B63342B626=02681D311E,3D627=0241425E5F4A1D381E,64628=24163F434C,39126F48629=1951520304594B,61623E62A=256745,5A5B1022578662B=2C69,1F2021725C7562C=185D37261B055360,6B11125662D=4F490118402D2E1A0C5345,0708150B566D62E=50011C06,6A3A0E0F1362F=01175841442F270D,3233463E630=01304D1E,3C28292A4E761235361423631=01,54553B6334726E2B87632=241602681D311E,3D72633=0241425E5F4A1D381E,7464634=3F434C,39124748635=1951520304594B,61623E6573636=661825671B,5A5B10225786637=4F49182C69,1F20210B725C75638=505D372605536045,6B11125672639=17402D2E1A0C5345,070815566D63A=1B1C06,6A3A0E0F1363B=5841442F270D,323346763E700=0103404142445906,46701=01020D,4E14702=50015152694D1D1E,54553B23703=4901051D1E,5A5B2B1288704=4F0102415E5F0C31,6162636415705=6667681C38,6A6B3E706=4303042745,07080B48707=02304B,0E0F101112708=16171819,1F20135657709=24185825261B5345,28292A353622565C70A=025D2C2D2E2F4A60,3233893470B=374C,393A3C3D3E6D70C=503F4041424459061E,466E70D=49020D,4E1470E=4F5152694D1D,54553B70F=01051D,5A5B12132B710=0102415E5F0C31,61626364150B65711=0167681C38,6A6B3E712=162417184303041B2745,070848713=240102181B304B,0E0F1011126E714=191A1B5345,1F20215657715=5825261B5345,28292A353622565C717=49374C,393A3C3D126F473E6D718=4F3F404142445906,46719=020D,4E1471A=515269,1D1E71B=051D1E,5A5B12132B71C=16021718415E5F0C31,616263641571D=241867681B1C38,6A6B3E71E=4303041B2745,07084871F=021B30,0E0F101112720=50191A5345,1F20215657721=495825265345,28292A353622565C722=4F025D2C2D2E2F4A60,32338934723=374C,393A3C3D123E6D724=3F4041424459061E,46098A0B725=020D,4E7114726=1617185152694D1D1E,54553B23727=2418051D1E,5A5B12132B728=02415E5F0C31,616263641573729=67681B1C38,6A6B3E72A=504303042745,07084872B=4902304B,0E0F1011126F7272C=4F70191A1B,1F2021565772D=015825265345,28292A353622565C72E=01025D2C2D2E2F4A60,323389340B72F=01374C,393A3C3D6C8A123E6D730=160117183F4041424459061E,46731=240102180D,4E14726E732=5152694D1D1E,54553B767223733=051D1E,5A5B7612132B77734=5002415E5F0C31,6162636415735=4967681C38,6A6B473E736=4F4303041B27,7448737=02304B,0E0F10111272738=191A5345,1F20210B56725775739=5825265345,28292A353622565C73A=160217185D2C2D2E2F4A60,3233893473B=2418374C,393A3C3D123E6D800=50013F5D402760,6A3A5A5B22801=490102414430,466D802=014D1D061E,6B4E4714803=011D0D1E,54550708616212804=0102671B4A,0E0F6323805=41425E5F4C,8B2B806=16593145,3928292A113536807=025803041A1B38,1234130B808=181943681B695345,3D105648809=1718252F0553534B45,1F20213B32335680A=50022C260C,3C155780B=493751522D2E1C,12643E5C80C=3F5D4027601E,6A3A5A5B226E80D=02414430,466D80E=4D1D06,6B4E1480F=011D0D,5455070861621279810=16010266674A,0E0F6323811=0141425E5F1B4C,0B3E2B812=01181B593145,3928292A113536813=010217185803041A1B38,1234136E814=501943681B695345,3D105648815=49252F05534B45,1F20213B323356816=022C260C,3C1557817=3751522D2E1C,126F643E5C818=3F5D402760,6A3A5A5B22819=02414430,466D81A=164D1D061E,6B4E1481B=1D0D1E,545507086162120B6581C=0218671B4A,0E0F632381D=171841425E5F1B4C,3E2B81E=501B593145,3928292A11353681F=49025D03041A38,123413820=194368695345,3D10475648821=252F05534B45,1F20213B323356716=50025D2C2D2E2F4A60,32338934822=022C260C,3C1557823=3751522D2E1C,12643E5C824=163F5D4027601E,6A3A5A5B098A22825=02414430,46710B6D826=184D1D061E,6B4E14827=17181D0D1E,54550708616212828=5002671B4A,0E0F6323829=4941425E5F4C,3E2B82A=593145,3928292A11353682B=025803041A38,126F34137282C=701943681B6953,3D10564882D=01252F05534B45,1F2021613233567882E=1601022C260C,3C155782F=013751522D2E1C,6C8A12640B3E5C830=01183F5D4027601E,6A3A5A5B22831=01021718414430,46726E6D832=504D1D061E,6B4E761472833=491D0D1E,545507086162761273834=02674A,0E0F6323835=41425E5F4C,3E2B836=1B5931,3928292A11743536837=025803041A38,12341372838=16194368695345,3D10567248839=252F05534B45,1F20213B32330B567583A=02182C260C,3C155783B=17183751522D2E1C,12643E5C900=013F408C2E4C,0708641457901=010259,393A0E0F5C902=2416015D4142441D601E,61624635367B903=0167691D1E,28292A4E126D904=01021B054D06,5455637134220B905=580C0D,3D11153E906=17415E5F1A1B1C45,23907=4F49021B27,6A3B12472B908=501819515203042F30533145,323356909=1825533845,3C5A5B105690A=022C43,1F2021487C90B=3726684A4B,6B12133E90C=24163F402D2E4C1E,070864146E5790D=0259,393A0E0F5C90E=5D4142441D60,61624635360B7B90F=0167691D,28292A4E126D910=0102171B054D06,5455633422911=4F4901581B0C0D,3D11153E912=500118415E5F1A1B1C45,23913=0102181B27,6A3B126E2B914=19515203042F30533145,323356915=25533845,3C5A5B1056916=2416022C43,1F202148917=3726684A4B,6B126F133E918=3F402D2E4C,070864140B57919=0259,393A0E0F5C91A=175D4142441D601E,61624635367D91B=4F4966671B691D1E,28292A4E126D91C=5002181B054D06,545563342291D=18581B0C0D,3D11153E91E=415E5F1A1C45,2391F=0227,6A3B122B920=241619515203042F305331,323356921=25533845,3C5A5B1056922=022C43,1F20210B48788D923=3726684A4B,6B12133E924=173F402D2E4C1E,0708098A641457925=4F49022E,393A0E0F475C926=50185D4142441D601E,61624635367E927=18671B691D1E,28292A4E126D928=02054D06,5455633422929=580C0D,3D11153E92A=2416415E5F1A1C45,2392B=0227,6A3B126F722B92C=7019515203042F305331,32330B5692D=0125533845,3C5A5B105692E=0102162C43,1F2021487592F=4F49013726684A4B,6B6C8A12133E930=5001183F402D2E4C1E,0708641457931=01021859,393A0E0F726E5C932=5D4142441D601E,616246763536727B73933=67691D1E,28292A4E76126D934=241602054D06,5455633422935=580C0D,3D11153E936=415E5F1A1B1C,740B23937=0227,6A3B12722B938=1719515203042F30533145,32335672939=4F4925533845,3C5A5B105693A=5002182C43,1F20214893B=183726684A4B,6B12133EA00=160170182543261C,28292A48A01=240117182C2D2E274B,61623464147BA02=013F376768301D1E,6A3A3D1257A03=01584041441D1E,465CA04=015D4D60,4E1113A05=4951521A1B4A,54553E6DA06=4F501B4C0645,5A5B12A07=41425E5F2F590D,32336322A08=025345,396B3C0B5623A09=020304695345,0708562BA0A=16180531,0E0F10126FA0B=241618190C38,1F20213B3536103EA0C=2543261C1E,28292A6E48A0D=2C2D2E274B,61623464147BA0E=3F376768301D,6A3A3D124757A0F=4924584041441B1D,465CA10=4F50015D1B4D60,4E1113A11=0151521A1B4A,54553E6DA12=011B4C0645,5A5B120BA13=0141425E5F2F590D,323363226EA14=1602185345,396B3C5623A15=240217180304695345,0708562BA16=0531,0E0F1012A17=190C38,1F20213B3536153EA18=2543261C,28292A4882A19=49503F3767681B301D1E,6A3A3D1257A1A=4F503F3767681B301D1E,6A3A3D1257A1B=584041441B1D1E,465CA1C=5D1B4D60,4E1171130BA1D=51521A1B4A,54553E6DA1E=16184C0645,5A5B12A1F=24171841425E5F2F590D,32336322A20=025345,396B3C5623A21=020304695345,0708562BA22=0531,0E0F10128EA23=49190C38,1F20213B3536153E788FA24=4F502543261C1E,28292A48A25=2C2D2E274B,61623464147DA26=663F3767681B301D1E,6A3A3D120B57A27=584041441B1D1E,465CA28=16185D4D60,4E1113A29=24171851521A4A,54553E6DA2A=4C0645,5A5B7612A2B=41425E5F2F590D,3233632272A2C=0253,396B3C475623A2D=1601020304695345,0708562BA2E=4F50010531,0E0F1012A2F=01190C38,1F20213B3536153EA30=012543261C1E,28292A09900B4882A31=012C2D2E274B,6162346414726E7E73A32=16183F376768301D1E,6A3A3D126F7257A33=2417185D4041441D1E,465CA34=5D4D60,4E1113A35=51521A4A,5455763E6D83A36=4C06,5A5B12A37=4941425E5F2F590D,3233632272A38=4F50029145,396B3C567223A39=020304695345,070874562BA3A=0531,0E0F10120BA3B=190C38,1F20213B6C903536153E75B00=01701718254A31,1F20216162B01=0118582C26,674C38B02=50013F375152432D2E591D1E,121448B03=4901401B1D4B1E,393A5B11B04=014142441A69,4657B05=681B05,6B4E3E5CB06=682F0C4D6045,5455070832331215B07=1C,0E0F3C636DB08=1602415E5F27530645,3536136456B09=0230530D45,6A28292A0B56B0A=17180304,126F342223B0B=1819,3D103E2BB0C=50254A311E,1F202161626EB0D=49582C26,671B4C38B0E=3F375152432D2E591D,121448B0F=01401B1D4B,393A3B5A5B11B10=014142441A1B69,4657B11=01681B05,6B4E3E5CB12=16015D2F0C4D6045,5455070832331215B13=011C,0E0F3C630B6E6DB14=021718415E5F27530645,3536136456B15=021830530D45,6A28292A56B16=500304,12342223B17=4919,3D103E2BB18=254A31,1F4E21616278B19=582C26,671B4C38B1A=3F375152432D2E1B591D1E,121448B1B=401B1D4B1E,393A3B5A5B1147B1C=164142441A1B69,467157B1D=6805,6B4E0B3E5CB1E=17185D2F0C926045,5455070832331215B1F=181C,0E0F3C636DB20=5002415E5F27530645,3536136456B21=490230530D45,6A28292A56B22=0304,12342223B23=19,3D103E2BB24=254A311E,1F20136162B25=582C26671B4C38,00B26=163F375152432D2E1B591D1E,121448B27=401D4B1E,393A3B5A5B110BB28=17184142441A69,4657B29=186805,6B4E3E5CB2A=505D2F0C4D6045,54550708323376121585B2B=491C,0E0F3C63726DB2C=02415E5F275306,3536136456B2D=010230530D45,6A28292A56B2E=010304,12342223B2F=0119,3D103E2BB30=1601254A311E,1F2021616209906584B31=0166582C26674C38,0B726EB32=17183F375152432D2E591D1E,126F147248B33=18401D4B1E,393A3B5A5B11B34=504142441A69,4657B35=49681B05,6B4E763E5CB36=5D2F0C4D60,5455070832331215B37=1C,0E0F3C63726DB38=02415E5F27530645,353613645672B39=0230530D45,6A28292A744756B3A=160304,12342223B3B=19,3D106C900B3E2BC00=500170661825670C,5A5B1013141523C01=4F4901182C1C,1F2021222BC02=011637261B271D311E,6B1112C03=01402D2E1A1B311D381E,0708C04=0143,6A3A0E0F7148C05=41442F4B,32334635360B3EC06=24164A4D45,3C28292A4E1257C07=174C,545563345CC08=025D6859536045,3D56C09=0241425E5F5345,4764566DC0A=50186906,393B126FC0B=4F4918581951520304050D,61623EC0C=25671B0C1E,5A5B101314156E23C0D=2C1B1C,1F2021222BC0E=3F37264B1D31,6B1112C0F=01402D2E1A1B301D38,07080BC10=241601431B,6A3A0E0F48C11=011741442F4B,32334635363EC12=014A4D45,3C28292A4E1257C13=014C,545563346E5CC14=5002185D6804536045,3D56C15=4F49021841425E5F5345,64566DC16=6906,393B12C17=581951524404050D,61623EC18=25670C,5A5B101314152386C19=2C1B1C,1F2021220B2BC1A=24163F37261B271D31,6B1112C1B=17402D2E1A1B301D381E,0708C1C=43,6A3A0E0F48C1D=41582F4B,32334635363EC1E=50184A4D45,3C28292A4E1257C1F=4F49184C,545563345CC20=025D6859536045,3D56C21=0241425E5F5345,64566DC22=6906,393B12C23=581951520304050D,61620B3EC24=241625671B0C1E,5A5B1013141523C25=172C1B1C,1F2021222BC26=3F3726271D311E,6B1112C27=402D2E1A301D381E,0708C28=501843,6A5B0E0F48C29=4F491841442F4B,32334635363EC2A=4A4D45,3C28292A4E761257C2B=4C,54556334725C93C2C=025D68595360,3D56C2D=010241425E5F5345,640B566DC2E=2416016906,393B12C2F=0117581951520304050D,61623EC30=0125670C,5A5B1009901314152386C31=012C1C,1F202122726E2B75C32=50183F3726271D311E,6B11126F72C33=4F4918402D2E1A301D381E,070847C34=431B,6A3A0E0F48C35=41442F4B,3233467635363EC36=4A4D,3C28292A4E1257C37=4C,545563340B725CC38=2416025D6859536045,3D5672C39=021741425E5F5345,7464566DC3A=6906,393B12C3B=581951520304050D,61626C903E6573', getTimeZhiIndex:function(hm){ @@ -5706,7 +5706,7 @@ getIndex:function(){return this._p.index;}, getMonthInChinese:function(){return LunarUtil.MONTH[this._p.index + 1];}, getGanZhi:function(){ - var yearGanIndex = LunarUtil.find(liuNian.getGanZhi(), LunarUtil.GAN).value; + var yearGanIndex = LunarUtil.find(this._p.liuNian.getGanZhi(), LunarUtil.GAN).index - 1; var offset = [2, 4, 6, 8, 0][yearGanIndex % 5]; var gan = LunarUtil.GAN[(this._p.index + offset) % 10 + 1]; var zhi = LunarUtil.ZHI[(this._p.index + LunarUtil.BASE_MONTH_ZHI_INDEX) % 12 + 1]; @@ -7091,6 +7091,110 @@ 'sn.tuHu': '土府', 'sn.wangWang': '往亡', 'sn.yaoAn': '要安', + 'sn.siShen': '死神', + 'sn.tianMa': '天马', + 'sn.jiuHu': '九虎', + 'sn.qiNiao': '七鸟', + 'sn.liuShe': '六蛇', + 'sn.guanRi': '官日', + 'sn.jiQi': '吉期', + 'sn.yuYu': '玉宇', + 'sn.daShi': '大时', + 'sn.daBai': '大败', + 'sn.xianChi': '咸池', + 'sn.shouRi': '守日', + 'sn.tianWu': '天巫', + 'sn.fuDe': '福德', + 'sn.liuYi': '六仪', + 'sn.jinTang': '金堂', + 'sn.yanDui': '厌对', + 'sn.zhaoYao': '招摇', + 'sn.jiuKong': '九空', + 'sn.jiuKan': '九坎', + 'sn.jiuJiao': '九焦', + 'sn.xiangRi': '相日', + 'sn.baoGuang': '宝光', + 'sn.tianGang': '天罡', + 'sn.yueXing': '月刑', + 'sn.yueHai': '月害', + 'sn.youHuo': '游祸', + 'sn.chongRi': '重日', + 'sn.shiDe': '时德', + 'sn.minRi': '民日', + 'sn.sanHe': '三合', + 'sn.linRi': '临日', + 'sn.shiYin': '时阴', + 'sn.mingFei': '鸣吠', + 'sn.siQi': '死气', + 'sn.diNang': '地囊', + 'sn.yueDeHe': '月德合', + 'sn.jingAn': '敬安', + 'sn.puHu': '普护', + 'sn.jieShen': '解神', + 'sn.xiaoHao': '小耗', + 'sn.tianDeHe': '天德合', + 'sn.yueKong': '月空', + 'sn.yiMa': '驿马', + 'sn.tianHou': '天后', + 'sn.chuShen': '除神', + 'sn.yuePo': '月破', + 'sn.daHao': '大耗', + 'sn.wuLi': '五离', + 'sn.yinDe': '阴德', + 'sn.fuSheng': '福生', + 'sn.tianLi': '天吏', + 'sn.zhiSi': '致死', + 'sn.yuanWu': '元武', + 'sn.yangDe': '阳德', + 'sn.tianXi': '天喜', + 'sn.tianYi': '天医', + 'sn.yueYan': '月厌', + 'sn.diHuo': '地火', + 'sn.fourHit': '四击', + 'sn.daSha': '大煞', + 'sn.daHui': '大会', + 'sn.tianYuan': '天愿', + 'sn.liuHe': '六合', + 'sn.wuFu': '五富', + 'sn.shengXin': '圣心', + 'sn.heKui': '河魁', + 'sn.jieSha': '劫煞', + 'sn.siQiong': '四穷', + 'sn.chuShuiLong': '触水龙', + 'sn.baFeng': '八风', + 'sn.tianShe': '天赦', + 'sn.wuMu': '五墓', + 'sn.baZhuan': '八专', + 'sn.yinCuo': '阴错', + 'sn.siHao': '四耗', + 'sn.yangCuo': '阳错', + 'sn.siFei': '四废', + 'sn.sanYin': '三阴', + 'sn.xiaoHui': '小会', + 'sn.yinDaoChongYang': '阴道冲阳', + 'sn.danYin': '单阴', + 'sn.guChen': '孤辰', + 'sn.yinWei': '阴位', + 'sn.xingHen': '行狠', + 'sn.liaoLi': '了戾', + 'sn.jueYin': '绝阴', + 'sn.chunYang': '纯阳', + 'sn.suiBo': '岁薄', + 'sn.yinYangJiaoPo': '阴阳交破', + 'sn.yinYangJuCuo': '阴阳俱错', + 'sn.yinYangJiChong': '阴阳击冲', + 'sn.zhuZhen': '逐阵', + 'sn.yangCuoYinChong': '阳错阴冲', + 'sn.qiFu': '七符', + 'sn.tianGou': '天狗', + 'sn.chengRi': '成日', + 'sn.tianFu': '天符', + 'sn.guYang': '孤阳', + 'sn.jueYang': '绝阳', + 'sn.chunYin': '纯阴', + 'sn.yinShen': '阴神', + 'sn.jieChu': '解除', + 'sn.yangPoYinChong': '阳破阴冲', 'ss.biJian': '比肩', 'ss.jieCai': '劫财', 'ss.shiShen': '食神', @@ -7481,6 +7585,100 @@ 'ny.changLiu': '长流' }, 'en': { + 'tg.jia': 'Jia', + 'tg.yi': 'Yi', + 'tg.bing': 'Bing', + 'tg.ding': 'Ding', + 'tg.wu': 'Wu', + 'tg.ji': 'Ji', + 'tg.geng': 'Geng', + 'tg.xin': 'Xin', + 'tg.ren': 'Ren', + 'tg.gui': 'Gui', + 'dz.zi': 'Zi', + 'dz.chou': 'Chou', + 'dz.yin': 'Yin', + 'dz.mao': 'Mao', + 'dz.chen': 'Chen', + 'dz.si': 'Si', + 'dz.wu': 'Wu', + 'dz.wei': 'Wei', + 'dz.shen': 'Shen', + 'dz.you': 'You', + 'dz.xu': 'Xu', + 'dz.hai': 'Hai', + 'zx.jian': 'Build', + 'zx.chu': 'Remove', + 'zx.man': 'Full', + 'zx.ping': 'Flat', + 'zx.ding': 'Stable', + 'zx.zhi': 'Hold', + 'zx.po': 'Break', + 'zx.wei': 'Danger', + 'zx.cheng': 'Complete', + 'zx.shou': 'Collect', + 'zx.kai': 'Open', + 'zx.bi': 'Close', + 'jz.jiaZi': 'JiaZi', + 'jz.yiChou': 'YiChou', + 'jz.bingYin': 'BingYin', + 'jz.dingMao': 'DingMao', + 'jz.wuChen': 'WuChen', + 'jz.jiSi': 'JiSi', + 'jz.gengWu': 'GengWu', + 'jz.xinWei': 'XinWei', + 'jz.renShen': 'RenShen', + 'jz.guiYou': 'GuiYou', + 'jz.jiaXu': 'JiaXu', + 'jz.yiHai': 'YiHai', + 'jz.bingZi': 'BingZi', + 'jz.dingChou': 'DingChou', + 'jz.wuYin': 'WuYin', + 'jz.jiMao': 'JiMao', + 'jz.gengChen': 'GengChen', + 'jz.xinSi': 'XinSi', + 'jz.renWu': 'RenWu', + 'jz.guiWei': 'GuiWei', + 'jz.jiaShen': 'JiaShen', + 'jz.yiYou': 'YiYou', + 'jz.bingXu': 'BingXu', + 'jz.dingHai': 'DingHai', + 'jz.wuZi': 'WuZi', + 'jz.jiChou': 'JiChou', + 'jz.gengYin': 'GengYin', + 'jz.xinMao': 'XinMao', + 'jz.renChen': 'RenChen', + 'jz.guiSi': 'GuiSi', + 'jz.jiaWu': 'JiaWu', + 'jz.yiWei': 'YiWei', + 'jz.bingShen': 'BingShen', + 'jz.dingYou': 'DingYou', + 'jz.wuXu': 'WuXu', + 'jz.jiHai': 'JiHai', + 'jz.gengZi': 'GengZi', + 'jz.xinChou': 'XinChou', + 'jz.renYin': 'RenYin', + 'jz.guiMao': 'GuiMao', + 'jz.jiaChen': 'JiaChen', + 'jz.yiSi': 'YiSi', + 'jz.bingWu': 'BingWu', + 'jz.dingWei': 'DingWei', + 'jz.wuShen': 'WuShen', + 'jz.jiYou': 'JiYou', + 'jz.gengXu': 'GengXu', + 'jz.xinHai': 'XinHai', + 'jz.renZi': 'RenZi', + 'jz.guiChou': 'GuiChou', + 'jz.jiaYin': 'JiaYin', + 'jz.yiMao': 'YiMao', + 'jz.bingChen': 'BingChen', + 'jz.dingSi': 'DingSi', + 'jz.wuWu': 'WuWu', + 'jz.jiWei': 'JiWei', + 'jz.gengShen': 'GengShen', + 'jz.xinYou': 'XinYou', + 'jz.renXu': 'RenXu', + 'jz.guiHai': 'GuiHai', 'sx.rat': 'Rat', 'sx.ox': 'Ox', 'sx.tiger': 'Tiger', @@ -7604,6 +7802,12 @@ 'sn.zhuQue': 'Rosefinch', 'sn.xuanWu': 'Black Tortoise', 'sn.tianEn': 'Serene Grace', + 'sn.siShen': 'Death', + 'sn.tianMa': 'Pegasus', + 'sn.baLong': 'Eight Dragon', + 'sn.jiuHu': 'Nine Tiger', + 'sn.qiNiao': 'Seven Bird', + 'sn.liuShe': 'Six Snake', 's.none': 'None', 's.goodLuck': 'Good luck', 's.badLuck': 'Bad luck', @@ -7640,6 +7844,11 @@ 'jr.wanSheng': 'All Saints\' Day', 'jr.pingAn': 'Christmas Eve', 'jr.shengDan': 'Christmas Day', + 'ts.zhan': 'At', + 'ts.hu': 'Household', + 'ts.zao': 'Cooker', + 'ts.dui': 'Pestle', + 'ts.xi': 'Habitat', 'ts.win': 'Window', 'ts.fang': 'Room', 'ts.chuang': 'Bed', @@ -7649,7 +7858,7 @@ 'ts.ce': 'Toilet', 'ts.cang': 'Depot', 'ts.cangKu': 'Depot', - 'ts.daMen': 'Door', + 'ts.daMen': 'Gate', 'ts.men': 'Door', 'ts.tang': 'Hall', 'ly.xianSheng': 'Win first', diff --git a/package.json b/package.json index cd0447d..de6c5be 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lunar-javascript", - "version": "1.6.1", + "version": "1.6.2", "description": "lunar is a calendar library for Solar and Chinese Lunar.", "main": "index.js", "scripts": {