v1.7.2 修复八字身宫计算错误的问题。
This commit is contained in:
@@ -23,3 +23,6 @@
|
|||||||
## [1.7.1] - 2025-03-05
|
## [1.7.1] - 2025-03-05
|
||||||
1. 调整每日宜忌的默认流派。
|
1. 调整每日宜忌的默认流派。
|
||||||
2. 更新2018之后的△T参数。
|
2. 更新2018之后的△T参数。
|
||||||
|
|
||||||
|
## [1.7.2] - 2025-04-07
|
||||||
|
1. 修复八字身宫计算错误的问题。
|
||||||
|
|||||||
@@ -152,7 +152,7 @@ test('身宫1', () => {
|
|||||||
const solar = Solar.fromYmdHms(1994, 12, 6, 2, 0, 0);
|
const solar = Solar.fromYmdHms(1994, 12, 6, 2, 0, 0);
|
||||||
const lunar = solar.getLunar();
|
const lunar = solar.getLunar();
|
||||||
const eightChar = lunar.getEightChar();
|
const eightChar = lunar.getEightChar();
|
||||||
expect(eightChar.getShenGong()).toBe('乙丑');
|
expect(eightChar.getShenGong()).toBe('丁丑');
|
||||||
});
|
});
|
||||||
|
|
||||||
test('身宫2', () => {
|
test('身宫2', () => {
|
||||||
|
|||||||
9
lunar.js
9
lunar.js
@@ -5727,15 +5727,12 @@
|
|||||||
getShenGong:function(){
|
getShenGong:function(){
|
||||||
var monthZhiIndex = LunarUtil.index(this.getMonthZhi(), LunarUtil.MONTH_ZHI, 0);
|
var monthZhiIndex = LunarUtil.index(this.getMonthZhi(), LunarUtil.MONTH_ZHI, 0);
|
||||||
var timeZhiIndex = LunarUtil.index(this.getTimeZhi(), LunarUtil.ZHI, 0);
|
var timeZhiIndex = LunarUtil.index(this.getTimeZhi(), LunarUtil.ZHI, 0);
|
||||||
var offset = monthZhiIndex + timeZhiIndex;
|
var offset = (monthZhiIndex + timeZhiIndex - 1) % 12;
|
||||||
while (offset > 12) {
|
var ganIndex = (this._p.lunar.getYearGanIndexExact() + 1) * 2 + offset;
|
||||||
offset -= 12;
|
|
||||||
}
|
|
||||||
var ganIndex = (this._p.lunar.getYearGanIndexExact() + 1) * 2 + (offset % 12);
|
|
||||||
while (ganIndex > 10) {
|
while (ganIndex > 10) {
|
||||||
ganIndex -= 10;
|
ganIndex -= 10;
|
||||||
}
|
}
|
||||||
return LunarUtil.GAN[ganIndex] + LunarUtil.MONTH_ZHI[offset];
|
return LunarUtil.GAN[ganIndex + 1] + LunarUtil.MONTH_ZHI[offset + 1];
|
||||||
},
|
},
|
||||||
getShenGongNaYin:function(){return LunarUtil.NAYIN[this.getShenGong()];},
|
getShenGongNaYin:function(){return LunarUtil.NAYIN[this.getShenGong()];},
|
||||||
getLunar:function(){return this._p.lunar;},
|
getLunar:function(){return this._p.lunar;},
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "lunar-javascript",
|
"name": "lunar-javascript",
|
||||||
"version": "1.7.1",
|
"version": "1.7.2",
|
||||||
"description": "lunar是一款无第三方依赖的公历(阳历)、农历(阴历、老黄历)、佛历和道历工具,支持星座、儒略日、干支、生肖、节气、节日、彭祖百忌、每日宜忌、吉神宜趋、凶煞宜忌、吉神(喜神/福神/财神/阳贵神/阴贵神)方位、胎神方位、冲煞、纳音、星宿、八字、五行、十神、建除十二值星、青龙名堂等十二神、黄道日及吉凶等。lunar is a calendar library for Solar and Chinese Lunar.",
|
"description": "lunar是一款无第三方依赖的公历(阳历)、农历(阴历、老黄历)、佛历和道历工具,支持星座、儒略日、干支、生肖、节气、节日、彭祖百忌、每日宜忌、吉神宜趋、凶煞宜忌、吉神(喜神/福神/财神/阳贵神/阴贵神)方位、胎神方位、冲煞、纳音、星宿、八字、五行、十神、建除十二值星、青龙名堂等十二神、黄道日及吉凶等。lunar is a calendar library for Solar and Chinese Lunar.",
|
||||||
"main": "index.js",
|
"main": "index.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
Reference in New Issue
Block a user